coreboot February 2008

coreboot@coreboot.org

77 participants
422 discussions

r3094 - trunk/coreboot-v2/targets
by svn＠coreboot.org 07 Feb '08

07 Feb '08

Author: ward Date: 2008-02-07 22:50:22 +0100 (Thu, 07 Feb 2008) New Revision: 3094 Modified: trunk/coreboot-v2/targets/buildtarget Log: Make the check for -fno-stack-protector fail silently, if it fails. This is a trivial patch. Signed-off-by: Ward Vandewege <ward(a)gnu.org> Acked-by: Ward Vandewege <ward(a)gnu.org> Modified: trunk/coreboot-v2/targets/buildtarget =================================================================== --- trunk/coreboot-v2/targets/buildtarget 2008-02-07 20:37:37 UTC (rev 3093) +++ trunk/coreboot-v2/targets/buildtarget 2008-02-07 21:50:22 UTC (rev 3094) @@ -61,7 +61,7 @@ CC=gcc fi -$CC -fno-stack-protector -S -xc /dev/null -o .$$.tmp +$CC -fno-stack-protector -S -xc /dev/null -o .$$.tmp 2>/dev/null if [ $? -eq 0 ]; then EXTRA_CFLAGS=-fno-stack-protector

1 0

r3093 build service
by coreboot information 07 Feb '08

07 Feb '08

Dear coreboot readers! This is the automated build check service of coreboot. The developer "myles" checked in revision 3093 to the coreboot source repository and caused the following changes: Change Log: Change references to qemu in Coreboot-v2 calls to qemu-x86. The patch was followed by these svn commands: svn mv targets/emulation/qemu-i386/ targets/emulation/qemu-x86 svn mv --force targets/emulation/qemu-i386/ targets/emulation/qemu-x86 svn mv --force src/mainboard/emulation/qemu-i386/ src/mainboard/emulation/qemu-x86 svn mv --force src/cpu/emulation/qemu-i386/ src/cpu/emulation/qemu-x86 Signed-off-by: Myles Watson <myles(a)pel.cs.byu.edu> Acked-by: Stefan Reinauer <stepan(a)coresystems.de> Build Log: Compilation of amd:serengeti_cheetah_fam10 is still broken See the error log at http://qa.coreboot.org/log_buildbrd.php?revision=3093&device=serengeti_chee… If something broke during this checkin please be a pain in myles's neck until the issue is fixed. If this issue is not fixed within 24h the revision should be backed out. Best regards, coreboot automatic build system

1 0

r111 - buildrom-devel/packages/coreboot-v3
by svn＠coreboot.org 07 Feb '08

07 Feb '08

Author: myles Date: 2008-02-07 22:26:29 +0100 (Thu, 07 Feb 2008) New Revision: 111 Modified: buildrom-devel/packages/coreboot-v3/coreboot-v3.mk Log: Trivial fix of a verbose makefile rule. Thanks, Myles Signed-off-by: Myles Watson <myles(a)pel.cs.byu.edu> Acked-by: Myles Watson <myles(a)pel.cs.byu.edu> Modified: buildrom-devel/packages/coreboot-v3/coreboot-v3.mk =================================================================== --- buildrom-devel/packages/coreboot-v3/coreboot-v3.mk 2008-02-07 21:11:20 UTC (rev 110) +++ buildrom-devel/packages/coreboot-v3/coreboot-v3.mk 2008-02-07 21:26:29 UTC (rev 111) @@ -68,7 +68,7 @@ @ cp $< $@ $(CBV3_STAMP_DIR) $(CBV3_LOG_DIR): - mkdir -p $@ + @ mkdir -p $@ coreboot-v3: $(CBV3_LOG_DIR) $(CBV3_STAMP_DIR) $(CBV3_OUTPUT) $(STAGING_DIR)/bin/lar

1 0

Buildrom v3 config patch and qemu rename patch
by Myles Watson 07 Feb '08

07 Feb '08

This patch changes buildrom for the renaming of qemu-i386 to qemu-x86. It also adds "make coreboot-v3-config" support ala Ward. Ward, could you check to make sure I didn't do something dumb when I shamelessly copied you? Thanks, Myles Signed-off-by: Myles Watson <myles(a)pel.cs.byu.edu>

2 3

r110 - in buildrom-devel: config/platforms packages/coreboot-v3 packages/coreboot-v3/conf
by svn＠coreboot.org 07 Feb '08

07 Feb '08

