diff --git a/arch/x86/Makefile b/arch/x86/Makefile index ef09d27793..897f942e7a 100644 --- a/arch/x86/Makefile +++ b/arch/x86/Makefile @@ -52,7 +52,7 @@ $(obj)/linuxbios.lar: $(obj)/util/lar/lar lzma $(obj)/linuxbios.initram $(obj)/l $(Q)cd $(obj)/lar.tmp && ../util/lar/lar c ../linuxbios.lar.pre normal/initram normal/stage2 # TODO: dynamically pad the lar archive. bs is image size - bootblock size (8k) $(Q)dd if=$(obj)/linuxbios.lar.pre of=$(obj)/linuxbios.lar \ - bs=253952 count=1 conv=sync $(SILENT) + bs=245760 count=1 conv=sync $(SILENT) @@ -91,13 +91,14 @@ $(obj)/stage0.init: $(Q)objcopy -O binary $(obj)/stage0.o $(obj)/stage0.init.pre - # Pad boot block to 0x2000 - 0x100 + # Pad boot block to 0x4000 - 0x100 # we will probably remove this step -- not needed if we continue with ldscript.ld + $(Q)dd if=$(obj)/stage0.init.pre of=$(obj)/stage0.init \ - bs=7936 conv=sync $(SILENT) + bs=16128 conv=sync $(SILENT) $(Q)echo "Len: `wc -c < $(obj)/stage0.init.pre`" - $(Q)test `wc -c < $(obj)/stage0.init.pre` -gt 7936 && echo "Error. Bootblock got too big" || true + $(Q)test `wc -c < $(obj)/stage0.init.pre` -gt 16128 && echo "Error. Bootblock got too big" || true diff --git a/arch/x86/ldscript.ld b/arch/x86/ldscript.ld index 84d282c456..56d46944e8 100644 --- a/arch/x86/ldscript.ld +++ b/arch/x86/ldscript.ld @@ -28,7 +28,7 @@ ENTRY(_start) TARGET(binary) SECTIONS { - . = 0xffffe000 + 256; /* leave space for vpd */ + . = 0xffffc000 + 256; /* leave space for vpd */ .stage0_1 . : { _stage0_1 = .;