Patrick Georgi (patrick@georgi-clan.de) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/962
-gerrit
commit 68ae60f6d9bcef7e365a3a00fbe78111e7da7ee6 Author: Patrick Georgi patrick@georgi-clan.de Date: Mon Apr 30 23:56:58 2012 +0200
Move VSA support from x86 to Geode
Instead of the special case in the generic Makefile.inc, use cbfs-files in the CPU directories.
Change-Id: I71d9c8dff906c9a516ac0dd09a315f8956075592 Signed-off-by: Patrick Georgi patrick@georgi-clan.de --- src/arch/x86/Makefile.inc | 9 --------- src/cpu/amd/geode_gx2/Makefile.inc | 4 ++++ src/cpu/amd/geode_lx/Makefile.inc | 4 ++++ 3 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/src/arch/x86/Makefile.inc b/src/arch/x86/Makefile.inc index a5116c0..5486bb1 100755 --- a/src/arch/x86/Makefile.inc +++ b/src/arch/x86/Makefile.inc @@ -49,9 +49,6 @@ endif ifeq ($(CONFIG_AP_CODE_IN_CAR),y) COREBOOT_ROM_DEPENDENCIES+=$(objcbfs)/coreboot_ap.elf endif -ifeq ($(CONFIG_GEODE_VSA_FILE),y) -COREBOOT_ROM_DEPENDENCIES+=$(CONFIG_VSA_FILENAME) -endif
extract_nth=$(word $(1), $(subst |, ,$(2)))
@@ -96,12 +93,6 @@ ifeq ($(CONFIG_PAYLOAD_FILO),y) @printf " PAYLOAD FILO (internal, compression: $(CBFS_PAYLOAD_COMPRESS_NAME))\n" $(CBFSTOOL) $@.tmp add-payload $(CONFIG_PAYLOAD_FILE) $(CONFIG_CBFS_PREFIX)/payload $(CBFS_PAYLOAD_COMPRESS_FLAG) endif -ifeq ($(CONFIG_GEODE_VSA_FILE),y) - @printf " VSA $(CONFIG_VSA_FILENAME)\n" - $(OBJCOPY) --set-start 0x20 --adjust-vma 0x60000 -I binary -O elf32-i386 -B i386 $(CONFIG_VSA_FILENAME) $(obj)/vsa.o - $(LD) -m elf_i386 -e 0x60020 --section-start .data=0x60000 $(obj)/vsa.o -o $(obj)/vsa.elf - $(CBFSTOOL) $@.tmp add-stage $(obj)/vsa.elf vsa -endif ifeq ($(CONFIG_INCLUDE_CONFIG_FILE),y) @printf " CONFIG $(DOTCONFIG)\n" if [ -f $(DOTCONFIG) ]; then \ diff --git a/src/cpu/amd/geode_gx2/Makefile.inc b/src/cpu/amd/geode_gx2/Makefile.inc index b70537a..d3777a6 100644 --- a/src/cpu/amd/geode_gx2/Makefile.inc +++ b/src/cpu/amd/geode_gx2/Makefile.inc @@ -7,3 +7,7 @@ driver-y += geode_gx2_init.c ramstage-y += cpubug.c
cpu_incs += $(src)/cpu/amd/geode_gx2/cache_as_ram.inc + +cbfs-files-$(CONFIG_GEODE_VSA_FILE) += vsa +vsa-file = $(call strip_quotes,$(CONFIG_VSA_FILENAME)):vsa +vsa-type = stage diff --git a/src/cpu/amd/geode_lx/Makefile.inc b/src/cpu/amd/geode_lx/Makefile.inc index a5e1281..4b2b37c 100644 --- a/src/cpu/amd/geode_lx/Makefile.inc +++ b/src/cpu/amd/geode_lx/Makefile.inc @@ -7,3 +7,7 @@ driver-y += geode_lx_init.c ramstage-y += cpubug.c
cpu_incs += $(src)/cpu/amd/geode_lx/cache_as_ram.inc + +cbfs-files-$(CONFIG_GEODE_VSA_FILE) += vsa +vsa-file = $(call strip_quotes,$(CONFIG_VSA_FILENAME)):vsa +vsa-type = stage