Author: myles Date: 2008-02-07 22:11:20 +0100 (Thu, 07 Feb 2008) New Revision: 110 Removed: buildrom-devel/packages/coreboot-v3/conf/qemu-i386-defconfig Modified: buildrom-devel/config/platforms/Config.in buildrom-devel/config/platforms/platforms.conf buildrom-devel/config/platforms/qemu.conf buildrom-devel/config/platforms/serengeti_cheetah.conf buildrom-devel/packages/coreboot-v3/coreboot-v3.mk Log: This patch changes buildrom for the renaming of qemu-i386 to qemu-x86. It also adds "make coreboot-v3-config" support ala Ward. Thanks, Myles Signed-off-by: Myles Watson <myles(a)pel.cs.byu.edu> Acked-by: Ward Vandewege <ward(a)gnu.org> Modified: buildrom-devel/config/platforms/Config.in =================================================================== --- buildrom-devel/config/platforms/Config.in 2008-02-07 17:41:01 UTC (rev 109) +++ buildrom-devel/config/platforms/Config.in 2008-02-07 21:11:20 UTC (rev 110) @@ -95,7 +95,7 @@ select PLATFORM select PLATFORM_SUPPORT_64BIT -config PLATFORM_QEMU-i386 +config PLATFORM_QEMU-X86 bool "QEMU Emulator" depends VENDOR_QEMU select PLATFORM @@ -122,7 +122,7 @@ config BUILD_QEMU bool "Build QEMU with patches for LinuxBIOS" - depends PLATFORM_QEMU-i386 + depends PLATFORM_QEMU-X86 default n help Say 'y' here to build a patched version of QEMU to work with Modified: buildrom-devel/config/platforms/platforms.conf =================================================================== --- buildrom-devel/config/platforms/platforms.conf 2008-02-07 17:41:01 UTC (rev 109) +++ buildrom-devel/config/platforms/platforms.conf 2008-02-07 21:11:20 UTC (rev 110) @@ -18,6 +18,6 @@ PLATFORM-$(CONFIG_PLATFORM_SERENGETI_CHEETAH) = serengeti_cheetah.conf PLATFORM-$(CONFIG_PLATFORM_CHEETAH_FAM10) = serengeti_cheetah.conf PLATFORM-$(CONFIG_PLATFORM_GA_2761GXDK) = ga-2761gxdk.conf -PLATFORM-$(CONFIG_PLATFORM_QEMU-i386) = qemu.conf +PLATFORM-$(CONFIG_PLATFORM_QEMU-X86) = qemu.conf include $(CONFIG_DIR)/platforms/$(PLATFORM-y) Modified: buildrom-devel/config/platforms/qemu.conf =================================================================== --- buildrom-devel/config/platforms/qemu.conf 2008-02-07 17:41:01 UTC (rev 109) +++ buildrom-devel/config/platforms/qemu.conf 2008-02-07 21:11:20 UTC (rev 110) @@ -24,17 +24,16 @@ ETHERBOOT_ARCH=i386 # coreboot-v2 configuration -CBV2_TAG=3092 +CBV2_TAG=3093 CBV2_CONFIG=Config.lb CBV2_PAYLOAD_FILE_EXT=elf -CBV2_TDIR=qemu-i386 +CBV2_TDIR=qemu-x86 # coreboot v3 configuration -CBV3_CONFIG=qemu-i386-defconfig CBV3_TAG=HEAD COREBOOT_VENDOR=emulation -COREBOOT_BOARD=qemu-i386 +COREBOOT_BOARD=qemu-x86 # FILO configuration Modified: buildrom-devel/config/platforms/serengeti_cheetah.conf =================================================================== --- buildrom-devel/config/platforms/serengeti_cheetah.conf 2008-02-07 17:41:01 UTC (rev 109) +++ buildrom-devel/config/platforms/serengeti_cheetah.conf 2008-02-07 21:11:20 UTC (rev 110) @@ -52,12 +52,10 @@ COREBOOT_BOARD=serengeti_cheetah_fam10 CBV2_TDIR=serengeti_cheetah_fam10 CBV2_TAG=3092 -CBV3_CONFIG=serengeti_cheetah_fam10-defconfig else COREBOOT_BOARD=serengeti_cheetah CBV2_TDIR=serengeti_cheetah CBV2_TAG=3092 -CBV3_CONFIG=serengeti_cheetah-defconfig endif # FILO configuration Deleted: buildrom-devel/packages/coreboot-v3/conf/qemu-i386-defconfig =================================================================== --- buildrom-devel/packages/coreboot-v3/conf/qemu-i386-defconfig 2008-02-07 17:41:01 UTC (rev 109) +++ buildrom-devel/packages/coreboot-v3/conf/qemu-i386-defconfig 2008-02-07 21:11:20 UTC (rev 110) @@ -1,88 +0,0 @@ -# -# Automatically generated make config: don't edit -# coreboot version: 3.0.0 -# Wed Feb 6 13:55:31 2008 -# - -# -# General setup -# -# CONFIG_EXPERIMENTAL is not set -# CONFIG_EXPERT is not set -CONFIG_LOCALVERSION="" - -# -# Mainboard -# -# CONFIG_VENDOR_ADL is not set -# CONFIG_VENDOR_AMD is not set -# CONFIG_VENDOR_ARTECGROUP is not set -CONFIG_VENDOR_EMULATION=y -# CONFIG_VENDOR_PCENGINES is not set -CONFIG_MAINBOARD_NAME="emulation/qemu-x86" -CONFIG_MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID=0x15ad -CONFIG_MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID=0x1976 -CONFIG_BOARD_EMULATION_QEMU_X86=y -# CONFIG_COREBOOT_ROMSIZE_KB_128 is not set -# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set -# CONFIG_COREBOOT_ROMSIZE_KB_512 is not set -CONFIG_COREBOOT_ROMSIZE_KB_1024=y -# CONFIG_COREBOOT_ROMSIZE_KB_2048 is not set -CONFIG_COREBOOT_ROMSIZE_KB=1024 -CONFIG_ARCH_X86=y -CONFIG_ARCH="x86" -CONFIG_CPU_I586=y -CONFIG_OPTION_TABLE=y - -# -# Compression -# -CONFIG_COMPRESSION_LZMA=y -# CONFIG_COMPRESSION_NRV2B is not set -CONFIG_DEFAULT_COMPRESSION_LZMA=y -# CONFIG_DEFAULT_COMPRESSION_NRV2B is not set -# CONFIG_DEFAULT_COMPRESSION_NONE is not set - -# -# Console -# -CONFIG_CONSOLE=y -CONFIG_CONSOLE_LOGLEVEL_8=y -# CONFIG_CONSOLE_LOGLEVEL_7 is not set -# CONFIG_CONSOLE_LOGLEVEL_6 is not set -# CONFIG_CONSOLE_LOGLEVEL_5 is not set -# CONFIG_CONSOLE_LOGLEVEL_4 is not set -# CONFIG_CONSOLE_LOGLEVEL_3 is not set -# CONFIG_CONSOLE_LOGLEVEL_2 is not set -# CONFIG_CONSOLE_LOGLEVEL_1 is not set -# CONFIG_CONSOLE_LOGLEVEL_0 is not set -CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8 -CONFIG_CONSOLE_SERIAL=y -CONFIG_CONSOLE_SERIAL_COM1=y -# CONFIG_CONSOLE_SERIAL_COM2 is not set -CONFIG_CONSOLE_SERIAL_115200=y -# CONFIG_CONSOLE_SERIAL_57600 is not set -# CONFIG_CONSOLE_SERIAL_38400 is not set -# CONFIG_CONSOLE_SERIAL_19200 is not set -# CONFIG_CONSOLE_SERIAL_9600 is not set - -# -# Devices -# -CONFIG_PCI_OPTION_ROM_RUN=y -# CONFIG_PCI_OPTION_ROM_RUN_X86EMU is not set -CONFIG_PCI_OPTION_ROM_RUN_VM86=y -# CONFIG_PCI_OPTION_ROM_RUN_NONE is not set -# CONFIG_MULTIPLE_VGA_INIT is not set -# CONFIG_INITIALIZE_ONBOARD_VGA_FIRST is not set -CONFIG_NORTHBRIDGE_INTEL_I440BXEMULATION=y -CONFIG_SOUTHBRIDGE_INTEL_I82371EB=y -CONFIG_SUPERIO_WINBOND_W83627HF=y -CONFIG_NORTHBRIDGE_INTEL_I440BXEMULATION_RAMSIZE=32 - -# -# Payload -# -# CONFIG_PAYLOAD_PREPARSE_ELF is not set -# CONFIG_PAYLOAD_ELF is not set -CONFIG_PAYLOAD_NONE=y Modified: buildrom-devel/packages/coreboot-v3/coreboot-v3.mk =================================================================== --- buildrom-devel/packages/coreboot-v3/coreboot-v3.mk 2008-02-07 17:41:01 UTC (rev 109) +++ buildrom-devel/packages/coreboot-v3/coreboot-v3.mk 2008-02-07 21:11:20 UTC (rev 110) @@ -3,7 +3,7 @@ endif CBV3_URL=svn://coreboot.org/repository/coreboot-v3 -CBV3_TARBALL=coreboot-svn-$(CBV3_TAG).tar.gz +CBV3_TARBALL=coreboot-v3-svn-$(CBV3_TAG).tar.gz CBV3_DIR=$(BUILD_DIR)/coreboot-v3 CBV3_SRC_DIR=$(CBV3_DIR)/svn @@ -32,7 +32,7 @@ $(SOURCE_DIR)/coreboot-v3 $(CBV3_TAG) \ $@ > $(CBV3_FETCH_LOG) 2>&1 -$(CBV3_STAMP_DIR)/.unpacked: $(SOURCE_DIR)/$(CBV3_TARBALL) +$(CBV3_STAMP_DIR)/.unpacked: $(SOURCE_DIR)/$(CBV3_TARBALL) | $(CBV3_STAMP_DIR) @echo "Unpacking coreboot v3..." @ mkdir -p $(CBV3_DIR) @ tar -C $(CBV3_DIR) -zxf $(SOURCE_DIR)/$(CBV3_TARBALL) @@ -45,8 +45,15 @@ $(CBV3_STAMP_DIR)/.configured: $(CBV3_STAMP_DIR)/.patched @ echo "Configuring coreboot v3..." - @ cp $(PACKAGE_DIR)/coreboot-v3/conf/$(CBV3_CONFIG) $(CBV3_SRC_DIR)/.config +ifeq ($(shell if [ -f $(PACKAGE_DIR)/coreboot-v3/conf/customconfig--$(PAYLOAD)--$(COREBOOT_VENDOR)-$(COREBOOT_BOARD) ]; then echo 1; fi),1) + @ cp -f $(PACKAGE_DIR)/coreboot-v3/conf/customconfig--$(PAYLOAD)--$(COREBOOT_VENDOR)-$(COREBOOT_BOARD) $(CBV3_SRC_DIR)/.config + @ echo "Using custom config $(PACKAGE_DIR)/coreboot-v3/conf/customconfig--$(PAYLOAD)--$(COREBOOT_VENDOR)-$(COREBOOT_BOARD)" @ make -C $(CBV3_SRC_DIR) oldconfig > $(CBV3_CONFIG_LOG) 2>&1 +else + @ make -C $(CBV3_SRC_DIR) defconfig \ + MAINBOARDDIR="$(COREBOOT_VENDOR)/$(COREBOOT_BOARD)" \ + > $(CBV3_CONFIG_LOG) 2>&1 +endif @ touch $@ $(CBV3_OUTPUT): $(CBV3_STAMP_DIR)/.configured @@ -60,9 +67,8 @@ @ mkdir -p $(STAGING_DIR)/bin @ cp $< $@ - $(CBV3_STAMP_DIR) $(CBV3_LOG_DIR): - @ mkdir -p $@ + mkdir -p $@ coreboot-v3: $(CBV3_LOG_DIR) $(CBV3_STAMP_DIR) $(CBV3_OUTPUT) $(STAGING_DIR)/bin/lar @@ -74,3 +80,21 @@ @ rm -rf $(CBV3_DIR)/* @ rm -rf $(STAGING_DIR)/bin/lar +coreboot-v3-config: $(CBV3_STAMP_DIR)/.unpacked +ifeq ($(shell if [ -f $(PACKAGE_DIR)/coreboot-v3/conf/customconfig--$(PAYLOAD)--$(COREBOOT_VENDOR)-$(COREBOOT_BOARD) ]; then echo 1; fi),1) + @ cp -f $(PACKAGE_DIR)/coreboot-v3/conf/customconfig--$(PAYLOAD)--$(COREBOOT_VENDOR)-$(COREBOOT_BOARD) $(CBV3_SRC_DIR)/.config +endif + @ echo "Configure coreboot-v3..." + @ $(MAKE) -C $(CBV3_SRC_DIR) menuconfig + @ echo +ifeq ($(shell if [ -f $(PACKAGE_DIR)/coreboot-v3/conf/customconfig--$(PAYLOAD)--$(COREBOOT_VENDOR)-$(COREBOOT_BOARD) ]; then echo 1; fi),1) + @ echo "Found an existing custom configuration file:" + @ echo " $(PACKAGE_DIR)/coreboot-v3/conf/customconfig--$(PAYLOAD)--$(COREBOOT_VENDOR)-$(COREBOOT_BOARD)" + @ echo "I've copied it back to the source directory for modification." + @ echo "Remove the above file and re-run this command if you want to create a new custom configuration from scratch for this payload/board." + @ echo +endif + @ cp -f $(CBV3_SRC_DIR)/.config $(PACKAGE_DIR)/coreboot-v3/conf/customconfig--$(PAYLOAD)--$(COREBOOT_VENDOR)-$(COREBOOT_BOARD) + @ echo "Your custom coreboot-v3 config file has been saved as $(PACKAGE_DIR)/coreboot-v3/conf/customconfig--$(PAYLOAD)--$(COREBOOT_VENDOR)-$(COREBOOT_BOARD)." + @ echo + @ touch $(CBV3_STAMP_DIR)/.configured

