diff options
author | Gabe Black <gabeblack@google.com> | 2013-09-30 23:00:33 -0700 |
---|---|---|
committer | Isaac Christensen <isaac.christensen@se-eng.com> | 2014-09-08 18:59:23 +0200 |
commit | 51edd54738b2248e92580caa317aa4e8e1694d40 (patch) | |
tree | d10c6be921f2d3656d9f504f4572a1c73f7860e3 /payloads/libpayload | |
parent | 94b4a266fb4df1f2f59ed8052c150ee4bf3e6d41 (diff) | |
download | coreboot-staging-51edd54738b2248e92580caa317aa4e8e1694d40.zip coreboot-staging-51edd54738b2248e92580caa317aa4e8e1694d40.tar.gz |
ARM: Generalize armv7 as arm.
There are ARM systems which are essentially heterogeneous multicores where
some cores implement a different ARM architecture version than other cores. A
specific example is the tegra124 which boots on an ARMv4 coprocessor while
most code, including most of the firmware, runs on the main ARMv7 core. To
support SOCs like this, the plan is to generalize the ARM architecture so that
all versions are available, and an SOC/CPU can then select what architecture
variant should be used for each component of the firmware; bootblock,
romstage, and ramstage.
Old-Change-Id: I22e048c3bc72bd56371e14200942e436c1e312c2
Signed-off-by: Gabe Black <gabeblack@google.com>
Reviewed-on: https://chromium-review.googlesource.com/171338
Reviewed-by: Gabe Black <gabeblack@chromium.org>
Commit-Queue: Gabe Black <gabeblack@chromium.org>
Tested-by: Gabe Black <gabeblack@chromium.org>
(cherry picked from commit 8423a41529da0ff67fb9873be1e2beb30b09ae2d)
Signed-off-by: Isaac Christensen <isaac.christensen@se-eng.com>
ARM: Split out ARMv7 code and make it possible to have other arch versions.
We don't always want to use ARMv7 code when building for ARM, so we should
separate out the ARMv7 code so it can be excluded, and also make it possible
to include code for some other version of the architecture instead, all per
build component for cases where we need more than one architecture version
at a time.
The tegra124 bootblock will ultimately need to be ARMv4, but until we have
some ARMv4 code to switch over to we can leave it set to ARMv7.
Old-Change-Id: Ia982c91057fac9c252397b7c866224f103761cc7
Reviewed-on: https://chromium-review.googlesource.com/171400
Reviewed-by: Gabe Black <gabeblack@chromium.org>
Tested-by: Gabe Black <gabeblack@chromium.org>
Commit-Queue: Gabe Black <gabeblack@chromium.org>
(cherry picked from commit 799514e6060aa97acdcf081b5c48f965be134483)
Squashed two related patches for splitting ARM support into general
ARM support and ARMv7 specific pieces.
Change-Id: Ic6511507953a2223c87c55f90252c4a4e1dd6010
Signed-off-by: Isaac Christensen <isaac.christensen@se-eng.com>
Reviewed-on: http://review.coreboot.org/6782
Tested-by: build bot (Jenkins)
Diffstat (limited to 'payloads/libpayload')
-rw-r--r-- | payloads/libpayload/Config.in | 6 | ||||
-rw-r--r-- | payloads/libpayload/Makefile | 4 | ||||
-rw-r--r-- | payloads/libpayload/Makefile.inc | 2 | ||||
-rw-r--r-- | payloads/libpayload/arch/Config.in | 2 | ||||
-rw-r--r-- | payloads/libpayload/arch/arm/Config.in (renamed from payloads/libpayload/arch/armv7/Config.in) | 2 | ||||
-rw-r--r-- | payloads/libpayload/arch/arm/Makefile.inc (renamed from payloads/libpayload/arch/armv7/Makefile.inc) | 0 | ||||
-rw-r--r-- | payloads/libpayload/arch/arm/assembler.h (renamed from payloads/libpayload/arch/armv7/assembler.h) | 0 | ||||
-rw-r--r-- | payloads/libpayload/arch/arm/cache.c (renamed from payloads/libpayload/arch/armv7/cache.c) | 3 | ||||
-rw-r--r-- | payloads/libpayload/arch/arm/coreboot.c (renamed from payloads/libpayload/arch/armv7/coreboot.c) | 0 | ||||
-rw-r--r-- | payloads/libpayload/arch/arm/dummy_media.c (renamed from payloads/libpayload/arch/armv7/dummy_media.c) | 0 | ||||
-rw-r--r-- | payloads/libpayload/arch/arm/exception.c (renamed from payloads/libpayload/arch/armv7/exception.c) | 0 | ||||
-rw-r--r-- | payloads/libpayload/arch/arm/exception_asm.S (renamed from payloads/libpayload/arch/armv7/exception_asm.S) | 0 | ||||
-rw-r--r-- | payloads/libpayload/arch/arm/head.S (renamed from payloads/libpayload/arch/armv7/head.S) | 0 | ||||
-rw-r--r-- | payloads/libpayload/arch/arm/libpayload.ldscript (renamed from payloads/libpayload/arch/armv7/libpayload.ldscript) | 0 | ||||
-rw-r--r-- | payloads/libpayload/arch/arm/main.c (renamed from payloads/libpayload/arch/armv7/main.c) | 0 | ||||
-rw-r--r-- | payloads/libpayload/arch/arm/memcpy.S (renamed from payloads/libpayload/arch/armv7/memcpy.S) | 0 | ||||
-rw-r--r-- | payloads/libpayload/arch/arm/memset.S (renamed from payloads/libpayload/arch/armv7/memset.S) | 0 | ||||
-rw-r--r-- | payloads/libpayload/arch/arm/sysinfo.c (renamed from payloads/libpayload/arch/armv7/sysinfo.c) | 0 | ||||
-rw-r--r-- | payloads/libpayload/arch/arm/timer.c (renamed from payloads/libpayload/arch/armv7/timer.c) | 4 | ||||
-rw-r--r-- | payloads/libpayload/arch/arm/util.S (renamed from payloads/libpayload/arch/armv7/util.S) | 0 | ||||
-rw-r--r-- | payloads/libpayload/arch/arm/virtual.c (renamed from payloads/libpayload/arch/armv7/virtual.c) | 0 | ||||
-rwxr-xr-x | payloads/libpayload/bin/lpgcc | 8 | ||||
-rw-r--r-- | payloads/libpayload/configs/config.panther | 2 | ||||
-rw-r--r-- | payloads/libpayload/configs/defconfig | 2 | ||||
-rw-r--r-- | payloads/libpayload/configs/defconfig-arm | 7 | ||||
-rw-r--r-- | payloads/libpayload/include/arm/arch/cache.h (renamed from payloads/libpayload/include/armv7/arch/cache.h) | 12 | ||||
-rw-r--r-- | payloads/libpayload/include/arm/arch/exception.h (renamed from payloads/libpayload/include/armv7/arch/exception.h) | 0 | ||||
-rw-r--r-- | payloads/libpayload/include/arm/arch/io.h (renamed from payloads/libpayload/include/armv7/arch/io.h) | 0 | ||||
-rw-r--r-- | payloads/libpayload/include/arm/arch/types.h (renamed from payloads/libpayload/include/armv7/arch/types.h) | 0 | ||||
-rw-r--r-- | payloads/libpayload/include/arm/arch/virtual.h (renamed from payloads/libpayload/include/armv7/arch/virtual.h) | 0 | ||||
-rw-r--r-- | payloads/libpayload/include/cbfs_core.h | 2 | ||||
-rw-r--r-- | payloads/libpayload/sample/Makefile | 2 | ||||
-rw-r--r-- | payloads/libpayload/util/xcompile/xcompile | 12 |
33 files changed, 33 insertions, 37 deletions
diff --git a/payloads/libpayload/Config.in b/payloads/libpayload/Config.in index e3e064e..2a5048c 100644 --- a/payloads/libpayload/Config.in +++ b/payloads/libpayload/Config.in @@ -67,10 +67,10 @@ choice prompt "Target Architecture" default ARCH_X86 -config ARCH_ARMV7 - bool "ARMv7" +config ARCH_ARM + bool "ARM" help - Support the x86 architecture + Support the ARM architecture config ARCH_X86 bool "x86" diff --git a/payloads/libpayload/Makefile b/payloads/libpayload/Makefile index 6416519..d84b63b 100644 --- a/payloads/libpayload/Makefile +++ b/payloads/libpayload/Makefile @@ -91,14 +91,14 @@ include util/kconfig/Makefile include $(HAVE_DOTCONFIG) -ARCHDIR-$(CONFIG_LP_ARCH_ARMV7) := armv7 +ARCHDIR-$(CONFIG_LP_ARCH_ARM) := arm ARCHDIR-$(CONFIG_LP_ARCH_X86) := x86 ARCH-y := $(ARCHDIR-y) # If architecture folder name is different from GCC binutils architecture name, # override here. -ARCH-$(CONFIG_LP_ARCH_ARMV7) := armv7 +ARCH-$(CONFIG_LP_ARCH_ARM) := arm ARCH-$(CONFIG_LP_ARCH_X86) := i386 CC := $(CC_$(ARCH-y)) diff --git a/payloads/libpayload/Makefile.inc b/payloads/libpayload/Makefile.inc index 5eeb907..d3b8787 100644 --- a/payloads/libpayload/Makefile.inc +++ b/payloads/libpayload/Makefile.inc @@ -31,7 +31,7 @@ export KERNELVERSION := 0.2.0 -ARCHDIR-$(CONFIG_LP_ARCH_ARMV7) := armv7 +ARCHDIR-$(CONFIG_LP_ARCH_ARM) := arm ARCHDIR-$(CONFIG_LP_ARCH_X86) := x86 DESTDIR ?= install diff --git a/payloads/libpayload/arch/Config.in b/payloads/libpayload/arch/Config.in index 1049da0..541f64f 100644 --- a/payloads/libpayload/arch/Config.in +++ b/payloads/libpayload/arch/Config.in @@ -27,5 +27,5 @@ ## SUCH DAMAGE. ## -source "arch/armv7/Config.in" +source "arch/arm/Config.in" source "arch/x86/Config.in" diff --git a/payloads/libpayload/arch/armv7/Config.in b/payloads/libpayload/arch/arm/Config.in index 79cd676..b2ee527 100644 --- a/payloads/libpayload/arch/armv7/Config.in +++ b/payloads/libpayload/arch/arm/Config.in @@ -27,7 +27,7 @@ ## SUCH DAMAGE. ## -if ARCH_ARMV7 +if ARCH_ARM config ARCH_SPECIFIC_OPTIONS # dummy def_bool y diff --git a/payloads/libpayload/arch/armv7/Makefile.inc b/payloads/libpayload/arch/arm/Makefile.inc index 42d6ed2..42d6ed2 100644 --- a/payloads/libpayload/arch/armv7/Makefile.inc +++ b/payloads/libpayload/arch/arm/Makefile.inc diff --git a/payloads/libpayload/arch/armv7/assembler.h b/payloads/libpayload/arch/arm/assembler.h index 5e4789b..5e4789b 100644 --- a/payloads/libpayload/arch/armv7/assembler.h +++ b/payloads/libpayload/arch/arm/assembler.h diff --git a/payloads/libpayload/arch/armv7/cache.c b/payloads/libpayload/arch/arm/cache.c index 3af7cbd..3944818 100644 --- a/payloads/libpayload/arch/armv7/cache.c +++ b/payloads/libpayload/arch/arm/cache.c @@ -267,7 +267,6 @@ void dcache_mmu_disable(void) write_sctlr(sctlr); } - void dcache_mmu_enable(void) { uint32_t sctlr; @@ -278,7 +277,7 @@ void dcache_mmu_enable(void) write_sctlr(sctlr); } -void armv7_invalidate_caches(void) +void arm_invalidate_caches(void) { uint32_t clidr; int level; diff --git a/payloads/libpayload/arch/armv7/coreboot.c b/payloads/libpayload/arch/arm/coreboot.c index 1397fc1..1397fc1 100644 --- a/payloads/libpayload/arch/armv7/coreboot.c +++ b/payloads/libpayload/arch/arm/coreboot.c diff --git a/payloads/libpayload/arch/armv7/dummy_media.c b/payloads/libpayload/arch/arm/dummy_media.c index 7926976..7926976 100644 --- a/payloads/libpayload/arch/armv7/dummy_media.c +++ b/payloads/libpayload/arch/arm/dummy_media.c diff --git a/payloads/libpayload/arch/armv7/exception.c b/payloads/libpayload/arch/arm/exception.c index 8d8b50b..8d8b50b 100644 --- a/payloads/libpayload/arch/armv7/exception.c +++ b/payloads/libpayload/arch/arm/exception.c diff --git a/payloads/libpayload/arch/armv7/exception_asm.S b/payloads/libpayload/arch/arm/exception_asm.S index 163fdbd..163fdbd 100644 --- a/payloads/libpayload/arch/armv7/exception_asm.S +++ b/payloads/libpayload/arch/arm/exception_asm.S diff --git a/payloads/libpayload/arch/armv7/head.S b/payloads/libpayload/arch/arm/head.S index 7a706e3..7a706e3 100644 --- a/payloads/libpayload/arch/armv7/head.S +++ b/payloads/libpayload/arch/arm/head.S diff --git a/payloads/libpayload/arch/armv7/libpayload.ldscript b/payloads/libpayload/arch/arm/libpayload.ldscript index 5f65bd7..5f65bd7 100644 --- a/payloads/libpayload/arch/armv7/libpayload.ldscript +++ b/payloads/libpayload/arch/arm/libpayload.ldscript diff --git a/payloads/libpayload/arch/armv7/main.c b/payloads/libpayload/arch/arm/main.c index 4e7c05d..4e7c05d 100644 --- a/payloads/libpayload/arch/armv7/main.c +++ b/payloads/libpayload/arch/arm/main.c diff --git a/payloads/libpayload/arch/armv7/memcpy.S b/payloads/libpayload/arch/arm/memcpy.S index e68b28f..e68b28f 100644 --- a/payloads/libpayload/arch/armv7/memcpy.S +++ b/payloads/libpayload/arch/arm/memcpy.S diff --git a/payloads/libpayload/arch/armv7/memset.S b/payloads/libpayload/arch/arm/memset.S index aa4f57a..aa4f57a 100644 --- a/payloads/libpayload/arch/armv7/memset.S +++ b/payloads/libpayload/arch/arm/memset.S diff --git a/payloads/libpayload/arch/armv7/sysinfo.c b/payloads/libpayload/arch/arm/sysinfo.c index 5aa5175..5aa5175 100644 --- a/payloads/libpayload/arch/armv7/sysinfo.c +++ b/payloads/libpayload/arch/arm/sysinfo.c diff --git a/payloads/libpayload/arch/armv7/timer.c b/payloads/libpayload/arch/arm/timer.c index 9449c9f..3902308 100644 --- a/payloads/libpayload/arch/armv7/timer.c +++ b/payloads/libpayload/arch/arm/timer.c @@ -28,8 +28,8 @@ */ /** - * @file armv7/timer.c - * ARMv7 specific timer routines + * @file arm/timer.c + * ARM specific timer routines */ #include <libpayload.h> diff --git a/payloads/libpayload/arch/armv7/util.S b/payloads/libpayload/arch/arm/util.S index e3f173e..e3f173e 100644 --- a/payloads/libpayload/arch/armv7/util.S +++ b/payloads/libpayload/arch/arm/util.S diff --git a/payloads/libpayload/arch/armv7/virtual.c b/payloads/libpayload/arch/arm/virtual.c index 59768db..59768db 100644 --- a/payloads/libpayload/arch/armv7/virtual.c +++ b/payloads/libpayload/arch/arm/virtual.c diff --git a/payloads/libpayload/bin/lpgcc b/payloads/libpayload/bin/lpgcc index 32ec568..a555bcb 100755 --- a/payloads/libpayload/bin/lpgcc +++ b/payloads/libpayload/bin/lpgcc @@ -68,11 +68,11 @@ else exit 1 fi -if [ "$CONFIG_LP_ARCH_ARMV7" = "y" ]; then - _ARCHINCDIR=$_INCDIR/armv7 - _ARCHLIBDIR=$_LIBDIR/armv7 +if [ "$CONFIG_LP_ARCH_ARM" = "y" ]; then + _ARCHINCDIR=$_INCDIR/arm + _ARCHLIBDIR=$_LIBDIR/arm _ARCHEXTRA="" - _ARCH=armv7 + _ARCH=arm fi if [ "$CONFIG_LP_ARCH_X86" = "y" ]; then diff --git a/payloads/libpayload/configs/config.panther b/payloads/libpayload/configs/config.panther index ec0f11d..e3af099 100644 --- a/payloads/libpayload/configs/config.panther +++ b/payloads/libpayload/configs/config.panther @@ -15,7 +15,7 @@ CONFIG_LP_CHROMEOS=y # # Architecture Options # -# CONFIG_LP_ARCH_ARMV7 is not set +# CONFIG_LP_ARCH_ARM is not set # CONFIG_LP_ARCH_POWERPC is not set CONFIG_LP_ARCH_X86=y # CONFIG_LP_MEMMAP_RAM_ONLY is not set diff --git a/payloads/libpayload/configs/defconfig b/payloads/libpayload/configs/defconfig index aef9fc3..f63822e 100644 --- a/payloads/libpayload/configs/defconfig +++ b/payloads/libpayload/configs/defconfig @@ -15,7 +15,7 @@ # # Architecture Options # -# CONFIG_LP_ARCH_ARMV7 is not set +# CONFIG_LP_ARCH_ARM is not set CONFIG_LP_ARCH_X86=y # CONFIG_LP_MEMMAP_RAM_ONLY is not set # CONFIG_LP_MULTIBOOT is not set diff --git a/payloads/libpayload/configs/defconfig-arm b/payloads/libpayload/configs/defconfig-arm index 55552b0..e336f6a 100644 --- a/payloads/libpayload/configs/defconfig-arm +++ b/payloads/libpayload/configs/defconfig-arm @@ -15,7 +15,7 @@ # # Architecture Options # -CONFIG_LP_ARCH_ARMV7=y +CONFIG_LP_ARCH_ARM=y # CONFIG_LP_ARCH_X86 is not set # CONFIG_LP_MEMMAP_RAM_ONLY is not set @@ -35,6 +35,7 @@ CONFIG_LP_LZMA=y # CONFIG_LP_SKIP_CONSOLE_INIT is not set CONFIG_LP_CBMEM_CONSOLE=y CONFIG_LP_SERIAL_CONSOLE=y +# CONFIG_LP_8250_SERIAL_CONSOLE is not set # CONFIG_LP_SERIAL_SET_SPEED is not set # CONFIG_LP_SERIAL_ACS_FALLBACK is not set CONFIG_LP_VIDEO_CONSOLE=y @@ -60,10 +61,6 @@ CONFIG_LP_USB_HUB=y CONFIG_LP_USB_MSC=y CONFIG_LP_USB_GEN_HUB=y # CONFIG_LP_USB_PCI is not set -CONFIG_LP_USB_MEMORY=y -CONFIG_LP_USB_OHCI_BASE_ADDRESS=0x12120000 -CONFIG_LP_USB_EHCI_BASE_ADDRESS=0x12110000 -CONFIG_LP_USB_XHCI_BASE_ADDRESS=0x12000000 # CONFIG_LP_BIG_ENDIAN is not set CONFIG_LP_LITTLE_ENDIAN=y # CONFIG_LP_IO_ADDRESS_SPACE is not set diff --git a/payloads/libpayload/include/armv7/arch/cache.h b/payloads/libpayload/include/arm/arch/cache.h index 1cd9958..ffdb55a 100644 --- a/payloads/libpayload/include/armv7/arch/cache.h +++ b/payloads/libpayload/include/arm/arch/cache.h @@ -26,11 +26,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * cache.h: Cache maintenance API for ARMv7 + * cache.h: Cache maintenance API for ARM */ -#ifndef ARMV7_CACHE_H -#define ARMV7_CACHE_H +#ifndef ARM_CACHE_H +#define ARM_CACHE_H #include <stddef.h> #include <stdint.h> @@ -320,8 +320,8 @@ void tlb_invalidate_all(void); * Generalized setup/init functions */ -/* invalidate all caches on ARMv7 */ -void armv7_invalidate_caches(void); +/* invalidate all caches on ARM */ +void arm_invalidate_caches(void); /* mmu initialization (set page table address, set permissions, etc) */ void mmu_init(void); @@ -338,4 +338,4 @@ void mmu_disable_range(unsigned long start_mb, unsigned long size_mb); void mmu_config_range(unsigned long start_mb, unsigned long size_mb, enum dcache_policy policy); -#endif /* ARMV7_CACHE_H */ +#endif /* ARM_CACHE_H */ diff --git a/payloads/libpayload/include/armv7/arch/exception.h b/payloads/libpayload/include/arm/arch/exception.h index 57076bd..57076bd 100644 --- a/payloads/libpayload/include/armv7/arch/exception.h +++ b/payloads/libpayload/include/arm/arch/exception.h diff --git a/payloads/libpayload/include/armv7/arch/io.h b/payloads/libpayload/include/arm/arch/io.h index 8948e13..8948e13 100644 --- a/payloads/libpayload/include/armv7/arch/io.h +++ b/payloads/libpayload/include/arm/arch/io.h diff --git a/payloads/libpayload/include/armv7/arch/types.h b/payloads/libpayload/include/arm/arch/types.h index 1bd815b..1bd815b 100644 --- a/payloads/libpayload/include/armv7/arch/types.h +++ b/payloads/libpayload/include/arm/arch/types.h diff --git a/payloads/libpayload/include/armv7/arch/virtual.h b/payloads/libpayload/include/arm/arch/virtual.h index 328c3aa..328c3aa 100644 --- a/payloads/libpayload/include/armv7/arch/virtual.h +++ b/payloads/libpayload/include/arm/arch/virtual.h diff --git a/payloads/libpayload/include/cbfs_core.h b/payloads/libpayload/include/cbfs_core.h index d908d83..6edad0e 100644 --- a/payloads/libpayload/include/cbfs_core.h +++ b/payloads/libpayload/include/cbfs_core.h @@ -106,7 +106,7 @@ struct cbfs_header { */ #define CBFS_ARCHITECTURE_UNKNOWN 0xFFFFFFFF #define CBFS_ARCHITECTURE_X86 0x00000001 -#define CBFS_ARCHITECTURE_ARMV7 0x00000010 +#define CBFS_ARCHITECTURE_ARM 0x00000010 /** This is a component header - every entry in the CBFS will have this header. diff --git a/payloads/libpayload/sample/Makefile b/payloads/libpayload/sample/Makefile index 67697e8..2029209 100644 --- a/payloads/libpayload/sample/Makefile +++ b/payloads/libpayload/sample/Makefile @@ -31,7 +31,7 @@ include ../.xcompile include ../.config -ARCH-$(CONFIG_ARCH_ARMV7) := armv7 +ARCH-$(CONFIG_ARCH_ARMV) := arm ARCH-$(CONFIG_ARCH_POWERPC) := powerpc ARCH-$(CONFIG_ARCH_X86) := i386 diff --git a/payloads/libpayload/util/xcompile/xcompile b/payloads/libpayload/util/xcompile/xcompile index 09c1879..755fb18 100644 --- a/payloads/libpayload/util/xcompile/xcompile +++ b/payloads/libpayload/util/xcompile/xcompile @@ -106,7 +106,7 @@ detect_special_flags() { CFLAGS="$CFLAGS -Wl,--build-id=none" case "$architecture" in - armv7 ) + arm ) # testcc "$CC" "$CFLAGS -mcpu=cortex-a9" && # CFLAGS="$CFLAGS -mcpu=cortex-a9" ;; @@ -135,13 +135,13 @@ touch "$TMPFILE" trap clean_up EXIT # Architecture definition -SUPPORTED_ARCHITECTURE="x86 armv7" +SUPPORTED_ARCHITECTURE="x86 arm" # ARM Architecture -TARCH_armv7="armv7" -TBFDARCH_armv7="littlearm" -TCLIST_armv7="armv7a" -TWIDTH_armv7="32" +TARCH_arm="arm" +TBFDARCH_arm="littlearm" +TCLIST_arm="armv7a" +TWIDTH_arm="32" # X86 Architecture TARCH_x86="i386" |