coreboot May 2008

coreboot@coreboot.org

79 participants
387 discussions

r183 - buildrom-devel/packages/coreboot-v2
by svn＠coreboot.org 06 May '08

06 May '08

Author: jcrouse Date: 2008-05-06 17:39:08 +0200 (Tue, 06 May 2008) New Revision: 183 Modified: buildrom-devel/packages/coreboot-v2/coreboot.inc buildrom-devel/packages/coreboot-v2/optionroms.inc Log: buildrom: Fix a parser error and add some informating messages for optionroms Signed-off-by: Jordan Crouse <jordan.crouse(a)amd.com> Acked-by: Myles Watson <mylesgw(a)gmail.com> Modified: buildrom-devel/packages/coreboot-v2/coreboot.inc =================================================================== --- buildrom-devel/packages/coreboot-v2/coreboot.inc 2008-05-06 15:37:55 UTC (rev 182) +++ buildrom-devel/packages/coreboot-v2/coreboot.inc 2008-05-06 15:39:08 UTC (rev 183) @@ -86,7 +86,7 @@ include $(PACKAGE_DIR)/coreboot-v2/optionroms.inc # Add it to the front of the list so it is prepended to the coreboot output -CBV2_COMPONENTS=$(SOURCE_DIR)/$(OPTIONROM_ID).rom $(CBV2_COMPONENTS) +CBV2_COMPONENTS := $(SOURCE_DIR)/$(OPTIONROM_ID).rom $(CBV2_COMPONENTS) endif $(CBV2_PAYLOAD_TARGET): $(PAYLOAD_TARGET) Modified: buildrom-devel/packages/coreboot-v2/optionroms.inc =================================================================== --- buildrom-devel/packages/coreboot-v2/optionroms.inc 2008-05-06 15:37:55 UTC (rev 182) +++ buildrom-devel/packages/coreboot-v2/optionroms.inc 2008-05-06 15:39:08 UTC (rev 183) @@ -4,9 +4,11 @@ OPTIONROMURL=http://coreboot.org/data/optionroms/ $(OUTPUT_DIR)/$(OPTIONROM_ID).license: + @ echo "Fetching $(OPTIONROM_ID).license..." @ mkdir -p $(OUTPUT_DIR) @ wget $(WGET_Q) -P $(OUTPUT_DIR) $(OPTIONROMURL)/$(OPTIONROM_ID).license -O $@ $(SOURCE_DIR)/$(OPTIONROM_ID).rom: $(OUTPUT_DIR)/$(OPTIONROM_ID).license + @ echo "Fetching $(OPTIONROM_ID).rom..." @ mkdir -p $(SOURCE_DIR) @ wget $(WGET_Q) -P $(SOURCE_DIR) $(OPTIONROMURL)/$(OPTIONROM_ID).rom -O $@

1 0

r182 - in buildrom-devel: . config/payloads config/platforms packages/coreboot-v2 packages/geodevsa packages/kernel packages/roms
by svn＠coreboot.org 06 May '08

06 May '08

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(a)amd.com> Acked-by: Myles Watson <mylesgw(a)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)

1 0

Buildrom lzma patch and update QEMU Config-lab.lb
by Myles Watson 06 May '08

06 May '08

These patches go together and make it so that checking the "USE_LZMA" option in buildrom doesn't break builds. It assumes that all Config.lb files don't use compression, and all Config-lab.lb files do. The qemu-lab.lzma.diff patch makes that change. Signed-off-by: Myles Watson <mylesgw(a)gmail.com> Thanks, Myles

2 4

r181 - in buildrom-devel: . config/payloads config/platforms packages/coreboot-v2
by svn＠coreboot.org 06 May '08

06 May '08

Author: myles Date: 2008-05-06 17:30:32 +0200 (Tue, 06 May 2008) New Revision: 181 Modified: buildrom-devel/Config.in buildrom-devel/config/payloads/Config.in buildrom-devel/config/platforms/alix1c.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/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/coreboot-v2/coreboot.inc buildrom-devel/packages/coreboot-v2/generic.mk Log: This makes it so that checking the "USE_LZMA" option in buildrom doesn't break builds. It moves the USE_LZMA option to the payload menu, since it only affects the payload. It assumes that all Config.lb files don't use compression, and all Config-lab.lb files do. It also updates qemu.conf to use 3281 which has the correct Config-lab.lb. Signed-off-by: Myles Watson <mylesgw(a)gmail.com> Acked-by: Jordan Crouse <jordan.crouse(a)amd.com> Modified: buildrom-devel/Config.in =================================================================== --- buildrom-devel/Config.in 2008-05-05 20:54:01 UTC (rev 180) +++ buildrom-devel/Config.in 2008-05-06 15:30:32 UTC (rev 181) @@ -99,19 +99,6 @@ help Specify the ROM size here in KB. -config USE_LZMA - bool "Enable LZMA compression" - depends on !(PAYLOAD_OFW && COREBOOT_V2) - depends on !(PAYLOAD_FILO && COREBOOT_V2) - depends on !(PAYLOAD_ETHERBOOT && COREBOOT_V2) - default y - help - Precompress the payload with LZMA when using coreboot v2. This doesn't - work for FILO, OFW, or ETHERBOOT. - - When using COREBOOT_V3, parse the elf and have lar compress the files. - This works with all ELF payloads. - config CB_USE_BUILD bool "Specify a coreboot build dir" depends on ADVANCED Modified: buildrom-devel/config/payloads/Config.in =================================================================== --- buildrom-devel/config/payloads/Config.in 2008-05-05 20:54:01 UTC (rev 180) +++ buildrom-devel/config/payloads/Config.in 2008-05-06 15:30:32 UTC (rev 181) @@ -3,6 +3,16 @@ menu "Payload Configuration" +config USE_LZMA + bool "Enable LZMA compression" + default y + help + Precompress the payload with LZMA when using coreboot v2. This changes + the Config.lb file used. + + When using COREBOOT_V3, parse the elf and have lar compress the files. + This works with all ELF payloads. + choice prompt "Desired payload" default PAYLOAD_KERNEL Modified: buildrom-devel/config/platforms/alix1c.conf =================================================================== --- buildrom-devel/config/platforms/alix1c.conf 2008-05-05 20:54:01 UTC (rev 180) +++ buildrom-devel/config/platforms/alix1c.conf 2008-05-06 15:30:32 UTC (rev 181) @@ -27,8 +27,6 @@ COREBOOT_VENDOR=pcengines COREBOOT_BOARD=alix1c -CBV2_CONFIG=Config.lb -CBV2_PAYLOAD_FILE_EXT=elf CBV2_TDIR=alix1c CBV2_TAG=3079 Modified: buildrom-devel/config/platforms/asus_a8v-e_se.conf =================================================================== --- buildrom-devel/config/platforms/asus_a8v-e_se.conf 2008-05-05 20:54:01 UTC (rev 180) +++ buildrom-devel/config/platforms/asus_a8v-e_se.conf 2008-05-06 15:30:32 UTC (rev 181) @@ -41,8 +41,6 @@ COREBOOT_VENDOR=asus COREBOOT_BOARD=a8v-e_se -CBV2_CONFIG=Config.lb -CBV2_PAYLOAD_FILE_EXT=elf CBV2_TDIR=asus_a8v-e_se CBV2_TAG=3241 Modified: buildrom-devel/config/platforms/db800.conf =================================================================== --- buildrom-devel/config/platforms/db800.conf 2008-05-05 20:54:01 UTC (rev 180) +++ buildrom-devel/config/platforms/db800.conf 2008-05-06 15:30:32 UTC (rev 181) @@ -30,8 +30,6 @@ COREBOOT_VENDOR=amd COREBOOT_BOARD=db800 -CBV2_CONFIG=Config.lb -CBV2_PAYLOAD_FILE_EXT=elf CBV2_TDIR=db800 CBV2_TAG=3090 Modified: buildrom-devel/config/platforms/dbe61.conf =================================================================== --- buildrom-devel/config/platforms/dbe61.conf 2008-05-05 20:54:01 UTC (rev 180) +++ buildrom-devel/config/platforms/dbe61.conf 2008-05-06 15:30:32 UTC (rev 181) @@ -29,8 +29,6 @@ COREBOOT_VENDOR=artecgroup COREBOOT_BOARD=dbe61 -CBV2_CONFIG=Config.lb -CBV2_PAYLOAD_FILE_EXT=elf CBV2_TDIR=dbe61 CBV2_TAG=3090 Modified: buildrom-devel/config/platforms/ga-2761gxdk.conf =================================================================== --- buildrom-devel/config/platforms/ga-2761gxdk.conf 2008-05-05 20:54:01 UTC (rev 180) +++ buildrom-devel/config/platforms/ga-2761gxdk.conf 2008-05-06 15:30:32 UTC (rev 181) @@ -34,8 +34,6 @@ COREBOOT_VENDOR=gigabyte COREBOOT_BOARD=ga_2761gxdk -CBV2_CONFIG=Config.lb -CBV2_PAYLOAD_FILE_EXT=elf CBV2_TDIR=ga_2761gxdk CBV2_TAG=3092 Modified: buildrom-devel/config/platforms/m57sli.conf =================================================================== --- buildrom-devel/config/platforms/m57sli.conf 2008-05-05 20:54:01 UTC (rev 180) +++ buildrom-devel/config/platforms/m57sli.conf 2008-05-06 15:30:32 UTC (rev 181) @@ -38,8 +38,6 @@ COREBOOT_VENDOR=gigabyte COREBOOT_BOARD=m57sli -CBV2_CONFIG=Config.lb -CBV2_PAYLOAD_FILE_EXT=elf CBV2_TDIR=m57sli CBV2_TAG=3118 Modified: buildrom-devel/config/platforms/msm800sev.conf =================================================================== --- buildrom-devel/config/platforms/msm800sev.conf 2008-05-05 20:54:01 UTC (rev 180) +++ buildrom-devel/config/platforms/msm800sev.conf 2008-05-06 15:30:32 UTC (rev 181) @@ -28,8 +28,6 @@ COREBOOT_VENDOR=digitallogic COREBOOT_BOARD=msm800sev -CBV2_CONFIG=Config.lb -CBV2_PAYLOAD_FILE_EXT=elf CBV2_TDIR=msm800sev CBV2_TAG=3079 Modified: buildrom-devel/config/platforms/norwich.conf =================================================================== --- buildrom-devel/config/platforms/norwich.conf 2008-05-05 20:54:01 UTC (rev 180) +++ buildrom-devel/config/platforms/norwich.conf 2008-05-06 15:30:32 UTC (rev 181) @@ -28,8 +28,6 @@ COREBOOT_VENDOR=amd COREBOOT_BOARD=norwich -CBV2_CONFIG=Config.lb -CBV2_PAYLOAD_FILE_EXT=elf CBV2_TDIR=norwich CBV2_TAG=3090 Modified: buildrom-devel/config/platforms/qemu.conf =================================================================== --- buildrom-devel/config/platforms/qemu.conf 2008-05-05 20:54:01 UTC (rev 180) +++ buildrom-devel/config/platforms/qemu.conf 2008-05-06 15:30:32 UTC (rev 181) @@ -24,9 +24,7 @@ ETHERBOOT_ARCH=i386 # coreboot-v2 configuration -CBV2_TAG=3241 -CBV2_CONFIG=Config.lb -CBV2_PAYLOAD_FILE_EXT=elf +CBV2_TAG=3281 CBV2_TDIR=qemu-x86 # coreboot v3 configuration Modified: buildrom-devel/config/platforms/serengeti_cheetah.conf =================================================================== --- buildrom-devel/config/platforms/serengeti_cheetah.conf 2008-05-05 20:54:01 UTC (rev 180) +++ buildrom-devel/config/platforms/serengeti_cheetah.conf 2008-05-06 15:30:32 UTC (rev 181) @@ -43,8 +43,6 @@ # coreboot configuration COREBOOT_VENDOR=amd -CBV2_CONFIG=Config.lb -CBV2_PAYLOAD_FILE_EXT=elf CBV3_TAG=HEAD Modified: buildrom-devel/config/platforms/supermicro-h8dmr.conf =================================================================== --- buildrom-devel/config/platforms/supermicro-h8dmr.conf 2008-05-05 20:54:01 UTC (rev 180) +++ buildrom-devel/config/platforms/supermicro-h8dmr.conf 2008-05-06 15:30:32 UTC (rev 181) @@ -38,8 +38,6 @@ COREBOOT_VENDOR=supermicro COREBOOT_BOARD=h8dmr -CBV2_CONFIG=Config.lb -CBV2_PAYLOAD_FILE_EXT=elf CBV2_TDIR=h8dmr CBV2_TAG=3278 Modified: buildrom-devel/config/platforms/tyan-s2881.conf =================================================================== --- buildrom-devel/config/platforms/tyan-s2881.conf 2008-05-05 20:54:01 UTC (rev 180) +++ buildrom-devel/config/platforms/tyan-s2881.conf 2008-05-06 15:30:32 UTC (rev 181) @@ -38,8 +38,6 @@ COREBOOT_VENDOR=tyan COREBOOT_BOARD=s2881 -CBV2_CONFIG=Config.lb -CBV2_PAYLOAD_FILE_EXT=elf CBV2_TDIR=s2881 CBV2_TAG=3131 Modified: buildrom-devel/config/platforms/tyan-s2882.conf =================================================================== --- buildrom-devel/config/platforms/tyan-s2882.conf 2008-05-05 20:54:01 UTC (rev 180) +++ buildrom-devel/config/platforms/tyan-s2882.conf 2008-05-06 15:30:32 UTC (rev 181) @@ -38,8 +38,6 @@ COREBOOT_VENDOR=tyan COREBOOT_BOARD=s2882 -CBV2_CONFIG=Config.lb -CBV2_PAYLOAD_FILE_EXT=elf CBV2_TDIR=s2882 CBV2_TAG=3114 Modified: buildrom-devel/config/platforms/tyan-s2891.conf =================================================================== --- buildrom-devel/config/platforms/tyan-s2891.conf 2008-05-05 20:54:01 UTC (rev 180) +++ buildrom-devel/config/platforms/tyan-s2891.conf 2008-05-06 15:30:32 UTC (rev 181) @@ -38,8 +38,6 @@ COREBOOT_VENDOR=tyan COREBOOT_BOARD=s2891 -CBV2_CONFIG=Config.lb -CBV2_PAYLOAD_FILE_EXT=elf CBV2_TDIR=s2891 CBV2_TAG=3259 Modified: buildrom-devel/config/platforms/tyan-s2892.conf =================================================================== --- buildrom-devel/config/platforms/tyan-s2892.conf 2008-05-05 20:54:01 UTC (rev 180) +++ buildrom-devel/config/platforms/tyan-s2892.conf 2008-05-06 15:30:32 UTC (rev 181) @@ -36,8 +36,6 @@ COREBOOT_VENDOR=tyan COREBOOT_BOARD=s2892 -CBV2_CONFIG=Config.lb -CBV2_PAYLOAD_FILE_EXT=elf CBV2_TDIR=s2892 CBV2_TAG=3259 Modified: buildrom-devel/config/platforms/tyan-s2895.conf =================================================================== --- buildrom-devel/config/platforms/tyan-s2895.conf 2008-05-05 20:54:01 UTC (rev 180) +++ buildrom-devel/config/platforms/tyan-s2895.conf 2008-05-06 15:30:32 UTC (rev 181) @@ -36,8 +36,6 @@ COREBOOT_VENDOR=tyan COREBOOT_BOARD=s2895 -CBV2_CONFIG=Config.lb -CBV2_PAYLOAD_FILE_EXT=elf CBV2_TDIR=s2895 CBV2_TAG=3259 Modified: buildrom-devel/packages/coreboot-v2/coreboot.inc =================================================================== --- buildrom-devel/packages/coreboot-v2/coreboot.inc 2008-05-05 20:54:01 UTC (rev 180) +++ buildrom-devel/packages/coreboot-v2/coreboot.inc 2008-05-06 15:30:32 UTC (rev 181) @@ -1,5 +1,13 @@ # This is the common code included by all the targets +ifeq ($(CONFIG_USE_LZMA),y) + CBV2_CONFIG=Config-lab.lb + CBV2_PAYLOAD_FILE_EXT=elf.lzma +else + CBV2_CONFIG=Config.lb + CBV2_PAYLOAD_FILE_EXT=elf +endif + ifeq ($(CONFIG_CB_CUSTOM_REV),y) $(warning Using custom rev $(CONFIG_CB_REVISION)) CBV2_TAG=$(CONFIG_CB_REVISION) Modified: buildrom-devel/packages/coreboot-v2/generic.mk =================================================================== --- buildrom-devel/packages/coreboot-v2/generic.mk 2008-05-05 20:54:01 UTC (rev 180) +++ buildrom-devel/packages/coreboot-v2/generic.mk 2008-05-06 15:30:32 UTC (rev 181) @@ -1,20 +1,5 @@ # This is the Generic coreboot target -ifeq ($(CONFIG_PAYLOAD_OFW),y) - CBV2_CONFIG=Config-lab.lb - CBV2_PAYLOAD_FILE_EXT=elf.lzma -endif - -ifeq ($(CONFIG_PAYLOAD_KERNEL),y) - CBV2_CONFIG=Config-lab.lb - CBV2_PAYLOAD_FILE_EXT=elf.lzma -endif - -ifeq ($(CONFIG_PAYLOAD_LAB),y) - CBV2_CONFIG=Config-lab.lb - CBV2_PAYLOAD_FILE_EXT=elf.lzma -endif - include $(PACKAGE_DIR)/coreboot-v2/coreboot.inc coreboot: generic-coreboot

