Author: jcrouse Date: 2008-05-06 17:37:55 +0200 (Tue, 06 May 2008) New Revision: 182
Added: buildrom-devel/packages/coreboot-v2/coreboot-v2.mk buildrom-devel/packages/kernel/kernel.mk Removed: buildrom-devel/packages/roms/rom-geode.inc Modified: buildrom-devel/Makefile buildrom-devel/config/payloads/generic.conf buildrom-devel/config/payloads/kernel.conf buildrom-devel/config/payloads/lab.conf buildrom-devel/config/payloads/libpayload-dep.conf buildrom-devel/config/payloads/payloads.conf buildrom-devel/config/platforms/alix1c.conf buildrom-devel/config/platforms/alix2c3.conf buildrom-devel/config/platforms/asus_a8v-e_se.conf buildrom-devel/config/platforms/db800.conf buildrom-devel/config/platforms/dbe61.conf buildrom-devel/config/platforms/ga-2761gxdk.conf buildrom-devel/config/platforms/m57sli.conf buildrom-devel/config/platforms/msm800sev.conf buildrom-devel/config/platforms/norwich.conf buildrom-devel/config/platforms/platforms.conf buildrom-devel/config/platforms/qemu.conf buildrom-devel/config/platforms/serengeti_cheetah.conf buildrom-devel/config/platforms/supermicro-h8dmr.conf buildrom-devel/config/platforms/tyan-s2881.conf buildrom-devel/config/platforms/tyan-s2882.conf buildrom-devel/config/platforms/tyan-s2891.conf buildrom-devel/config/platforms/tyan-s2892.conf buildrom-devel/config/platforms/tyan-s2895.conf buildrom-devel/packages/geodevsa/geodevsa.mk buildrom-devel/packages/roms/roms.mk Log: buildrom: Consolidate and streamline how packages are included and managed.
Signed-off-by: Jordan Crouse jordan.crouse@amd.com Acked-by: Myles Watson mylesgw@gmail.com
Modified: buildrom-devel/Makefile =================================================================== --- buildrom-devel/Makefile 2008-05-06 15:30:32 UTC (rev 181) +++ buildrom-devel/Makefile 2008-05-06 15:37:55 UTC (rev 182) @@ -40,7 +40,8 @@ else WGET_Q = "-q" endif - + +DEPENDS-y= include $(CONFIG_DIR)/platforms/platforms.conf include $(CONFIG_DIR)/payloads/payloads.conf
@@ -57,7 +58,7 @@ # elsewhere, but what the heck - its easy.
COREBOOT-$(CONFIG_COREBOOT_V2) = coreboot -COREBOOT-$(CONFIG_COREBOOT_V3) = coreboot-v3 roms +COREBOOT-$(CONFIG_COREBOOT_V3) = coreboot-v3
# Add openvsa as a dependency if it is configured to be used; this makes sure # that make distclean will clear out work/openvsa (see below) @@ -88,23 +89,17 @@ LAR_PAYLOAD_FLAGS-y=-a -e LAR_PAYLOAD_FLAGS-$(CONFIG_USE_LZMA) += -C lzma
-ifeq ($(or $(CONFIG_VSA_LEGACY), $(CONFIG_VSA_OPENVSA)),) -else -OPTIONROM_TARGETS+=geodevsa -endif - rom: $(HOSTTOOLS-y) payload $(COREBOOT-y) + @ mkdir -p $(shell dirname $(TARGET_ROM_FILE)) @ cp $(CBV3_OUTPUT) $(TARGET_ROM_FILE) @ $(STAGING_DIR)/bin/lar $(LAR_PAYLOAD_FLAGS-y) $(TARGET_ROM_FILE) $(PAYLOAD_TARGET):normal/payload -ifeq ($(CONFIG_VSA_LEGACY),y) - @ $(STAGING_DIR)/bin/lar $(LAR_PAYLOAD_FLAGS-y) $(TARGET_ROM_FILE) $(SOURCE_DIR)/amd_vsa_lx_1.01.bin:blob/vsa -endif -ifeq ($(CONFIG_VSA_OPENVSA),y) - @ $(STAGING_DIR)/bin/lar $(LAR_PAYLOAD_FLAGS-y) $(TARGET_ROM_FILE) $(OPENVSA_SRC_DIR)/vsa_lx.bin:blob/vsa -endif - @ for file in `ls $(ROM_DIR)`; do \ - $(STAGING_DIR)/bin/lar $(LAR_PAYLOAD_FLAGS-y) $(TARGET_ROM_FILE) $(ROM_DIR)/$$file:$$file; \ - done + @ if [ -d $(ROM_DIR) ]; then \ + for file in `find $(ROM_DIR) -type f`; do \ + b=`echo $$file | sed -e s:^$(ROM_DIR)/*::`; \ + $(STAGING_DIR)/bin/lar $(LAR_PAYLOAD_FLAGS-y) \ + $(TARGET_ROM_FILE) $$file:$$b; \ + done; \ + fi @ $(STAGING_DIR)/bin/lar -z $(TARGET_ROM_FILE) endif
@@ -129,28 +124,20 @@ include $(PAYLOAD_BUILD) endif
-# The following code gets all the make targets, but filters out the kernel -# targets which are implicitly set by the platform configuration +INCMK=$(foreach mk,$(DEPENDS-y) $(PAYLOAD-y) $(HOSTTOOLS-y),$(PACKAGE_DIR)/$(mk)/$(mk).mk)
-ifneq ($(PAYLOAD_AND_DEP_MK),) -include $(PAYLOAD_AND_DEP_MK) -endif - -include $(PACKAGE_DIR)/nrv2b/nrv2b.mk -include $(PACKAGE_DIR)/lzma/lzma.mk -include $(PACKAGE_DIR)/geodevsa/geodevsa.mk -include $(PACKAGE_DIR)/roms/roms.mk - -include $(KERNEL_MK) - ifeq ($(CONFIG_COREBOOT_V2),y) -include $(CBV2_MK) +INCMK += $(PACKAGE_DIR)/coreboot-v2/coreboot-v2.mk else -include $(PACKAGE_DIR)/coreboot-v3/coreboot-v3.mk +INCMK += $(PACKAGE_DIR)/coreboot-v3/coreboot-v3.mk endif
+ifneq ($(INCMK),) +include $(INCMK) endif
+endif + super-distclean: @ make -C $(KCONFIG_DIR) clean @ rm -rf $(BUILD_DIR)
Modified: buildrom-devel/config/payloads/generic.conf =================================================================== --- buildrom-devel/config/payloads/generic.conf 2008-05-06 15:30:32 UTC (rev 181) +++ buildrom-devel/config/payloads/generic.conf 2008-05-06 15:37:55 UTC (rev 182) @@ -4,5 +4,3 @@
PAYLOAD_ELF=$(OUTPUT_DIR)/$(PAYLOAD-y)-payload.elf PAYLOAD_COMPRESSED=$(PAYLOAD_ELF).lzma - -PAYLOAD_AND_DEP_MK=$(PACKAGE_DIR)/$(PAYLOAD-y)/$(PAYLOAD-y).mk
Modified: buildrom-devel/config/payloads/kernel.conf =================================================================== --- buildrom-devel/config/payloads/kernel.conf 2008-05-06 15:30:32 UTC (rev 181) +++ buildrom-devel/config/payloads/kernel.conf 2008-05-06 15:37:55 UTC (rev 182) @@ -15,5 +15,4 @@ PAYLOAD_ELF=$(OUTPUT_DIR)/kernel-payload.elf PAYLOAD_COMPRESSED=$(OUTPUT_DIR)/kernel-payload.elf.lzma
-HOSTTOOLS-y = mkelfimage -PAYLOAD_AND_DEP_MK=$(PACKAGE_DIR)/mkelfimage/mkelfimage.mk +HOSTTOOLS-y += mkelfimage unifdef
Modified: buildrom-devel/config/payloads/lab.conf =================================================================== --- buildrom-devel/config/payloads/lab.conf 2008-05-06 15:30:32 UTC (rev 181) +++ buildrom-devel/config/payloads/lab.conf 2008-05-06 15:37:55 UTC (rev 182) @@ -30,20 +30,4 @@ PAYLOAD-$(CONFIG_BOOTMENU) += bootmenu PAYLOAD-$(CONFIG_OLPCFLASH) += olpcflash
-HOSTTOOLS-y = mkelfimage unifdef -PAYLOAD_AND_DEP_MK=$(PACKAGE_DIR)/mkelfimage/mkelfimage.mk -PAYLOAD_AND_DEP_MK+=$(PACKAGE_DIR)/uclibc/uclibc.mk -PAYLOAD_AND_DEP_MK+=$(PACKAGE_DIR)/unifdef/unifdef.mk - -ifeq ($(CONFIG_KBL),y) - PAYLOAD_AND_DEP_MK+=$(PACKAGE_DIR)/kexec-boot-loader/kexec-boot-loader.mk -endif -ifeq ($(CONFIG_BUSYBOX),y) - PAYLOAD_AND_DEP_MK+=$(PACKAGE_DIR)/busybox/busybox.mk -endif -ifeq ($(CONFIG_BOOTMENU),y) - PAYLOAD_AND_DEP_MK+=$(PACKAGE_DIR)/bootmenu/bootmenu.mk -endif -ifeq ($(CONFIG_OLPCFLASH),y) - PAYLOAD_AND_DEP_MK+=$(PACKAGE_DIR)/olpcflash/olpcflash.mk -endif +HOSTTOOLS-y += mkelfimage unifdef
Modified: buildrom-devel/config/payloads/libpayload-dep.conf =================================================================== --- buildrom-devel/config/payloads/libpayload-dep.conf 2008-05-06 15:30:32 UTC (rev 181) +++ buildrom-devel/config/payloads/libpayload-dep.conf 2008-05-06 15:37:55 UTC (rev 182) @@ -3,5 +3,4 @@ include $(CONFIG_DIR)/payloads/generic.conf
# Add libpayload as a dependency -PAYLOAD_AND_DEP_MK+= $(PACKAGE_DIR)/libpayload/libpayload.mk DEPENDS-y=libpayload
Modified: buildrom-devel/config/payloads/payloads.conf =================================================================== --- buildrom-devel/config/payloads/payloads.conf 2008-05-06 15:30:32 UTC (rev 181) +++ buildrom-devel/config/payloads/payloads.conf 2008-05-06 15:37:55 UTC (rev 182) @@ -41,7 +41,6 @@ PCONF-$(CONFIG_PAYLOAD_OPENBIOS) = openbios.conf PCONF-$(CONFIG_PAYLOAD_TINT) = libpayload-dep.conf
-DEPENDS-y= include $(CONFIG_DIR)/payloads/$(PCONF-y)
# Add LZMA if it is enabled and we are using v2
Modified: buildrom-devel/config/platforms/alix1c.conf =================================================================== --- buildrom-devel/config/platforms/alix1c.conf 2008-05-06 15:30:32 UTC (rev 181) +++ buildrom-devel/config/platforms/alix1c.conf 2008-05-06 15:37:55 UTC (rev 182) @@ -9,11 +9,6 @@ TARGET_ARCH=i586 CFLAGS_platform =
-# Targets - -KERNEL_MK=$(PACKAGE_DIR)/kernel/alix1c.mk -CBV2_MK=$(PACKAGE_DIR)/coreboot-v2/geodelx.mk - # kernel configuration (for LAB)
KERNEL_VERSION=2.6.20.2
Modified: buildrom-devel/config/platforms/alix2c3.conf =================================================================== --- buildrom-devel/config/platforms/alix2c3.conf 2008-05-06 15:30:32 UTC (rev 181) +++ buildrom-devel/config/platforms/alix2c3.conf 2008-05-06 15:37:55 UTC (rev 182) @@ -9,10 +9,6 @@ TARGET_ARCH=i586 CFLAGS_platform =
-# Targets - -KERNEL_MK=$(PACKAGE_DIR)/kernel/alix2c3.mk - # kernel configuration (for LAB)
KERNEL_VERSION=2.6.20.2
Modified: buildrom-devel/config/platforms/asus_a8v-e_se.conf =================================================================== --- buildrom-devel/config/platforms/asus_a8v-e_se.conf 2008-05-06 15:30:32 UTC (rev 181) +++ buildrom-devel/config/platforms/asus_a8v-e_se.conf 2008-05-06 15:37:55 UTC (rev 182) @@ -14,12 +14,6 @@ CFLAGS_platform = endif
-# Targets - -# TODO -# KERNEL_MK=$(PACKAGE_DIR)/kernel/asus_a8v-e_se.mk -CBV2_MK=$(PACKAGE_DIR)/coreboot-v2/generic.mk - # kernel configuration (for LAB)
# TODO
Modified: buildrom-devel/config/platforms/db800.conf =================================================================== --- buildrom-devel/config/platforms/db800.conf 2008-05-06 15:30:32 UTC (rev 181) +++ buildrom-devel/config/platforms/db800.conf 2008-05-06 15:37:55 UTC (rev 182) @@ -10,12 +10,6 @@ TARGET_ARCH=i586 CFLAGS_platform =
-# Targets -# Use the same settings as the Norwich platform - -KERNEL_MK=$(PACKAGE_DIR)/kernel/norwich.mk -CBV2_MK=$(PACKAGE_DIR)/coreboot-v2/geodelx.mk - # kernel configuration (for LAB) # Use the same settings as the Norwich platform
Modified: buildrom-devel/config/platforms/dbe61.conf =================================================================== --- buildrom-devel/config/platforms/dbe61.conf 2008-05-06 15:30:32 UTC (rev 181) +++ buildrom-devel/config/platforms/dbe61.conf 2008-05-06 15:37:55 UTC (rev 182) @@ -11,11 +11,6 @@ TARGET_ARCH=i586 CFLAGS_platform =
-# Targets - -KERNEL_MK=$(PACKAGE_DIR)/kernel/norwich.mk -CBV2_MK=$(PACKAGE_DIR)/coreboot-v2/geodelx.mk - # kernel configuration (for LAB)
KERNEL_VERSION=2.6.20.2
Modified: buildrom-devel/config/platforms/ga-2761gxdk.conf =================================================================== --- buildrom-devel/config/platforms/ga-2761gxdk.conf 2008-05-06 15:30:32 UTC (rev 181) +++ buildrom-devel/config/platforms/ga-2761gxdk.conf 2008-05-06 15:37:55 UTC (rev 182) @@ -14,12 +14,6 @@ CFLAGS_platform = endif
-# Targets - -# Disable for now - I don't know the right kernel for this platform -#KERNEL_MK=$(PACKAGE_DIR)/kernel/ -CBV2_MK=$(PACKAGE_DIR)/coreboot-v2/ga-2761gxdk.mk - # kernel configuration (for LAB)
# Disable for now - I don't know the right kernel for this platform
Modified: buildrom-devel/config/platforms/m57sli.conf =================================================================== --- buildrom-devel/config/platforms/m57sli.conf 2008-05-06 15:30:32 UTC (rev 181) +++ buildrom-devel/config/platforms/m57sli.conf 2008-05-06 15:37:55 UTC (rev 182) @@ -14,11 +14,6 @@ CFLAGS_platform = endif
-# Targets - -KERNEL_MK=$(PACKAGE_DIR)/kernel/m57sli.mk -CBV2_MK=$(PACKAGE_DIR)/coreboot-v2/generic.mk - # kernel configuration (for LAB)
KERNEL_VERSION=2.6.22.2
Modified: buildrom-devel/config/platforms/msm800sev.conf =================================================================== --- buildrom-devel/config/platforms/msm800sev.conf 2008-05-06 15:30:32 UTC (rev 181) +++ buildrom-devel/config/platforms/msm800sev.conf 2008-05-06 15:37:55 UTC (rev 182) @@ -10,11 +10,6 @@ TARGET_ARCH=i586 CFLAGS_platform =
-# Targets - -KERNEL_MK=$(PACKAGE_DIR)/kernel/msm800sev.mk -CBV2_MK=$(PACKAGE_DIR)/coreboot-v2/geodelx.mk - # kernel configuration (for LAB)
KERNEL_VERSION=2.6.20.2
Modified: buildrom-devel/config/platforms/norwich.conf =================================================================== --- buildrom-devel/config/platforms/norwich.conf 2008-05-06 15:30:32 UTC (rev 181) +++ buildrom-devel/config/platforms/norwich.conf 2008-05-06 15:37:55 UTC (rev 182) @@ -10,11 +10,6 @@ TARGET_ARCH=i586 CFLAGS_platform =
-# Targets - -KERNEL_MK=$(PACKAGE_DIR)/kernel/norwich.mk -CBV2_MK=$(PACKAGE_DIR)/coreboot-v2/geodelx.mk - # kernel configuration (for LAB)
KERNEL_VERSION=2.6.20.2
Modified: buildrom-devel/config/platforms/platforms.conf =================================================================== --- buildrom-devel/config/platforms/platforms.conf 2008-05-06 15:30:32 UTC (rev 181) +++ buildrom-devel/config/platforms/platforms.conf 2008-05-06 15:37:55 UTC (rev 182) @@ -1,8 +1,6 @@ # This will include the correct configuration for the # selected platform
-CBV2_MK=$(PACKAGE_DIR)/coreboot-v2/generic.mk - ##Include the correct platform configuration
PLATFORM-y= @@ -26,3 +24,9 @@ PLATFORM-$(CONFIG_PLATFORM_QEMU-X86) = qemu.conf
include $(CONFIG_DIR)/platforms/$(PLATFORM-y) + +# Platform specific dependencies +DEPENDS-$(CONFIG_PLATFORM_GEODE) += geodevsa + +# For those platforms that have option roms, add the following line +#DEPENDS-$(MYPLATFORM) += roms
Modified: buildrom-devel/config/platforms/qemu.conf =================================================================== --- buildrom-devel/config/platforms/qemu.conf 2008-05-06 15:30:32 UTC (rev 181) +++ buildrom-devel/config/platforms/qemu.conf 2008-05-06 15:37:55 UTC (rev 182) @@ -9,11 +9,6 @@ TARGET_ARCH=i686 CFLAGS_platform =
-# Targets - -KERNEL_MK=$(PACKAGE_DIR)/kernel/qemu.mk -CBV2_MK=$(PACKAGE_DIR)/coreboot-v2/generic.mk - # kernel configuration (for LAB)
KERNEL_VERSION=2.6.22.2
Modified: buildrom-devel/config/platforms/serengeti_cheetah.conf =================================================================== --- buildrom-devel/config/platforms/serengeti_cheetah.conf 2008-05-06 15:30:32 UTC (rev 181) +++ buildrom-devel/config/platforms/serengeti_cheetah.conf 2008-05-06 15:37:55 UTC (rev 182) @@ -15,11 +15,6 @@ CFLAGS_platform = endif
-# Targets - -KERNEL_MK=$(PACKAGE_DIR)/kernel/serengeti_cheetah.mk -CBV2_MK=$(PACKAGE_DIR)/coreboot-v2/serengeti_cheetah.mk - # kernel configuration (for LAB)
ifeq ($(CONFIG_TARGET_64BIT),y)
Modified: buildrom-devel/config/platforms/supermicro-h8dmr.conf =================================================================== --- buildrom-devel/config/platforms/supermicro-h8dmr.conf 2008-05-06 15:30:32 UTC (rev 181) +++ buildrom-devel/config/platforms/supermicro-h8dmr.conf 2008-05-06 15:37:55 UTC (rev 182) @@ -14,11 +14,6 @@ CFLAGS_platform = endif
-# Targets - -KERNEL_MK=$(PACKAGE_DIR)/kernel/supermicro-h8dmr.mk -CBV2_MK=$(PACKAGE_DIR)/coreboot-v2/generic.mk - # kernel configuration (for LAB)
KERNEL_VERSION=2.6.22.2
Modified: buildrom-devel/config/platforms/tyan-s2881.conf =================================================================== --- buildrom-devel/config/platforms/tyan-s2881.conf 2008-05-06 15:30:32 UTC (rev 181) +++ buildrom-devel/config/platforms/tyan-s2881.conf 2008-05-06 15:37:55 UTC (rev 182) @@ -14,11 +14,6 @@ CFLAGS_platform = endif
-# Targets - -KERNEL_MK=$(PACKAGE_DIR)/kernel/tyan-s2881.mk -CBV2_MK=$(PACKAGE_DIR)/coreboot-v2/generic.mk - # kernel configuration (for LAB)
KERNEL_VERSION=2.6.22.2
Modified: buildrom-devel/config/platforms/tyan-s2882.conf =================================================================== --- buildrom-devel/config/platforms/tyan-s2882.conf 2008-05-06 15:30:32 UTC (rev 181) +++ buildrom-devel/config/platforms/tyan-s2882.conf 2008-05-06 15:37:55 UTC (rev 182) @@ -14,11 +14,6 @@ CFLAGS_platform = endif
-# Targets - -KERNEL_MK=$(PACKAGE_DIR)/kernel/tyan-s2882.mk -CBV2_MK=$(PACKAGE_DIR)/coreboot-v2/generic.mk - # kernel configuration (for LAB)
KERNEL_VERSION=2.6.22.2
Modified: buildrom-devel/config/platforms/tyan-s2891.conf =================================================================== --- buildrom-devel/config/platforms/tyan-s2891.conf 2008-05-06 15:30:32 UTC (rev 181) +++ buildrom-devel/config/platforms/tyan-s2891.conf 2008-05-06 15:37:55 UTC (rev 182) @@ -14,11 +14,6 @@ CFLAGS_platform = endif
-# Targets - -KERNEL_MK=$(PACKAGE_DIR)/kernel/tyan-s2891.mk -CBV2_MK=$(PACKAGE_DIR)/coreboot-v2/generic.mk - # kernel configuration (for LAB)
KERNEL_VERSION=2.6.22.2
Modified: buildrom-devel/config/platforms/tyan-s2892.conf =================================================================== --- buildrom-devel/config/platforms/tyan-s2892.conf 2008-05-06 15:30:32 UTC (rev 181) +++ buildrom-devel/config/platforms/tyan-s2892.conf 2008-05-06 15:37:55 UTC (rev 182) @@ -14,11 +14,6 @@ CFLAGS_platform = endif
-# Targets - -KERNEL_MK=$(PACKAGE_DIR)/kernel/tiny-2.6.22.mk -CBV2_MK=$(PACKAGE_DIR)/coreboot-v2/generic.mk - # kernel configuration (for LAB)
KERNEL_VERSION=2.6.22.2
Modified: buildrom-devel/config/platforms/tyan-s2895.conf =================================================================== --- buildrom-devel/config/platforms/tyan-s2895.conf 2008-05-06 15:30:32 UTC (rev 181) +++ buildrom-devel/config/platforms/tyan-s2895.conf 2008-05-06 15:37:55 UTC (rev 182) @@ -14,11 +14,6 @@ CFLAGS_platform = endif
-# Targets - -KERNEL_MK=$(PACKAGE_DIR)/kernel/tiny-2.6.22.mk -CBV2_MK=$(PACKAGE_DIR)/coreboot-v2/generic.mk - # kernel configuration (for LAB)
KERNEL_VERSION=2.6.22.2
Added: buildrom-devel/packages/coreboot-v2/coreboot-v2.mk =================================================================== --- buildrom-devel/packages/coreboot-v2/coreboot-v2.mk (rev 0) +++ buildrom-devel/packages/coreboot-v2/coreboot-v2.mk 2008-05-06 15:37:55 UTC (rev 182) @@ -0,0 +1,15 @@ +# "toplevel" coreboot-v2.mk - this is where we decide +# which of the platform specific files to actually +# include + +# Most platforms use the generic target +CBV2MK-y=$(PACKAGE_DIR)/coreboot-v2/generic.mk + +# All Geode LX targets use the same .mk file +CBV2MK-$(CONFIG_PLATFORM_GEODE) = $(PACKAGE_DIR)/coreboot-v2/geodelx.mk + +CBV2MK-$(CONFIG_PLATFORM_GA_2761GXDK) = $(PACKAGE_DIR)/coreboot-v2/ga-2761gxdk.mk +CBV2MK-$(CONFIG_PLATFORM_SERENGETI_CHEETAH) = $(PACKAGE_DIR)/coreboot-v2/serengeti_cheetah.mk +CBV2MK-$(CONFIG_PLATFORM_CHEETAH_FAM10) = $(PACKAGE_DIR)/coreboot-v2/serengeti_cheetah.mk + +include $(CBV2MK-y)
Modified: buildrom-devel/packages/geodevsa/geodevsa.mk =================================================================== --- buildrom-devel/packages/geodevsa/geodevsa.mk 2008-05-06 15:30:32 UTC (rev 181) +++ buildrom-devel/packages/geodevsa/geodevsa.mk 2008-05-06 15:37:55 UTC (rev 182) @@ -12,6 +12,10 @@ VSA_BUILD_TARGET = $(GEODE_UNCOMPRESSED_VSA) endif
+ifeq ($(CONFIG_COREBOOT_V3),y) +VSA_ROM_FILE = $(ROM_DIR)/blob/vsa +endif + VSA_CLEAN_TARGET= VSA_DISTCLEAN_TARGET=
@@ -31,13 +35,19 @@ $(GEODE_PADDED_VSA): $(GEODE_COMPRESSED_VSA) @ cp $< $@ @ (size=`stat -c %s $<`; count=`expr $(GEODE_VSA_SIZE) - $$size`; \ - dd if=/dev/zero bs=1 count=$$count >> $@ 2> /dev/null) + dd if=/dev/zero bs=1 count=$$count >> $@ 2> /dev/null)
-geodevsa: $(VSA_BUILD_TARGET) +ifeq ($(CONFIG_COREBOOT_V3),y) +$(VSA_ROM_FILE): $(VSA_BUILD_TARGET) + mkdir -p $(shell dirname $(VSA_ROM_FILE)) + cp $(VSA_BUILD_TARGET) $(VSA_ROM_FILE) +endif
+geodevsa: $(VSA_BUILD_TARGET) $(VSA_ROM_FILE) + geodevsa-clean: $(VSA_CLEAN_TARGET) @ rm -f $(GEODE_UNCOMPRESSED_VSA) $(GEODE_COMPRESSED_VSA) - @ rm -f $(GEODE_PADDED_VSA) + @ rm -f $(GEODE_PADDED_VSA) $(VSA_ROM_FILE)
geodevsa-distclean: $(VSA_DISTCLEAN_TARGET) - @ rm -rf $(OUTPUT_DIR)/vsa + @ rm -rf $(OUTPUT_DIR)/vsa $(VSA_ROM_FILE)
Added: buildrom-devel/packages/kernel/kernel.mk =================================================================== --- buildrom-devel/packages/kernel/kernel.mk (rev 0) +++ buildrom-devel/packages/kernel/kernel.mk 2008-05-06 15:37:55 UTC (rev 182) @@ -0,0 +1,31 @@ +# "toplevel" kernel.mk - this is where we decide +# which of the platform specific files to actually +# include + +KERNELMK-y= +KERNELMK-$(CONFIG_PLATFORM_NORWICH) = $(PACKAGE_DIR)/kernel/norwich.mk +KERNELMK-$(CONFIG_PLATFORM_MSM800SEV) = $(PACKAGE_DIR)/kernel/msm800sev.mk +KERNELMK-$(CONFIG_PLATFORM_ALIX1C) = $(PACKAGE_DIR)/kernel/alix1c.mk +KERNELMK-$(CONFIG_PLATFORM_ALIX2C3) = $(PACKAGE_DIR)/kernel/alix2c3.mk +KERNELMK-$(CONFIG_PLATFORM_DB800) = $(PACKAGE_DIR)/kernel/norwich.mk +KERNELMK-$(CONFIG_PLATFORM_DBE61) = $(PACKAGE_DIR)/kernel/norwich.mk +KERNELMK-$(CONFIG_PLATFORM_GA_M57SLI_S4) = $(PACKAGE_DIR)/kernel/m57sli.mk +KERNELMK-$(CONFIG_PLATFORM_TYAN_S2881) = $(PACKAGE_DIR)/kernel/tyan-s2881.mk +KERNELMK-$(CONFIG_PLATFORM_TYAN_S2882) = $(PACKAGE_DIR)/kernel/tyan-s2882.mk +KERNELMK-$(CONFIG_PLATFORM_TYAN_S2891) = $(PACKAGE_DIR)/kernel/tyan-s2891.mk +KERNELMK-$(CONFIG_PLATFORM_TYAN_S2892) = $(PACKAGE_DIR)/kernel/tiny-2.6.22.mk +KERNELMK-$(CONFIG_PLATFORM_TYAN_S2895) = $(PACKAGE_DIR)/kernel/tiny-2.6.22.mk +KERNELMK-$(CONFIG_PLATFORM_SUPERMICRO_H8DMR) = $(PACKAGE_DIR)/kernel/supermicro-h8dmr.mk +KERNELMK-$(CONFIG_PLATFORM_SERENGETI_CHEETAH) = $(PACKAGE_DIR)/kernel/serengeti_cheetah.mk +KERNELMK-$(CONFIG_PLATFORM_QEMU-X86) = $(PACKAGE_DIR)/kernel/qemu.mk + +# buildrom platforms that don't have a kernel .mk +#KERNELMK-$(CONFIG_PLATFORM_ASUS_A8V_E_SE) = +#KERNELMK-$(CONFIG_PLATFORM_CHEETAH_FAM10) = +#KERNELMK-$(CONFIG_PLATFORM_GA_2761GXDK) = + +ifeq ($(KERNELMK-y),) +$(error "You do not have a kernel .mk file defined for this platform") +endif + +include $(KERNELMK-y)
Deleted: buildrom-devel/packages/roms/rom-geode.inc =================================================================== --- buildrom-devel/packages/roms/rom-geode.inc 2008-05-06 15:30:32 UTC (rev 181) +++ buildrom-devel/packages/roms/rom-geode.inc 2008-05-06 15:37:55 UTC (rev 182) @@ -1,17 +0,0 @@ -# This is the geode specific optionrom target -# download VSA - -VSA_URL=http://www.amd.com/files/connectivitysolutions/geode/geode_lx/ -GEODE_VSA=lx_vsa.36k.bin - -$(SOURCE_DIR)/$(GEODE_VSA): - @ echo "Fetching the VSA code..." - @ wget $(wGET_Q) -P $(SOURCE_DIR) $(VSA_URL)/$(GEODE_VSA).gz -O $@ - -# Copy the file to the ROM_DIR - it should have the same name that it -# will have in the LAR - -$(ROM_DIR)/vsa: $(SOURCE_DIR)/$(GEODE_VSA): - @ cp $< $@ - -OPTIONROM_TARGETS += $(ROM_DIR)/vsa
Modified: buildrom-devel/packages/roms/roms.mk =================================================================== --- buildrom-devel/packages/roms/roms.mk 2008-05-06 15:30:32 UTC (rev 181) +++ buildrom-devel/packages/roms/roms.mk 2008-05-06 15:37:55 UTC (rev 182) @@ -4,7 +4,6 @@ OPTIONROM_TARGETS?=
OPTIONROM-y = -OPTIONROM-$(CONFIG_PLATFORM_NORWICH) += rom-geode.inc
ifneq ($(OPTIONROMS-y),) include $(OPTIONROM-y)