Signed-off-by: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx> --- arch/arm/Kconfig | 18 +++++++++++++++--- arch/arm/configs/am335x_mlo_defconfig | 2 +- arch/arm/configs/am35xx_pfc200_xload_defconfig | 2 +- arch/arm/configs/archosg9_defconfig | 2 +- arch/arm/configs/archosg9_xload_defconfig | 2 +- .../omap3430_sdp3430_per_uart_defconfig | 2 +- arch/arm/configs/omap3530_beagle_defconfig | 2 +- .../configs/omap3530_beagle_per_uart_defconfig | 2 +- .../configs/omap3530_beagle_xload_defconfig | 2 +- arch/arm/configs/omap3_evm_defconfig | 2 +- arch/arm/configs/omap_defconfig | 2 +- arch/arm/configs/panda_defconfig | 2 +- arch/arm/configs/panda_xload_defconfig | 2 +- .../phytec-phycard-omap3-xload_defconfig | 2 +- .../arm/configs/phytec-phycard-omap3_defconfig | 2 +- .../phytec-phycard-omap4-xload_defconfig | 2 +- .../arm/configs/phytec-phycard-omap4_defconfig | 2 +- ...phytec-phycore-omap4460-xload-mmc_defconfig | 2 +- ...hytec-phycore-omap4460-xload-nand_defconfig | 2 +- .../configs/phytec-phycore-omap4460_defconfig | 2 +- 20 files changed, 34 insertions(+), 22 deletions(-) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 44055456ce..7ac24ba1de 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -32,6 +32,11 @@ config ARCH_STM32 Selected by both STM32 MCUs and MPUs to restrict driver visibility. +config ARCH_OMAP + bool + select HAS_DEBUG_LL + select GPIOLIB + choice prompt "ARM system type" @@ -140,10 +145,9 @@ config ARCH_NOMADIK help Support for the Nomadik platform by ST-Ericsson -config ARCH_OMAP +config ARCH_OMAP_SINGLE bool "TI OMAP" - select HAS_DEBUG_LL - select GPIOLIB + select ARCH_OMAP config ARCH_PXA bool "Intel/Marvell PXA based" @@ -271,6 +275,14 @@ config ARCH_IMX select CPU_SUPPORTS_32BIT_KERNEL select CPU_SUPPORTS_64BIT_KERNEL +config ARCH_OMAP_MULTI + bool "TI OMAP" + depends on ARCH_MULTIARCH + select OMAP_MULTI_BOARDS + select ARCH_OMAP + select HAS_DEBUG_LL + select GPIOLIB + config ARCH_ROCKCHIP bool "Rockchip RX3xxx" depends on ARCH_MULTIARCH diff --git a/arch/arm/configs/am335x_mlo_defconfig b/arch/arm/configs/am335x_mlo_defconfig index 57602ba309..f2b722056b 100644 --- a/arch/arm/configs/am335x_mlo_defconfig +++ b/arch/arm/configs/am335x_mlo_defconfig @@ -1,4 +1,4 @@ -CONFIG_ARCH_OMAP=y +CONFIG_ARCH_OMAP_SINGLE=y CONFIG_BAREBOX_MAX_IMAGE_SIZE=0x1b400 CONFIG_OMAP_BUILD_IFT=y CONFIG_OMAP_SERIALBOOT=y diff --git a/arch/arm/configs/am35xx_pfc200_xload_defconfig b/arch/arm/configs/am35xx_pfc200_xload_defconfig index 710e39ff61..4bc119f75b 100644 --- a/arch/arm/configs/am35xx_pfc200_xload_defconfig +++ b/arch/arm/configs/am35xx_pfc200_xload_defconfig @@ -1,4 +1,4 @@ -CONFIG_ARCH_OMAP=y +CONFIG_ARCH_OMAP_SINGLE=y CONFIG_OMAP_BUILD_IFT=y CONFIG_OMAP_MULTI_BOARDS=y CONFIG_MACH_WAGO_PFC_AM35XX=y diff --git a/arch/arm/configs/archosg9_defconfig b/arch/arm/configs/archosg9_defconfig index dd509fca72..288d4bda52 100644 --- a/arch/arm/configs/archosg9_defconfig +++ b/arch/arm/configs/archosg9_defconfig @@ -1,5 +1,5 @@ CONFIG_TEXT_BASE=0x8f000000 -CONFIG_ARCH_OMAP=y +CONFIG_ARCH_OMAP_SINGLE=y CONFIG_OMAP4_USBBOOT=y CONFIG_MACH_ARCHOSG9=y CONFIG_THUMB2_BAREBOX=y diff --git a/arch/arm/configs/archosg9_xload_defconfig b/arch/arm/configs/archosg9_xload_defconfig index b6a0475d40..f90757d954 100644 --- a/arch/arm/configs/archosg9_xload_defconfig +++ b/arch/arm/configs/archosg9_xload_defconfig @@ -1,5 +1,5 @@ CONFIG_TEXT_BASE=0x40300000 -CONFIG_ARCH_OMAP=y +CONFIG_ARCH_OMAP_SINGLE=y CONFIG_BAREBOX_MAX_IMAGE_SIZE=0xC000 # CONFIG_OMAP_GPMC is not set CONFIG_OMAP_BUILD_IFT=y diff --git a/arch/arm/configs/omap3430_sdp3430_per_uart_defconfig b/arch/arm/configs/omap3430_sdp3430_per_uart_defconfig index 646a392b6b..b41176342f 100644 --- a/arch/arm/configs/omap3430_sdp3430_per_uart_defconfig +++ b/arch/arm/configs/omap3430_sdp3430_per_uart_defconfig @@ -1,5 +1,5 @@ CONFIG_TEXT_BASE=0x40200000 -CONFIG_ARCH_OMAP=y +CONFIG_ARCH_OMAP_SINGLE=y CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y CONFIG_PROMPT="X-load 343x> " CONFIG_SHELL_SIMPLE=y diff --git a/arch/arm/configs/omap3530_beagle_defconfig b/arch/arm/configs/omap3530_beagle_defconfig index e959bdfde3..d1f5669cb3 100644 --- a/arch/arm/configs/omap3530_beagle_defconfig +++ b/arch/arm/configs/omap3530_beagle_defconfig @@ -1,4 +1,4 @@ -CONFIG_ARCH_OMAP=y +CONFIG_ARCH_OMAP_SINGLE=y CONFIG_OMAP_MULTI_BOARDS=y CONFIG_MACH_BEAGLE=y CONFIG_THUMB2_BAREBOX=y diff --git a/arch/arm/configs/omap3530_beagle_per_uart_defconfig b/arch/arm/configs/omap3530_beagle_per_uart_defconfig index 2439bd955e..3a38011f3d 100644 --- a/arch/arm/configs/omap3530_beagle_per_uart_defconfig +++ b/arch/arm/configs/omap3530_beagle_per_uart_defconfig @@ -1,5 +1,5 @@ CONFIG_TEXT_BASE=0x40200000 -CONFIG_ARCH_OMAP=y +CONFIG_ARCH_OMAP_SINGLE=y CONFIG_PROMPT="X-load Beagle>" CONFIG_SHELL_SIMPLE=y # CONFIG_ERRNO_MESSAGES is not set diff --git a/arch/arm/configs/omap3530_beagle_xload_defconfig b/arch/arm/configs/omap3530_beagle_xload_defconfig index 0a47479f18..15984e129e 100644 --- a/arch/arm/configs/omap3530_beagle_xload_defconfig +++ b/arch/arm/configs/omap3530_beagle_xload_defconfig @@ -1,4 +1,4 @@ -CONFIG_ARCH_OMAP=y +CONFIG_ARCH_OMAP_SINGLE=y CONFIG_OMAP_BUILD_IFT=y CONFIG_OMAP3_USBBOOT=y CONFIG_OMAP_MULTI_BOARDS=y diff --git a/arch/arm/configs/omap3_evm_defconfig b/arch/arm/configs/omap3_evm_defconfig index 8c5df029a7..22ac4b66ec 100644 --- a/arch/arm/configs/omap3_evm_defconfig +++ b/arch/arm/configs/omap3_evm_defconfig @@ -1,5 +1,5 @@ CONFIG_TEXT_BASE=0x40200000 -CONFIG_ARCH_OMAP=y +CONFIG_ARCH_OMAP_SINGLE=y CONFIG_MACH_OMAP3EVM=y CONFIG_AEABI=y CONFIG_PROMPT="OMAP3_EVM> " diff --git a/arch/arm/configs/omap_defconfig b/arch/arm/configs/omap_defconfig index 433d9bdd7d..13b630a978 100644 --- a/arch/arm/configs/omap_defconfig +++ b/arch/arm/configs/omap_defconfig @@ -1,4 +1,4 @@ -CONFIG_ARCH_OMAP=y +CONFIG_ARCH_OMAP_SINGLE=y CONFIG_BAREBOX_UPDATE_AM33XX_SPI_NOR_MLO=y CONFIG_BAREBOX_UPDATE_AM33XX_NAND=y CONFIG_BAREBOX_UPDATE_AM33XX_EMMC=y diff --git a/arch/arm/configs/panda_defconfig b/arch/arm/configs/panda_defconfig index b199e7990b..97118fb837 100644 --- a/arch/arm/configs/panda_defconfig +++ b/arch/arm/configs/panda_defconfig @@ -1,5 +1,5 @@ CONFIG_TEXT_BASE=0x8f000000 -CONFIG_ARCH_OMAP=y +CONFIG_ARCH_OMAP_SINGLE=y CONFIG_MACH_PANDA=y CONFIG_THUMB2_BAREBOX=y CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y diff --git a/arch/arm/configs/panda_xload_defconfig b/arch/arm/configs/panda_xload_defconfig index bc33882c85..9203734dd6 100644 --- a/arch/arm/configs/panda_xload_defconfig +++ b/arch/arm/configs/panda_xload_defconfig @@ -1,5 +1,5 @@ CONFIG_TEXT_BASE=0x40300000 -CONFIG_ARCH_OMAP=y +CONFIG_ARCH_OMAP_SINGLE=y # CONFIG_OMAP_GPMC is not set CONFIG_OMAP_BUILD_IFT=y CONFIG_MACH_PANDA=y diff --git a/arch/arm/configs/phytec-phycard-omap3-xload_defconfig b/arch/arm/configs/phytec-phycard-omap3-xload_defconfig index 26a539f7f7..048f7c0bde 100644 --- a/arch/arm/configs/phytec-phycard-omap3-xload_defconfig +++ b/arch/arm/configs/phytec-phycard-omap3-xload_defconfig @@ -1,5 +1,5 @@ CONFIG_TEXT_BASE=0x40200000 -CONFIG_ARCH_OMAP=y +CONFIG_ARCH_OMAP_SINGLE=y CONFIG_BAREBOX_MAX_IMAGE_SIZE=0x0000f000 CONFIG_OMAP_BUILD_IFT=y CONFIG_MACH_PCAAL1=y diff --git a/arch/arm/configs/phytec-phycard-omap3_defconfig b/arch/arm/configs/phytec-phycard-omap3_defconfig index a9abf12a13..fbcf5c6390 100644 --- a/arch/arm/configs/phytec-phycard-omap3_defconfig +++ b/arch/arm/configs/phytec-phycard-omap3_defconfig @@ -1,5 +1,5 @@ CONFIG_TEXT_BASE=0x85000000 -CONFIG_ARCH_OMAP=y +CONFIG_ARCH_OMAP_SINGLE=y CONFIG_MACH_PCAAL1=y CONFIG_AEABI=y CONFIG_MALLOC_SIZE=0x1000000 diff --git a/arch/arm/configs/phytec-phycard-omap4-xload_defconfig b/arch/arm/configs/phytec-phycard-omap4-xload_defconfig index a1859140db..1761a15b72 100644 --- a/arch/arm/configs/phytec-phycard-omap4-xload_defconfig +++ b/arch/arm/configs/phytec-phycard-omap4-xload_defconfig @@ -1,5 +1,5 @@ CONFIG_TEXT_BASE=0x40300000 -CONFIG_ARCH_OMAP=y +CONFIG_ARCH_OMAP_SINGLE=y CONFIG_OMAP_BUILD_IFT=y CONFIG_MACH_PCAAXL2=y CONFIG_THUMB2_BAREBOX=y diff --git a/arch/arm/configs/phytec-phycard-omap4_defconfig b/arch/arm/configs/phytec-phycard-omap4_defconfig index a0bb846a6d..ae3cfb751d 100644 --- a/arch/arm/configs/phytec-phycard-omap4_defconfig +++ b/arch/arm/configs/phytec-phycard-omap4_defconfig @@ -1,5 +1,5 @@ CONFIG_TEXT_BASE=0x8f000000 -CONFIG_ARCH_OMAP=y +CONFIG_ARCH_OMAP_SINGLE=y CONFIG_MACH_PCAAXL2=y CONFIG_AEABI=y CONFIG_ARM_UNWIND=y diff --git a/arch/arm/configs/phytec-phycore-omap4460-xload-mmc_defconfig b/arch/arm/configs/phytec-phycore-omap4460-xload-mmc_defconfig index 19365a6fcd..8ffdd90789 100644 --- a/arch/arm/configs/phytec-phycore-omap4460-xload-mmc_defconfig +++ b/arch/arm/configs/phytec-phycore-omap4460-xload-mmc_defconfig @@ -1,5 +1,5 @@ CONFIG_TEXT_BASE=0x40300000 -CONFIG_ARCH_OMAP=y +CONFIG_ARCH_OMAP_SINGLE=y CONFIG_BAREBOX_MAX_IMAGE_SIZE=0xC000 CONFIG_OMAP_BUILD_IFT=y CONFIG_MACH_PCM049=y diff --git a/arch/arm/configs/phytec-phycore-omap4460-xload-nand_defconfig b/arch/arm/configs/phytec-phycore-omap4460-xload-nand_defconfig index 14cab44b5d..66ee694542 100644 --- a/arch/arm/configs/phytec-phycore-omap4460-xload-nand_defconfig +++ b/arch/arm/configs/phytec-phycore-omap4460-xload-nand_defconfig @@ -1,5 +1,5 @@ CONFIG_TEXT_BASE=0x40300000 -CONFIG_ARCH_OMAP=y +CONFIG_ARCH_OMAP_SINGLE=y CONFIG_BAREBOX_MAX_IMAGE_SIZE=0xC000 CONFIG_OMAP_BUILD_IFT=y CONFIG_MACH_PCM049=y diff --git a/arch/arm/configs/phytec-phycore-omap4460_defconfig b/arch/arm/configs/phytec-phycore-omap4460_defconfig index 7d5369cb23..a2362a0fce 100644 --- a/arch/arm/configs/phytec-phycore-omap4460_defconfig +++ b/arch/arm/configs/phytec-phycore-omap4460_defconfig @@ -1,5 +1,5 @@ CONFIG_TEXT_BASE=0x8f000000 -CONFIG_ARCH_OMAP=y +CONFIG_ARCH_OMAP_SINGLE=y CONFIG_BAREBOX_MAX_IMAGE_SIZE=0x80000 CONFIG_MACH_PCM049=y CONFIG_AEABI=y -- 2.30.2
