Commit 499f1640 authored by Stefan Agner's avatar Stefan Agner Committed by Arnd Bergmann

ARM: use ARM_SINGLE_ARMV7M for ARMv7-M platforms

Use the new config symbol ARM_SINGLE_ARMV7M which groups config
symbols used by modern ARMv7-M platforms. This allows supporting
multiple ARMv7-M platforms in one kernel image. However, a common
kernel image requires the combined platforms to share the same
main memory layout to be bootable.
Signed-off-by: default avatarStefan Agner <stefan@agner.ch>
Acked-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Acked-by: default avatarJoachim Eastwood <manabian@gmail.com>
Acked-by: default avatarMaxime Coquelin <maxime.coquelin@st.com>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent 993198a6
...@@ -334,6 +334,7 @@ config ARM_SINGLE_ARMV7M ...@@ -334,6 +334,7 @@ config ARM_SINGLE_ARMV7M
depends on !MMU depends on !MMU
select ARCH_WANT_OPTIONAL_GPIOLIB select ARCH_WANT_OPTIONAL_GPIOLIB
select ARM_NVIC select ARM_NVIC
select AUTO_ZRELADDR
select CLKSRC_OF select CLKSRC_OF
select COMMON_CLK select COMMON_CLK
select CPU_V7M select CPU_V7M
...@@ -411,24 +412,6 @@ config ARCH_EBSA110 ...@@ -411,24 +412,6 @@ config ARCH_EBSA110
Ethernet interface, two PCMCIA sockets, two serial ports and a Ethernet interface, two PCMCIA sockets, two serial ports and a
parallel port. parallel port.
config ARCH_EFM32
bool "Energy Micro efm32"
depends on !MMU
select ARCH_REQUIRE_GPIOLIB
select ARM_NVIC
select AUTO_ZRELADDR
select CLKSRC_OF
select COMMON_CLK
select CPU_V7M
select GENERIC_CLOCKEVENTS
select NO_DMA
select NO_IOPORT_MAP
select SPARSE_IRQ
select USE_OF
help
Support for Energy Micro's (now Silicon Labs) efm32 Giant Gecko
processors.
config ARCH_EP93XX config ARCH_EP93XX
bool "EP93xx-based" bool "EP93xx-based"
select ARCH_HAS_HOLES_MEMORYMODEL select ARCH_HAS_HOLES_MEMORYMODEL
...@@ -599,26 +582,6 @@ config ARCH_W90X900 ...@@ -599,26 +582,6 @@ config ARCH_W90X900
<http://www.nuvoton.com/hq/enu/ProductAndSales/ProductLines/ <http://www.nuvoton.com/hq/enu/ProductAndSales/ProductLines/
ConsumerElectronicsIC/ARMMicrocontroller/ARMMicrocontroller> ConsumerElectronicsIC/ARMMicrocontroller/ARMMicrocontroller>
config ARCH_LPC18XX
bool "NXP LPC18xx/LPC43xx"
depends on !MMU
select ARCH_HAS_RESET_CONTROLLER
select ARCH_REQUIRE_GPIOLIB
select ARM_AMBA
select ARM_NVIC
select AUTO_ZRELADDR
select CLKSRC_LPC32XX
select COMMON_CLK
select CPU_V7M
select GENERIC_CLOCKEVENTS
select NO_IOPORT_MAP
select PINCTRL
select SPARSE_IRQ
select USE_OF
help
Support for NXP's LPC18xx Cortex-M3 and LPC43xx Cortex-M4
high performance microcontrollers.
config ARCH_LPC32XX config ARCH_LPC32XX
bool "NXP LPC32XX" bool "NXP LPC32XX"
select ARCH_REQUIRE_GPIOLIB select ARCH_REQUIRE_GPIOLIB
...@@ -793,24 +756,6 @@ config ARCH_OMAP1 ...@@ -793,24 +756,6 @@ config ARCH_OMAP1
help help
Support for older TI OMAP1 (omap7xx, omap15xx or omap16xx) Support for older TI OMAP1 (omap7xx, omap15xx or omap16xx)
config ARCH_STM32
bool "STMicrolectronics STM32"
depends on !MMU
select ARCH_HAS_RESET_CONTROLLER
select ARM_NVIC
select ARMV7M_SYSTICK
select AUTO_ZRELADDR
select CLKSRC_OF
select COMMON_CLK
select CPU_V7M
select GENERIC_CLOCKEVENTS
select NO_IOPORT_MAP
select RESET_CONTROLLER
select SPARSE_IRQ
select USE_OF
help
Support for STMicroelectronics STM32 processors.
endchoice endchoice
menu "Multiple platform selection" menu "Multiple platform selection"
...@@ -1008,6 +953,35 @@ source "arch/arm/mach-zx/Kconfig" ...@@ -1008,6 +953,35 @@ source "arch/arm/mach-zx/Kconfig"
source "arch/arm/mach-zynq/Kconfig" source "arch/arm/mach-zynq/Kconfig"
# ARMv7-M architecture
config ARCH_EFM32
bool "Energy Micro efm32"
depends on ARM_SINGLE_ARMV7M
select ARCH_REQUIRE_GPIOLIB
help
Support for Energy Micro's (now Silicon Labs) efm32 Giant Gecko
processors.
config ARCH_LPC18XX
bool "NXP LPC18xx/LPC43xx"
depends on ARM_SINGLE_ARMV7M
select ARCH_HAS_RESET_CONTROLLER
select ARM_AMBA
select CLKSRC_LPC32XX
select PINCTRL
help
Support for NXP's LPC18xx Cortex-M3 and LPC43xx Cortex-M4
high performance microcontrollers.
config ARCH_STM32
bool "STMicrolectronics STM32"
depends on ARM_SINGLE_ARMV7M
select ARCH_HAS_RESET_CONTROLLER
select ARMV7M_SYSTICK
select RESET_CONTROLLER
help
Support for STMicroelectronics STM32 processors.
# Definitions to make life easier # Definitions to make life easier
config ARCH_ACORN config ARCH_ACORN
bool bool
......
...@@ -1596,9 +1596,8 @@ config DEBUG_UNCOMPRESS ...@@ -1596,9 +1596,8 @@ config DEBUG_UNCOMPRESS
config UNCOMPRESS_INCLUDE config UNCOMPRESS_INCLUDE
string string
default "debug/uncompress.h" if ARCH_MULTIPLATFORM || ARCH_MSM || \ default "debug/uncompress.h" if ARCH_MULTIPLATFORM || ARCH_MSM || \
PLAT_SAMSUNG || ARCH_EFM32 || \ PLAT_SAMSUNG || ARM_SINGLE_ARMV7M || \
ARCH_SHMOBILE_LEGACY || \ ARCH_SHMOBILE_LEGACY
ARCH_LPC18XX || ARM_SINGLE_ARMV7M
default "mach/uncompress.h" default "mach/uncompress.h"
config EARLY_PRINTK config EARLY_PRINTK
......
...@@ -16,6 +16,7 @@ CONFIG_EMBEDDED=y ...@@ -16,6 +16,7 @@ CONFIG_EMBEDDED=y
# CONFIG_IOSCHED_DEADLINE is not set # CONFIG_IOSCHED_DEADLINE is not set
# CONFIG_IOSCHED_CFQ is not set # CONFIG_IOSCHED_CFQ is not set
# CONFIG_MMU is not set # CONFIG_MMU is not set
CONFIG_ARM_SINGLE_ARMV7M=y
CONFIG_ARCH_EFM32=y CONFIG_ARCH_EFM32=y
CONFIG_SET_MEM_PARAM=y CONFIG_SET_MEM_PARAM=y
CONFIG_DRAM_BASE=0x88000000 CONFIG_DRAM_BASE=0x88000000
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment