aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTomasz Figa <t.figa@samsung.com>2013-06-14 20:01:49 -0400
committerKukjin Kim <kgene.kim@samsung.com>2013-06-14 20:32:33 -0400
commitcd8dc7ae41f2b2e6392e32c8471589a8ca5fa705 (patch)
tree84552d9c237ff6cd07f48ada4edc270fe1379ccd
parentf8b1ac01458a39454d04172df4c070134902f837 (diff)
ARM: SAMSUNG: Introduce SAMSUNG_ATAGS Kconfig entry
This patch adds a Kconfig entry that enables compilation of legacy support code required for Samsung platforms that require ATAGS based boot. This allows to bypass compilation of this code when platforms without ATAGS support are selected. Signed-off-by: Tomasz Figa <t.figa@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Acked-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
-rw-r--r--arch/arm/Kconfig6
-rw-r--r--arch/arm/plat-samsung/Kconfig26
-rw-r--r--arch/arm/plat-samsung/Makefile6
3 files changed, 30 insertions, 8 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index fc20cfc471d0..aa8dcfc27903 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -702,6 +702,7 @@ config ARCH_S3C24XX
702 select MULTI_IRQ_HANDLER 702 select MULTI_IRQ_HANDLER
703 select NEED_MACH_GPIO_H 703 select NEED_MACH_GPIO_H
704 select NEED_MACH_IO_H 704 select NEED_MACH_IO_H
705 select SAMSUNG_ATAGS
705 help 706 help
706 Samsung S3C2410, S3C2412, S3C2413, S3C2416, S3C2440, S3C2442, S3C2443 707 Samsung S3C2410, S3C2412, S3C2413, S3C2416, S3C2440, S3C2442, S3C2443
707 and S3C2450 SoCs based systems, such as the Simtec Electronics BAST 708 and S3C2450 SoCs based systems, such as the Simtec Electronics BAST
@@ -726,6 +727,7 @@ config ARCH_S3C64XX
726 select PLAT_SAMSUNG 727 select PLAT_SAMSUNG
727 select S3C_DEV_NAND 728 select S3C_DEV_NAND
728 select S3C_GPIO_TRACK 729 select S3C_GPIO_TRACK
730 select SAMSUNG_ATAGS
729 select SAMSUNG_CLKSRC 731 select SAMSUNG_CLKSRC
730 select SAMSUNG_GPIOLIB_4BIT 732 select SAMSUNG_GPIOLIB_4BIT
731 select SAMSUNG_IRQ_VIC_TIMER 733 select SAMSUNG_IRQ_VIC_TIMER
@@ -744,6 +746,7 @@ config ARCH_S5P64X0
744 select HAVE_S3C2410_WATCHDOG if WATCHDOG 746 select HAVE_S3C2410_WATCHDOG if WATCHDOG
745 select HAVE_S3C_RTC if RTC_CLASS 747 select HAVE_S3C_RTC if RTC_CLASS
746 select NEED_MACH_GPIO_H 748 select NEED_MACH_GPIO_H
749 select SAMSUNG_ATAGS
747 help 750 help
748 Samsung S5P64X0 CPU based systems, such as the Samsung SMDK6440, 751 Samsung S5P64X0 CPU based systems, such as the Samsung SMDK6440,
749 SMDK6450. 752 SMDK6450.
@@ -760,6 +763,7 @@ config ARCH_S5PC100
760 select HAVE_S3C2410_WATCHDOG if WATCHDOG 763 select HAVE_S3C2410_WATCHDOG if WATCHDOG
761 select HAVE_S3C_RTC if RTC_CLASS 764 select HAVE_S3C_RTC if RTC_CLASS
762 select NEED_MACH_GPIO_H 765 select NEED_MACH_GPIO_H
766 select SAMSUNG_ATAGS
763 help 767 help
764 Samsung S5PC100 series based systems 768 Samsung S5PC100 series based systems
765 769
@@ -778,6 +782,7 @@ config ARCH_S5PV210
778 select HAVE_S3C_RTC if RTC_CLASS 782 select HAVE_S3C_RTC if RTC_CLASS
779 select NEED_MACH_GPIO_H 783 select NEED_MACH_GPIO_H
780 select NEED_MACH_MEMORY_H 784 select NEED_MACH_MEMORY_H
785 select SAMSUNG_ATAGS
781 help 786 help
782 Samsung S5PV210/S5PC110 series based systems 787 Samsung S5PV210/S5PC110 series based systems
783 788
@@ -796,6 +801,7 @@ config ARCH_EXYNOS
796 select HAVE_S3C_RTC if RTC_CLASS 801 select HAVE_S3C_RTC if RTC_CLASS
797 select NEED_MACH_GPIO_H 802 select NEED_MACH_GPIO_H
798 select NEED_MACH_MEMORY_H 803 select NEED_MACH_MEMORY_H
804 select SAMSUNG_ATAGS
799 select USE_OF 805 select USE_OF
800 help 806 help
801 Support for SAMSUNG's EXYNOS SoCs (EXYNOS4/5) 807 Support for SAMSUNG's EXYNOS SoCs (EXYNOS4/5)
diff --git a/arch/arm/plat-samsung/Kconfig b/arch/arm/plat-samsung/Kconfig
index f8ed2de0a678..c0f0542e6dfc 100644
--- a/arch/arm/plat-samsung/Kconfig
+++ b/arch/arm/plat-samsung/Kconfig
@@ -60,6 +60,20 @@ config S3C_LOWLEVEL_UART_PORT
60 this configuration should be between zero and two. The port 60 this configuration should be between zero and two. The port
61 must have been initialised by the boot-loader before use. 61 must have been initialised by the boot-loader before use.
62 62
63config SAMSUNG_ATAGS
64 def_bool n
65 depends on !ARCH_MULTIPLATFORM
66 depends on ATAGS
67 help
68 This option enables ATAGS based boot support code for
69 Samsung platforms, including static platform devices, legacy
70 clock, timer and interrupt initialization, etc.
71
72 Platforms that support only DT based boot need not to select
73 this option.
74
75if SAMSUNG_ATAGS
76
63# timer options 77# timer options
64 78
65config SAMSUNG_HRT 79config SAMSUNG_HRT
@@ -367,11 +381,6 @@ config S5P_DEV_JPEG
367 help 381 help
368 Compile in platform device definitions for JPEG codec 382 Compile in platform device definitions for JPEG codec
369 383
370config S5P_DEV_MFC
371 bool
372 help
373 Compile in setup memory (init) code for MFC
374
375config S5P_DEV_ONENAND 384config S5P_DEV_ONENAND
376 bool 385 bool
377 help 386 help
@@ -412,6 +421,8 @@ config S3C_DMA
412 help 421 help
413 Internal configuration for S3C DMA core 422 Internal configuration for S3C DMA core
414 423
424endif
425
415config SAMSUNG_DMADEV 426config SAMSUNG_DMADEV
416 bool 427 bool
417 select ARM_AMBA 428 select ARM_AMBA
@@ -421,6 +432,11 @@ config SAMSUNG_DMADEV
421 help 432 help
422 Use DMA device engine for PL330 DMAC. 433 Use DMA device engine for PL330 DMAC.
423 434
435config S5P_DEV_MFC
436 bool
437 help
438 Compile in setup memory (init) code for MFC
439
424comment "Power management" 440comment "Power management"
425 441
426config SAMSUNG_PM_DEBUG 442config SAMSUNG_PM_DEBUG
diff --git a/arch/arm/plat-samsung/Makefile b/arch/arm/plat-samsung/Makefile
index a23c460299a1..b549ea9cfe09 100644
--- a/arch/arm/plat-samsung/Makefile
+++ b/arch/arm/plat-samsung/Makefile
@@ -31,10 +31,10 @@ obj-$(CONFIG_S3C_ADC) += adc.o
31 31
32# devices 32# devices
33 33
34obj-y += platformdata.o 34obj-$(CONFIG_SAMSUNG_ATAGS) += platformdata.o
35 35
36obj-y += devs.o 36obj-$(CONFIG_SAMSUNG_ATAGS) += devs.o
37obj-y += dev-uart.o 37obj-$(CONFIG_SAMSUNG_ATAGS) += dev-uart.o
38obj-$(CONFIG_S5P_DEV_MFC) += s5p-dev-mfc.o 38obj-$(CONFIG_S5P_DEV_MFC) += s5p-dev-mfc.o
39obj-$(CONFIG_S5P_DEV_UART) += s5p-dev-uart.o 39obj-$(CONFIG_S5P_DEV_UART) += s5p-dev-uart.o
40 40