Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4b478ced authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'next/deletion' of... 

Merge branch 'next/deletion' of git+ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc

* 'next/deletion' of git+ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc:
  ARM: mach-loki: delete
  ARM: mach-s3c2400: delete
  ARM: mach-s3c24a0: delete
parents ae4c42e4 c8b7d43b

Documentation/arm/Samsung-S3C24XX/Overview.txt

+5 −2
Original line number Diff line number Diff line
@@ -8,10 +8,13 @@ Introduction 


  The Samsung S3C24XX range of ARM9 System-on-Chip CPUs are supported

  by the 's3c2410' architecture of ARM Linux. Currently the S3C2410,

  S3C2412, S3C2413, S3C2416 S3C2440, S3C2442, S3C2443 and S3C2450 devices

  S3C2412, S3C2413, S3C2416, S3C2440, S3C2442, S3C2443 and S3C2450 devices

  are supported.



  Support for the S3C2400 and S3C24A0 series are in progress.

  Support for the S3C2400 and S3C24A0 series was never completed and the

  corresponding code has been removed after a while.  If someone wishes to

  revive this effort, partial support can be retrieved from earlier Linux

  versions.



  The S3C2416 and S3C2450 devices are very similar and S3C2450 support is

  included under the arch/arm/mach-s3c2416 directory. Note, whilst core

arch/arm/Kconfig

+0 −11
Original line number Diff line number Diff line
@@ -493,14 +493,6 @@ config ARCH_KIRKWOOD 
	  Support for the following Marvell Kirkwood series SoCs:

	  88F6180, 88F6192 and 88F6281.



config ARCH_LOKI

	bool "Marvell Loki (88RC8480)"

	select CPU_FEROCEON

	select GENERIC_CLOCKEVENTS

	select PLAT_ORION

	help

	  Support for the Marvell Loki (88RC8480) SoC.



config ARCH_LPC32XX

	bool "NXP LPC32XX"

	select CLKSRC_MMIO
@@ -937,8 +929,6 @@ source "arch/arm/mach-kirkwood/Kconfig" 


source "arch/arm/mach-ks8695/Kconfig"



source "arch/arm/mach-loki/Kconfig"



source "arch/arm/mach-lpc32xx/Kconfig"



source "arch/arm/mach-msm/Kconfig"
@@ -982,7 +972,6 @@ source "arch/arm/plat-spear/Kconfig" 
source "arch/arm/plat-tcc/Kconfig"



if ARCH_S3C2410

source "arch/arm/mach-s3c2400/Kconfig"

source "arch/arm/mach-s3c2410/Kconfig"

source "arch/arm/mach-s3c2412/Kconfig"

source "arch/arm/mach-s3c2416/Kconfig"

arch/arm/Makefile

+1 −3
Original line number Diff line number Diff line
@@ -150,7 +150,6 @@ machine-$(CONFIG_ARCH_IXP23XX) := ixp23xx 
machine-$(CONFIG_ARCH_IXP4XX)		:= ixp4xx

machine-$(CONFIG_ARCH_KIRKWOOD)		:= kirkwood

machine-$(CONFIG_ARCH_KS8695)		:= ks8695

machine-$(CONFIG_ARCH_LOKI) 		:= loki

machine-$(CONFIG_ARCH_LPC32XX)		:= lpc32xx

machine-$(CONFIG_ARCH_MMP)		:= mmp

machine-$(CONFIG_ARCH_MSM)		:= msm
@@ -172,8 +171,7 @@ machine-$(CONFIG_ARCH_PNX4008) := pnx4008 
machine-$(CONFIG_ARCH_PXA)		:= pxa

machine-$(CONFIG_ARCH_REALVIEW)		:= realview

machine-$(CONFIG_ARCH_RPC)		:= rpc

machine-$(CONFIG_ARCH_S3C2410)		:= s3c2410 s3c2400 s3c2412 s3c2416 s3c2440 s3c2443

machine-$(CONFIG_ARCH_S3C24A0)		:= s3c24a0

machine-$(CONFIG_ARCH_S3C2410)		:= s3c2410 s3c2412 s3c2416 s3c2440 s3c2443

machine-$(CONFIG_ARCH_S3C64XX)		:= s3c64xx

machine-$(CONFIG_ARCH_S5P64X0)		:= s5p64x0

machine-$(CONFIG_ARCH_S5PC100)		:= s5pc100

arch/arm/configs/loki_defconfig

deleted100644 → 0
+0 −120
Original line number Diff line number Diff line 
CONFIG_EXPERIMENTAL=y

CONFIG_SYSVIPC=y

CONFIG_LOG_BUF_SHIFT=14

CONFIG_EXPERT=y

CONFIG_SLAB=y

CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

# CONFIG_BLK_DEV_BSG is not set

CONFIG_ARCH_LOKI=y

CONFIG_MACH_LB88RC8480=y

# CONFIG_CPU_FEROCEON_OLD_ID is not set

CONFIG_NO_HZ=y

CONFIG_HIGH_RES_TIMERS=y

CONFIG_PREEMPT=y

CONFIG_AEABI=y

CONFIG_ZBOOT_ROM_TEXT=0x0

CONFIG_ZBOOT_ROM_BSS=0x0

