diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2014-07-07 14:25:15 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2015-12-01 21:50:26 +0100 |
| commit | af37eec0653128e991d20b8c1fc763ed1cde96c7 (patch) | |
| tree | 1aeffa5986ee10893627c0ac5bc970b6ff19336c /arch/arm/plat-samsung | |
| parent | ARM: s3c64xx: use common debug-ll implementation (diff) | |
| download | linux-af37eec0653128e991d20b8c1fc763ed1cde96c7.tar.xz linux-af37eec0653128e991d20b8c1fc763ed1cde96c7.zip | |
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: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/plat-samsung')
| -rw-r--r-- | arch/arm/plat-samsung/Kconfig | 2 | ||||
| -rw-r--r-- | arch/arm/plat-samsung/Makefile | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/plat-samsung/Kconfig b/arch/arm/plat-samsung/Kconfig index 1a1ba83e7da6..e8229b9fee4a 100644 --- a/arch/arm/plat-samsung/Kconfig +++ b/arch/arm/plat-samsung/Kconfig @@ -39,7 +39,6 @@ config S3C_LOWLEVEL_UART_PORT config SAMSUNG_ATAGS def_bool n - depends on !ARCH_MULTIPLATFORM depends on ATAGS help This option enables ATAGS based boot support code for @@ -70,6 +69,7 @@ config S3C_GPIO_TRACK config S3C_ADC bool "ADC common driver support" + depends on !ARCH_MULTIPLATFORM help Core support for the ADC block found in the Samsung SoC systems for drivers such as the touchscreen and hwmon to use to share diff --git a/arch/arm/plat-samsung/Makefile b/arch/arm/plat-samsung/Makefile index aeb19e3288b9..be172efec15c 100644 --- a/arch/arm/plat-samsung/Makefile +++ b/arch/arm/plat-samsung/Makefile @@ -4,7 +4,8 @@ # # Licensed under GPLv2 -ccflags-$(CONFIG_ARCH_MULTI_V7) += -I$(srctree)/$(src)/include +ccflags-$(CONFIG_ARCH_S3C64XX) := -I$(srctree)/arch/arm/mach-s3c64xx/include +ccflags-$(CONFIG_ARCH_MULTIPLATFORM) += -I$(srctree)/$(src)/include # Objects we always build independent of SoC choice |