summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGabe Black <gabeblack@google.com>2013-10-01 05:24:47 -0700
committerIsaac Christensen <isaac.christensen@se-eng.com>2014-09-09 19:49:52 +0200
commit2ceb1d8be6ef09efd66153a9ad6023843b514996 (patch)
treea1fd454eebae456999e0f19cbacfe5f9b22416d3
parentf2f817ed1d5494b8ded166306564d16673fbf02c (diff)
tegra124: Switch the bootblock over the ARMv4 impelementation.
The bootblock for the tegra124 runs on the AVP coprocessor which uses the ARMv4 architecture. Switch it over to that architecture. Change-Id: Ie527bbff938e6148c58727d448f9c2e6862da872 Signed-off-by: Gabe Black <gabeblack@google.com> Reviewed-on: https://chromium-review.googlesource.com/171402 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 c1aa76b7607ee40ff848628971a97eea5393aebe) Signed-off-by: Isaac Christensen <isaac.christensen@se-eng.com> Reviewed-on: http://review.coreboot.org/6784 Reviewed-by: Marc Jones <marc.jones@se-eng.com> Tested-by: build bot (Jenkins)
-rw-r--r--src/soc/nvidia/tegra124/Kconfig2
-rw-r--r--src/soc/nvidia/tegra124/Makefile.inc3
2 files changed, 1 insertions, 4 deletions
diff --git a/src/soc/nvidia/tegra124/Kconfig b/src/soc/nvidia/tegra124/Kconfig
index 4f33f566a7..4e5bd62585 100644
--- a/src/soc/nvidia/tegra124/Kconfig
+++ b/src/soc/nvidia/tegra124/Kconfig
@@ -1,5 +1,5 @@
config SOC_NVIDIA_TEGRA124
- select ARCH_BOOTBLOCK_ARMV7
+ select ARCH_BOOTBLOCK_ARMV4
select ARCH_ROMSTAGE_ARMV7
select ARCH_RAMSTAGE_ARMV7
select HAVE_UART_SPECIAL
diff --git a/src/soc/nvidia/tegra124/Makefile.inc b/src/soc/nvidia/tegra124/Makefile.inc
index 34d24da6c1..a63eb357db 100644
--- a/src/soc/nvidia/tegra124/Makefile.inc
+++ b/src/soc/nvidia/tegra124/Makefile.inc
@@ -1,8 +1,5 @@
CBOOTIMAGE = cbootimage
-bootblock-c-ccopts += -marm
-bootblock-S-ccopts += -marm
-
bootblock-y += bootblock.c
bootblock-y += bootblock_asm.S
bootblock-y += cbfs.c