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

Commit af37eec0 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

ARM: s3c64xx: multiplatform support 



After all preparation work is done, we can finally move the Kconfig
option for s3c64xx into ARCH_MULTIPLATFORM. This implies allowing
SAMSUNG_ATAGS for multiplatform again, but now disallowing the
ADC driver below it, as that still has dependencies on header files.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent bb08dea1

arch/arm/Kconfig

+0 −27
Original line number Diff line number Diff line
@@ -682,33 +682,6 @@ config ARCH_S3C24XX 
	  (<http://www.simtec.co.uk/products/EB110ITX/>), the IPAQ 1940 or the

	  Samsung SMDK2410 development board (and derivatives).



config ARCH_S3C64XX

	bool "Samsung S3C64XX"

	select ARCH_REQUIRE_GPIOLIB

	select ARM_AMBA

	select ARM_VIC

	select ATAGS

	select CLKDEV_LOOKUP

	select CLKSRC_SAMSUNG_PWM

	select COMMON_CLK_SAMSUNG

	select CPU_V6K

	select GENERIC_CLOCKEVENTS

	select GPIO_SAMSUNG

	select HAVE_S3C2410_I2C if I2C

	select HAVE_S3C2410_WATCHDOG if WATCHDOG

	select HAVE_TCM

	select NO_IOPORT_MAP

	select PLAT_SAMSUNG

	select PM_GENERIC_DOMAINS if PM

	select S3C_DEV_NAND

	select S3C_GPIO_TRACK

	select SAMSUNG_ATAGS

	select SAMSUNG_WAKEMASK

	select SAMSUNG_WDT_RESET

	select SPARSE_IRQ

	help

	  Samsung S3C64XX series based systems



config ARCH_DAVINCI

	bool "TI DaVinci"

	select ARCH_HAS_HOLES_MEMORYMODEL

arch/arm/configs/multi_v7_defconfig

+3 −0
Original line number Diff line number Diff line
@@ -11,6 +11,9 @@ CONFIG_MODULES=y 
CONFIG_MODULE_UNLOAD=y

CONFIG_PARTITION_ADVANCED=y

CONFIG_CMDLINE_PARTITION=y

CONFIG_ARCH_MULTI_V7=y

# CONFIG_ARCH_MULTI_V5 is not set

# CONFIG_ARCH_MULTI_V4 is not set

CONFIG_ARCH_VIRT=y

CONFIG_ARCH_ALPINE=y

CONFIG_ARCH_MVEBU=y

arch/arm/configs/s3c6400_defconfig

+2 −0
Original line number Diff line number Diff line
@@ -5,6 +5,8 @@ CONFIG_KALLSYMS_ALL=y 
CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

# CONFIG_BLK_DEV_BSG is not set

CONFIG_ARCH_MULTI_V6=y

# CONFIG_ARCH_MULTI_V7 is not set

CONFIG_ARCH_S3C64XX=y

CONFIG_S3C_BOOT_ERROR_RESET=y

CONFIG_MACH_SMDK6400=y

arch/arm/mach-s3c64xx/Kconfig

+21 −1
Original line number Diff line number Diff line
@@ -2,6 +2,27 @@ 
#	Simtec Electronics, Ben Dooks <ben@simtec.co.uk>

#

# Licensed under GPLv2

menuconfig ARCH_S3C64XX

	bool "Samsung S3C64XX" if ARCH_MULTI_V6

	select ARCH_REQUIRE_GPIOLIB

	select ARM_AMBA

	select ARM_VIC

	select ATAGS

	select CLKSRC_SAMSUNG_PWM

	select COMMON_CLK_SAMSUNG

	select GPIO_SAMSUNG

	select HAVE_S3C2410_I2C if I2C

	select HAVE_S3C2410_WATCHDOG if WATCHDOG

	select HAVE_TCM

	select PLAT_SAMSUNG

	select PM_GENERIC_DOMAINS if PM

	select S3C_DEV_NAND

	select S3C_GPIO_TRACK

	select SAMSUNG_ATAGS

	select SAMSUNG_WAKEMASK if PM

	select SAMSUNG_WDT_RESET

	help

	  Samsung S3C64XX series based systems



if ARCH_S3C64XX
@@ -310,7 +331,6 @@ config MACH_S3C64XX_DT 
	select CPU_S3C6410

	select PINCTRL

	select PINCTRL_S3C64XX

	select USE_OF

	help

	  Machine support for Samsung S3C6400/S3C6410 machines with Device Tree

	  enabled.

arch/arm/mach-s3c64xx/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -5,6 +5,9 @@ 
#

# Licensed under GPLv2



ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/$(src)/include -I$(srctree)/arch/arm/plat-samsung/include

asflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/$(src)/include -I$(srctree)/arch/arm/plat-samsung/include



# Core



obj-y				+= common.o