CONFIG_NET=y

CONFIG_PACKET=y

CONFIG_UNIX=y

CONFIG_INET=y

CONFIG_IP_MULTICAST=y

CONFIG_IP_PNP=y

CONFIG_IP_PNP_DHCP=y

CONFIG_IP_PNP_BOOTP=y

# CONFIG_IPV6 is not set

CONFIG_NET_PKTGEN=m

CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

CONFIG_MTD=y

CONFIG_MTD_PARTITIONS=y

CONFIG_MTD_CMDLINE_PARTS=y

CONFIG_MTD_CHAR=y

CONFIG_MTD_BLOCK=y

CONFIG_FTL=y

CONFIG_NFTL=y

CONFIG_MTD_CFI=y

CONFIG_MTD_JEDECPROBE=y

CONFIG_MTD_CFI_ADV_OPTIONS=y

CONFIG_MTD_CFI_GEOMETRY=y

CONFIG_MTD_CFI_I4=y

CONFIG_MTD_CFI_INTELEXT=y

CONFIG_MTD_CFI_AMDSTD=y

CONFIG_MTD_CFI_STAA=y

CONFIG_MTD_PHYSMAP=y

CONFIG_MTD_M25P80=y

CONFIG_MTD_NAND=y

CONFIG_MTD_NAND_VERIFY_WRITE=y

CONFIG_MTD_NAND_ORION=y

CONFIG_BLK_DEV_LOOP=y

# CONFIG_MISC_DEVICES is not set

# CONFIG_SCSI_PROC_FS is not set

CONFIG_BLK_DEV_SD=y

CONFIG_BLK_DEV_SR=m

CONFIG_CHR_DEV_SG=m

CONFIG_ATA=y

CONFIG_SATA_MV=y

CONFIG_NETDEVICES=y

CONFIG_NET_ETHERNET=y

CONFIG_MII=y

CONFIG_MV643XX_ETH=y

# CONFIG_NETDEV_10000 is not set

# CONFIG_INPUT_KEYBOARD is not set

# CONFIG_INPUT_MOUSE is not set

# CONFIG_SERIO is not set

CONFIG_SERIAL_8250=y

CONFIG_SERIAL_8250_CONSOLE=y

CONFIG_SERIAL_8250_RUNTIME_UARTS=2

CONFIG_LEGACY_PTY_COUNT=16

CONFIG_I2C=y

CONFIG_I2C_CHARDEV=y

CONFIG_I2C_MV64XXX=y

CONFIG_SPI=y

# CONFIG_HWMON is not set

# CONFIG_VGA_CONSOLE is not set

CONFIG_USB=y

CONFIG_USB_DEVICEFS=y

CONFIG_USB_PRINTER=y

CONFIG_USB_STORAGE=y

CONFIG_USB_STORAGE_DATAFAB=y

CONFIG_USB_STORAGE_FREECOM=y

CONFIG_USB_STORAGE_SDDR09=y

CONFIG_USB_STORAGE_SDDR55=y

CONFIG_USB_STORAGE_JUMPSHOT=y

CONFIG_NEW_LEDS=y

CONFIG_EXT2_FS=y

CONFIG_EXT3_FS=y

# CONFIG_EXT3_FS_XATTR is not set

CONFIG_XFS_FS=y

CONFIG_INOTIFY=y

CONFIG_ISO9660_FS=y

CONFIG_UDF_FS=m

CONFIG_MSDOS_FS=y

CONFIG_VFAT_FS=y

CONFIG_TMPFS=y

CONFIG_JFFS2_FS=y

CONFIG_CRAMFS=y

CONFIG_NFS_FS=y

CONFIG_NFS_V3=y

CONFIG_ROOT_NFS=y

CONFIG_PARTITION_ADVANCED=y

CONFIG_BSD_DISKLABEL=y

CONFIG_MINIX_SUBPARTITION=y

CONFIG_SOLARIS_X86_PARTITION=y

CONFIG_UNIXWARE_DISKLABEL=y

CONFIG_LDM_PARTITION=y

CONFIG_LDM_DEBUG=y

CONFIG_SUN_PARTITION=y

CONFIG_NLS_CODEPAGE_437=y

CONFIG_NLS_CODEPAGE_850=y

CONFIG_NLS_ISO8859_1=y

CONFIG_NLS_ISO8859_2=y

CONFIG_MAGIC_SYSRQ=y

CONFIG_SYSCTL_SYSCALL_CHECK=y

CONFIG_DEBUG_USER=y

CONFIG_CRYPTO_CBC=m

CONFIG_CRYPTO_ECB=m

CONFIG_CRYPTO_PCBC=m

CONFIG_CRC_CCITT=y

CONFIG_CRC16=y

CONFIG_LIBCRC32C=y

arch/arm/mach-loki/Kconfig

deleted100644 → 0
+0 −13
Original line number Diff line number Diff line 
if ARCH_LOKI



menu "Marvell Loki (88RC8480) Implementations"



config MACH_LB88RC8480

	bool "Marvell LB88RC8480 Development Board"

	help

	  Say 'Y' here if you want your kernel to support the

	  Marvell LB88RC8480 Development Board.



endmenu



endif