From d41de2ea7a65242f5c95e578d99cf46cd23920dd Mon Sep 17 00:00:00 2001 From: "Ronald G. minnich" Date: Tue, 16 Jun 2009 15:02:52 +0000 Subject: These changes implement car in qemu. The implementation is in several ways superior to v3, while lacking its completeness. But, one nice thing: no more included .S or .c files. It's all separate compilation. That should allow our Makefiles to work much better. Note that the current non-CAR implementation is the default and continues to work (tested FILO boot to Linux on both CAR and non-CAR). Index: src/mainboard/emulation/qemu-x86/Config.lb Change this to be sensitive to USE_DCACHE_RAM. All settings etc. that depend on this variable are grouped in one if, and the other parts (romcc etc.) are in the else. This change is a model of how we should be able to do other motherboards. Index: src/mainboard/emulation/qemu-x86/Options.lb add needed options. Index: src/mainboard/emulation/qemu-x86/failover.c remove code inclusion from this not-yet-used file. Index: src/mainboard/emulation/qemu-x86/rom.c This is the entry point for the rom-based code. Called stage1.c in v3. Index: src/lib/Config.lb change initobject to a .o from a .c; this fixed a build problem. Index: src/pc80/serial.c make uart_init non-static. Index: src/pc80/Config.lb add initobject Index: src/arch/i386/init/entry.S Entry point. Unify a bunch of files that were fiddly lttle includes. From v3. Index: src/arch/i386/init/ldscript.ld new file. The goal is to hang all init changes for CAR here, to minimize other changes to any other ldscript. Besides, putting this in init makes sense; entry and car are manage init. Index: src/arch/i386/init/car.S generic i386 car code from v3. Index: src/arch/i386/init/ldscript_fallback_cbfs.lb Fix what looks like a bug: this was not including the init.text section. Index: targets/emulation/qemu-x86/Config.lb push up the console loglevel. qemu is for debugging so we might as well get all the debugging we can. Index: targets/emulation/qemu-x86/Config-car.lb For CAR bullds. Signed-off-by: Ronald G. minnich Acked-by: Carl-Daniel Hailfinger git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4357 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- targets/emulation/qemu-x86/Config-car.lb | 26 ++++++++++++++++++++++++++ targets/emulation/qemu-x86/Config.lb | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 targets/emulation/qemu-x86/Config-car.lb (limited to 'targets') diff --git a/targets/emulation/qemu-x86/Config-car.lb b/targets/emulation/qemu-x86/Config-car.lb new file mode 100644 index 0000000000..bdb27bc9cd --- /dev/null +++ b/targets/emulation/qemu-x86/Config-car.lb @@ -0,0 +1,26 @@ +# This will make a target directory of ./emulation_qemu-x86 + +target qemu-x86-car +mainboard emulation/qemu-x86 + +option USE_DCACHE_RAM=1 +option CONFIG_USE_INIT=1 +option ROM_SIZE=512*1024 +option CONFIG_USE_INIT=1 +option CONFIG_USE_PRINTK_IN_CAR=1 + +option CC="gcc -m32" + +option HAVE_PIRQ_TABLE=1 +option IRQ_SLOT_COUNT=6 + +romimage "fallback" + option USE_FALLBACK_IMAGE=1 + option ROM_IMAGE_SIZE=0x10000 + option COREBOOT_EXTRA_VERSION="-GRUB2" +# payload /home/stepan/core.img + payload ../payload.elf +end + +buildrom ./coreboot.rom ROM_SIZE "fallback" + diff --git a/targets/emulation/qemu-x86/Config.lb b/targets/emulation/qemu-x86/Config.lb index 03527483d0..91d4413725 100644 --- a/targets/emulation/qemu-x86/Config.lb +++ b/targets/emulation/qemu-x86/Config.lb @@ -9,6 +9,8 @@ option CC="gcc -m32" option HAVE_PIRQ_TABLE=1 option IRQ_SLOT_COUNT=6 +option DEFAULT_CONSOLE_LOGLEVEL=9 +option MAXIMUM_CONSOLE_LOGLEVEL=9 romimage "normal" option COREBOOT_EXTRA_VERSION="-GRUB2" -- cgit v1.2.3