erebion/coreboot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Diffs which get us to stage two.

Browse source 
It's slightly broken by the merge, but we want to get it in.
Will be fixed tomorrow.

Signed-off-by: Ronald G. Minnich <rminnich@gmail.com>
Acked-by: Ronald G. Minnich <rminnich@gmail.com> 
Acked-by: Stefan Reinauer <stepan@coresystems.de>



git-svn-id: svn://coreboot.org/repository/LinuxBIOSv3@79 f3766cd6-281f-0410-b1cd-43a5c92072e9
This commit is contained in:
Stefan Reinauer 2007-02-22 22:09:10 +00:00
commit 417311203a
3 changed files with 34 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

22
arch/x86/Makefile
View file

@ -52,9 +52,25 @@ initram:
# This needs to be compressed with the default compressor
#
$(obj)/linuxbios.stage2: $(obj)/statictree.o
$(Q)echo "building linuxbios_ram"
touch $(obj)/linuxbios.stage2
$(obj)/linuxbios.stage2: $(obj)/stage0.init $(obj)/statictree.o
$(Q)echo "Building linuxbios.stage2"
#
# main
$(Q)$(CC) $(INITCFLAGS) -c $(src)/lib/stage2.c -o $(obj)/stage2.o
$(Q)$(CC) $(INITCFLAGS) -c $(src)/devices/device.c -o $(obj)/device.o
$(Q)$(CC) $(INITCFLAGS) -c $(src)/devices/device_util.c -o $(obj)/device_util.o
$(Q)$(CC) $(INITCFLAGS) -c $(src)/lib/mem.c -o $(obj)/mem.o
$(Q)$(CC) $(INITCFLAGS) -c $(src)/lib/malloc.c -o $(obj)/malloc.o
$(Q)$(CC) $(INITCFLAGS) -c $(src)/lib/clog2.c -o $(obj)/clog2.o
$(Q)$(CC) $(INITCFLAGS) -c -I$(src) $(src)/statictree.c -o $(obj)/statictree.o
$(Q)$(CC) $(INITCFLAGS) -c mainboard/$(MAINBOARDDIR)/mainboard.c -o $(obj)/mainboard.o
# leave a .o with full symbols in it for debugging.
$(Q)cd $(obj); $(LD) -R stage0.o -Ttext 0x0 stage2.o \
-o $(obj)/linuxbios.stage2.o device.o device_util.o mem.o malloc.o clog2.o mainboard.o statictree.o
objcopy -O binary $(obj)/linuxbios.stage2.o $(obj)/linuxbios.stage2
$(Q)chmod 644 $(obj)/linuxbios.stage2
#
# The payload as we love it. Get it from somewhere.

23
mainboard/emulation/qemu-i386/Makefile
View file

@ -26,28 +26,33 @@
$(obj)/linuxbios.vpd:
@printf "Building dummy VPD ..."
@dd if=/dev/zero of=$(obj)/linuxbios.vpd bs=240 count=1
@dd if=/dev/zero of=$(obj)/linuxbios.vpd bs=256 count=1
@printf "ok.\n"
#
# this is going to be the enable car code, lar parser and such:
# this is going to be the init ram code:
#
linuxbios.initram:
$(obj)/linuxbios.initram: $(obj)/stage0.init
$(Q)echo Building linuxbios.initram
#
# main
$(Q)$(CC) $(INITCFLAGS) -c $(src)/mainboard/$(MAINBOARDDIR)/initram.c -o $(obj)/initram.o
#
# console lib
$(Q)$(CC) $(INITCFLAGS) -c $(src)/arch/x86/console.c -o $(obj)/console.o
$(Q)$(CC) $(INITCFLAGS) -c $(src)/arch/x86/serial.c -o $(obj)/serial.o
$(Q)$(CC) $(INITCFLAGS) -c $(src)/console/vtxprintf.c -o $(obj)/vtxprintf.o
$(Q)$(CC) $(INITCFLAGS) -c $(src)/lib/uart8250.c -o $(obj)/uart8250.o
#$(Q)$(CC) $(INITCFLAGS) -c $(src)/arch/x86/console.c -o $(obj)/console.o
#$(Q)$(CC) $(INITCFLAGS) -c $(src)/arch/x86/serial.c -o $(obj)/serial.o
#$(Q)$(CC) $(INITCFLAGS) -c $(src)/console/vtxprintf.c -o $(obj)/vtxprintf.o
#$(Q)$(CC) $(INITCFLAGS) -c $(src)/lib/uart8250.c -o $(obj)/uart8250.o
cd $(obj); $(Q)$(LD) -Ttext 0x00000000 -s --oformat binary initram.o console.o uart8250.o \
serial.o vtxprintf.o -o $(obj)/linuxbios.initram
#cd $(obj); $(Q)$(LD) -Ttext 0x00000000 -s --oformat binary initram.o console.o uart8250.o \
# serial.o vtxprintf.o -o $(obj)/linuxbios.initram
$(Q)$(LD) -R stage0.o -Ttext 0x80000 $(obj)/initram.o \
-o $(obj)/linuxbios.initram.o
$(Q)objcopy -O binary $(obj)/linuxbios.initram.o $(obj)/linuxbios.initram
$(Q)chmod 644 $(obj)/linuxbios.initram

2
mainboard/emulation/qemu-i386/initram.c
View file

@ -34,7 +34,7 @@ int main(void)
{
printk(BIOS_INFO, "RAM init code started\n");
die("Nothing to do.");
printk(BIOS_INFO, "Nothing to do.");
return 0;
}