These patches are nearly identical. The only difference is which directory lar is invoked from.
They do away with lar.tmp because path handling in lar has been fixed. In other words, there is no need for copying files around. Just use them.
I like the second version better, because it makes it clear where all the files live by prepending $(obj) in the right places. I included both versions because I think it is a matter of taste.
lar -l is identical before and after the patch, and it still boots with and without payloads in qemu.
Myles
Signed-off-by: Myles Watson mylesgw@gmail.com
* Myles Watson mylesgw@gmail.com [080305 19:27]:
$(Q)# QEMU wants bios.bin: $(Q)# Run "qemu -L build/ -serial stdio -hda /dev/zero".
- $(Q)printf " CP $(subst $(shell pwd)/,,$(obj)/bios.bin)\n"
- $(Q)cp $@ $(obj)/bios.bin
- $(Q)# printf " CP $(subst $(shell pwd)/,,$(obj)/bios.bin)\n"
- $(Q)# cp $@ $(obj)/bios.bin $(Q)echo "Coreboot ROM Image:" > $(obj)/coreboot.map $(Q)$(obj)/util/lar/lar -l $(obj)/coreboot.rom >> $(obj)/coreboot.map $(Q)(echo; echo "Stage 0/1 Map:") >> $(obj)/coreboot.map
I think this sneaked in... Please make sure you don't commit this.
-----Original Message----- From: Stefan Reinauer [mailto:stepan@coresystems.de] Sent: Thursday, March 06, 2008 7:07 AM To: Myles Watson Cc: Coreboot Subject: Re: [coreboot] Makefile simplification for v3
- Myles Watson mylesgw@gmail.com [080305 19:27]:
$(Q)# QEMU wants bios.bin: $(Q)# Run "qemu -L build/ -serial stdio -hda /dev/zero".
- $(Q)printf " CP $(subst $(shell pwd)/,,$(obj)/bios.bin)\n"
- $(Q)cp $@ $(obj)/bios.bin
- $(Q)# printf " CP $(subst $(shell pwd)/,,$(obj)/bios.bin)\n"
- $(Q)# cp $@ $(obj)/bios.bin $(Q)echo "Coreboot ROM Image:" > $(obj)/coreboot.map $(Q)$(obj)/util/lar/lar -l $(obj)/coreboot.rom >>
$(obj)/coreboot.map
$(Q)(echo; echo "Stage 0/1 Map:") >> $(obj)/coreboot.map
I think this sneaked in... Please make sure you don't commit this.
You're right. It should be a separate patch. I'll make sure I don't commit it with the rest of this patch.
I think it would be correct to remove it because it is mainboard specific. Someone who wants to automate testing could use a symbolic link to coreboot.rom from their BIOS directory.
Myles
On Thu, Mar 06, 2008 at 07:23:45AM -0700, Myles Watson wrote:
-----Original Message----- From: Stefan Reinauer [mailto:stepan@coresystems.de] Sent: Thursday, March 06, 2008 7:07 AM To: Myles Watson Cc: Coreboot Subject: Re: [coreboot] Makefile simplification for v3
- Myles Watson mylesgw@gmail.com [080305 19:27]:
$(Q)# QEMU wants bios.bin: $(Q)# Run "qemu -L build/ -serial stdio -hda /dev/zero".
- $(Q)printf " CP $(subst $(shell pwd)/,,$(obj)/bios.bin)\n"
- $(Q)cp $@ $(obj)/bios.bin
- $(Q)# printf " CP $(subst $(shell pwd)/,,$(obj)/bios.bin)\n"
- $(Q)# cp $@ $(obj)/bios.bin $(Q)echo "Coreboot ROM Image:" > $(obj)/coreboot.map $(Q)$(obj)/util/lar/lar -l $(obj)/coreboot.rom >>
$(obj)/coreboot.map
$(Q)(echo; echo "Stage 0/1 Map:") >> $(obj)/coreboot.map
I think this sneaked in... Please make sure you don't commit this.
You're right. It should be a separate patch. I'll make sure I don't commit it with the rest of this patch.
I think it would be correct to remove it because it is mainboard specific. Someone who wants to automate testing could use a symbolic link to coreboot.rom from their BIOS directory.
QEMU expects a file called bios.bin, that's why this is done. Now you can just type 'qemu -L build ...' and it works. Not critical, but nice to have, and it doesn't really hurt to leave it in.
Uwe.
On Thu, Mar 6, 2008 at 5:16 PM, Uwe Hermann uwe@hermann-uwe.de wrote:
On Thu, Mar 06, 2008 at 07:23:45AM -0700, Myles Watson wrote:
-----Original Message----- From: Stefan Reinauer [mailto:stepan@coresystems.de] Sent: Thursday, March 06, 2008 7:07 AM To: Myles Watson Cc: Coreboot Subject: Re: [coreboot] Makefile simplification for v3
- Myles Watson mylesgw@gmail.com [080305 19:27]:
$(Q)# QEMU wants bios.bin: $(Q)# Run "qemu -L build/ -serial stdio -hda /dev/zero".
- $(Q)printf " CP $(subst $(shell pwd)/,,$(obj)/bios.bin)\n"
- $(Q)cp $@ $(obj)/bios.bin
- $(Q)# printf " CP $(subst $(shell pwd)/,,$(obj)/bios.bin)\n"
- $(Q)# cp $@ $(obj)/bios.bin $(Q)echo "Coreboot ROM Image:" > $(obj)/coreboot.map $(Q)$(obj)/util/lar/lar -l $(obj)/coreboot.rom >>
$(obj)/coreboot.map
$(Q)(echo; echo "Stage 0/1 Map:") >> $(obj)/coreboot.map
I think this sneaked in... Please make sure you don't commit this.
You're right. It should be a separate patch. I'll make sure I don't commit it with the rest of this patch.
I think it would be correct to remove it because it is mainboard specific. Someone who wants to automate testing could use a symbolic link to coreboot.rom from their BIOS directory.
QEMU expects a file called bios.bin, that's why this is done. Now you can just type 'qemu -L build ...' and it works. Not critical, but nice to have, and it doesn't really hurt to leave it in.
Yep.
I've attached the original two patches minus the QEMU part. Which one do people like better?
Myles
Signed-off-by: Myles Watson mylesgw@gmail.com
On 11.03.2008 21:59, Myles Watson wrote:
On Thu, Mar 6, 2008 at 5:16 PM, Uwe Hermann uwe@hermann-uwe.de wrote:
On Thu, Mar 06, 2008 at 07:23:45AM -0700, Myles Watson wrote:
-----Original Message----- From: Stefan Reinauer [mailto:stepan@coresystems.de] Sent: Thursday, March 06, 2008 7:07 AM To: Myles Watson Cc: Coreboot Subject: Re: [coreboot] Makefile simplification for v3
- Myles Watson mylesgw@gmail.com [080305 19:27]:
$(Q)# QEMU wants bios.bin: $(Q)# Run "qemu -L build/ -serial stdio -hda /dev/zero".
- $(Q)printf " CP $(subst $(shell pwd)/,,$(obj)/bios.bin)\n"
- $(Q)cp $@ $(obj)/bios.bin
- $(Q)# printf " CP $(subst $(shell pwd)/,,$(obj)/bios.bin)\n"
- $(Q)# cp $@ $(obj)/bios.bin $(Q)echo "Coreboot ROM Image:" > $(obj)/coreboot.map $(Q)$(obj)/util/lar/lar -l $(obj)/coreboot.rom >>
$(obj)/coreboot.map
$(Q)(echo; echo "Stage 0/1 Map:") >> $(obj)/coreboot.map
I think this sneaked in... Please make sure you don't commit this.
You're right. It should be a separate patch. I'll make sure I don't commit it with the rest of this patch.
I think it would be correct to remove it because it is mainboard specific. Someone who wants to automate testing could use a symbolic link to coreboot.rom from their BIOS directory.
QEMU expects a file called bios.bin, that's why this is done. Now you can just type 'qemu -L build ...' and it works. Not critical, but nice to have, and it doesn't really hurt to leave it in.
Yep.
I've attached the original two patches minus the QEMU part. Which one do people like better?
Myles
Signed-off-by: Myles Watson mylesgw@gmail.com
simplify.patch is better because it keeps LARFILES_* free of $(obj) stuff which doesn't belong there. Acked-by: Carl-Daniel Hailfinger c-d.hailfinger.devel.2006@gmx.net
Regards, Carl-Daniel
I've attached the original two patches minus the QEMU part. Which one do people like better?
Myles
Signed-off-by: Myles Watson mylesgw@gmail.com
simplify.patch is better because it keeps LARFILES_* free of $(obj) stuff which doesn't belong there. Acked-by: Carl-Daniel Hailfinger c-d.hailfinger.devel.2006@gmx.net
Rev 639.
Thanks, Myles
-
Carl-Daniel Hailfinger -
Myles Watson -
Stefan Reinauer -
Uwe Hermann