summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPatrick Georgi <patrick@georgi-clan.de>2012-04-30 23:56:58 +0200
committerPatrick Georgi <patrick@georgi-clan.de>2012-05-01 11:35:40 +0200
commita1155b47ca42ad1813c36e1d6de6e8116ae13845 (patch)
tree831a5d7b9a79af35908e03dcc7a55d0d66a9b3d8 /src
parent0909d86760aab4f58fd711183ce1b586b493b5e6 (diff)
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> Reviewed-on: http://review.coreboot.org/962 Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org> Tested-by: build bot (Jenkins)
Diffstat (limited to 'src')
-rwxr-xr-xsrc/arch/x86/Makefile.inc9
-rw-r--r--src/cpu/amd/geode_gx2/Makefile.inc4
-rw-r--r--src/cpu/amd/geode_lx/Makefile.inc4
3 files changed, 8 insertions, 9 deletions
diff --git a/src/arch/x86/Makefile.inc b/src/arch/x86/Makefile.inc
index a5116c0871..5486bb130a 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 b70537accf..d3777a6c1d 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 a5e12817eb..4b2b37c436 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