diff options
| author | Manish Pandey <manish.pandey2@arm.com> | 2018-06-18 13:00:31 +0100 |
|---|---|---|
| committer | Tushar Khandelwal <tushar.khandelwal@arm.com> | 2019-06-27 18:13:37 +0100 |
| commit | 0d0f2307c4d4638c959e0d6ab43801287f81ad18 (patch) | |
| tree | e610f9ba51d8ba573e1fa0607ff40dcf5128a7e1 | |
| parent | 94710cac0ef4ee177a63b5227664b38c95bbf703 (diff) | |
arm: support for a single ARMv7-A based platform.
The reason for having a single ARMv7A based platform is to bypass
collection of configs provided/concealed by ARCH_MULTIPLATFORM, for
example XIP_KERNEL cannot be enabled with ARCH_MULTIPLATFORM.
Having a separate config for single ARMv7-A platform will give the
freedom to choose only those configs which are required for a given
ARMv7-A based platform.
Signed-off-by: Manish Pandey <manish.pandey2@arm.com>
| -rw-r--r-- | arch/arm/Kconfig | 14 | ||||
| -rw-r--r-- | arch/arm/Kconfig.debug | 3 | ||||
| -rw-r--r-- | arch/arm/Makefile | 2 | ||||
| -rw-r--r-- | arch/arm/kernel/devtree.c | 3 |
4 files changed, 20 insertions, 2 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 843edfd000be..525c21d5ded7 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -356,6 +356,20 @@ config ARM_SINGLE_ARMV7M select SPARSE_IRQ select USE_OF +config ARM_SINGLE_ARMV7A + bool "ARMv7-A single platform" + select ARM_HAS_SG_CHAIN + select AUTO_ZRELADDR + select TIMER_OF + select COMMON_CLK + select CPU_V7 + select GENERIC_CLOCKEVENTS + select MIGHT_HAVE_PCI + select MULTI_IRQ_HANDLER + select PCI_DOMAINS if PCI + select SPARSE_IRQ + select USE_OF + config ARCH_EBSA110 bool "EBSA-110" select ARCH_USES_GETTIMEOFFSET diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug index 693f84392f1b..3e629df88437 100644 --- a/arch/arm/Kconfig.debug +++ b/arch/arm/Kconfig.debug @@ -1836,7 +1836,8 @@ config DEBUG_UNCOMPRESS config UNCOMPRESS_INCLUDE string default "debug/uncompress.h" if ARCH_MULTIPLATFORM || ARCH_MSM || \ - PLAT_SAMSUNG || ARM_SINGLE_ARMV7M + PLAT_SAMSUNG || ARM_SINGLE_ARMV7M || \ + ARM_SINGLE_ARMV7A default "mach/uncompress.h" config EARLY_PRINTK diff --git a/arch/arm/Makefile b/arch/arm/Makefile index fc26c3d7b9b6..da5b699fbcaa 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -268,6 +268,7 @@ platdirs := $(patsubst %,arch/arm/plat-%/,$(sort $(plat-y))) ifneq ($(CONFIG_ARCH_MULTIPLATFORM),y) ifneq ($(CONFIG_ARM_SINGLE_ARMV7M),y) +ifneq ($(CONFIG_ARM_SINGLE_ARMV7A),y) ifeq ($(KBUILD_SRC),) KBUILD_CPPFLAGS += $(patsubst %,-I%include,$(machdirs) $(platdirs)) else @@ -275,6 +276,7 @@ KBUILD_CPPFLAGS += $(patsubst %,-I$(srctree)/%include,$(machdirs) $(platdirs)) endif endif endif +endif export TEXT_OFFSET GZFLAGS MMUEXT diff --git a/arch/arm/kernel/devtree.c b/arch/arm/kernel/devtree.c index ecaa68dd1af5..fbeb098dbf00 100644 --- a/arch/arm/kernel/devtree.c +++ b/arch/arm/kernel/devtree.c @@ -219,7 +219,8 @@ const struct machine_desc * __init setup_machine_fdt(unsigned int dt_phys) { const struct machine_desc *mdesc, *mdesc_best = NULL; -#if defined(CONFIG_ARCH_MULTIPLATFORM) || defined(CONFIG_ARM_SINGLE_ARMV7M) +#if defined(CONFIG_ARCH_MULTIPLATFORM) || defined(CONFIG_ARM_SINGLE_ARMV7M)\ + || defined(CONFIG_ARM_SINGLE_ARMV7A) DT_MACHINE_START(GENERIC_DT, "Generic DT based system") .l2c_aux_val = 0x0, .l2c_aux_mask = ~0x0, |