From 2ceb1d8be6ef09efd66153a9ad6023843b514996 Mon Sep 17 00:00:00 2001 From: Gabe Black Date: Tue, 1 Oct 2013 05:24:47 -0700 Subject: [PATCH] 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 Reviewed-on: https://chromium-review.googlesource.com/171402 Reviewed-by: Gabe Black Tested-by: Gabe Black Commit-Queue: Gabe Black (cherry picked from commit c1aa76b7607ee40ff848628971a97eea5393aebe) Signed-off-by: Isaac Christensen Reviewed-on: http://review.coreboot.org/6784 Reviewed-by: Marc Jones Tested-by: build bot (Jenkins) --- src/soc/nvidia/tegra124/Kconfig | 2 +- src/soc/nvidia/tegra124/Makefile.inc | 3 --- 2 files changed, 1 insertion(+), 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