11 Jan
2008
11 Jan
'08
10:56 p.m.
I'm about to introduce some new code, but first, this is some cleanup of the linuxbios/ directory - all the geode targets were the same, so I consolidated them.
Jordan
--
Jordan Crouse
Systems Software Development Engineer
Advanced Micro Devices, Inc.
[BUILDROM] Consolidate all the geode Linuxbios targets
All the Geode LinuxBIOS v2 targets do the same thing, so consolidate them.
Signed-off-by: Jordan Crouse jordan.crouse@amd.com
Index: buildrom-devel/packages/linuxbios/alix1c-linuxbios.mk
===================================================================
--- buildrom-devel.orig/packages/linuxbios/alix1c-linuxbios.mk 2008-01-11 12:16:03.000000000 -0700
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,38 +0,0 @@
-# This is the Generic LinuxBIOS target
-
-ifeq ($(CONFIG_PLATFORM),y)
-ifeq ($(LBV2_TAG),)
-$(error You need to specify a version to pull in your platform config)
-endif
-endif
-
-LBV2_BASE_DIR=svn
-LBV2_URL=svn://openbios.org/repos/trunk/LinuxBIOSv2
-LBV2_TARBALL=linuxbios-svn-$(LBV2_TAG).tar.gz
-LBV2_PAYLOAD_TARGET=$(LBV2_BUILD_DIR)/payload.elf
-VSA_URL=http://www.amd.com/files/connectivitysolutions/geode/geode_lx/
-LBV2_VSA=lx_vsa.36k.bin
-TARGET_ROM = $(LINUXBIOS_VENDOR)-$(LINUXBIOS_BOARD).rom
-
-include $(PACKAGE_DIR)/linuxbios/linuxbios.inc
-
-$(SOURCE_DIR)/$(LBV2_VSA):
- @ echo "Fetching the VSA code..."
- wget -P $(SOURCE_DIR) $(VSA_URL)/$(LBV2_VSA).gz -O $@
-
-$(SOURCE_DIR)/$(LBV2_TARBALL):
- @ echo "Fetching the LinuxBIOS code..."
- @ mkdir -p $(SOURCE_DIR)/linuxbios
- @ $(BIN_DIR)/fetchsvn.sh $(LBV2_URL) $(SOURCE_DIR)/linuxbios \
- $(LBV2_TAG) $(SOURCE_DIR)/$(LBV2_TARBALL) \
- > $(LBV2_FETCH_LOG) 2>&1
-
-# Special rule - append the VSA
-
-$(OUTPUT_DIR)/$(TARGET_ROM): $(LBV2_OUTPUT) $(SOURCE_DIR)/$(LBV2_VSA)
- @ mkdir -p $(OUTPUT_DIR)
- @ cat $(SOURCE_DIR)/$(LBV2_VSA) $(LBV2_OUTPUT) > $@
-
-linuxbios: $(OUTPUT_DIR)/$(TARGET_ROM)
-linuxbios-clean: generic-linuxbios-clean
-linuxbios-distclean: generic-linuxbios-distclean
Index: buildrom-devel/packages/linuxbios/geodelx-linuxbios.mk
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ buildrom-devel/packages/linuxbios/geodelx-linuxbios.mk 2008-01-11 14:17:05.000000000 -0700
@@ -0,0 +1,39 @@
+# This target supports all Geode LX platforms - it handles downloading
+# the VSA as an additional step
+
+ifeq ($(CONFIG_PLATFORM),y)
+ifeq ($(LBV2_TAG),)
+$(error You need to specify a version to pull in your platform config)
+endif
+endif
+
+LBV2_BASE_DIR=svn
+LBV2_URL=svn://openbios.org/repos/trunk/LinuxBIOSv2
+LBV2_TARBALL=linuxbios-svn-$(LBV2_TAG).tar.gz
+LBV2_PAYLOAD_TARGET=$(LBV2_BUILD_DIR)/payload.elf
+VSA_URL=http://www.amd.com/files/connectivitysolutions/geode/geode_lx/
+LBV2_VSA=lx_vsa.36k.bin
+TARGET_ROM = $(LINUXBIOS_VENDOR)-$(LINUXBIOS_BOARD).rom
+
+include $(PACKAGE_DIR)/linuxbios/linuxbios.inc
+
+$(SOURCE_DIR)/$(LBV2_VSA):
+ @ echo "Fetching the VSA code..."
+ wget -P $(SOURCE_DIR) $(VSA_URL)/$(LBV2_VSA).gz -O $@
+
+$(SOURCE_DIR)/$(LBV2_TARBALL):
+ @ echo "Fetching the LinuxBIOS code..."
+ @ mkdir -p $(SOURCE_DIR)/linuxbios
+ @ $(BIN_DIR)/fetchsvn.sh $(LBV2_URL) $(SOURCE_DIR)/linuxbios \
+ $(LBV2_TAG) $(SOURCE_DIR)/$(LBV2_TARBALL) \
+ > $(LBV2_FETCH_LOG) 2>&1
+
+# Special rule - append the VSA
+
+$(OUTPUT_DIR)/$(TARGET_ROM): $(LBV2_OUTPUT) $(SOURCE_DIR)/$(LBV2_VSA)
+ @ mkdir -p $(OUTPUT_DIR)
+ @ cat $(SOURCE_DIR)/$(LBV2_VSA) $(LBV2_OUTPUT) > $@
+
+linuxbios: $(OUTPUT_DIR)/$(TARGET_ROM)
+linuxbios-clean: generic-linuxbios-clean
+linuxbios-distclean: generic-linuxbios-distclean
Index: buildrom-devel/packages/linuxbios/msm800sev-linuxbios.mk
===================================================================
--- buildrom-devel.orig/packages/linuxbios/msm800sev-linuxbios.mk 2008-01-11 12:16:08.000000000 -0700
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,38 +0,0 @@
-# This is the Generic LinuxBIOS target
-
-ifeq ($(CONFIG_PLATFORM),y)
-ifeq ($(LBV2_TAG),)
-$(error You need to specify a version to pull in your platform config)
-endif
-endif
-
-LBV2_BASE_DIR=svn
-LBV2_URL=svn://openbios.org/repos/trunk/LinuxBIOSv2
-LBV2_TARBALL=linuxbios-svn-$(LBV2_TAG).tar.gz
-LBV2_PAYLOAD_TARGET=$(LBV2_BUILD_DIR)/payload.elf
-VSA_URL=http://www.amd.com/files/connectivitysolutions/geode/geode_lx/
-LBV2_VSA=lx_vsa.36k.bin
-TARGET_ROM = $(LINUXBIOS_VENDOR)-$(LINUXBIOS_BOARD).rom
-
-include $(PACKAGE_DIR)/linuxbios/linuxbios.inc
-
-$(SOURCE_DIR)/$(LBV2_VSA):
- @ echo "Fetching the VSA code..."
- wget -P $(SOURCE_DIR) $(VSA_URL)/$(LBV2_VSA).gz -O $@
-
-$(SOURCE_DIR)/$(LBV2_TARBALL):
- @ echo "Fetching the LinuxBIOS code..."
- @ mkdir -p $(SOURCE_DIR)/linuxbios
- @ $(BIN_DIR)/fetchsvn.sh $(LBV2_URL) $(SOURCE_DIR)/linuxbios \
- $(LBV2_TAG) $(SOURCE_DIR)/$(LBV2_TARBALL) \
- > $(LBV2_FETCH_LOG) 2>&1
-
-# Special rule - append the VSA
-
-$(OUTPUT_DIR)/$(TARGET_ROM): $(LBV2_OUTPUT) $(SOURCE_DIR)/$(LBV2_VSA)
- @ mkdir -p $(OUTPUT_DIR)
- @ cat $(SOURCE_DIR)/$(LBV2_VSA) $(LBV2_OUTPUT) > $@
-
-linuxbios: $(OUTPUT_DIR)/$(TARGET_ROM)
-linuxbios-clean: generic-linuxbios-clean
-linuxbios-distclean: generic-linuxbios-distclean
Index: buildrom-devel/packages/linuxbios/norwich-linuxbios.mk
===================================================================
--- buildrom-devel.orig/packages/linuxbios/norwich-linuxbios.mk 2008-01-11 12:16:11.000000000 -0700
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,41 +0,0 @@
-# This is the Generic LinuxBIOS target
-
-echo $(LBV2_TAG)
-ifeq ($(CONFIG_PLATFORM),y)
-ifeq ($(LBV2_TAG),)
-$(error You need to specify a version to pull in your platform config)
-else
-$(warning You specified $(LBV2_TAG) a version to pull in your platform config)
-endif
-endif
-
-LBV2_BASE_DIR=svn
-LBV2_URL=svn://openbios.org/repos/trunk/LinuxBIOSv2
-LBV2_TARBALL=linuxbios-svn-$(LBV2_TAG).tar.gz
-LBV2_PAYLOAD_TARGET=$(LBV2_BUILD_DIR)/payload.elf
-VSA_URL=http://www.amd.com/files/connectivitysolutions/geode/geode_lx/
-LBV2_VSA=lx_vsa.36k.bin
-TARGET_ROM = $(LINUXBIOS_VENDOR)-$(LINUXBIOS_BOARD).rom
-
-include $(PACKAGE_DIR)/linuxbios/linuxbios.inc
-
-$(SOURCE_DIR)/$(LBV2_VSA):
- @ echo "Fetching the VSA code..."
- wget -P $(SOURCE_DIR) $(VSA_URL)/$(LBV2_VSA).gz -O $@
-
-$(SOURCE_DIR)/$(LBV2_TARBALL):
- @ echo "Fetching the LinuxBIOS rev $(LBV2_TAG) code..."
- @ mkdir -p $(SOURCE_DIR)/linuxbios
- @ $(BIN_DIR)/fetchsvn.sh $(LBV2_URL) $(SOURCE_DIR)/linuxbios \
- $(LBV2_TAG) $(SOURCE_DIR)/$(LBV2_TARBALL) \
- > $(LBV2_FETCH_LOG) 2>&1
-
-# Special rule - append the VSA
-
-$(OUTPUT_DIR)/$(TARGET_ROM): $(LBV2_OUTPUT) $(SOURCE_DIR)/$(LBV2_VSA)
- @ mkdir -p $(OUTPUT_DIR)
- @ cat $(SOURCE_DIR)/$(LBV2_VSA) $(LBV2_OUTPUT) > $@
-
-linuxbios: $(OUTPUT_DIR)/$(TARGET_ROM)
-linuxbios-clean: generic-linuxbios-clean
-linuxbios-distclean: generic-linuxbios-distclean
Index: buildrom-devel/config/platforms/alix1c.conf
===================================================================
--- buildrom-devel.orig/config/platforms/alix1c.conf 2008-01-11 13:39:10.000000000 -0700
+++ buildrom-devel/config/platforms/alix1c.conf 2008-01-11 13:39:30.000000000 -0700
@@ -12,7 +12,7 @@
# Targets
KERNEL_MK=$(PACKAGE_DIR)/kernel/alix1c-kernel.mk
-LBV2_MK=$(PACKAGE_DIR)/linuxbios/alix1c-linuxbios.mk
+LBV2_MK=$(PACKAGE_DIR)/linuxbios/geodelx-linuxbios.mk
# kernel configuration (for LAB)
Index: buildrom-devel/config/platforms/db800.conf
===================================================================
--- buildrom-devel.orig/config/platforms/db800.conf 2008-01-11 13:39:10.000000000 -0700
+++ buildrom-devel/config/platforms/db800.conf 2008-01-11 13:39:39.000000000 -0700
@@ -14,7 +14,7 @@
# Use the same settings as the Norwich platform
KERNEL_MK=$(PACKAGE_DIR)/kernel/norwich-kernel.mk
-LBV2_MK=$(PACKAGE_DIR)/linuxbios/norwich-linuxbios.mk
+LBV2_MK=$(PACKAGE_DIR)/linuxbios/geodelx-linuxbios.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-01-11 13:39:10.000000000 -0700
+++ buildrom-devel/config/platforms/dbe61.conf 2008-01-11 13:39:49.000000000 -0700
@@ -14,7 +14,7 @@
# Targets
KERNEL_MK=$(PACKAGE_DIR)/kernel/norwich-kernel.mk
-LBV2_MK=$(PACKAGE_DIR)/linuxbios/norwich-linuxbios.mk
+LBV2_MK=$(PACKAGE_DIR)/linuxbios/geodelx-linuxbios.mk
# kernel configuration (for LAB)
Index: buildrom-devel/config/platforms/msm800sev.conf
===================================================================
--- buildrom-devel.orig/config/platforms/msm800sev.conf 2008-01-11 13:39:11.000000000 -0700
+++ buildrom-devel/config/platforms/msm800sev.conf 2008-01-11 13:39:57.000000000 -0700
@@ -13,7 +13,7 @@
# Targets
KERNEL_MK=$(PACKAGE_DIR)/kernel/msm800sev-kernel.mk
-LBV2_MK=$(PACKAGE_DIR)/linuxbios/msm800sev-linuxbios.mk
+LBV2_MK=$(PACKAGE_DIR)/linuxbios/geodelx-linuxbios.mk
# kernel configuration (for LAB)
Index: buildrom-devel/config/platforms/norwich.conf
===================================================================
--- buildrom-devel.orig/config/platforms/norwich.conf 2008-01-11 13:39:11.000000000 -0700
+++ buildrom-devel/config/platforms/norwich.conf 2008-01-11 13:40:07.000000000 -0700
@@ -13,7 +13,7 @@
# Targets
KERNEL_MK=$(PACKAGE_DIR)/kernel/norwich-kernel.mk
-LBV2_MK=$(PACKAGE_DIR)/linuxbios/norwich-linuxbios.mk
+LBV2_MK=$(PACKAGE_DIR)/linuxbios/geodelx-linuxbios.mk
# kernel configuration (for LAB)