Author: jcrouse Date: 2008-02-22 22:50:12 +0100 (Fri, 22 Feb 2008) New Revision: 128
Modified: buildrom-devel/Config.in buildrom-devel/config/payloads/payloads.conf buildrom-devel/config/platforms/Config.in buildrom-devel/packages/coreboot-v2/geodelx.mk Log: [BUILDROM] Fixup VSA fetching code
In preparation for v3 and the upcoming openvsa changes, rearrange the VSA fetching code. We now fetch an uncompressed blob, and do the compressing within buildrom. I'm mainly concentrating on v2 right now (this is not quite v3 friendly), but it will be.
Also, work around a hopefully temporary bug on the AMD servers.
Signed-off-by: Jordan Crouse jordan.crouse@amd.com Acked-by: Ward Vandewege ward@gnu.org
Modified: buildrom-devel/Config.in =================================================================== --- buildrom-devel/Config.in 2008-02-22 21:07:10 UTC (rev 127) +++ buildrom-devel/Config.in 2008-02-22 21:50:12 UTC (rev 128) @@ -124,6 +124,10 @@ bool default n
+config PLATFORM_GEODE + bool + default n + config PAYLOAD_64BIT bool default n @@ -137,5 +141,13 @@ bool default n
+# This config option will only be set by platforms that need it +# (geode + coreboot v2) + +config USE_NRV2B + bool + depends PLATFORM_GEODE && COREBOOT_V2 + default y + source config/platforms/Config.in source config/payloads/Config.in
Modified: buildrom-devel/config/payloads/payloads.conf =================================================================== --- buildrom-devel/config/payloads/payloads.conf 2008-02-22 21:07:10 UTC (rev 127) +++ buildrom-devel/config/payloads/payloads.conf 2008-02-22 21:50:12 UTC (rev 128) @@ -33,6 +33,7 @@ endif
HOSTTOOLS-$(CONFIG_BUILD_QEMU) += qemu +HOSTTOOLS-$(CONFIG_USE_NRV2B) += nrv2b
# Sanity check
Modified: buildrom-devel/config/platforms/Config.in =================================================================== --- buildrom-devel/config/platforms/Config.in 2008-02-22 21:07:10 UTC (rev 127) +++ buildrom-devel/config/platforms/Config.in 2008-02-22 21:50:12 UTC (rev 128) @@ -45,27 +45,32 @@ bool "AMD Geode LX 'Norwich'" depends VENDOR_AMD select PLATFORM + select PLATFORM_GEODE
config PLATFORM_DBE61 bool "Artec Group DBE61" depends VENDOR_ARTEC_GROUP select PLATFORM + select PLATFORM_GEODE
config PLATFORM_ALIX1C bool "PC Engines ALIX1.C" depends VENDOR_PC_ENGINES select PLATFORM + select PLATFORM_GEODE
config PLATFORM_MSM800SEV bool "Advanced Digital Logic MSM800SEV" depends VENDOR_ADVANCED_DIGITAL_LOGIC select PLATFORM + select PLATFORM_GEODE
config PLATFORM_DB800 bool "AMD DB800" depends VENDOR_AMD depends COREBOOT_V2 select PLATFORM + select PLATFORM_GEODE
config PLATFORM_GA_M57SLI_S4 bool "GIGABYTE GA-M57SLI-S4"
Modified: buildrom-devel/packages/coreboot-v2/geodelx.mk =================================================================== --- buildrom-devel/packages/coreboot-v2/geodelx.mk 2008-02-22 21:07:10 UTC (rev 127) +++ buildrom-devel/packages/coreboot-v2/geodelx.mk 2008-02-22 21:50:12 UTC (rev 128) @@ -10,16 +10,11 @@ CBV2_URL=svn://coreboot.org/repos/trunk/coreboot-v2 CBV2_TARBALL=coreboot-svn-$(CBV2_TAG).tar.gz CBV2_PAYLOAD_TARGET=$(CBV2_BUILD_DIR)/payload.$(CBV2_PAYLOAD_FILE_EXT) -VSA_URL=http://www.amd.com/files/connectivitysolutions/geode/geode_lx/ -CBV2_VSA=lx_vsa.36k.bin + TARGET_ROM = $(COREBOOT_VENDOR)-$(COREBOOT_BOARD).rom
include $(PACKAGE_DIR)/coreboot-v2/coreboot.inc
-$(SOURCE_DIR)/$(CBV2_VSA): - @ echo "Fetching the VSA blob..." - wget -P $(SOURCE_DIR) $(VSA_URL)/$(CBV2_VSA).gz -O $@ - $(SOURCE_DIR)/$(CBV2_TARBALL): @ echo "Fetching the coreboot rev $(CBV2_TAG) code..." @ mkdir -p $(SOURCE_DIR)/coreboot @@ -27,12 +22,10 @@ $(CBV2_TAG) $(SOURCE_DIR)/$(CBV2_TARBALL) \ > $(CBV2_FETCH_LOG) 2>&1
-# Special rule - append the VSA - -$(OUTPUT_DIR)/$(TARGET_ROM): $(CBV2_OUTPUT) $(SOURCE_DIR)/$(CBV2_VSA) +$(OUTPUT_DIR)/$(TARGET_ROM): $(CBV2_OUTPUT) $(GEODE_PADDED_VSA) @ mkdir -p $(OUTPUT_DIR) - @ cat $(SOURCE_DIR)/$(CBV2_VSA) $(CBV2_OUTPUT) > $@ + @ cat $(GEODE_PADDED_VSA) $(CBV2_OUTPUT) > $@
-coreboot: $(OUTPUT_DIR)/$(TARGET_ROM) -coreboot-clean: generic-coreboot-clean -coreboot-distclean: generic-coreboot-distclean +coreboot: geodevsa $(OUTPUT_DIR)/$(TARGET_ROM) +coreboot-clean: geodevsa-clean generic-coreboot-clean +coreboot-distclean: geodevsa-distclean generic-coreboot-distclean