From c1aa76b7607ee40ff848628971a97eea5393aebe 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. BUG=chrome-os-partner:23009 TEST=Built and booted into the bootblock on nyan. Built for link, snow, pit, and falco. BRANCH=None 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 --- 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 c75db27236..b88abb0f53 100644 --- a/src/soc/nvidia/tegra124/Kconfig +++ b/src/soc/nvidia/tegra124/Kconfig @@ -7,7 +7,7 @@ config SOC_NVIDIA_TEGRA124 select BOOTBLOCK_CONSOLE select EARLY_CONSOLE select ARM_BOOTBLOCK_CUSTOM - select ARM_BOOTBLOCK_ARMV7 + select ARM_BOOTBLOCK_ARMV4 select ARM_ROMSTAGE_ARMV7 select ARM_RAMSTAGE_ARMV7 diff --git a/src/soc/nvidia/tegra124/Makefile.inc b/src/soc/nvidia/tegra124/Makefile.inc index 19aabf6b64..961f6ce40b 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 -march=armv4t -bootblock-S-ccopts += -marm -march=armv4t - bootblock-y += bootblock.c bootblock-y += bootblock_asm.S bootblock-y += cbfs.c