Next up on the path to openvsa, I present a patch to consolidate all of the Geode V2 targets into a single file. Every one of the Geode LX targets are identical, and consolidating them into a single file saves us much hassle.
If in the future, one platform needs a patch that the others don't, then that can be easily added with the following construct: PATCHES-y= PATCHES-$(MY_PLATFORM_A) += a.patch PATCHES-$(MY_PLATFORM_B) += b.patch After this patch, we'll push the code for the new VSA download (now with NRV2B and padding!), and finally openvsa support, which at that time should be pretty darn transparent. I hope. Jordan -- Jordan Crouse Systems Software Development Engineer Advanced Micro Devices, Inc.
[BUILDROM] conslidate the V2 Geode targets All the Geode targets are the same, so consolidate them into a single target - this will make the forthcoming VSA changes much easier to maintain. Signed-off-by: Jordan Crouse <[EMAIL PROTECTED]> Index: buildrom-devel/config/platforms/alix1c.conf =================================================================== --- buildrom-devel.orig/config/platforms/alix1c.conf 2008-02-18 12:41:59.000000000 -0700 +++ buildrom-devel/config/platforms/alix1c.conf 2008-02-18 12:47:29.000000000 -0700 @@ -12,7 +12,7 @@ # Targets KERNEL_MK=$(PACKAGE_DIR)/kernel/alix1c.mk -CBV2_MK=$(PACKAGE_DIR)/coreboot-v2/alix1c.mk +CBV2_MK=$(PACKAGE_DIR)/coreboot-v2/geodelx.mk # kernel configuration (for LAB) Index: buildrom-devel/config/platforms/db800.conf =================================================================== --- buildrom-devel.orig/config/platforms/db800.conf 2008-02-18 12:47:28.000000000 -0700 +++ buildrom-devel/config/platforms/db800.conf 2008-02-18 12:47:29.000000000 -0700 @@ -14,7 +14,7 @@ # Use the same settings as the Norwich platform KERNEL_MK=$(PACKAGE_DIR)/kernel/norwich.mk -CBV2_MK=$(PACKAGE_DIR)/coreboot-v2/norwich.mk +CBV2_MK=$(PACKAGE_DIR)/coreboot-v2/geodelx.mk # kernel configuration (for LAB) # Use the same settings as the Norwich platform Index: buildrom-devel/config/platforms/dbe61.conf =================================================================== --- buildrom-devel.orig/config/platforms/dbe61.conf 2008-02-18 12:47:28.000000000 -0700 +++ buildrom-devel/config/platforms/dbe61.conf 2008-02-18 12:47:29.000000000 -0700 @@ -14,7 +14,7 @@ # Targets KERNEL_MK=$(PACKAGE_DIR)/kernel/norwich.mk -CBV2_MK=$(PACKAGE_DIR)/coreboot-v2/norwich.mk +CBV2_MK=$(PACKAGE_DIR)/coreboot-v2/geodelx.mk # kernel configuration (for LAB) Index: buildrom-devel/config/platforms/msm800sev.conf =================================================================== --- buildrom-devel.orig/config/platforms/msm800sev.conf 2008-02-18 12:41:59.000000000 -0700 +++ buildrom-devel/config/platforms/msm800sev.conf 2008-02-18 12:47:29.000000000 -0700 @@ -13,7 +13,7 @@ # Targets KERNEL_MK=$(PACKAGE_DIR)/kernel/msm800sev.mk -CBV2_MK=$(PACKAGE_DIR)/coreboot-v2/msm800sev.mk +CBV2_MK=$(PACKAGE_DIR)/coreboot-v2/geodelx.mk # kernel configuration (for LAB) Index: buildrom-devel/config/platforms/norwich.conf =================================================================== --- buildrom-devel.orig/config/platforms/norwich.conf 2008-02-18 12:47:28.000000000 -0700 +++ buildrom-devel/config/platforms/norwich.conf 2008-02-18 12:47:29.000000000 -0700 @@ -13,7 +13,7 @@ # Targets KERNEL_MK=$(PACKAGE_DIR)/kernel/norwich.mk -CBV2_MK=$(PACKAGE_DIR)/coreboot-v2/norwich.mk +CBV2_MK=$(PACKAGE_DIR)/coreboot-v2/geodelx.mk # kernel configuration (for LAB) Index: buildrom-devel/packages/coreboot-v2/alix1c.mk =================================================================== --- buildrom-devel.orig/packages/coreboot-v2/alix1c.mk 2008-02-18 12:41:59.000000000 -0700 +++ /dev/null 1970-01-01 00:00:00.000000000 +0000 @@ -1,38 +0,0 @@ -# This is the Generic coreboot target - -ifeq ($(CONFIG_PLATFORM),y) -ifeq ($(CBV2_TAG),) -$(error You need to specify a version to pull in your platform config) -endif -endif - -CBV2_BASE_DIR=svn -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 code..." - wget -P $(SOURCE_DIR) $(VSA_URL)/$(CBV2_VSA).gz -O $@ - -$(SOURCE_DIR)/$(CBV2_TARBALL): - @ echo "Fetching the coreboot code..." - @ mkdir -p $(SOURCE_DIR)/coreboot - @ $(BIN_DIR)/fetchsvn.sh $(CBV2_URL) $(SOURCE_DIR)/coreboot \ - $(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) - @ mkdir -p $(OUTPUT_DIR) - @ cat $(SOURCE_DIR)/$(CBV2_VSA) $(CBV2_OUTPUT) > $@ - -coreboot: $(OUTPUT_DIR)/$(TARGET_ROM) -coreboot-clean: generic-coreboot-clean -coreboot-distclean: generic-coreboot-distclean Index: buildrom-devel/packages/coreboot-v2/geodelx.mk =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ buildrom-devel/packages/coreboot-v2/geodelx.mk 2008-02-18 12:47:29.000000000 -0700 @@ -0,0 +1,38 @@ +# This target supports all Geode LX platforms +# +ifeq ($(CONFIG_PLATFORM),y) +ifeq ($(CBV2_TAG),) +$(error You need to specify a version to pull in your platform config) +endif +endif + +CBV2_BASE_DIR=svn +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 + @ $(BIN_DIR)/fetchsvn.sh $(CBV2_URL) $(SOURCE_DIR)/coreboot \ + $(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) + @ mkdir -p $(OUTPUT_DIR) + @ cat $(SOURCE_DIR)/$(CBV2_VSA) $(CBV2_OUTPUT) > $@ + +coreboot: $(OUTPUT_DIR)/$(TARGET_ROM) +coreboot-clean: generic-coreboot-clean +coreboot-distclean: generic-coreboot-distclean Index: buildrom-devel/packages/coreboot-v2/msm800sev.mk =================================================================== --- buildrom-devel.orig/packages/coreboot-v2/msm800sev.mk 2008-02-18 12:41:59.000000000 -0700 +++ /dev/null 1970-01-01 00:00:00.000000000 +0000 @@ -1,38 +0,0 @@ -# This is the Generic coreboot target - -ifeq ($(CONFIG_PLATFORM),y) -ifeq ($(CBV2_TAG),) -$(error You need to specify a version to pull in your platform config) -endif -endif - -CBV2_BASE_DIR=svn -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 code..." - wget -P $(SOURCE_DIR) $(VSA_URL)/$(CBV2_VSA).gz -O $@ - -$(SOURCE_DIR)/$(CBV2_TARBALL): - @ echo "Fetching the coreboot code..." - @ mkdir -p $(SOURCE_DIR)/coreboot - @ $(BIN_DIR)/fetchsvn.sh $(CBV2_URL) $(SOURCE_DIR)/coreboot \ - $(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) - @ mkdir -p $(OUTPUT_DIR) - @ cat $(SOURCE_DIR)/$(CBV2_VSA) $(CBV2_OUTPUT) > $@ - -coreboot: $(OUTPUT_DIR)/$(TARGET_ROM) -coreboot-clean: generic-coreboot-clean -coreboot-distclean: generic-coreboot-distclean Index: buildrom-devel/packages/coreboot-v2/norwich.mk =================================================================== --- buildrom-devel.orig/packages/coreboot-v2/norwich.mk 2008-02-18 12:41:59.000000000 -0700 +++ /dev/null 1970-01-01 00:00:00.000000000 +0000 @@ -1,40 +0,0 @@ -# This is the Generic coreboot target - -ifeq ($(CONFIG_PLATFORM),y) -ifeq ($(CBV2_TAG),) -$(error You need to specify a version to pull in your platform config) -else -$(warning You specified $(CBV2_TAG) a version to pull in your platform config) -endif -endif - -CBV2_BASE_DIR=svn -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 code..." - 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 - @ $(BIN_DIR)/fetchsvn.sh $(CBV2_URL) $(SOURCE_DIR)/coreboot \ - $(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) - @ mkdir -p $(OUTPUT_DIR) - @ cat $(SOURCE_DIR)/$(CBV2_VSA) $(CBV2_OUTPUT) > $@ - -coreboot: $(OUTPUT_DIR)/$(TARGET_ROM) -coreboot-clean: generic-coreboot-clean -coreboot-distclean: generic-coreboot-distclean
-- coreboot mailing list [email protected] http://www.coreboot.org/mailman/listinfo/coreboot
