GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replace hard coded build with $(obj) paths. 

Signed-off-by: Myles Watson <mylesgw@gmail.com>
Acked-by: Ronald G. Minnich <rminnich@gmail.com>


git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4877 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
This commit is contained in:
Myles Watson 2009-10-28 15:30:11 +00:00
parent 2a87ac6403
commit d4e5c0a228
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Makefile
View File

@ -35,7 +35,7 @@ export top := $(shell pwd)
export src := $(top)/src export src := $(top)/src
export srck := $(top)/util/kconfig export srck := $(top)/util/kconfig
export obj := $(top)/build export obj := $(top)/build
export objk := $(top)/build/util/kconfig export objk := $(obj)/util/kconfig
export sconfig := $(top)/util/sconfig export sconfig := $(top)/util/sconfig
export yapps2_py := $(sconfig)/yapps2.py export yapps2_py := $(sconfig)/yapps2.py
export config_g := $(sconfig)/config.g export config_g := $(sconfig)/config.g
@ -289,8 +289,8 @@ doxygen-clean:
rm -rf $(DOXYGEN_OUTPUT_DIR) rm -rf $(DOXYGEN_OUTPUT_DIR)
clean: doxygen-clean clean: doxygen-clean
rm -f $(allobjs) build/coreboot* .xcompile rm -f $(allobjs) $(obj)/coreboot* .xcompile
rm -f build/option_table.* build/crt0_includes.h build/ldscript rm -f $(obj)/option_table.* $(obj)/crt0_includes.h $(obj)/ldscript
rm -f $(obj)/mainboard/$(MAINBOARDDIR)/static.c $(obj)/mainboard/$(MAINBOARDDIR)/config.py $(obj)/mainboard/$(MAINBOARDDIR)/static.dot rm -f $(obj)/mainboard/$(MAINBOARDDIR)/static.c $(obj)/mainboard/$(MAINBOARDDIR)/config.py $(obj)/mainboard/$(MAINBOARDDIR)/static.dot
rm -f $(obj)/mainboard/$(MAINBOARDDIR)/auto.inc $(obj)/mainboard/$(MAINBOARDDIR)/crt0.s $(obj)/mainboard/$(MAINBOARDDIR)/crt0.disasm rm -f $(obj)/mainboard/$(MAINBOARDDIR)/auto.inc $(obj)/mainboard/$(MAINBOARDDIR)/crt0.s $(obj)/mainboard/$(MAINBOARDDIR)/crt0.disasm
rmdir -p $(alldirs) 2>/dev/null >/dev/null || true rmdir -p $(alldirs) 2>/dev/null >/dev/null || true
@ -300,7 +300,7 @@ distclean: clean
rm -f .config .config.old ..config.tmp .kconfig.d .tmpconfig* rm -f .config .config.old ..config.tmp .kconfig.d .tmpconfig*
update: update:
dongle.py -c /dev/term/1 build/coreboot.rom EOF dongle.py -c /dev/term/1 $(obj)/coreboot.rom EOF
# This include must come _before_ the pattern rules below! # This include must come _before_ the pattern rules below!
# Order _does_ matter for pattern rules. # Order _does_ matter for pattern rules.
@ -311,7 +311,7 @@ $(obj)/ldoptions: $(obj)/config.h
awk '/^#define ([^"])* ([^"])*$$/ {print $$2 " = " $$3 ";";}' $< > $@ awk '/^#define ([^"])* ([^"])*$$/ {print $$2 " = " $$3 ";";}' $< > $@
$(obj)/romcc: $(top)/util/romcc/romcc.c $(obj)/romcc: $(top)/util/romcc/romcc.c
@printf " HOSTCC build/romcc (this may take a while)\n" @printf " HOSTCC $(obj)/romcc (this may take a while)\n"
$(HOSTCC) -g -O2 -Wall -o $@ $< $(HOSTCC) -g -O2 -Wall -o $@ $<
.PHONY: $(PHONY) prepare prepare2 clean distclean doxygen doxy coreboot .PHONY: $(PHONY) prepare prepare2 clean distclean doxygen doxy coreboot

7
src/arch/i386/Makefile.inc
View File

@ -25,14 +25,13 @@ ifeq ($(CONFIG_PAYLOAD_NONE),y)
@printf " PAYLOAD none (as specified by user)\n" @printf " PAYLOAD none (as specified by user)\n"
else else
@printf " PAYLOAD $(CONFIG_FALLBACK_PAYLOAD_FILE) $(CBFS_PAYLOAD_COMPRESS_FLAG)\n" @printf " PAYLOAD $(CONFIG_FALLBACK_PAYLOAD_FILE) $(CBFS_PAYLOAD_COMPRESS_FLAG)\n"
$(CBFSTOOL) ./build/coreboot.rom add-payload $(CONFIG_FALLBACK_PAYLOAD_FILE) fallback/payload $(CBFS_PAYLOAD_COMPRESS_FLAG) $(CBFSTOOL) $(obj)/coreboot.rom add-payload $(CONFIG_FALLBACK_PAYLOAD_FILE) fallback/payload $(CBFS_PAYLOAD_COMPRESS_FLAG)
endif endif
ifeq ($(CONFIG_VGA_BIOS),y) ifeq ($(CONFIG_VGA_BIOS),y)
@printf " VGABIOS $(CONFIG_FALLBACK_VGA_BIOS_FILE) $(CONFIG_FALLBACK_VGA_BIOS_ID)\n" @printf " VGABIOS $(CONFIG_FALLBACK_VGA_BIOS_FILE) $(CONFIG_FALLBACK_VGA_BIOS_ID)\n"
$(CBFSTOOL) ./build/coreboot.rom add $(CONFIG_FALLBACK_VGA_BIOS_FILE) "pci$(CONFIG_FALLBACK_VGA_BIOS_ID).rom" optionrom $(CBFSTOOL) $(obj)/coreboot.rom add $(CONFIG_FALLBACK_VGA_BIOS_FILE) "pci$(CONFIG_FALLBACK_VGA_BIOS_ID).rom" optionrom
endif endif
@printf " CBFSPRINT build/coreboot.rom\n\n" $(CBFSTOOL) $(obj)/coreboot.rom print
$(CBFSTOOL) build/coreboot.rom print
####################################################################### #######################################################################