1 0

r3281 - trunk/coreboot-v2/targets/emulation/qemu-x86
by svn＠coreboot.org 06 May '08

06 May '08

Author: myles Date: 2008-05-06 17:17:43 +0200 (Tue, 06 May 2008) New Revision: 3281 Modified: trunk/coreboot-v2/targets/emulation/qemu-x86/Config-lab.lb Log: This patch changes Config-lab.lb for qemu to use lzma like the other targets. Signed-off-by: Myles Watson <mylesgw(a)gmail.com> Acked-by: Jordan Crouse <jordan.crouse(a)amd.com> Modified: trunk/coreboot-v2/targets/emulation/qemu-x86/Config-lab.lb =================================================================== --- trunk/coreboot-v2/targets/emulation/qemu-x86/Config-lab.lb 2008-05-06 15:02:22 UTC (rev 3280) +++ trunk/coreboot-v2/targets/emulation/qemu-x86/Config-lab.lb 2008-05-06 15:17:43 UTC (rev 3281) @@ -4,8 +4,8 @@ mainboard emulation/qemu-x86 option ROM_SIZE=2048*1024 -option CONFIG_COMPRESSED_PAYLOAD_LZMA=0 -option CONFIG_PRECOMPRESSED_PAYLOAD=0 +option CONFIG_COMPRESSED_PAYLOAD_LZMA=1 +option CONFIG_PRECOMPRESSED_PAYLOAD=1 option CC="gcc -m32"

