From 8ba1b364ad49e58f785e228666c83d345fb2b848 Mon Sep 17 00:00:00 2001 From: Hung-Te Lin Date: Wed, 12 Feb 2014 12:11:14 +0800 Subject: qemu-armv7: Minimal changes to pass compiling qemu-v7 platform. The ARM configuration files have been changed that we need more settings to run Coreboot on qemu-v7. Also fixed the incorrect Makefile settings that caused armv7 to try building with armv8 cache. BRANCH=none BUG=none TEST=make menuconfig # select qemu-armv7 make # pass qemu... # successfully boots to ramstage. Original-Change-Id: I4040e86ad1ff6e8ebd07cfe387c3f5a0e8941800 Original-Signed-off-by: Hung-Te Lin Original-Reviewed-on: https://chromium-review.googlesource.com/186080 Original-Reviewed-by: David Hendricks Original-Tested-by: Hung-Te Lin (cherry picked from commit f2fab7383ee5352dab2d5f2b8a7d2d321d5944bc) Signed-off-by: Marc Jones Change-Id: Ibe18a1a87f036df148393f8dfc6a6d92dba4ac5c Reviewed-on: http://review.coreboot.org/7421 Tested-by: build bot (Jenkins) Reviewed-by: David Hendricks --- src/mainboard/emulation/qemu-armv7/Kconfig | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/src/mainboard/emulation/qemu-armv7/Kconfig b/src/mainboard/emulation/qemu-armv7/Kconfig index fad20c62db..b275e88eed 100644 --- a/src/mainboard/emulation/qemu-armv7/Kconfig +++ b/src/mainboard/emulation/qemu-armv7/Kconfig @@ -25,6 +25,12 @@ config BOARD_SPECIFIC_OPTIONS # dummy def_bool y select CPU_ARMLTD_CORTEX_A9 select DRIVERS_UART_PL011 + select BOOTBLOCK_CONSOLE + select EARLY_CONSOLE + select CONSOLE_SERIAL + select ARM_BOOTBLOCK_ARMV7 + select ARM_ROMSTAGE_ARMV7 + select ARM_RAMSTAGE_ARMV7 select BOARD_ROMSIZE_KB_4096 config MAINBOARD_DIR @@ -61,6 +67,14 @@ config DRAM_SIZE_MB # 0x0011_0000: CBFS data # 0x0100_0000: reserved for ramstage # 0x1000_0000: I/O map address +# +config STACK_TOP + hex + default 0x00100000 + +config STACK_BOTTOM + hex + default 0x0007FF00 config BOOTBLOCK_BASE hex @@ -86,16 +100,4 @@ config CBFS_ROM_OFFSET hex default 0x0110000 -config STACK_TOP - hex - default 0x0007ff00 - -config STACK_BOTTOM - hex - default 0x00040000 - -config STACK_SIZE - hex - default 0x0003ff00 - endif # BOARD_EMULATION_QEMU_ARMV7 -- cgit v1.2.3