summaryrefslogtreecommitdiff
path: root/payloads/libpayload/arch
diff options
context:
space:
mode:
authorGabe Black <gabeblack@google.com>2013-09-30 23:00:33 -0700
committerIsaac Christensen <isaac.christensen@se-eng.com>2014-09-08 18:59:23 +0200
commit51edd54738b2248e92580caa317aa4e8e1694d40 (patch)
treed10c6be921f2d3656d9f504f4572a1c73f7860e3 /payloads/libpayload/arch
parent94b4a266fb4df1f2f59ed8052c150ee4bf3e6d41 (diff)
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/arch')
-rw-r--r--payloads/libpayload/arch/Config.in2
-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
18 files changed, 5 insertions, 6 deletions
diff --git a/payloads/libpayload/arch/Config.in b/payloads/libpayload/arch/Config.in
index 1049da02cc..541f64f2c1 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 79cd6768a0..b2ee527ab7 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 42d6ed2d5c..42d6ed2d5c 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 5e4789b145..5e4789b145 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 3af7cbd28b..3944818110 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 1397fc1be2..1397fc1be2 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 7926976422..7926976422 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 8d8b50b175..8d8b50b175 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 163fdbd52a..163fdbd52a 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 7a706e3aa6..7a706e3aa6 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 5f65bd7f1a..5f65bd7f1a 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 4e7c05dfe1..4e7c05dfe1 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 e68b28f542..e68b28f542 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 aa4f57a993..aa4f57a993 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 5aa517594c..5aa517594c 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 9449c9feff..3902308562 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 e3f173eb2d..e3f173eb2d 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 59768dbd66..59768dbd66 100644
--- a/payloads/libpayload/arch/armv7/virtual.c
+++ b/payloads/libpayload/arch/arm/virtual.c