aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Reinauer <stepan@coresystems.de>2010-04-20 18:35:33 +0000
committerStefan Reinauer <stepan@openbios.org>2010-04-20 18:35:33 +0000
commitbda29314c25aca190071988ec9adfb42f4ba5114 (patch)
tree87970ef76d4db715431f5015734933a2565b29cb
parent0e5e7c309157c1f8f047149e55d12a224d262a3e (diff)
Make VSA code selectable in Kconfig
Signed-off-by: Stefan Reinauer <stepan@coresystems.de> Acked-by: Peter Stuge <peter@stuge.se> git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5467 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
-rw-r--r--src/arch/i386/Makefile.inc9
-rw-r--r--src/cpu/amd/model_gx2/Kconfig18
-rw-r--r--src/cpu/amd/model_lx/Kconfig18
3 files changed, 45 insertions, 0 deletions
diff --git a/src/arch/i386/Makefile.inc b/src/arch/i386/Makefile.inc
index 5f8d110eb6..24fd02abab 100644
--- a/src/arch/i386/Makefile.inc
+++ b/src/arch/i386/Makefile.inc
@@ -25,6 +25,9 @@ endif
ifeq ($(CONFIG_AP_CODE_IN_CAR),y)
COREBOOT_ROM_DEPENDENCIES+=$(obj)/coreboot_ap
endif
+ifeq ($(CONFIG_GEODE_VSA),y)
+COREBOOT_ROM_DEPENDENCIES+=$(CONFIG_VSA_FILE)
+endif
$(obj)/coreboot.rom: $(obj)/coreboot.pre $(obj)/coreboot_ram $(CBFSTOOL) $(call strip_quotes,$(COREBOOT_ROM_DEPENDENCIES))
@printf " CBFS $(subst $(obj)/,,$(@))\n"
@@ -52,6 +55,12 @@ ifeq ($(CONFIG_BOOTSPLASH),y)
@printf " BOOTSPLASH $(CONFIG_FALLBACK_BOOTSPLASH_FILE)\n"
$(CBFSTOOL) $@.tmp add $(CONFIG_FALLBACK_BOOTSPLASH_FILE) bootsplash.jpg bootsplash
endif
+ifeq ($(CONFIG_GEODE_VSA),y)
+ @printf " VSA $(CONFIG_VSA_FILE)\n"
+ $(OBJCOPY) --set-start 0x20 --adjust-vma 0x60000 -I binary -O elf32-i386 -B i386 $(CONFIG_VSA_FILE) $(obj)/vsa.o
+ $(LD) -e 0x60020 --section-start .data=0x60000 $(obj)/vsa.o -o $(obj)/vsa.elf
+ $(CBFSTOOL) $@.tmp add-stage $(obj)/vsa.elf vsa
+endif
mv $@.tmp $@
@printf " CBFSPRINT $(subst $(obj)/,,$(@))\n\n"
$(CBFSTOOL) $@ print
diff --git a/src/cpu/amd/model_gx2/Kconfig b/src/cpu/amd/model_gx2/Kconfig
index f4fa709a99..8aa3420ecb 100644
--- a/src/cpu/amd/model_gx2/Kconfig
+++ b/src/cpu/amd/model_gx2/Kconfig
@@ -30,3 +30,21 @@ config DCACHE_RAM_SIZE
default 0x01000
depends on CPU_AMD_GX2
+config GEODE_VSA
+ bool "Add a VSA image"
+ depends on CPU_AMD_GX2
+ help
+ Select this option if you have an AMD Geode GX2 vsa that you would
+ like to add to your ROM.
+
+ You will be able to specify the location and file name of the
+ image later.
+
+config VSA_FILE
+ string "AMD Geode GX2 VSA path and filename"
+ depends on GEODE_VSA
+ default "gpl_vsa_gx_102.bin"
+ help
+ The path and filename of the file to use as VSA.
+
+
diff --git a/src/cpu/amd/model_lx/Kconfig b/src/cpu/amd/model_lx/Kconfig
index 4bcf31bc57..769c600a46 100644
--- a/src/cpu/amd/model_lx/Kconfig
+++ b/src/cpu/amd/model_lx/Kconfig
@@ -11,3 +11,21 @@ config DCACHE_RAM_SIZE
default 0x8000
depends on CPU_AMD_LX
+config GEODE_VSA
+ bool "Add a VSA image"
+ depends on CPU_AMD_LX
+ help
+ Select this option if you have an AMD Geode LX vsa that you would
+ like to add to your ROM.
+
+ You will be able to specify the location and file name of the
+ image later.
+
+config VSA_FILE
+ string "AMD Geode LX VSA path and filename"
+ depends on GEODE_VSA
+ default "gpl_vsa_lx_102.bin"
+ help
+ The path and filename of the file to use as VSA.
+
+