1 0

QEMU Keyboard problems in v2
by aaron lwe 06 May '08

06 May '08

Hi, I have the same problem when using ADLO as the payload with qemu. I found qemu in coreboot-v2 didn't init keyboard while v3 did in setup_onboard of vga.c. And the ADLO code in bochs/bios/rombios.c defined COREBOOT which caused function keyboard_init did noting. Adding init_pc_keyboard(0x60, 0x64, &conf) for qemu in coreboot-v2 worked for me.

2 3

r3280 - trunk/coreboot-v2/src/mainboard/emulation/qemu-x86
by svn＠coreboot.org 06 May '08

06 May '08

Author: myles Date: 2008-05-06 17:02:22 +0200 (Tue, 06 May 2008) New Revision: 3280 Modified: trunk/coreboot-v2/src/mainboard/emulation/qemu-x86/mainboard.c Log: This patch adds pc keyboard init function call for qemu in v2 since some payloads assume Coreboot initializes it. Coreboot v3 already does it. Signed-off-by: Aaron Lwe <aaron.lwe(a)gmail.com> Acked-by: Myles Watson <mylesgw(a)gmail.com> Modified: trunk/coreboot-v2/src/mainboard/emulation/qemu-x86/mainboard.c =================================================================== --- trunk/coreboot-v2/src/mainboard/emulation/qemu-x86/mainboard.c 2008-05-06 13:26:32 UTC (rev 3279) +++ trunk/coreboot-v2/src/mainboard/emulation/qemu-x86/mainboard.c 2008-05-06 15:02:22 UTC (rev 3280) @@ -17,6 +17,8 @@ do_vgabios(); vga_enable_console(); + + init_pc_keyboard(0x60, 0x64, 0); } static struct device_operations vga_operations = {

1 0

[PATCH] MS7135 fixes and updates
by Jonathan A. Kollasch 06 May '08

06 May '08

Fix various issues on MSI MS7135 board. - w83627thf is strapped to 0x4e, not 0x2e - there's no device 9 on PCI-E x1 bus, it should be device 0 - add mptable entries for AGR slot, based on info in user manual - enable floppy drive controller so that some legacy VGA ROMs will work Signed-off-by: Jonathan A. Kollasch <jakllsch(a)kollasch.net> ---

5 10

r3279 - trunk/coreboot-v2/src/mainboard/msi/ms7135
by svn＠coreboot.org 06 May '08

06 May '08

Author: uwe Date: 2008-05-06 15:26:32 +0200 (Tue, 06 May 2008) New Revision: 3279 Modified: trunk/coreboot-v2/src/mainboard/msi/ms7135/Config.lb trunk/coreboot-v2/src/mainboard/msi/ms7135/cache_as_ram_auto.c trunk/coreboot-v2/src/mainboard/msi/ms7135/mptable.c Log: Fix various issues on MSI MS-7135 board. - W83627THF is strapped to 0x4e, not 0x2e - there's no device 9 on PCI-E x1 bus, it should be device 0 - add mptable entries for AGR slot, based on info in user manual - enable floppy drive controller so that some legacy VGA ROMs will work Signed-off-by: Jonathan A. Kollasch <jakllsch(a)kollasch.net> Acked-by: Uwe Hermann <uwe(a)hermann-uwe.de> Modified: trunk/coreboot-v2/src/mainboard/msi/ms7135/Config.lb =================================================================== --- trunk/coreboot-v2/src/mainboard/msi/ms7135/Config.lb 2008-05-05 20:50:58 UTC (rev 3278) +++ trunk/coreboot-v2/src/mainboard/msi/ms7135/Config.lb 2008-05-06 13:26:32 UTC (rev 3279) @@ -242,35 +242,34 @@ device pci 0.0 on end # HT device pci 1.0 on # LPC chip superio/winbond/w83627thf # Super I/O - device pnp 2e.0 off # Floppy + device pnp 4e.0 on # Floppy io 0x60 = 0x3f0 irq 0x70 = 6 drq 0x74 = 2 end - device pnp 2e.1 on # Parallel port + device pnp 4e.1 on # Parallel port io 0x60 = 0x378 - irq 0x70 = 0 + irq 0x70 = 7 end - device pnp 2e.2 on # Com1 + device pnp 4e.2 on # Com1 io 0x60 = 0x3f8 irq 0x70 = 4 end - device pnp 2e.3 on # Com2 + device pnp 4e.3 on # Com2 io 0x60 = 0x2f8 irq 0x70 = 3 end - device pnp 2e.5 on # PS/2 keyboard + device pnp 4e.5 on # PS/2 keyboard io 0x60 = 0x60 io 0x62 = 0x64 irq 0x70 = 1 irq 0x72 = 12 end - device pnp 2e.6 off end # non-existant or undocumented - device pnp 2e.7 off end # Game, MIDI, GPIO 1, GPIO 5 - device pnp 2e.8 off end # GPIO 2 - device pnp 2e.9 off end # GPIO 3, GPIO 4 - device pnp 2e.a off end # ACPI - device pnp 2e.b on # env monitor + device pnp 4e.7 off end # Game, MIDI, GPIO 1, GPIO 5 + device pnp 4e.8 off end # GPIO 2 + device pnp 4e.9 off end # GPIO 3, GPIO 4 + device pnp 4e.a off end # ACPI + device pnp 4e.b on # Hardware monitor io 0x60 = 0x290 irq 0x70 = 0 end Modified: trunk/coreboot-v2/src/mainboard/msi/ms7135/cache_as_ram_auto.c =================================================================== --- trunk/coreboot-v2/src/mainboard/msi/ms7135/cache_as_ram_auto.c 2008-05-05 20:50:58 UTC (rev 3278) +++ trunk/coreboot-v2/src/mainboard/msi/ms7135/cache_as_ram_auto.c 2008-05-06 13:26:32 UTC (rev 3279) @@ -25,7 +25,7 @@ #define ASSEMBLY 1 #define __ROMCC__ -#define SERIAL_DEV PNP_DEV(0x2e, W83627HF_SP1) +#define SERIAL_DEV PNP_DEV(0x4e, W83627HF_SP1) /* Used by raminit. */ #define QRANK_DIMM_SUPPORT 1 Modified: trunk/coreboot-v2/src/mainboard/msi/ms7135/mptable.c =================================================================== --- trunk/coreboot-v2/src/mainboard/msi/ms7135/mptable.c 2008-05-05 20:50:58 UTC (rev 3278) +++ trunk/coreboot-v2/src/mainboard/msi/ms7135/mptable.c 2008-05-06 13:26:32 UTC (rev 3279) @@ -163,6 +163,10 @@ PCI_INT(0, sbdn+10, 0, 22); + /* "AGR" slot */ + PCI_INT(1, 0, 0, 16); + PCI_INT(1, 0, 1, 17); + /* legacy PCI */ PCI_INT(1, 7, 0, 17); PCI_INT(1, 7, 1, 18); @@ -184,8 +188,8 @@ PCI_INT(2, 0, 0, 19); /* XXX guesses */ PCI_INT(2, 0, 1, 16); - PCI_INT(2, 9, 2, 17); - PCI_INT(2, 9, 3, 18); + PCI_INT(2, 0, 2, 17); + PCI_INT(2, 0, 3, 18); /* PCI-E x16 port */ /* XXX fix me ? */ PCI_INT(3, 0, 0, 18);

1 0

Fix ambiguity, if a board is equipped with more than one chip
by Claus Gindhart 06 May '08

06 May '08

Currently there is an ongoing technology migration from FWH to SPI chips. For this reason some boards have multiple chips of different technologies onboard. Flashrom will probe for up to 3 chips; if more than one chip is detected, it will stop, and will prompt the user to choose one by the -c option, e.g. [root@localhost src]# ./flashrom ... Warning: Multiple flash chips detected SST49LF008A M25P16@ICH9 Please fix this ambiguity by providing the -c | --chip <chipname> command line option Signed-off-by: Claus Gindhart <claus.gindhart(a)kontron.com> --- Mit freundlichen Grüßen / Best regards Claus Gindhart SW R&D Kontron Modular Computers phone :++49 (0)8341-803-374 mailto:claus.gindhart@kontron.com http://www.kontron.com Kontron Modular Computers GmbH Geschaeftsfuehrer / Managing Directors: Ulrich Gehrmann, Thomas Sabisch Sitz der Gesellschaft / Registered Office: Kaufbeuren, Rechtsform / Legal: GmbH Amtsgericht / Local District Court Kempten, HRB Nr. / Trade Register No. 6195 The information contained in this document is CONFIDENTIAL and property of Kontron. Any unauthorized review, use, disclosure or distribution is prohibited without express written consent of Kontron. If you are not the intended recipient, please contact the sender and destroy all copies of the original message and enclosed attachments. Diese E-Mail enthält vertrauliche und/oder rechtlich geschützte Informationen und ist Eigentum von Kontron. Die Verwendung und Weitergabe von jeglichen Inhalten ist ohne ausdrückliche schriftliche Genehmigung von Kontron strikt untersagt. Wenn Sie diese E-Mail irrtümlich erhalten haben, informieren Sie bitte sofort den Absender und vernichten diese Mail und enthaltene Dokumente.

3 9

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

coreboot May 2008