Kyösti Mälkki ([email protected]) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/840
-gerrit commit 0c2472511c3f90db69e224d267ebedbe9a2f033c Author: Kyösti Mälkki <[email protected]> Date: Mon Apr 2 11:03:49 2012 +0300 Makefile: rename coreboot_ap linking filenames $(obj)/coreboot_ap -> $(obj)/ramstage/ramstage_ap.elf It is really a ramstage for AP CPU and not a romstage, it is not enabled for any mainboard by default, and it doesn't compile even if enabled. Change-Id: Ifb9c5cb6df65309660b000876cf6a9a3da9b6839 Signed-off-by: Kyösti Mälkki <[email protected]> --- src/arch/x86/Makefile.inc | 18 +++++++----------- 1 files changed, 7 insertions(+), 11 deletions(-) diff --git a/src/arch/x86/Makefile.inc b/src/arch/x86/Makefile.inc index 6b60db0..a878a60 100755 --- a/src/arch/x86/Makefile.inc +++ b/src/arch/x86/Makefile.inc @@ -47,7 +47,7 @@ ifeq ($(CONFIG_PAYLOAD_FILO),y) COREBOOT_ROM_DEPENDENCIES+=filo endif ifeq ($(CONFIG_AP_CODE_IN_CAR),y) -COREBOOT_ROM_DEPENDENCIES+=$(obj)/coreboot_ap +COREBOOT_ROM_DEPENDENCIES+=$(obj)/ramstage/ramstage_ap.elf endif ifeq ($(CONFIG_GEODE_VSA_FILE),y) COREBOOT_ROM_DEPENDENCIES+=$(CONFIG_VSA_FILENAME) @@ -76,9 +76,9 @@ endif $(obj)/coreboot.rom: $(obj)/coreboot.pre $(obj)/ramstage/ramstage.elf $(CBFSTOOL) $(call strip_quotes,$(COREBOOT_ROM_DEPENDENCIES)) @printf " CBFS $(subst $(obj)/,,$(@))\n" cp $(obj)/coreboot.pre [email protected] - if [ -f $(obj)/coreboot_ap ]; \ + if [ -f $(obj)/ramstage/ramstage_ap.elf ]; \ then \ - $(CBFSTOOL) [email protected] add-stage $(obj)/coreboot_ap $(CONFIG_CBFS_PREFIX)/coreboot_ap $(CBFS_COMPRESS_FLAG); \ + $(CBFSTOOL) [email protected] add-stage $(obj)/ramstage/ramstage_ap.elf $(CONFIG_CBFS_PREFIX)/coreboot_ap $(CBFS_COMPRESS_FLAG); \ fi $(CBFSTOOL) [email protected] add-stage $(obj)/ramstage/ramstage.elf $(CONFIG_CBFS_PREFIX)/coreboot_ram $(CBFS_COMPRESS_FLAG) ifeq ($(CONFIG_PAYLOAD_NONE),y) @@ -164,21 +164,17 @@ $(obj)/ramstage/coreboot.a: $$(ramstage-objs) $(AR) cr $@ $^ ####################################################################### -# coreboot_ap.rom +# Ramstage for AP CPU (AMD K8, obsolete?) -ifeq ($(CONFIG_AP_CODE_IN_CAR),y) - -$(obj)/coreboot_ap: $(obj)/mainboard/$(MAINBOARDDIR)/ap_romstage.o +$(obj)/ramstage/ramstage_ap.elf: $(obj)/mainboard/$(MAINBOARDDIR)/ap_romstage.o @printf " CC $(subst $(obj)/,,$(@))\n" $(CC) -nostdlib -nostartfiles -static -o [email protected] -L$(obj) -T $(src)/arch/x86/init/ldscript_apc.lb $^ - $(OBJCOPY) --only-keep-debug [email protected] [email protected] + $(OBJCOPY) --only-keep-debug [email protected] $(basename $@).debug $(OBJCOPY) --strip-debug [email protected] - $(OBJCOPY) [email protected] [email protected] + $(OBJCOPY) --add-gnu-debuglink=$(basename $@).debug [email protected] $(NM) -n [email protected] | sort > [email protected] mv [email protected] $@ -endif - ####################################################################### # done -- coreboot mailing list: [email protected] http://www.coreboot.org/mailman/listinfo/coreboot