1 0

r3093 - in trunk/coreboot-v2: src/cpu/emulation src/cpu/emulation/qemu-x86 src/mainboard/emulation src/mainboard/emulation/qemu-x86 targets/emulation targets/emulation/qemu-x86
by svn＠coreboot.org 07 Feb '08

07 Feb '08

Author: myles Date: 2008-02-07 21:37:37 +0100 (Thu, 07 Feb 2008) New Revision: 3093 Added: trunk/coreboot-v2/src/cpu/emulation/qemu-x86/ trunk/coreboot-v2/src/mainboard/emulation/qemu-x86/ trunk/coreboot-v2/targets/emulation/qemu-x86/ Removed: trunk/coreboot-v2/src/cpu/emulation/qemu-i386/ trunk/coreboot-v2/src/mainboard/emulation/qemu-i386/ trunk/coreboot-v2/targets/emulation/qemu-i386/ Modified: trunk/coreboot-v2/src/cpu/emulation/qemu-x86/chip.h trunk/coreboot-v2/src/cpu/emulation/qemu-x86/northbridge.c trunk/coreboot-v2/src/cpu/emulation/qemu-x86/northbridge.h trunk/coreboot-v2/src/mainboard/emulation/qemu-x86/Config.lb trunk/coreboot-v2/src/mainboard/emulation/qemu-x86/chip.h trunk/coreboot-v2/src/mainboard/emulation/qemu-x86/mainboard.c trunk/coreboot-v2/targets/emulation/qemu-x86/Config-abuild.lb trunk/coreboot-v2/targets/emulation/qemu-x86/Config-lab.lb trunk/coreboot-v2/targets/emulation/qemu-x86/Config.OLPC.lb trunk/coreboot-v2/targets/emulation/qemu-x86/Config.lb Log: Change references to qemu in Coreboot-v2 calls to qemu-x86. The patch was followed by these svn commands: svn mv targets/emulation/qemu-i386/ targets/emulation/qemu-x86 svn mv --force targets/emulation/qemu-i386/ targets/emulation/qemu-x86 svn mv --force src/mainboard/emulation/qemu-i386/ src/mainboard/emulation/qemu-x86 svn mv --force src/cpu/emulation/qemu-i386/ src/cpu/emulation/qemu-x86 Signed-off-by: Myles Watson <myles(a)pel.cs.byu.edu> Acked-by: Stefan Reinauer <stepan(a)coresystems.de> Modified: trunk/coreboot-v2/src/cpu/emulation/qemu-x86/chip.h =================================================================== --- trunk/coreboot-v2/src/cpu/emulation/qemu-i386/chip.h 2008-02-06 22:33:50 UTC (rev 3092) +++ trunk/coreboot-v2/src/cpu/emulation/qemu-x86/chip.h 2008-02-07 20:37:37 UTC (rev 3093) @@ -1,6 +1,6 @@ -struct cpu_emulation_qemu_i386_config +struct cpu_emulation_qemu_x86_config { }; -extern struct chip_operations cpu_emulation_qemu_i386_ops; +extern struct chip_operations cpu_emulation_qemu_x86_ops; Modified: trunk/coreboot-v2/src/cpu/emulation/qemu-x86/northbridge.c =================================================================== --- trunk/coreboot-v2/src/cpu/emulation/qemu-i386/northbridge.c 2008-02-06 22:33:50 UTC (rev 3092) +++ trunk/coreboot-v2/src/cpu/emulation/qemu-x86/northbridge.c 2008-02-07 20:37:37 UTC (rev 3093) @@ -138,7 +138,7 @@ } } -struct chip_operations cpu_emulation_qemu_i386_ops = { +struct chip_operations cpu_emulation_qemu_x86_ops = { CHIP_NAME("QEMU Northbridge") .enable_dev = enable_dev, }; Modified: trunk/coreboot-v2/src/cpu/emulation/qemu-x86/northbridge.h =================================================================== --- trunk/coreboot-v2/src/cpu/emulation/qemu-i386/northbridge.h 2008-02-06 22:33:50 UTC (rev 3092) +++ trunk/coreboot-v2/src/cpu/emulation/qemu-x86/northbridge.h 2008-02-07 20:37:37 UTC (rev 3093) @@ -1,5 +1,5 @@ -#ifndef NORTHBRIDGE_EMULATION_QEMU_I386_H -#define NORTHBRIDGE_EMULATION_QEMU_I386_H +#ifndef NORTHBRIDGE_EMULATION_QEMU_X86_H +#define NORTHBRIDGE_EMULATION_QEMU_X86_H -#endif /* NORTHBRIDGE_EMULATION_QEMU_I386 */ +#endif /* NORTHBRIDGE_EMULATION_QEMU_X86 */ Modified: trunk/coreboot-v2/src/mainboard/emulation/qemu-x86/Config.lb =================================================================== --- trunk/coreboot-v2/src/mainboard/emulation/qemu-i386/Config.lb 2008-02-06 22:33:50 UTC (rev 3092) +++ trunk/coreboot-v2/src/mainboard/emulation/qemu-x86/Config.lb 2008-02-07 20:37:37 UTC (rev 3093) @@ -104,7 +104,7 @@ dir /pc80 config chip.h -chip cpu/emulation/qemu-i386 +chip cpu/emulation/qemu-x86 device pci_domain 0 on device pci 0.0 on end device pci 1.0 on end Modified: trunk/coreboot-v2/src/mainboard/emulation/qemu-x86/chip.h =================================================================== --- trunk/coreboot-v2/src/mainboard/emulation/qemu-i386/chip.h 2008-02-06 22:33:50 UTC (rev 3092) +++ trunk/coreboot-v2/src/mainboard/emulation/qemu-x86/chip.h 2008-02-07 20:37:37 UTC (rev 3093) @@ -1,4 +1,4 @@ -extern struct chip_operations mainboard_emulation_qemu_i386_ops; +extern struct chip_operations mainboard_emulation_qemu_x86_ops; -struct mainboard_emulation_qemu_i386_config { +struct mainboard_emulation_qemu_x86_config { }; Modified: trunk/coreboot-v2/src/mainboard/emulation/qemu-x86/mainboard.c =================================================================== --- trunk/coreboot-v2/src/mainboard/emulation/qemu-i386/mainboard.c 2008-02-06 22:33:50 UTC (rev 3092) +++ trunk/coreboot-v2/src/mainboard/emulation/qemu-x86/mainboard.c 2008-02-07 20:37:37 UTC (rev 3093) @@ -33,7 +33,7 @@ .device = 0x00b8, }; -struct chip_operations mainboard_emulation_qemu_i386_ops = { +struct chip_operations mainboard_emulation_qemu_x86_ops = { CHIP_NAME("QEMU Mainboard") }; Modified: trunk/coreboot-v2/targets/emulation/qemu-x86/Config-abuild.lb =================================================================== --- trunk/coreboot-v2/targets/emulation/qemu-i386/Config-abuild.lb 2008-02-06 22:33:50 UTC (rev 3092) +++ trunk/coreboot-v2/targets/emulation/qemu-x86/Config-abuild.lb 2008-02-07 20:37:37 UTC (rev 3093) @@ -1,7 +1,7 @@ -# This will make a target directory of ./emulation_qemu-i386 +# This will make a target directory of ./emulation_qemu-x86 -target emulation_qemu-i386 -mainboard emulation/qemu-i386 +target emulation_qemu-x86 +mainboard emulation/qemu-x86 __COMPRESSION__ Modified: trunk/coreboot-v2/targets/emulation/qemu-x86/Config-lab.lb =================================================================== --- trunk/coreboot-v2/targets/emulation/qemu-i386/Config-lab.lb 2008-02-06 22:33:50 UTC (rev 3092) +++ trunk/coreboot-v2/targets/emulation/qemu-x86/Config-lab.lb 2008-02-07 20:37:37 UTC (rev 3093) @@ -1,7 +1,7 @@ -# This will make a target directory of ./emulation_qemu-i386 +# This will make a target directory of ./emulation_qemu-x86 -target qemu-i386 -mainboard emulation/qemu-i386 +target qemu-x86 +mainboard emulation/qemu-x86 option ROM_SIZE=2048*1024 option CONFIG_COMPRESSED_PAYLOAD_LZMA=0 Modified: trunk/coreboot-v2/targets/emulation/qemu-x86/Config.OLPC.lb =================================================================== --- trunk/coreboot-v2/targets/emulation/qemu-i386/Config.OLPC.lb 2008-02-06 22:33:50 UTC (rev 3092) +++ trunk/coreboot-v2/targets/emulation/qemu-x86/Config.OLPC.lb 2008-02-07 20:37:37 UTC (rev 3093) @@ -1,7 +1,7 @@ -# This will make a target directory of ./emulation_qemu-i386 +# This will make a target directory of ./emulation_qemu-x86 -target qemu-i386-OLPC -mainboard emulation/qemu-i386 +target qemu-x86-OLPC +mainboard emulation/qemu-x86 option ROM_SIZE=1024*1024 - (128 * 1024) option CONFIG_COMPRESSED_PAYLOAD_LZMA=1 Modified: trunk/coreboot-v2/targets/emulation/qemu-x86/Config.lb =================================================================== --- trunk/coreboot-v2/targets/emulation/qemu-i386/Config.lb 2008-02-06 22:33:50 UTC (rev 3092) +++ trunk/coreboot-v2/targets/emulation/qemu-x86/Config.lb 2008-02-07 20:37:37 UTC (rev 3093) @@ -1,7 +1,7 @@ -# This will make a target directory of ./emulation_qemu-i386 +# This will make a target directory of ./emulation_qemu-x86 -target qemu-i386 -mainboard emulation/qemu-i386 +target qemu-x86 +mainboard emulation/qemu-x86 option ROM_SIZE=256*1024

1 0

v3 for alix: add ide support
by ron minnich 07 Feb '08

07 Feb '08

This code now lets filo find IDE. but it locks up :-( oh well. attached. ron

4 6

Re: [coreboot] [ward@gnu.org: Re: [LinuxBIOS] [PATCH] buildrom: addextract andbusybox-config, uclibc-config targets]
by Myles Watson 07 Feb '08

07 Feb '08

> Hey Myles, > > Does this look good enough for an ack? I know you already ack'ed several > previous revisions of this patch, but it's probably best if I don't commit > this without a formal ack of the latest revision :) > > Thanks, > Ward. Sorry, since there wasn't a Signed-off-by: line in the last one I didn't think about it. Good work. Myles Acked-by: Myles Watson <myles(a)pel.cs.byu.edu>

2 1

r109 - in buildrom-devel: . config/payloads packages/busybox packages/coreboot-v2 packages/filo packages/kernel packages/lzma packages/mkelfimage packages/uclibc packages/unifdef
by svn＠coreboot.org 07 Feb '08

07 Feb '08

Author: ward Date: 2008-02-07 18:41:01 +0100 (Thu, 07 Feb 2008) New Revision: 109 Modified: buildrom-devel/Makefile buildrom-devel/config/payloads/filo.conf buildrom-devel/config/payloads/kernel.conf buildrom-devel/config/payloads/lab.conf buildrom-devel/packages/busybox/busybox.mk buildrom-devel/packages/coreboot-v2/coreboot.inc buildrom-devel/packages/filo/filo.mk buildrom-devel/packages/kernel/kernel.inc buildrom-devel/packages/lzma/lzma.mk buildrom-devel/packages/mkelfimage/mkelfimage.mk buildrom-devel/packages/uclibc/uclibc.mk buildrom-devel/packages/unifdef/unifdef.mk Log: This patch adds extract targets, as well as some config targets: busybox-config, uclibc-config, kernel-config and filo-config. The extract targets will just extract the component(s) under the work subdirectory. The config targets will run a configure command for the component, and then copy the resulting custom config file to the conf directory for the package using a naming convention that indicates the payload, vendor, board and (for the kernel and uclibc) architecture. That config file will then be used to build the image when 'make' is issued, overriding the default buildrom config for that package/payload - but only if there is a match for payload, vendor and board (and for uclibc and the kernel, architecture). The config targets are somewhat smart: they will copy an existing custom config file back to the source directory so that doing a make something-config when a custom config file exists will have the effect of editing the custom config, rather than overwriting it. If a custom config file is used, buildrom will say so on stdout. Signed-off-by: Ward Vandewege <ward(a)gnu.org> Acked-by: Myles Watson <myles(a)pel.cs.byu.edu> Modified: buildrom-devel/Makefile =================================================================== --- buildrom-devel/Makefile 2008-02-07 15:54:34 UTC (rev 108) +++ buildrom-devel/Makefile 2008-02-07 17:41:01 UTC (rev 109) @@ -21,7 +21,7 @@ config-targets := 1 endif -ifneq ($(filter config %config,$(MAKECMDGOALS)),) +ifneq ($(filter textconfig oldconfig defconfig menuconfig,$(MAKECMDGOALS)),) config-targets := 1 dot-config := 0 endif @@ -60,6 +60,7 @@ PKG_clean=$(patsubst %, %-clean, $(PKGLIST)) PKG_distclean=$(patsubst %, %-distclean, $(PKGLIST)) +PKG_extract=$(patsubst %, %-extract, $(PKGLIST)) # This is the top level target - for v2, the final deliverable is built # by coreboot, for v3 it is built by us, so we have ifdef magic here @@ -78,6 +79,8 @@ payload: $(PAYLOAD_TARGET) +extract: $(PKG_extract) + clean: $(PKG_clean) @ rm -rf $(INITRD_DIR) $(OUTPUT_DIR) Modified: buildrom-devel/config/payloads/filo.conf =================================================================== --- buildrom-devel/config/payloads/filo.conf 2008-02-07 15:54:34 UTC (rev 108) +++ buildrom-devel/config/payloads/filo.conf 2008-02-07 17:41:01 UTC (rev 109) @@ -8,3 +8,6 @@ PAYLOAD_COMPRESSED=$(OUTPUT_DIR)/filo-payload.elf.lzma PAYLOAD-y=filo + +PAYLOAD=filo + Modified: buildrom-devel/config/payloads/kernel.conf =================================================================== --- buildrom-devel/config/payloads/kernel.conf 2008-02-07 15:54:34 UTC (rev 108) +++ buildrom-devel/config/payloads/kernel.conf 2008-02-07 17:41:01 UTC (rev 109) @@ -16,4 +16,6 @@ PAYLOAD_COMPRESSED=$(OUTPUT_DIR)/kernel-payload.elf.lzma PAYLOAD-y= kernel +PAYLOAD=kernel + HOSTTOOLS-y = mkelfimage Modified: buildrom-devel/config/payloads/lab.conf =================================================================== --- buildrom-devel/config/payloads/lab.conf 2008-02-07 15:54:34 UTC (rev 108) +++ buildrom-devel/config/payloads/lab.conf 2008-02-07 17:41:01 UTC (rev 109) @@ -30,4 +30,6 @@ PAYLOAD-$(CONFIG_BOOTMENU) += bootmenu PAYLOAD-$(CONFIG_OLPCFLASH) += olpcflash +PAYLOAD=lab + HOSTTOOLS-y = mkelfimage unifdef Modified: buildrom-devel/packages/busybox/busybox.mk =================================================================== --- buildrom-devel/packages/busybox/busybox.mk 2008-02-07 15:54:34 UTC (rev 108) +++ buildrom-devel/packages/busybox/busybox.mk 2008-02-07 17:41:01 UTC (rev 109) @@ -17,11 +17,18 @@ BUSYBOX_CONFIG ?= defconfig +ifeq ($(findstring defconfig,$(BUSYBOX_CONFIG)),defconfig) +ifeq ($(shell if [ -f $(PACKAGE_DIR)/busybox/conf/customconfig--$(PAYLOAD)--$(COREBOOT_VENDOR)-$(COREBOOT_BOARD) ]; then echo 1; fi),1) + BUSYBOX_CONFIG = customconfig--$(PAYLOAD)--$(COREBOOT_VENDOR)-$(COREBOOT_BOARD) +endif +endif + $(SOURCE_DIR)/$(BUSYBOX_SOURCE): + @ echo "Downloading busybox..." @ mkdir -p $(SOURCE_DIR) @ wget -P $(SOURCE_DIR) $(BUSYBOX_URL)/$(BUSYBOX_SOURCE) -$(BUSYBOX_STAMP_DIR)/.unpacked: $(SOURCE_DIR)/$(BUSYBOX_SOURCE) +$(BUSYBOX_STAMP_DIR)/.unpacked: $(SOURCE_DIR)/$(BUSYBOX_SOURCE) | $(BUSYBOX_STAMP_DIR) $(BUSYBOX_DIR) @ echo "Unpacking busybox..." @ tar -C $(BUSYBOX_DIR) -jxf $(SOURCE_DIR)/$(BUSYBOX_SOURCE) @ touch $@ @@ -32,24 +39,27 @@ @ touch $@ $(BUSYBOX_SRC_DIR)/.config: $(BUSYBOX_STAMP_DIR)/.patched - @ cp $(PACKAGE_DIR)/busybox/conf/$(BUSYBOX_CONFIG) $@ + @ cp -f $(PACKAGE_DIR)/busybox/conf/$(BUSYBOX_CONFIG) $@ -$(BUSYBOX_SRC_DIR)/busybox: $(BUSYBOX_SRC_DIR)/.config +$(BUSYBOX_SRC_DIR)/busybox: $(BUSYBOX_SRC_DIR)/.config | $(BUSYBOX_LOG_DIR) @ echo "Building busybox..." +ifneq ($(findstring defconfig,$(BUSYBOX_CONFIG)),defconfig) + @ echo "Using custom config $(PACKAGE_DIR)/busybox/conf/$(BUSYBOX_CONFIG)" +endif @ ( unset CFLAGS; unset LDFLAGS; \ export EXTRA_CFLAGS="$(CFLAGS)";\ export LDFLAGS="$(LDFLAGS_orig)";\ $(MAKE) -C $(BUSYBOX_SRC_DIR) VERBOSE=y \ LIBRARIES="$(LIBS)" all > $(BUSYBOX_BUILD_LOG) 2>&1) -$(INITRD_DIR)/bin/busybox: $(BUSYBOX_SRC_DIR)/busybox +$(INITRD_DIR)/bin/busybox: $(BUSYBOX_SRC_DIR)/busybox | $(BUSYBOX_LOG_DIR) @ $(MAKE) -C $(BUSYBOX_SRC_DIR) \ PREFIX=$(INITRD_DIR) install > $(BUSYBOX_INSTALL_LOG) 2>&1 -$(BUSYBOX_STAMP_DIR) $(BUSYBOX_LOG_DIR): +$(BUSYBOX_STAMP_DIR) $(BUSYBOX_LOG_DIR) $(BUSYBOX_DIR): @ mkdir -p $@ -busybox: $(BUSYBOX_STAMP_DIR) $(BUSYBOX_LOG_DIR) $(INITRD_DIR)/bin/busybox +busybox: $(INITRD_DIR)/bin/busybox busybox-clean: @ echo "Cleaning busybox..." @@ -62,3 +72,27 @@ @ echo "Package: busybox" @ echo "Source: $(BUSYBOX_URL)/$(BUSYBOX_SOURCE)" @ echo "" + +busybox-extract: $(BUSYBOX_STAMP_DIR)/.patched + +busybox-config: $(BUSYBOX_STAMP_DIR)/.patched +ifeq ($(shell if [ -f $(PACKAGE_DIR)/busybox/conf/customconfig--$(PAYLOAD)--$(COREBOOT_VENDOR)-$(COREBOOT_BOARD) ]; then echo 1; fi),1) + @ cp -f $(PACKAGE_DIR)/busybox/conf/customconfig--$(PAYLOAD)--$(COREBOOT_VENDOR)-$(COREBOOT_BOARD) $(BUSYBOX_SRC_DIR)/.config +endif +ifeq (busybox,$(filter busybox,$(PAYLOAD-y))) + @ echo "Configure busybox..." + @ $(MAKE) -C $(BUSYBOX_SRC_DIR) menuconfig + @ echo +ifeq ($(shell if [ -f $(PACKAGE_DIR)/busybox/conf/customconfig--$(PAYLOAD)--$(COREBOOT_VENDOR)-$(COREBOOT_BOARD) ]; then echo 1; fi),1) + @ echo "Found an existing custom configuration file:" + @ echo " $(PACKAGE_DIR)/busybox/conf/customconfig--$(PAYLOAD)--$(COREBOOT_VENDOR)-$(COREBOOT_BOARD)" + @ echo "I've copied it back to the source directory for modification." + @ echo "Remove the above file and re-run this command if you want to create a new custom configuration from scratch for this payload/board." + @ echo +endif + @ cp -f $(BUSYBOX_SRC_DIR)/.config $(PACKAGE_DIR)/busybox/conf/customconfig--$(PAYLOAD)--$(COREBOOT_VENDOR)-$(COREBOOT_BOARD) + @ echo "Your custom busybox config file has been saved as $(PACKAGE_DIR)/busybox/conf/customconfig--$(PAYLOAD)--$(COREBOOT_VENDOR)-$(COREBOOT_BOARD)." + @ echo +else + @ echo "Your payload does not require busybox." +endif Modified: buildrom-devel/packages/coreboot-v2/coreboot.inc =================================================================== --- buildrom-devel/packages/coreboot-v2/coreboot.inc 2008-02-07 15:54:34 UTC (rev 108) +++ buildrom-devel/packages/coreboot-v2/coreboot.inc 2008-02-07 17:41:01 UTC (rev 109) @@ -58,8 +58,8 @@ $(CBV2_PAYLOAD_TARGET): $(PAYLOAD_TARGET) @ cp $< $@ -$(CBV2_STAMP_DIR)/.unpacked: $(SOURCE_DIR)/$(CBV2_TARBALL) - @ echo "Unpacking coreboot..." +$(CBV2_STAMP_DIR)/.unpacked: $(SOURCE_DIR)/$(CBV2_TARBALL) | $(CBV2_STAMP_DIR) $(CBV2_LOG_DIR) + @ echo "Unpacking coreboot ($(CBV2_TARBALL))..." @ tar -C $(CBV2_DIR) -zxf $(SOURCE_DIR)/$(CBV2_TARBALL) @ touch $@ @@ -98,3 +98,6 @@ fi @ rm -rf $(CBV2_DIR)/* + +coreboot-extract: $(CBV2_STAMP_DIR)/.patched + Modified: buildrom-devel/packages/filo/filo.mk =================================================================== --- buildrom-devel/packages/filo/filo.mk 2008-02-07 15:54:34 UTC (rev 108) +++ buildrom-devel/packages/filo/filo.mk 2008-02-07 17:41:01 UTC (rev 109) @@ -25,13 +25,17 @@ FILO_TARBALL=filo-svn-$(FILO_TAG).tar.gz +ifeq ($(shell if [ -f $(PACKAGE_DIR)/filo/conf/customconfig--$(PAYLOAD)--$(COREBOOT_VENDOR)-$(COREBOOT_BOARD) ]; then echo 1; fi),1) + FILO_CONFIG = customconfig--$(PAYLOAD)--$(COREBOOT_VENDOR)-$(COREBOOT_BOARD) +endif + $(SOURCE_DIR)/$(FILO_TARBALL): @ mkdir -p $(SOURCE_DIR)/filo @ $(BIN_DIR)/fetchsvn.sh $(FILO_URL) $(SOURCE_DIR)/filo \ $(FILO_TAG) $(SOURCE_DIR)/$(FILO_TARBALL) \ > $(FILO_FETCH_LOG) 2>&1 -$(FILO_STAMP_DIR)/.unpacked: $(SOURCE_DIR)/$(FILO_TARBALL) +$(FILO_STAMP_DIR)/.unpacked: $(SOURCE_DIR)/$(FILO_TARBALL) | $(FILO_STAMP_DIR) $(FILO_DIR) @ echo "Unpacking filo..." @ tar -C $(FILO_DIR) -zxf $(SOURCE_DIR)/$(FILO_TARBALL) @ touch $@ @@ -48,6 +52,9 @@ $(FILO_SRC_DIR)/filo.elf: $(FILO_STAMP_DIR)/.configured @ echo "Building filo..." +ifeq ($(findstring customconfig,$(FILO_CONFIG)),customconfig) + @ echo "Using custom config $(PACKAGE_DIR)/filo/conf/$(FILO_CONFIG)" +endif @ make -C $(FILO_SRC_DIR) filo.elf > $(FILO_BUILD_LOG) 2>&1 $(FILO_STAMP_DIR) $(FILO_LOG_DIR): @@ -64,3 +71,24 @@ filo-distclean: @ rm -rf $(FILO_DIR)/* +filo-extract: $(FILO_STAMP_DIR)/.patched + +filo-config: $(FILO_STAMP_DIR)/.unpacked +ifeq ($(shell if [ -f $(PACKAGE_DIR)/filo/conf/customconfig--$(PAYLOAD)--$(COREBOOT_VENDOR)-$(COREBOOT_BOARD) ]; then echo 1; fi),1) + @ echo + @ echo "Found an existing custom configuration file:" + @ echo " $(PACKAGE_DIR)/filo/conf/customconfig--$(PAYLOAD)--$(COREBOOT_VENDOR)-$(COREBOOT_BOARD)" + @ echo "Please modify this file by hand." + @ echo "Remove the above file and re-run this command if you want to create a new custom configuration from scratch for this payload/board." + @ echo +else + @ echo "Configure filo..." + @ $(MAKE) -C $(FILO_SRC_DIR) config + @ cp -f $(FILO_SRC_DIR)/Config $(PACKAGE_DIR)/filo/conf/customconfig--$(PAYLOAD)--$(COREBOOT_VENDOR)-$(COREBOOT_BOARD) + @ echo + @ echo "Your custom FILO config has been saved as " + @ echo " $(PACKAGE_DIR)/filo/conf/customconfig--$(PAYLOAD)--$(COREBOOT_VENDOR)-$(COREBOOT_BOARD)" + @ echo "Please edit it to your liking." + @ echo +endif + Modified: buildrom-devel/packages/kernel/kernel.inc =================================================================== --- buildrom-devel/packages/kernel/kernel.inc 2008-02-07 15:54:34 UTC (rev 108) +++ buildrom-devel/packages/kernel/kernel.inc 2008-02-07 17:41:01 UTC (rev 109) @@ -15,6 +15,12 @@ KERNEL_BUILD_ARCH=i386 endif +ifeq ($(findstring defconfig,$(KERNEL_CONFIG)),defconfig) +ifeq ($(shell if [ -f $(PACKAGE_DIR)/kernel/conf/customconfig--$(PAYLOAD)--$(KERNEL_BUILD_ARCH)--$(COREBOOT_VENDOR)-$(COREBOOT_BOARD) ]; then echo 1; fi),1) + KERNEL_CONFIG = $(PACKAGE_DIR)/kernel/conf/customconfig--$(PAYLOAD)--$(KERNEL_BUILD_ARCH)--$(COREBOOT_VENDOR)-$(COREBOOT_BOARD) +endif +endif + ifeq ($(CONFIG_VERBOSE),y) KERNEL_FETCH_LOG=/dev/stdout KERNEL_BUILD_LOG=/dev/stdout @@ -25,7 +31,7 @@ KERNEL_INSTALL_LOG=$(KERNEL_LOG_DIR)/install.log endif -$(KERNEL_STAMP_DIR)/.unpacked: $(SOURCE_DIR)/$(KERNEL_SOURCE) +$(KERNEL_STAMP_DIR)/.unpacked: $(SOURCE_DIR)/$(KERNEL_SOURCE) | $(KERNEL_STAMP_DIR) @ mkdir -p $(KERNEL_DIR) @ echo "Unpacking kernel..." @ tar -C $(KERNEL_DIR) -jxf $(SOURCE_DIR)/$(KERNEL_SOURCE) @@ -50,8 +56,11 @@ $(KERNEL_SRC_DIR)/.config: $(KERNEL_STAMP_DIR)/.patched @ cat $(KERNEL_CONFIG) | sed -e s:^CONFIG_LOCALVERSION=.*:CONFIG_LOCALVERSION=\"$(ROM_VERSION)\": > $(KERNEL_SRC_DIR)/.config -$(KERNEL_BZIMAGE): $(KERNEL_SRC_DIR)/.config +$(KERNEL_BZIMAGE): $(KERNEL_SRC_DIR)/.config | $(KERNEL_LOG_DIR) @ echo "Building kernel..." +ifneq ($(findstring defconfig,$(KERNEL_CONFIG)),defconfig) + @ echo "Using custom kernel config $(KERNEL_CONFIG)" +endif @ $(MAKE) $(PARALLEL_MAKE) -C $(KERNEL_SRC_DIR) ARCH=$(KERNEL_BUILD_ARCH) \ KERNEL_CC="$(CC)" KERNEL_LD="$(LD)" > $(KERNEL_BUILD_LOG) 2>&1 @@ -63,7 +72,7 @@ @ install -d $(OUTPUT_DIR) @ install -m 0644 $(KERNEL_SRC_DIR)/vmlinux $@ -$(KERNEL_STAMP_DIR)/.headers: $(KERNEL_SRC_DIR)/.config $(STAGING_DIR)/host/bin/unifdef +$(KERNEL_STAMP_DIR)/.headers: $(KERNEL_SRC_DIR)/.config $(STAGING_DIR)/host/bin/unifdef | $(KERNEL_LOG_DIR) @ echo "Installing kernel headers..." @( export PATH=$(PATH):$(STAGING_DIR)/host/bin; \ $(MAKE) -C $(KERNEL_SRC_DIR) ARCH=$(KERNEL_BUILD_ARCH) \ @@ -73,7 +82,7 @@ $(KERNEL_STAMP_DIR) $(KERNEL_LOG_DIR): @ mkdir -p $@ -generic-kernel: $(KERNEL_STAMP_DIR) $(KERNEL_LOG_DIR) $(OUTPUT_DIR)/bzImage $(OUTPUT_DIR)/vmlinux $(KERNEL_STAMP_DIR)/.headers +generic-kernel: $(OUTPUT_DIR)/bzImage $(OUTPUT_DIR)/vmlinux $(KERNEL_STAMP_DIR)/.headers generic-kernel-clean: @ echo "Cleaning kernel..." @@ -83,3 +92,27 @@ generic-kernel-distclean: @ rm -rf $(KERNEL_DIR) + +kernel-extract: $(KERNEL_STAMP_DIR)/.patched + +kernel-config: $(KERNEL_STAMP_DIR)/.patched +ifeq ($(shell if [ -f $(PACKAGE_DIR)/kernel/conf/customconfig--$(PAYLOAD)--$(KERNEL_BUILD_ARCH)--$(COREBOOT_VENDOR)-$(COREBOOT_BOARD) ]; then echo 1; fi),1) + @ cp -f $(PACKAGE_DIR)/kernel/conf/customconfig--$(PAYLOAD)--$(KERNEL_BUILD_ARCH)--$(COREBOOT_VENDOR)-$(COREBOOT_BOARD) $(KERNEL_SRC_DIR)/.config +endif +ifeq (kernel,$(filter kernel,$(PAYLOAD-y))) + @ echo "Configure kernel..." + @ $(MAKE) -C $(KERNEL_SRC_DIR) ARCH=$(KERNEL_BUILD_ARCH) menuconfig + @ echo +ifeq ($(shell if [ -f $(PACKAGE_DIR)/kernel/conf/customconfig--$(PAYLOAD)--$(KERNEL_BUILD_ARCH)--$(COREBOOT_VENDOR)-$(COREBOOT_BOARD) ]; then echo 1; fi),1) + @ echo "Found an existing custom configuration file:" + @ echo " $(PACKAGE_DIR)/kernel/conf/customconfig--$(PAYLOAD)--$(KERNEL_BUILD_ARCH)--$(COREBOOT_VENDOR)-$(COREBOOT_BOARD)" + @ echo "I've copied it back to the source directory for modification." + @ echo "Remove the above file and re-run this command if you want to create a new custom configuration from scratch for this payload/board." + @ echo +endif + @ cp -f $(KERNEL_SRC_DIR)/.config $(PACKAGE_DIR)/kernel/conf/customconfig--$(PAYLOAD)--$(KERNEL_BUILD_ARCH)--$(COREBOOT_VENDOR)-$(COREBOOT_BOARD) + @ echo "Your custom kernel config file has been saved as $(PACKAGE_DIR)/kernel/conf/customconfig--$(PAYLOAD)--$(KERNEL_BUILD_ARCH)--$(COREBOOT_VENDOR)-$(COREBOOT_BOARD)." + @ echo +else + @ echo "Your payload does not require a kernel." +endif Modified: buildrom-devel/packages/lzma/lzma.mk =================================================================== --- buildrom-devel/packages/lzma/lzma.mk 2008-02-07 15:54:34 UTC (rev 108) +++ buildrom-devel/packages/lzma/lzma.mk 2008-02-07 17:41:01 UTC (rev 109) @@ -17,7 +17,7 @@ @ mkdir -p $(SOURCE_DIR) @ wget -P $(SOURCE_DIR) $(LZMA_URL)/$(LZMA_SOURCE) -$(LZMA_STAMP_DIR)/.unpacked: $(SOURCE_DIR)/$(LZMA_SOURCE) +$(LZMA_STAMP_DIR)/.unpacked: $(SOURCE_DIR)/$(LZMA_SOURCE) | $(LZMA_STAMP_DIR) @ mkdir -p $(LZMA_SRC_DIR) @ tar -C $(LZMA_SRC_DIR) -jxf $(SOURCE_DIR)/$(LZMA_SOURCE) @ touch $@ @@ -44,3 +44,6 @@ lzma-distclean: @ rm -rf $(LZMA_DIR)/* + +lzma-extract: $(LZMA_STAMP_DIR)/.unpacked + Modified: buildrom-devel/packages/mkelfimage/mkelfimage.mk =================================================================== --- buildrom-devel/packages/mkelfimage/mkelfimage.mk 2008-02-07 15:54:34 UTC (rev 108) +++ buildrom-devel/packages/mkelfimage/mkelfimage.mk 2008-02-07 17:41:01 UTC (rev 109) @@ -15,11 +15,14 @@ MKELFIMAGE_CONFIG_LOG=$(MKELFIMAGE_LOG_DIR)/config.log endif +$(MKELFIMAGE_STAMP_DIR) $(MKELFIMAGE_LOG_DIR): + @ mkdir -p $@ + $(SOURCE_DIR)/$(MKELFIMAGE_SOURCE): @ mkdir -p $(SOURCE_DIR) @ wget -P $(SOURCE_DIR) $(MKELFIMAGE_URL)/$(MKELFIMAGE_SOURCE) -$(MKELFIMAGE_STAMP_DIR)/.unpacked: $(SOURCE_DIR)/$(MKELFIMAGE_SOURCE) +$(MKELFIMAGE_STAMP_DIR)/.unpacked: $(SOURCE_DIR)/$(MKELFIMAGE_SOURCE) | $(MKELFIMAGE_STAMP_DIR) $(MKELFIMAGE_LOG_DIR) @ echo "Unpacking mkelfimage..." @ tar -C $(MKELFIMAGE_DIR) -zxf $(SOURCE_DIR)/$(MKELFIMAGE_SOURCE) @ touch $@ @@ -45,11 +48,8 @@ @ install -d $(STAGING_DIR)/sbin @ install -m 0755 $< $@ -$(MKELFIMAGE_STAMP_DIR) $(MKELFIMAGE_LOG_DIR): - @ mkdir -p $@ +mkelfimage: $(STAGING_DIR)/sbin/mkelfImage -mkelfimage: $(MKELFIMAGE_STAMP_DIR) $(MKELFIMAGE_LOG_DIR) $(STAGING_DIR)/sbin/mkelfImage - mkelfimage-clean: $(MAKE) -C $(MKELFIMAGE_SRC_DIR) clean @@ -60,3 +60,6 @@ echo "Package: mkelfimage" echo "Source: $(MKELFIMAGE_URL)/$(MKELFIMAGE_SOURCE)" echo "" + +mkelfimage-extract: $(MKELFIMAGE_STAMP_DIR)/.patched + Modified: buildrom-devel/packages/uclibc/uclibc.mk =================================================================== --- buildrom-devel/packages/uclibc/uclibc.mk 2008-02-07 15:54:34 UTC (rev 108) +++ buildrom-devel/packages/uclibc/uclibc.mk 2008-02-07 17:41:01 UTC (rev 109) @@ -9,6 +9,12 @@ UCLIBC_CONFIG ?= defconfig endif +ifeq ($(findstring defconfig,$(UCLIBC_CONFIG)),defconfig) +ifeq ($(shell if [ -f $(PACKAGE_DIR)/uclibc/conf/customconfig--$(PAYLOAD)--$(UCLIBC_ARCH)--$(COREBOOT_VENDOR)-$(COREBOOT_BOARD) ]; then echo 1; fi),1) + UCLIBC_CONFIG = customconfig--$(PAYLOAD)--$(UCLIBC_ARCH)--$(COREBOOT_VENDOR)-$(COREBOOT_BOARD) +endif +endif + UCLIBC_URL=http://www.uclibc.org/downloads UCLIBC_SOURCE=uClibc-$(UCLIBC_VER).tar.bz2 UCLIBC_DIR=$(BUILD_DIR)/uclibc @@ -25,10 +31,11 @@ endif $(SOURCE_DIR)/$(UCLIBC_SOURCE): + @ echo "Downloading uclibc..." @ mkdir -p $(SOURCE_DIR) @ wget -P $(SOURCE_DIR) $(UCLIBC_URL)/$(UCLIBC_SOURCE) -$(UCLIBC_STAMP_DIR)/.unpacked: $(SOURCE_DIR)/$(UCLIBC_SOURCE) +$(UCLIBC_STAMP_DIR)/.unpacked: $(SOURCE_DIR)/$(UCLIBC_SOURCE) | $(UCLIBC_STAMP_DIR) $(UCLIBC_DIR) @ echo "Unpacking uclibc..." @ tar -C $(UCLIBC_DIR) -jxf $(SOURCE_DIR)/$(UCLIBC_SOURCE) @ touch $@ @@ -38,6 +45,9 @@ $(UCLIBC_SRC_DIR)/lib/libc.a: $(UCLIBC_SRC_DIR)/.config @ echo "Building uclibc..." +ifneq ($(findstring defconfig,$(UCLIBC_CONFIG)),defconfig) + @ echo "Using custom config $(PACKAGE_DIR)/uclibc/conf/$(UCLIBC_CONFIG)" +endif @ ( unset CFLAGS; unset LDFLAGS; \ $(MAKE) $(PARALLEL_MAKE) -C $(UCLIBC_SRC_DIR) TARGET_ARCH="$(UCLIBC_ARCH)" \ CC="$(CC) $(CROSS_CFLAGS)" LD="$(LD) $(CROSS_LDFLAGS)" \ @@ -61,7 +71,7 @@ @ install -m 755 -d $(STAGING_DIR)/bin @ install -m 755 $< $@ -$(UCLIBC_STAMP_DIR) $(UCLIBC_LOG_DIR): +$(UCLIBC_STAMP_DIR) $(UCLIBC_LOG_DIR) $(UCLIBC_DIR): @ mkdir -p $@ uclibc: $(UCLIBC_STAMP_DIR) $(UCLIBC_LOG_DIR) $(STAGING_DIR)/lib/libc.a @@ -77,3 +87,27 @@ @ echo "Package: uclibc" @ echo "Source: $(UCLIBC_URL)/$(UCLIBC_SOURCE)" @ echo "" + +uclibc-extract: $(UCLIBC_STAMP_DIR)/.unpacked + +uclibc-config: $(UCLIBC_STAMP_DIR)/.unpacked +ifeq ($(shell if [ -f $(PACKAGE_DIR)/uclibc/conf/customconfig--$(PAYLOAD)--$(UCLIBC_ARCH)--$(COREBOOT_VENDOR)-$(COREBOOT_BOARD) ]; then echo 1; fi),1) + @ cp -f $(PACKAGE_DIR)/uclibc/conf/customconfig--$(PAYLOAD)--$(UCLIBC_ARCH)--$(COREBOOT_VENDOR)-$(COREBOOT_BOARD) $(UCLIBC_SRC_DIR)/.config +endif +ifeq (uclibc,$(filter uclibc,$(PAYLOAD-y))) + @ echo "Configure uclibc..." + @ $(MAKE) -C $(UCLIBC_SRC_DIR) TARGET_ARCH="$(UCLIBC_ARCH)" menuconfig + @ echo +ifeq ($(shell if [ -f $(PACKAGE_DIR)/uclibc/conf/customconfig--$(PAYLOAD)--$(UCLIBC_ARCH)--$(COREBOOT_VENDOR)-$(COREBOOT_BOARD) ]; then echo 1; fi),1) + @ echo "Found an existing custom configuration file:" + @ echo " $(PACKAGE_DIR)/uclibc/conf/customconfig--$(PAYLOAD)--$(UCLIBC_ARCH)--$(COREBOOT_VENDOR)-$(COREBOOT_BOARD)" + @ echo "I've copied it back to the source directory for modification." + @ echo "Remove the above file and re-run this command if you want to create a new custom configuration from scratch for this payload/board." + @ echo +endif + @ cp -f $(UCLIBC_SRC_DIR)/.config $(PACKAGE_DIR)/uclibc/conf/customconfig--$(PAYLOAD)--$(UCLIBC_ARCH)--$(COREBOOT_VENDOR)-$(COREBOOT_BOARD) + @ echo "Your custom uclibc config file has been saved as $(PACKAGE_DIR)/uclibc/conf/customconfig--$(PAYLOAD)--$(UCLIBC_ARCH)--$(COREBOOT_VENDOR)-$(COREBOOT_BOARD)." + @ echo +else + @ echo "Your payload does not require uclibc." +endif Modified: buildrom-devel/packages/unifdef/unifdef.mk =================================================================== --- buildrom-devel/packages/unifdef/unifdef.mk 2008-02-07 15:54:34 UTC (rev 108) +++ buildrom-devel/packages/unifdef/unifdef.mk 2008-02-07 17:41:01 UTC (rev 109) @@ -17,7 +17,7 @@ @ mkdir -p $(SOURCE_DIR) @ wget -P $(SOURCE_DIR) $(UNIFDEF_URL)/$(UNIFDEF_SOURCE) -$(UNIFDEF_STAMP_DIR)/.unpacked: $(SOURCE_DIR)/$(UNIFDEF_SOURCE) +$(UNIFDEF_STAMP_DIR)/.unpacked: $(SOURCE_DIR)/$(UNIFDEF_SOURCE) | $(UNIFDEF_STAMP_DIR) @ tar -C $(UNIFDEF_DIR) -zxf $(SOURCE_DIR)/$(UNIFDEF_SOURCE) @ rm -f $(UNIFDEF_SRC_DIR)/unifdef @ rm -f $(UNIFDEF_SRC_DIR)/unifdef.o @@ -49,3 +49,5 @@ echo "" .PHONY: unifdef + +unifdef-extract: $(UNIFDEF_STAMP_DIR)/.unpacked

1 0

v3 defconfig
by Myles Watson 07 Feb '08

07 Feb '08

This patch adds support for make defconfig in v3. Those that port v3 to a board should add a defconfig in mainboard/vendor/board/defconfig. I think that the defconfig should: 1. Use the ROM size that comes with the board 2. Enable compression 3. Not include a payload This will make it easy for buildrom or anyone who wants to build it manually to use lar to add their payloads. It also allows buildrom to keep the configs in the coreboot tree. The patch also adds mainboard/emulation/qemu-x86/defconfig Should we change v2 to use the same naming? It would be nice not to have one be qemu-i386 and one qemu-x86. Myles Signed-off-by: Myles Watson <myles(a)pel.cs.byu.edu>

2 2

← Newer
1
...
31
32
33
34
35
36
37
...
43
Older →

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 February 2008