[LinuxBIOS] r68 - buildrom-devel/packages/linuxbios

[svn at openbios.org]

Author: jcrouse
Date: 2007-11-29 16:59:26 +0100 (Thu, 29 Nov 2007)
New Revision: 68

Added:
   buildrom-devel/packages/linuxbios/optionroms.inc
Modified:
   buildrom-devel/packages/linuxbios/ga-2761gxdk-linuxbios.mk
   buildrom-devel/packages/linuxbios/generic-linuxbios.mk
Log:
[BUILDROM] Download and prepend the VGA VBIOS for the ga-2761gxdk

First try at downloading and prepending the VGA VBIOS for the ga-2761gxdk
board stored on linuxbios.org.  This should be generic enough to extend
to other platforms when the time comes.

Signed-off-by: Jordan Crouse <jordan.crouse at amd.com>
Acked-by: Peter Stuge <peter at stuge.se>


Modified: buildrom-devel/packages/linuxbios/ga-2761gxdk-linuxbios.mk
===================================================================
--- buildrom-devel/packages/linuxbios/ga-2761gxdk-linuxbios.mk	2007-11-29 15:58:26 UTC (rev 67)
+++ buildrom-devel/packages/linuxbios/ga-2761gxdk-linuxbios.mk	2007-11-29 15:59:26 UTC (rev 68)
@@ -16,6 +16,12 @@
 
 include $(PACKAGE_DIR)/linuxbios/linuxbios.inc
 
+# This matches the base name of the ROM on
+# http://www.linuxbios.org/data/optionroms/
+
+OPTIONROM_ID = pci1039,6330
+include $(PACKAGE_DIR)/linuxbios/optionroms.inc
+
 $(SOURCE_DIR)/$(LINUXBIOS_TARBALL):
 	@ echo "Fetching the LinuxBIOS code..."
 	@ mkdir -p $(SOURCE_DIR)/linuxbios
@@ -23,9 +29,9 @@
 	$(LINUXBIOS_TAG) $(SOURCE_DIR)/$(LINUXBIOS_TARBALL) \
 	> $(LINUXBIOS_FETCH_LOG) 2>&1
 
-$(OUTPUT_DIR)/$(TARGET_ROM): $(LINUXBIOS_OUTPUT)
+$(OUTPUT_DIR)/$(TARGET_ROM): $(LINUXBIOS_OUTPUT) $(SOURCE_DIR)/$(OPTIONROM_ID).rom
 	@ mkdir -p $(OUTPUT_DIR)
-	@ cat $(LINUXBIOS_OUTPUT) > $@
+	@ cat $(SOURCE_DIR)/$(OPTIONROM_ID).rom $(LINUXBIOS_OUTPUT) > $@
 
 linuxbios: $(OUTPUT_DIR)/$(TARGET_ROM)
 linuxbios-clean: generic-linuxbios-clean

Modified: buildrom-devel/packages/linuxbios/generic-linuxbios.mk
===================================================================
--- buildrom-devel/packages/linuxbios/generic-linuxbios.mk	2007-11-29 15:58:26 UTC (rev 67)
+++ buildrom-devel/packages/linuxbios/generic-linuxbios.mk	2007-11-29 15:59:26 UTC (rev 68)
@@ -12,8 +12,20 @@
 LINUXBIOS_PAYLOAD_TARGET=$(LINUXBIOS_BUILD_DIR)/payload.elf
 TARGET_ROM = $(LINUXBIOS_VENDOR)-$(LINUXBIOS_BOARD).rom
 
+# This is the list of components that comprise the ROM (excluding the payload)
+LINUXBIOS_COMPONENTS = $(LINUXBIOS_OUTPUT)
+
 include $(PACKAGE_DIR)/linuxbios/linuxbios.inc
 
+# If an optionrom was specified in the configuration, then use it
+
+ifneq($(OPTIONROM_ID),)
+include $(PACKAGE_DIR)/linuxbios/optionroms.inc
+
+# Add it to the front of the list so it is prepended to the LinuxBIOS output
+LINUXBIOS_COMPONENTS = $(SOURCE_DIR)/$(OPTIONROM_ID).rom $(LINUXBIOS_COMPONENTS)
+endif
+
 $(SOURCE_DIR)/$(LINUXBIOS_TARBALL): 
 	@ echo "Fetching the LinuxBIOS code..."
 	@ mkdir -p $(SOURCE_DIR)/linuxbios
@@ -21,9 +33,9 @@
 	$(LINUXBIOS_TAG) $(SOURCE_DIR)/$(LINUXBIOS_TARBALL) \
 	> $(LINUXBIOS_FETCH_LOG) 2>&1
 
-$(OUTPUT_DIR)/$(TARGET_ROM): $(LINUXBIOS_OUTPUT)
+$(OUTPUT_DIR)/$(TARGET_ROM): $(LINUXBIOS_COMPONENTS)
 	@ mkdir -p $(OUTPUT_DIR)
-	@ cp $< $@
+	@ cat $(LINUXBIOS_COMPONENTS) > $@
 
 linuxbios: $(OUTPUT_DIR)/$(TARGET_ROM)
 linuxbios-clean: generic-linuxbios-clean

Added: buildrom-devel/packages/linuxbios/optionroms.inc
===================================================================
--- buildrom-devel/packages/linuxbios/optionroms.inc	                        (rev 0)
+++ buildrom-devel/packages/linuxbios/optionroms.inc	2007-11-29 15:59:26 UTC (rev 68)
@@ -0,0 +1,12 @@
+# Rules to download option roms from the LinuxBIOS option rom
+# repository
+
+OPTIONROMURL=http://www.linuxbios.org/data/optionroms/
+
+$(OUTPUT_DIR)/$(OPTIONROM_ID).license:
+	@ mkdir -p $(OUTPUT_DIR)
+	@ wget -P $(OUTPUT_DIR) $(OPTIONROMURL)/$(OPTIONROM_ID).license -O $@
+
+$(SOURCE_DIR)/$(OPTIONROM_ID).rom: $(OUTPUT_DIR)/$(OPTIONROM_ID).license
+	@ mkdir -p $(SOURCE_DIR)
+	@ wget -P $(SOURCE_DIR) $(OPTIONROMURL)/$(OPTIONROM_ID).rom -O $@