r96 - in buildrom-devel: . config/platforms packages/linuxbios packages/linuxbiosv3 scripts
Author: jcrouse Date: 2008-01-18 17:57:20 +0100 (Fri, 18 Jan 2008) New Revision: 96
Modified: buildrom-devel/Config.in buildrom-devel/Makefile buildrom-devel/README buildrom-devel/config/platforms/Config.in buildrom-devel/config/platforms/alix1c.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-s2882.conf buildrom-devel/config/platforms/tyan-s2891.conf buildrom-devel/packages/linuxbios/alix1c-linuxbios.mk buildrom-devel/packages/linuxbios/ga-2761gxdk-linuxbios.mk buildrom-devel/packages/linuxbios/generic-linuxbios.mk buildrom-devel/packages/linuxbios/linuxbios.inc buildrom-devel/packages/linuxbios/m57sli-linuxbios.mk buildrom-devel/packages/linuxbios/msm800sev-linuxbios.mk buildrom-devel/packages/linuxbios/norwich-linuxbios.mk buildrom-devel/packages/linuxbios/optionroms.inc buildrom-devel/packages/linuxbios/qemu.mk buildrom-devel/packages/linuxbios/serengeti_cheetah.mk buildrom-devel/packages/linuxbios/supermicro-h8dmr-linuxbios.mk buildrom-devel/packages/linuxbios/tyan-s2882-linuxbios.mk buildrom-devel/packages/linuxbios/tyan-s2891-linuxbios.mk buildrom-devel/packages/linuxbiosv3/linuxbiosv3.mk buildrom-devel/scripts/defconfig Log: [BUILDROM] rename LinuxBIOS to coreboot
Rename linuxBIOS to coreboot and fix it so the naming is consistant between v2 and v3.
Signed-off-by: Jordan Crouse jordan.crouse@amd.com Acked-by: Stefan Reinauer stepan@coresystems.de Acked-by: Uwe Hermann uwe@hermann-uwe.de
Modified: buildrom-devel/Config.in =================================================================== --- buildrom-devel/Config.in 2008-01-11 22:53:36 UTC (rev 95) +++ buildrom-devel/Config.in 2008-01-18 16:57:20 UTC (rev 96) @@ -45,24 +45,24 @@ endmenu
-menu "LinuxBIOS configuration" +menu "coreboot configuration"
choice - prompt "LinuxBIOS Version" - default LINUXBIOS_V2 + prompt "coreboot version" + default COREBOOT_V2
-config LINUXBIOS_V2 - bool "LinuxBIOS v2" +config COREBOOT_V2 + bool "coreboot v2" help - Select this option to build a .rom based on the LinuxBIOS + Select this option to build a .rom based on the coreboot v2 code. The v2 code is far more stable, and supports many different platforms.
-config LINUXBIOS_V3 - bool "LinuxBIOS v3" +config COREBOOT_V3 + bool "coreboot v3" depends EXPERIMENTAL help - Select this option to build a LinuxBIOS v3 based ROM. This + Select this option to build a coreboot v3 based ROM. This is experimental, and only supports a few platforms. endchoice
@@ -76,30 +76,30 @@ Precompress the payload with LZMA. This doesn't work for FILO, OFW, or ETHERBOOT.
-config LB_USE_BUILD - bool "Specify a LinuxBIOS build dir" +config CB_USE_BUILD + bool "Specify a coreboot build dir" depends ADVANCED default n help Say 'y' here to specify an existing directory to build - LinuxBIOS from - this is useful if you have local development + coreboot from - this is useful if you have local development tree you wish to work from
-config LB_BUILDDIR - string "LinuxBIOS build directory" - depends LB_USE_BUILD +config CB_BUILDDIR + string "coreboot build directory" + depends CB_USE_BUILD
-config LB_CUSTOM_REV - bool "Override the platform LinuxBIOS revision" - depends ADVANCED && !LB_USE_BUILD +config CB_CUSTOM_REV + bool "Override the platform coreboot revision" + depends ADVANCED && !CB_USE_BUILD default n help - Say 'y' here to overide the default LinuxBIOS SVN revsion + Say 'y' here to overide the default coreboot SVN revsion from the platform configuration
-config LB_REVISION - string "LinuxBIOS revision" - depends LB_CUSTOM_REV +config CB_REVISION + string "coreboot revision" + depends CB_CUSTOM_REV
endmenu
Modified: buildrom-devel/Makefile =================================================================== --- buildrom-devel/Makefile 2008-01-11 22:53:36 UTC (rev 95) +++ buildrom-devel/Makefile 2008-01-18 16:57:20 UTC (rev 96) @@ -46,15 +46,15 @@ TARGET_ROM ?= linuxbios.rom TARGET_ROM_FILE=$(OUTPUT_DIR)/$(TARGET_ROM)
-# Choose the version of LinuxBIOS to build - this might be better +# Choose the version of coreboot to build - this might be better # elsewhere, but what the heck - its easy.
-LINUXBIOS-$(CONFIG_LINUXBIOS_V2) = linuxbios -LINUXBIOS-$(CONFIG_LINUXBIOS_V3) = linuxbiosv3 roms +COREBOOT-$(CONFIG_COREBOOT_V2) = coreboot +COREBOOT-$(CONFIG_COREBOOT_V3) = coreboot-v3 roms
# Construct the list of packages we will be building
-PKGLIST = $(LINUXBIOS-y) $(PAYLOAD-y) $(HOSTTOOLS-y) +PKGLIST = $(COREBOOT-y) $(PAYLOAD-y) $(HOSTTOOLS-y)
# Construct the various targets
@@ -62,14 +62,14 @@ PKG_distclean=$(patsubst %, %-distclean, $(PKGLIST))
# This is the top level target - for v2, the final deliverable is built -# by LinuxBIOS, for v3 it is built by us, so we have ifdef magic here +# by coreboot, for v3 it is built by us, so we have ifdef magic here
-ifeq ($(CONFIG_LINUXBIOS_V2),y) -rom: $(HOSTTOOLS-y) payload $(LINUXBIOS-y) +ifeq ($(CONFIG_COREBOOT_V2),y) +rom: $(HOSTTOOLS-y) payload $(COREBOOT-y) else
-rom: $(HOSTTOOLS-y) payload $(LINUXBIOS-y) - @ cp $(LBV3_OUTPUT) $(TARGET_ROM_FILE) +rom: $(HOSTTOOLS-y) payload $(COREBOOT-y) + @ cp $(CBV3_OUTPUT) $(TARGET_ROM_FILE) @ $(STAGING_DIR)/bin/lar -a $(TARGET_ROM_FILE) $(PAYLOAD_TARGET):normal/payload @ for file in `ls $(ROM_DIR)`; do \ $(STAGING_DIR)/bin/lar -a $(TARGET_ROM_FILE) $(ROM_DIR)/$$file:$$file; \ @@ -96,14 +96,14 @@
MKTARGETS:= $(shell ls $(PACKAGE_DIR)/*/*.mk)
-include $(filter-out $(PACKAGE_DIR)/kernel/% $(PACKAGE_DIR)/linuxbios/% $(PACKAGE_DIR)/linuxbiosv3/%,$(MKTARGETS)) +include $(filter-out $(PACKAGE_DIR)/kernel/% $(PACKAGE_DIR)/coreboot-v2/% $(PACKAGE_DIR)/coreboot-v3/%,$(MKTARGETS))
include $(KERNEL_MK)
-ifeq ($(CONFIG_LINUXBIOS_V2),y) -include $(LBV2_MK) +ifeq ($(CONFIG_COREBOOT_V2),y) +include $(CBV2_MK) else -include $(PACKAGE_DIR)/linuxbiosv3/linuxbiosv3.mk +include $(PACKAGE_DIR)/coreboot-v3/coreboot-v3.mk endif
endif
Modified: buildrom-devel/README =================================================================== --- buildrom-devel/README 2008-01-11 22:53:36 UTC (rev 95) +++ buildrom-devel/README 2008-01-18 16:57:20 UTC (rev 96) @@ -6,10 +6,10 @@ Introduction
This is a simple makefile system that designed to build a ROM image for -LinuxBIOS based systems. This system allows one to choose one of several -different payloads for a variety of platforms. The intention of buildROM -is to build everything together with one step, rather then the 6 or 8 -individual steps that it would have taken previously. +coreboot (formally LinuxBIOS) based systems. This system allows one to +choose one of several different payloads for a variety of platforms. +The intention of buildROM is to build everything together with one step, +rather then the 6 or 8 individual steps that it would have taken previously.
Payloads
@@ -30,11 +30,11 @@
CONFIG_VERBOSE - show build output on stdout instead of a log file CONFIG_ADVANCED - select some advanced options: - CONFIG_USE_LZMA - Compress payloads with LZMA (requires LB support) - CONFIG_LB_USE_BUILD - Say 'y' here to specify an existing build - directory for LinuxBIOS. This is useful if you + CONFIG_USE_LZMA - Compress payloads with LZMA (requires coreboot support) + CONFIG_CB_USE_BUILD - Say 'y' here to specify an existing build + directory for coreboot. This is useful if you want build out of your development tree. - CONFIG_LB_BUILDDIR - Specify your remote LinuxBIOS build directory here + CONFIG_CB_BUILDDIR - Specify your remote coreboot build directory here
Some of the payload options have their own configuration:
Modified: buildrom-devel/config/platforms/Config.in =================================================================== --- buildrom-devel/config/platforms/Config.in 2008-01-11 22:53:36 UTC (rev 95) +++ buildrom-devel/config/platforms/Config.in 2008-01-18 16:57:20 UTC (rev 96) @@ -17,7 +17,7 @@
config VENDOR_GIGABYTE bool "GIGABYTE" - depends LINUXBIOS_V2 + depends COREBOOT_V2
config VENDOR_PC_ENGINES bool "PC Engines" @@ -27,11 +27,11 @@
config VENDOR_SUPERMICRO bool "Supermicro" - depends LINUXBIOS_V2 + depends COREBOOT_V2
config VENDOR_TYAN bool "Tyan" - depends LINUXBIOS_V2 + depends COREBOOT_V2
endchoice
@@ -64,34 +64,34 @@ config PLATFORM_DB800 bool "AMD DB800" depends VENDOR_AMD - depends LINUXBIOS_V2 + depends COREBOOT_V2 select PLATFORM
config PLATFORM_GA_M57SLI_S4 bool "GIGABYTE GA-M57SLI-S4" depends VENDOR_GIGABYTE - depends LINUXBIOS_V2 + depends COREBOOT_V2 select PLATFORM select PLATFORM_SUPPORT_64BIT
config PLATFORM_GA_2761GXDK bool "GIGABYTE GA-2761GXDK" depends VENDOR_GIGABYTE - depends LINUXBIOS_V2 + depends COREBOOT_V2 select PLATFORM select PLATFORM_SUPPORT_64BIT
config PLATFORM_TYAN_S2882 bool "Tyan S2882" depends VENDOR_TYAN - depends LINUXBIOS_V2 + depends COREBOOT_V2 select PLATFORM select PLATFORM_SUPPORT_64BIT
config PLATFORM_TYAN_S2891 bool "Tyan S2891" depends VENDOR_TYAN - depends LINUXBIOS_V2 + depends COREBOOT_V2 select PLATFORM select PLATFORM_SUPPORT_64BIT
@@ -103,21 +103,21 @@ config PLATFORM_SERENGETI_CHEETAH bool "AMD Serengeti-Cheetah" depends VENDOR_AMD - depends LINUXBIOS_V2 + depends COREBOOT_V2 select PLATFORM select PLATFORM_SUPPORT_64BIT
config PLATFORM_SUPERMICRO_H8DMR bool "Supermicro H8DMR" depends VENDOR_SUPERMICRO - depends LINUXBIOS_V2 + depends COREBOOT_V2 select PLATFORM select PLATFORM_SUPPORT_64BIT
config PLATFORM_CHEETAH_FAM10 bool "AMD Serengeti-Cheetah with fam10 processor" depends VENDOR_AMD - depends LINUXBIOS_V2 + depends COREBOOT_V2 select PLATFORM select PLATFORM_SUPPORT_64BIT endchoice
Modified: buildrom-devel/config/platforms/alix1c.conf =================================================================== --- buildrom-devel/config/platforms/alix1c.conf 2008-01-11 22:53:36 UTC (rev 95) +++ buildrom-devel/config/platforms/alix1c.conf 2008-01-18 16:57:20 UTC (rev 96) @@ -12,7 +12,7 @@ # Targets
KERNEL_MK=$(PACKAGE_DIR)/kernel/alix1c-kernel.mk -LBV2_MK=$(PACKAGE_DIR)/linuxbios/alix1c-linuxbios.mk +CBV2_MK=$(PACKAGE_DIR)/coreboot-v2/alix1c.mk
# kernel configuration (for LAB)
@@ -23,14 +23,14 @@ # Etherboot configuration ETHERBOOT_ARCH=i386
-# LinuxBIOS configuration +# coreboot configuration
-LINUXBIOS_VENDOR=pcengines -LINUXBIOS_BOARD=alix1c -LBV2_CONFIG=Config.lb -LBV2_TDIR=alix1c -LBV2_TAG=3047 -LINUXBIOS_ROM_NAME=linuxbios.rom +COREBOOT_VENDOR=pcengines +COREBOOT_BOARD=alix1c +CBV2_CONFIG=Config.lb +CBV2_TDIR=alix1c +CBV2_TAG=3047 +COREBOOT_ROM_NAME=linuxbios.rom
# FILO configuration
Modified: buildrom-devel/config/platforms/db800.conf =================================================================== --- buildrom-devel/config/platforms/db800.conf 2008-01-11 22:53:36 UTC (rev 95) +++ buildrom-devel/config/platforms/db800.conf 2008-01-18 16:57:20 UTC (rev 96) @@ -14,7 +14,7 @@ # Use the same settings as the Norwich platform
KERNEL_MK=$(PACKAGE_DIR)/kernel/norwich-kernel.mk -LBV2_MK=$(PACKAGE_DIR)/linuxbios/norwich-linuxbios.mk +CBV2_MK=$(PACKAGE_DIR)/coreboot-v2/norwich.mk
# kernel configuration (for LAB) # Use the same settings as the Norwich platform @@ -26,14 +26,14 @@ # Etherboot configuration ETHERBOOT_ARCH=i386
-# LinuxBIOS configuration +# coreboot configuration
-LINUXBIOS_VENDOR=amd -LINUXBIOS_BOARD=db800 -LBV2_CONFIG=Config.lb -LBV2_TDIR=db800 -LBV2_TAG=2810 -LINUXBIOS_ROM_NAME=db800.rom +COREBOOT_VENDOR=amd +COREBOOT_BOARD=db800 +CBV2_CONFIG=Config.lb +CBV2_TDIR=db800 +CBV2_TAG=2810 +COREBOOT_ROM_NAME=db800.rom
# FILO configuration # Use a new FILO config for the DB800 to autoload an image
Modified: buildrom-devel/config/platforms/dbe61.conf =================================================================== --- buildrom-devel/config/platforms/dbe61.conf 2008-01-11 22:53:36 UTC (rev 95) +++ buildrom-devel/config/platforms/dbe61.conf 2008-01-18 16:57:20 UTC (rev 96) @@ -14,7 +14,7 @@ # Targets
KERNEL_MK=$(PACKAGE_DIR)/kernel/norwich-kernel.mk -LBV2_MK=$(PACKAGE_DIR)/linuxbios/norwich-linuxbios.mk +CBV2_MK=$(PACKAGE_DIR)/coreboot-v2/norwich.mk
# kernel configuration (for LAB)
@@ -25,14 +25,14 @@ # Etherboot configuration ETHERBOOT_ARCH=i386
-# LinuxBIOS configuration +# coreboot configuration
-LINUXBIOS_VENDOR=artecgroup -LINUXBIOS_BOARD=dbe61 -LBV2_CONFIG=Config.lb -LBV2_TDIR=dbe61 -LBV2_TAG=2728 -LINUXBIOS_ROM_NAME=dbe61.rom +COREBOOT_VENDOR=artecgroup +COREBOOT_BOARD=dbe61 +CBV2_CONFIG=Config.lb +CBV2_TDIR=dbe61 +CBV2_TAG=2728 +COREBOOT_ROM_NAME=dbe61.rom
# FILO configuration
Modified: buildrom-devel/config/platforms/ga-2761gxdk.conf =================================================================== --- buildrom-devel/config/platforms/ga-2761gxdk.conf 2008-01-11 22:53:36 UTC (rev 95) +++ buildrom-devel/config/platforms/ga-2761gxdk.conf 2008-01-18 16:57:20 UTC (rev 96) @@ -18,7 +18,7 @@
# Disable for now - I don't know the right kernel for this platform #KERNEL_MK=$(PACKAGE_DIR)/kernel/ -LBV2_MK=$(PACKAGE_DIR)/linuxbios/ga-2761gxdk-linuxbios.mk +CBV2_MK=$(PACKAGE_DIR)/coreboot-v2/ga-2761gxdk.mk
# kernel configuration (for LAB)
@@ -30,14 +30,14 @@ # Etherboot configuration ETHERBOOT_ARCH=i386
-# LinuxBIOS configuration +# coreboot configuration
-LINUXBIOS_VENDOR=gigabyte -LINUXBIOS_BOARD=ga_2761gxdk -LBV2_CONFIG=Config.lb -LBV2_TDIR=ga_2761gxdk -LBV2_TAG=2908 -LINUXBIOS_ROM_NAME=linuxbios.rom +COREBOOT_VENDOR=gigabyte +COREBOOT_BOARD=ga_2761gxdk +CBV2_CONFIG=Config.lb +CBV2_TDIR=ga_2761gxdk +CBV2_TAG=2908 +COREBOOT_ROM_NAME=linuxbios.rom
# FILO configuration
Modified: buildrom-devel/config/platforms/m57sli.conf =================================================================== --- buildrom-devel/config/platforms/m57sli.conf 2008-01-11 22:53:36 UTC (rev 95) +++ buildrom-devel/config/platforms/m57sli.conf 2008-01-18 16:57:20 UTC (rev 96) @@ -17,7 +17,7 @@ # Targets
KERNEL_MK=$(PACKAGE_DIR)/kernel/m57sli-kernel.mk -LBV2_MK=$(PACKAGE_DIR)/linuxbios/m57sli-linuxbios.mk +CBV2_MK=$(PACKAGE_DIR)/coreboot-v2/m57sli.mk
# kernel configuration (for LAB)
@@ -34,14 +34,14 @@ # Etherboot configuration ETHERBOOT_ARCH=i386
-# LinuxBIOS configuration +# coreboot configuration
-LINUXBIOS_VENDOR=gigabyte -LINUXBIOS_BOARD=m57sli -LBV2_CONFIG=Config.lb -LBV2_TDIR=m57sli -LBV2_TAG=2958 -LINUXBIOS_ROM_NAME=linuxbios.rom +COREBOOT_VENDOR=gigabyte +COREBOOT_BOARD=m57sli +CBV2_CONFIG=Config.lb +CBV2_TDIR=m57sli +CBV2_TAG=2958 +COREBOOT_ROM_NAME=linuxbios.rom
# FILO configuration
Modified: buildrom-devel/config/platforms/msm800sev.conf =================================================================== --- buildrom-devel/config/platforms/msm800sev.conf 2008-01-11 22:53:36 UTC (rev 95) +++ buildrom-devel/config/platforms/msm800sev.conf 2008-01-18 16:57:20 UTC (rev 96) @@ -13,7 +13,7 @@ # Targets
KERNEL_MK=$(PACKAGE_DIR)/kernel/msm800sev-kernel.mk -LBV2_MK=$(PACKAGE_DIR)/linuxbios/msm800sev-linuxbios.mk +CBV2_MK=$(PACKAGE_DIR)/coreboot-v2/msm800sev.mk
# kernel configuration (for LAB)
@@ -24,14 +24,14 @@ # Etherboot configuration ETHERBOOT_ARCH=i386
-# LinuxBIOS configuration +# coreboot configuration
-LINUXBIOS_VENDOR=digitallogic -LINUXBIOS_BOARD=msm800sev -LBV2_CONFIG=Config.lb -LBV2_TDIR=msm800sev -LBV2_TAG=3047 -LINUXBIOS_ROM_NAME=linuxbios.rom +COREBOOT_VENDOR=digitallogic +COREBOOT_BOARD=msm800sev +CBV2_CONFIG=Config.lb +CBV2_TDIR=msm800sev +CBV2_TAG=3047 +COREBOOT_ROM_NAME=linuxbios.rom
# FILO configuration
Modified: buildrom-devel/config/platforms/norwich.conf =================================================================== --- buildrom-devel/config/platforms/norwich.conf 2008-01-11 22:53:36 UTC (rev 95) +++ buildrom-devel/config/platforms/norwich.conf 2008-01-18 16:57:20 UTC (rev 96) @@ -13,7 +13,7 @@ # Targets
KERNEL_MK=$(PACKAGE_DIR)/kernel/norwich-kernel.mk -LBV2_MK=$(PACKAGE_DIR)/linuxbios/norwich-linuxbios.mk +CBV2_MK=$(PACKAGE_DIR)/coreboot-v2/norwich.mk
# kernel configuration (for LAB)
@@ -24,14 +24,14 @@ # Etherboot configuration ETHERBOOT_ARCH=i386
-# LinuxBIOS configuration +# coreboot configuration
-LINUXBIOS_VENDOR=amd -LINUXBIOS_BOARD=norwich -LBV2_CONFIG=Config.lb -LBV2_TDIR=norwich -LBV2_TAG=2810 -LINUXBIOS_ROM_NAME=norwich.rom +COREBOOT_VENDOR=amd +COREBOOT_BOARD=norwich +CBV2_CONFIG=Config.lb +CBV2_TDIR=norwich +CBV2_TAG=2810 +COREBOOT_ROM_NAME=norwich.rom
# FILO configuration
Modified: buildrom-devel/config/platforms/platforms.conf =================================================================== --- buildrom-devel/config/platforms/platforms.conf 2008-01-11 22:53:36 UTC (rev 95) +++ buildrom-devel/config/platforms/platforms.conf 2008-01-18 16:57:20 UTC (rev 96) @@ -1,7 +1,7 @@ # This will include the correct configuration for the # selected platform
-LBV2_MK=$(PACKAGE_DIR)/linuxbios/generic-linuxbios.mk +CBV2_MK=$(PACKAGE_DIR)/coreboot-v2/generic.mk
##Include the correct platform configuration
Modified: buildrom-devel/config/platforms/qemu.conf =================================================================== --- buildrom-devel/config/platforms/qemu.conf 2008-01-11 22:53:36 UTC (rev 95) +++ buildrom-devel/config/platforms/qemu.conf 2008-01-18 16:57:20 UTC (rev 96) @@ -12,7 +12,7 @@ # Targets
KERNEL_MK=$(PACKAGE_DIR)/kernel/qemu-kernel.mk -LBV2_MK=$(PACKAGE_DIR)/linuxbios/qemu.mk +CBV2_MK=$(PACKAGE_DIR)/coreboot-v2/qemu.mk
# kernel configuration (for LAB)
@@ -23,19 +23,19 @@ # Etherboot configuration ETHERBOOT_ARCH=i386
-# LinuxBIOSv2 configuration -LBV2_TAG=2950 -LBV2_CONFIG=Config.lb -LINUXBIOS_ROM_NAME=qemu.rom +# coreboot-v2 configuration +CBV2_TAG=2950 +CBV2_CONFIG=Config.lb +COREBOOT_ROM_NAME=qemu.rom +CBV2_TDIR=qemu-i386
-# LinuxBIOS v3 configuration -LBV3_CONFIG=qemu-i386-defconfig -LBV3_TAG=HEAD -LBV3_ROM_NAME=linuxbios.rom +# coreboot v3 configuration +CBV3_CONFIG=qemu-i386-defconfig +CBV3_TAG=HEAD +CBV3_ROM_NAME=linuxbios.rom
-LINUXBIOS_VENDOR=emulation -LINUXBIOS_BOARD=qemu-i386 -LBV2_TDIR=qemu-i386 +COREBOOT_VENDOR=emulation +COREBOOT_BOARD=qemu-i386
# FILO configuration
Modified: buildrom-devel/config/platforms/serengeti_cheetah.conf =================================================================== --- buildrom-devel/config/platforms/serengeti_cheetah.conf 2008-01-11 22:53:36 UTC (rev 95) +++ buildrom-devel/config/platforms/serengeti_cheetah.conf 2008-01-18 16:57:20 UTC (rev 96) @@ -18,7 +18,7 @@ # Targets
KERNEL_MK=$(PACKAGE_DIR)/kernel/serengeti_cheetah-kernel.mk -LBV2_MK=$(PACKAGE_DIR)/linuxbios/serengeti_cheetah.mk +CBV2_MK=$(PACKAGE_DIR)/coreboot-v2/serengeti_cheetah.mk
# kernel configuration (for LAB)
@@ -40,22 +40,22 @@ # Etherboot configuration ETHERBOOT_ARCH=i386
-# LinuxBIOS configuration +# coreboot configuration
-LINUXBIOS_VENDOR=amd -LBV2_CONFIG=Config.lb +COREBOOT_VENDOR=amd +CBV2_CONFIG=Config.lb
ifeq ($(CONFIG_PLATFORM_CHEETAH_FAM10),y) -LINUXBIOS_BOARD=serengeti_cheetah_fam10 -LBV2_TDIR=serengeti_cheetah_fam10 -LBV2_TAG=3018 -LINUXBIOS_ROM_NAME=amd-cheetah-fam10.rom +COREBOOT_BOARD=serengeti_cheetah_fam10 +CBV2_TDIR=serengeti_cheetah_fam10 +CBV2_TAG=3018 +COREBOOT_ROM_NAME=amd-cheetah-fam10.rom else -LINUXBIOS_BOARD=serengeti_cheetah -LBV2_CONFIG=Config.lb -LBV2_TDIR=serengeti_cheetah -LBV2_TAG=2950 -LINUXBIOS_ROM_NAME=serengeti_cheetah.rom +COREBOOT_BOARD=serengeti_cheetah +CBV2_CONFIG=Config.lb +CBV2_TDIR=serengeti_cheetah +CBV2_TAG=2950 +COREBOOT_ROM_NAME=serengeti_cheetah.rom endif
# FILO configuration
Modified: buildrom-devel/config/platforms/supermicro-h8dmr.conf =================================================================== --- buildrom-devel/config/platforms/supermicro-h8dmr.conf 2008-01-11 22:53:36 UTC (rev 95) +++ buildrom-devel/config/platforms/supermicro-h8dmr.conf 2008-01-18 16:57:20 UTC (rev 96) @@ -17,7 +17,7 @@ # Targets
KERNEL_MK=$(PACKAGE_DIR)/kernel/supermicro-h8dmr-kernel.mk -LBV2_MK=$(PACKAGE_DIR)/linuxbios/supermicro-h8dmr-linuxbios.mk +CBV2_MK=$(PACKAGE_DIR)/coreboot-v2/supermicro-h8dmr.mk
# kernel configuration (for LAB)
@@ -34,14 +34,14 @@ # Etherboot configuration ETHERBOOT_ARCH=i386
-# LinuxBIOS configuration +# coreboot configuration
-LINUXBIOS_VENDOR=supermicro -LINUXBIOS_BOARD=h8dmr -LBV2_CONFIG=Config.lb -LBV2_TDIR=h8dmr -LBV2_TAG=2996 -LINUXBIOS_ROM_NAME=linuxbios.rom +COREBOOT_VENDOR=supermicro +COREBOOT_BOARD=h8dmr +CBV2_CONFIG=Config.lb +CBV2_TDIR=h8dmr +CBV2_TAG=2996 +COREBOOT_ROM_NAME=linuxbios.rom
# FILO configuration
Modified: buildrom-devel/config/platforms/tyan-s2882.conf =================================================================== --- buildrom-devel/config/platforms/tyan-s2882.conf 2008-01-11 22:53:36 UTC (rev 95) +++ buildrom-devel/config/platforms/tyan-s2882.conf 2008-01-18 16:57:20 UTC (rev 96) @@ -17,7 +17,7 @@ # Targets
KERNEL_MK=$(PACKAGE_DIR)/kernel/tyan-s2882-kernel.mk -LBV2_MK=$(PACKAGE_DIR)/linuxbios/tyan-s2882-linuxbios.mk +CBV2_MK=$(PACKAGE_DIR)/coreboot-v2/tyan-s2882.mk
# kernel configuration (for LAB)
@@ -34,14 +34,14 @@ # Etherboot configuration ETHERBOOT_ARCH=i386
-# LinuxBIOS configuration +# coreboot configuration
-LINUXBIOS_VENDOR=tyan -LINUXBIOS_BOARD=s2882 -LBV2_CONFIG=Config.lb -LBV2_TDIR=s2882 -LBV2_TAG=2887 -LINUXBIOS_ROM_NAME=linuxbios.rom +COREBOOT_VENDOR=tyan +COREBOOT_BOARD=s2882 +CBV2_CONFIG=Config.lb +CBV2_TDIR=s2882 +CBV2_TAG=2887 +COREBOOT_ROM_NAME=linuxbios.rom
# FILO configuration
Modified: buildrom-devel/config/platforms/tyan-s2891.conf =================================================================== --- buildrom-devel/config/platforms/tyan-s2891.conf 2008-01-11 22:53:36 UTC (rev 95) +++ buildrom-devel/config/platforms/tyan-s2891.conf 2008-01-18 16:57:20 UTC (rev 96) @@ -17,7 +17,7 @@ # Targets
KERNEL_MK=$(PACKAGE_DIR)/kernel/tyan-s2891-kernel.mk -LBV2_MK=$(PACKAGE_DIR)/linuxbios/tyan-s2891-linuxbios.mk +CBV2_MK=$(PACKAGE_DIR)/coreboot-v2/tyan-s2891.mk
# kernel configuration (for LAB)
@@ -34,14 +34,14 @@ # Etherboot configuration ETHERBOOT_ARCH=i386
-# LinuxBIOS configuration +# coreboot configuration
-LINUXBIOS_VENDOR=tyan -LINUXBIOS_BOARD=s2891 -LBV2_CONFIG=Config.lb -LBV2_TDIR=s2891 -LBV2_TAG=2792 -LINUXBIOS_ROM_NAME=linuxbios.rom +COREBOOT_VENDOR=tyan +COREBOOT_BOARD=s2891 +CBV2_CONFIG=Config.lb +CBV2_TDIR=s2891 +CBV2_TAG=2792 +COREBOOT_ROM_NAME=linuxbios.rom
# FILO configuration
Modified: buildrom-devel/packages/linuxbios/alix1c-linuxbios.mk =================================================================== --- buildrom-devel/packages/linuxbios/alix1c-linuxbios.mk 2008-01-11 22:53:36 UTC (rev 95) +++ buildrom-devel/packages/linuxbios/alix1c-linuxbios.mk 2008-01-18 16:57:20 UTC (rev 96) @@ -1,38 +1,38 @@ -# This is the Generic LinuxBIOS target +# This is the Generic coreboot target
ifeq ($(CONFIG_PLATFORM),y) -ifeq ($(LBV2_TAG),) +ifeq ($(CBV2_TAG),) $(error You need to specify a version to pull in your platform config) endif endif
-LBV2_BASE_DIR=svn -LBV2_URL=svn://openbios.org/repos/trunk/LinuxBIOSv2 -LBV2_TARBALL=linuxbios-svn-$(LBV2_TAG).tar.gz -LBV2_PAYLOAD_TARGET=$(LBV2_BUILD_DIR)/payload.elf +CBV2_BASE_DIR=svn +CBV2_URL=svn://coreboot.org/repos/trunk/coreboot-v2 +CBV2_TARBALL=coreboot-svn-$(CBV2_TAG).tar.gz +CBV2_PAYLOAD_TARGET=$(CBV2_BUILD_DIR)/payload.elf VSA_URL=http://www.amd.com/files/connectivitysolutions/geode/geode_lx/ -LBV2_VSA=lx_vsa.36k.bin -TARGET_ROM = $(LINUXBIOS_VENDOR)-$(LINUXBIOS_BOARD).rom +CBV2_VSA=lx_vsa.36k.bin +TARGET_ROM = $(COREBOOT_VENDOR)-$(COREBOOT_BOARD).rom
-include $(PACKAGE_DIR)/linuxbios/linuxbios.inc +include $(PACKAGE_DIR)/coreboot-v2/coreboot.inc
-$(SOURCE_DIR)/$(LBV2_VSA): +$(SOURCE_DIR)/$(CBV2_VSA): @ echo "Fetching the VSA code..." - wget -P $(SOURCE_DIR) $(VSA_URL)/$(LBV2_VSA).gz -O $@ + wget -P $(SOURCE_DIR) $(VSA_URL)/$(CBV2_VSA).gz -O $@
-$(SOURCE_DIR)/$(LBV2_TARBALL): - @ echo "Fetching the LinuxBIOS code..." - @ mkdir -p $(SOURCE_DIR)/linuxbios - @ $(BIN_DIR)/fetchsvn.sh $(LBV2_URL) $(SOURCE_DIR)/linuxbios \ - $(LBV2_TAG) $(SOURCE_DIR)/$(LBV2_TARBALL) \ - > $(LBV2_FETCH_LOG) 2>&1 +$(SOURCE_DIR)/$(CBV2_TARBALL): + @ echo "Fetching the coreboot code..." + @ mkdir -p $(SOURCE_DIR)/coreboot + @ $(BIN_DIR)/fetchsvn.sh $(CBV2_URL) $(SOURCE_DIR)/coreboot \ + $(CBV2_TAG) $(SOURCE_DIR)/$(CBV2_TARBALL) \ + > $(CBV2_FETCH_LOG) 2>&1
# Special rule - append the VSA
-$(OUTPUT_DIR)/$(TARGET_ROM): $(LBV2_OUTPUT) $(SOURCE_DIR)/$(LBV2_VSA) +$(OUTPUT_DIR)/$(TARGET_ROM): $(CBV2_OUTPUT) $(SOURCE_DIR)/$(CBV2_VSA) @ mkdir -p $(OUTPUT_DIR) - @ cat $(SOURCE_DIR)/$(LBV2_VSA) $(LBV2_OUTPUT) > $@ + @ cat $(SOURCE_DIR)/$(CBV2_VSA) $(CBV2_OUTPUT) > $@ -linuxbios: $(OUTPUT_DIR)/$(TARGET_ROM) -linuxbios-clean: generic-linuxbios-clean -linuxbios-distclean: generic-linuxbios-distclean +coreboot: $(OUTPUT_DIR)/$(TARGET_ROM) +coreboot-clean: generic-coreboot-clean +coreboot-distclean: generic-coreboot-distclean
Modified: buildrom-devel/packages/linuxbios/ga-2761gxdk-linuxbios.mk =================================================================== --- buildrom-devel/packages/linuxbios/ga-2761gxdk-linuxbios.mk 2008-01-11 22:53:36 UTC (rev 95) +++ buildrom-devel/packages/linuxbios/ga-2761gxdk-linuxbios.mk 2008-01-18 16:57:20 UTC (rev 96) @@ -1,38 +1,38 @@ -# This is the Generic LinuxBIOS target +# This is the Generic coreboot target
ifeq ($(CONFIG_PLATFORM),y) -ifeq ($(LBV2_TAG),) +ifeq ($(CBV2_TAG),) $(error You need to specify a version to pull in your platform config) endif endif
-LBV2_PATCHES=$(PACKAGE_DIR)/linuxbios/patches/2761gxdk-fix-target.patch +CBV2_PATCHES=$(PACKAGE_DIR)/coreboot-v2/patches/2761gxdk-fix-target.patch
-LBV2_BASE_DIR=svn -LBV2_URL=svn://linuxbios.org/repos/trunk/LinuxBIOSv2 -LBV2_TARBALL=linuxbios-svn-$(LBV2_TAG).tar.gz -LBV2_PAYLOAD_TARGET=$(LBV2_BUILD_DIR)/payload.elf -TARGET_ROM = $(LINUXBIOS_VENDOR)-$(LINUXBIOS_BOARD).rom +CBV2_BASE_DIR=svn +CBV2_URL=svn://coreboot.org/repos/trunk/coreboot-v2 +CBV2_TARBALL=coreboot-svn-$(CBV2_TAG).tar.gz +CBV2_PAYLOAD_TARGET=$(CBV2_BUILD_DIR)/payload.elf +TARGET_ROM = $(COREBOOT_VENDOR)-$(COREBOOT_BOARD).rom
-include $(PACKAGE_DIR)/linuxbios/linuxbios.inc +include $(PACKAGE_DIR)/coreboot-v2/coreboot.inc
# This matches the base name of the ROM on -# http://www.linuxbios.org/data/optionroms/ +# http://www.coreboot.org/data/optionroms/
OPTIONROM_ID = pci1039,6330 -include $(PACKAGE_DIR)/linuxbios/optionroms.inc +include $(PACKAGE_DIR)/coreboot-v2/optionroms.inc
-$(SOURCE_DIR)/$(LBV2_TARBALL): - @ echo "Fetching the LinuxBIOS code..." - @ mkdir -p $(SOURCE_DIR)/linuxbios - @ $(BIN_DIR)/fetchsvn.sh $(LBV2_URL) $(SOURCE_DIR)/linuxbios \ - $(LBV2_TAG) $(SOURCE_DIR)/$(LBV2_TARBALL) \ - > $(LBV2_FETCH_LOG) 2>&1 +$(SOURCE_DIR)/$(CBV2_TARBALL): + @ echo "Fetching the coreboot code..." + @ mkdir -p $(SOURCE_DIR)/coreboot + @ $(BIN_DIR)/fetchsvn.sh $(CBV2_URL) $(SOURCE_DIR)/coreboot \ + $(CBV2_TAG) $(SOURCE_DIR)/$(CBV2_TARBALL) \ + > $(CBV2_FETCH_LOG) 2>&1
-$(OUTPUT_DIR)/$(TARGET_ROM): $(LBV2_OUTPUT) $(SOURCE_DIR)/$(OPTIONROM_ID).rom +$(OUTPUT_DIR)/$(TARGET_ROM): $(CBV2_OUTPUT) $(SOURCE_DIR)/$(OPTIONROM_ID).rom @ mkdir -p $(OUTPUT_DIR) - @ cat $(SOURCE_DIR)/$(OPTIONROM_ID).rom $(LBV2_OUTPUT) > $@ + @ cat $(SOURCE_DIR)/$(OPTIONROM_ID).rom $(CBV2_OUTPUT) > $@
-linuxbios: $(OUTPUT_DIR)/$(TARGET_ROM) -linuxbios-clean: generic-linuxbios-clean -linuxbios-distclean: generic-linuxbios-distclean +coreboot: $(OUTPUT_DIR)/$(TARGET_ROM) +coreboot-clean: generic-coreboot-clean +coreboot-distclean: generic-coreboot-distclean
Modified: buildrom-devel/packages/linuxbios/generic-linuxbios.mk =================================================================== --- buildrom-devel/packages/linuxbios/generic-linuxbios.mk 2008-01-11 22:53:36 UTC (rev 95) +++ buildrom-devel/packages/linuxbios/generic-linuxbios.mk 2008-01-18 16:57:20 UTC (rev 96) @@ -1,42 +1,42 @@ -# This is the Generic LinuxBIOS target +# This is the Generic coreboot target
ifeq ($(CONFIG_PLATFORM),y) -ifeq ($(LBV2_TAG),) +ifeq ($(CBV2_TAG),) $(error You need to specify a version to pull in your platform config) endif endif
-LBV2_BASE_DIR=svn -LBV2_URL=svn://linuxbios.org/repos/trunk/LinuxBIOSv2 -LBV2_TARBALL=linuxbios-svn-$(LBV2_TAG).tar.gz -LBV2_PAYLOAD_TARGET=$(LBV2_BUILD_DIR)/payload.elf -TARGET_ROM = $(LINUXBIOS_VENDOR)-$(LINUXBIOS_BOARD).rom +CBV2_BASE_DIR=svn +CBV2_URL=svn://coreboot.org/repos/trunk/coreboot-v2 +CBV2_TARBALL=coreboot-svn-$(CBV2_TAG).tar.gz +CBV2_PAYLOAD_TARGET=$(CBV2_BUILD_DIR)/payload.elf +TARGET_ROM = $(COREBOOT_VENDOR)-$(COREBOOT_BOARD).rom
# This is the list of components that comprise the ROM (excluding the payload) -LBV2_COMPONENTS = $(LBV2_OUTPUT) +CBV2_COMPONENTS = $(CBV2_OUTPUT)
-include $(PACKAGE_DIR)/linuxbios/linuxbios.inc +include $(PACKAGE_DIR)/coreboot-v2/coreboot.inc
# If an optionrom was specified in the configuration, then use it
ifneq ($(OPTIONROM_ID),) -include $(PACKAGE_DIR)/linuxbios/optionroms.inc +include $(PACKAGE_DIR)/coreboot-v2/optionroms.inc
-# Add it to the front of the list so it is prepended to the LinuxBIOS output -LBV2_COMPONENTS = $(SOURCE_DIR)/$(OPTIONROM_ID).rom $(LBV2_COMPONENTS) +# 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) endif
-$(SOURCE_DIR)/$(LBV2_TARBALL): - @ echo "Fetching the LinuxBIOS code..." - @ mkdir -p $(SOURCE_DIR)/linuxbios - @ $(BIN_DIR)/fetchsvn.sh $(LBV2_URL) $(SOURCE_DIR)/linuxbios \ - $(LBV2_TAG) $(SOURCE_DIR)/$(LBV2_TARBALL) \ - > $(LBV2_FETCH_LOG) 2>&1 +$(SOURCE_DIR)/$(CBV2_TARBALL): + @ echo "Fetching the coreboot code..." + @ mkdir -p $(SOURCE_DIR)/coreboot + @ $(BIN_DIR)/fetchsvn.sh $(CBV2_URL) $(SOURCE_DIR)/coreboot \ + $(CBV2_TAG) $(SOURCE_DIR)/$(CBV2_TARBALL) \ + > $(CBV2_FETCH_LOG) 2>&1
-$(OUTPUT_DIR)/$(TARGET_ROM): $(LBV2_COMPONENTS) +$(OUTPUT_DIR)/$(TARGET_ROM): $(CBV2_COMPONENTS) @ mkdir -p $(OUTPUT_DIR) - @ cat $(LBV2_COMPONENTS) > $@ + @ cat $(CBV2_COMPONENTS) > $@
-linuxbios: $(OUTPUT_DIR)/$(TARGET_ROM) -linuxbios-clean: generic-linuxbios-clean -linuxbios-distclean: generic-linuxbios-distclean +coreboot: $(OUTPUT_DIR)/$(TARGET_ROM) +coreboot-clean: generic-coreboot-clean +coreboot-distclean: generic-coreboot-distclean
Modified: buildrom-devel/packages/linuxbios/linuxbios.inc =================================================================== --- buildrom-devel/packages/linuxbios/linuxbios.inc 2008-01-11 22:53:36 UTC (rev 95) +++ buildrom-devel/packages/linuxbios/linuxbios.inc 2008-01-18 16:57:20 UTC (rev 96) @@ -1,100 +1,100 @@ # This is the common code included by all the targets
ifeq ($(CONFIG_PLATFORM),y) -ifeq ($(LINUXBIOS_VENDOR),) -$(error No LinuxBIOS vendor specified) +ifeq ($(COREBOOT_VENDOR),) +$(error No coreboot vendor specified) endif -ifeq ($(LINUXBIOS_BOARD),) -$(error No LinuxBIOS board specified) +ifeq ($(COREBOOT_BOARD),) +$(error No coreboot board specified) endif -ifeq ($(LBV2_CONFIG),) -$(error No LinuxBIOS config specified) +ifeq ($(CBV2_CONFIG),) +$(error No coreboot config specified) endif -ifeq ($(LBV2_TDIR),) -$(error No LinuxBIOS TDIR specified) +ifeq ($(CBV2_TDIR),) +$(error No coreboot TDIR specified) endif endif
-LBV2_OUTPUT=$(LBV2_BUILD_DIR)/$(LINUXBIOS_ROM_NAME) -LBV2_DIR=$(BUILD_DIR)/linuxbios +CBV2_OUTPUT=$(CBV2_BUILD_DIR)/$(COREBOOT_ROM_NAME) +CBV2_DIR=$(BUILD_DIR)/coreboot
# If the user wanted to override the build directory - obey that now
-ifeq ($(CONFIG_LB_USE_BUILD),y) -LBV2_SRC_DIR=$(subst ",,$(CONFIG_LB_BUILDDIR)) +ifeq ($(CONFIG_CB_USE_BUILD),y) +CBV2_SRC_DIR=$(subst ",,$(CONFIG_CB_BUILDDIR)) else -LBV2_SRC_DIR=$(LBV2_DIR)/$(LBV2_BASE_DIR) +CBV2_SRC_DIR=$(CBV2_DIR)/$(CBV2_BASE_DIR) endif
-LBV2_TARGET_DIR=$(LBV2_SRC_DIR)/targets/ -LBV2_TARGET_NAME=$(LINUXBIOS_VENDOR)/$(LINUXBIOS_BOARD) -LBV2_CONFIG_NAME=$(LBV2_TARGET_NAME)/$(LBV2_CONFIG) +CBV2_TARGET_DIR=$(CBV2_SRC_DIR)/targets/ +CBV2_TARGET_NAME=$(COREBOOT_VENDOR)/$(COREBOOT_BOARD) +CBV2_CONFIG_NAME=$(CBV2_TARGET_NAME)/$(CBV2_CONFIG)
-LBV2_BUILD_DIR=$(LBV2_TARGET_DIR)/$(LBV2_TARGET_NAME)/$(LBV2_TDIR) +CBV2_BUILD_DIR=$(CBV2_TARGET_DIR)/$(CBV2_TARGET_NAME)/$(CBV2_TDIR)
-LBV2_STAMP_DIR=$(LBV2_DIR)/stamps -LBV2_LOG_DIR=$(LBV2_DIR)/logs +CBV2_STAMP_DIR=$(CBV2_DIR)/stamps +CBV2_LOG_DIR=$(CBV2_DIR)/logs
ifeq ($(CONFIG_VERBOSE),y) -LBV2_FETCH_LOG=/dev/stdout -LBV2_CONFIG_LOG=/dev/stdout -LBV2_BUILD_LOG=/dev/stdout -LBV2_INSTALL_LOG=/dev/stdout +CBV2_FETCH_LOG=/dev/stdout +CBV2_CONFIG_LOG=/dev/stdout +CBV2_BUILD_LOG=/dev/stdout +CBV2_INSTALL_LOG=/dev/stdout else -LBV2_FETCH_LOG=$(LBV2_LOG_DIR)/fetch.log -LBV2_BUILD_LOG=$(LBV2_LOG_DIR)/build.log -LBV2_CONFIG_LOG=$(LBV2_LOG_DIR)/config.log -LBV2_INSTALL_LOG=$(LBV2_LOG_DIR)/install.log +CBV2_FETCH_LOG=$(CBV2_LOG_DIR)/fetch.log +CBV2_BUILD_LOG=$(CBV2_LOG_DIR)/build.log +CBV2_CONFIG_LOG=$(CBV2_LOG_DIR)/config.log +CBV2_INSTALL_LOG=$(CBV2_LOG_DIR)/install.log endif
# This allows us to skip the unpack/patch/configure stage
-ifeq ($(CONFIG_LB_USE_BUILD),y) -LBV2_DIR_TARGET= +ifeq ($(CONFIG_CB_USE_BUILD),y) +CBV2_DIR_TARGET= else -LBV2_DIR_TARGET=$(LBV2_STAMP_DIR)/.configured +CBV2_DIR_TARGET=$(CBV2_STAMP_DIR)/.configured endif
-$(LBV2_PAYLOAD_TARGET): $(PAYLOAD_TARGET) +$(CBV2_PAYLOAD_TARGET): $(PAYLOAD_TARGET) @ cp $< $@
-$(LBV2_STAMP_DIR)/.unpacked: $(SOURCE_DIR)/$(LBV2_TARBALL) - @ echo "Unpacking LinuxBIOS..." - @ tar -C $(LBV2_DIR) -zxf $(SOURCE_DIR)/$(LBV2_TARBALL) +$(CBV2_STAMP_DIR)/.unpacked: $(SOURCE_DIR)/$(CBV2_TARBALL) + @ echo "Unpacking coreboot..." + @ tar -C $(CBV2_DIR) -zxf $(SOURCE_DIR)/$(CBV2_TARBALL) @ touch $@
-$(LBV2_STAMP_DIR)/.patched: $(LBV2_STAMP_DIR)/.unpacked - @ echo "Patching LinuxBIOS..." - @ $(BIN_DIR)/doquilt.sh $(LBV2_SRC_DIR) $(LBV2_PATCHES) +$(CBV2_STAMP_DIR)/.patched: $(CBV2_STAMP_DIR)/.unpacked + @ echo "Patching coreboot..." + @ $(BIN_DIR)/doquilt.sh $(CBV2_SRC_DIR) $(CBV2_PATCHES) @ touch $@
-$(LBV2_STAMP_DIR)/.configured: $(LBV2_STAMP_DIR)/.patched +$(CBV2_STAMP_DIR)/.configured: $(CBV2_STAMP_DIR)/.patched @ echo "Building target..." - @( cd $(LBV2_TARGET_DIR); \ - ./buildtarget $(LBV2_CONFIG_NAME) > $(LBV2_CONFIG_LOG) 2>&1) + @( cd $(CBV2_TARGET_DIR); \ + ./buildtarget $(CBV2_CONFIG_NAME) > $(CBV2_CONFIG_LOG) 2>&1) @ touch $@
-$(LBV2_STAMP_DIR) $(LBV2_LOG_DIR): +$(CBV2_STAMP_DIR) $(CBV2_LOG_DIR): @ mkdir -p $@
-$(LBV2_OUTPUT): $(LBV2_STAMP_DIR) $(LBV2_LOG_DIR) $(LBV2_DIR_TARGET) $(LBV2_PAYLOAD_TARGET) - @ echo "Building linuxbios..." +$(CBV2_OUTPUT): $(CBV2_STAMP_DIR) $(CBV2_LOG_DIR) $(CBV2_DIR_TARGET) $(CBV2_PAYLOAD_TARGET) + @ echo "Building coreboot..." @ (export CPU_OPT="$(STACKPROTECT)"; \ - make -C $(LBV2_BUILD_DIR) > $(LBV2_BUILD_LOG) 2>&1) + make -C $(CBV2_BUILD_DIR) > $(CBV2_BUILD_LOG) 2>&1)
-generic-linuxbios-clean: - @ echo "Cleaning linuxbios..." - @ rm -f $(LBV2_PAYLOAD_TARGET) - @ if [ -d $(LBV2_BUILD_DIR) ];then \ - $(MAKE) -C $(LBV2_BUILD_DIR) clean > /dev/null 2>&1; \ +generic-coreboot-clean: + @ echo "Cleaning coreboot..." + @ rm -f $(CBV2_PAYLOAD_TARGET) + @ if [ -d $(CBV2_BUILD_DIR) ];then \ + $(MAKE) -C $(CBV2_BUILD_DIR) clean > /dev/null 2>&1; \ fi - @ rm -f $(LBV2_OUTPUT) + @ rm -f $(CBV2_OUTPUT)
-generic-linuxbios-distclean: - @ if [ "$(CONFIG_LB_USE_BUILD)" = "y" ]; then \ - echo "Cleaning linuxbios build..."; \ - $(MAKE) -C $(LBV2_BUILD_DIR) clean > /dev/null 2>&1; \ - rm -f $(LBV2_OUTPUT); \ +generic-coreboot-distclean: + @ if [ "$(CONFIG_CB_USE_BUILD)" = "y" ]; then \ + echo "Cleaning coreboot build..."; \ + $(MAKE) -C $(CBV2_BUILD_DIR) clean > /dev/null 2>&1; \ + rm -f $(CBV2_OUTPUT); \ fi
- @ rm -rf $(LBV2_DIR)/* + @ rm -rf $(CBV2_DIR)/*
Modified: buildrom-devel/packages/linuxbios/m57sli-linuxbios.mk =================================================================== --- buildrom-devel/packages/linuxbios/m57sli-linuxbios.mk 2008-01-11 22:53:36 UTC (rev 95) +++ buildrom-devel/packages/linuxbios/m57sli-linuxbios.mk 2008-01-18 16:57:20 UTC (rev 96) @@ -1,49 +1,49 @@ -# This is the Generic LinuxBIOS target +# This is the Generic coreboot target
ifeq ($(CONFIG_PLATFORM),y) -ifeq ($(LBV2_TAG),) +ifeq ($(CBV2_TAG),) $(error You need to specify a version to pull in your platform config) endif endif
-LBV2_PATCHES= +CBV2_PATCHES=
ifeq ($(CONFIG_PAYLOAD_FILO),y) - LBV2_PATCHES += $(PACKAGE_DIR)/linuxbios/patches/m57sli-filo-and-etherboot-Config.lb.patch + CBV2_PATCHES += $(PACKAGE_DIR)/coreboot-v2/patches/m57sli-filo-and-etherboot-Config.lb.patch endif
ifeq ($(CONFIG_PAYLOAD_ETHERBOOT),y) - LBV2_PATCHES += $(PACKAGE_DIR)/linuxbios/patches/m57sli-filo-and-etherboot-Config.lb.patch + CBV2_PATCHES += $(PACKAGE_DIR)/coreboot-v2/patches/m57sli-filo-and-etherboot-Config.lb.patch endif
ifeq ($(CONFIG_PAYLOAD_KERNEL),y) - LBV2_PATCHES += $(PACKAGE_DIR)/linuxbios/patches/m57sli-kernel-and-lab-Config.lb.patch + CBV2_PATCHES += $(PACKAGE_DIR)/coreboot-v2/patches/m57sli-kernel-and-lab-Config.lb.patch endif
ifeq ($(CONFIG_PAYLOAD_LAB),y) - LBV2_PATCHES += $(PACKAGE_DIR)/linuxbios/patches/m57sli-kernel-and-lab-Config.lb.patch + CBV2_PATCHES += $(PACKAGE_DIR)/coreboot-v2/patches/m57sli-kernel-and-lab-Config.lb.patch endif
-LBV2_BASE_DIR=svn -LBV2_URL=svn://linuxbios.org/repos/trunk/LinuxBIOSv2 -LBV2_TARBALL=linuxbios-svn-$(LBV2_TAG).tar.gz -LBV2_PAYLOAD_TARGET=$(LBV2_BUILD_DIR)/payload.elf -TARGET_ROM = $(LINUXBIOS_VENDOR)-$(LINUXBIOS_BOARD).rom +CBV2_BASE_DIR=svn +CBV2_URL=svn://coreboot.org/repos/trunk/coreboot-v2 +CBV2_TARBALL=coreboot-svn-$(CBV2_TAG).tar.gz +CBV2_PAYLOAD_TARGET=$(CBV2_BUILD_DIR)/payload.elf +TARGET_ROM = $(COREBOOT_VENDOR)-$(COREBOOT_BOARD).rom
-include $(PACKAGE_DIR)/linuxbios/linuxbios.inc +include $(PACKAGE_DIR)/coreboot-v2/coreboot.inc
-$(SOURCE_DIR)/$(LBV2_TARBALL): - @ echo "Fetching the LinuxBIOS code..." - @ mkdir -p $(SOURCE_DIR)/linuxbios - @ $(BIN_DIR)/fetchsvn.sh $(LBV2_URL) $(SOURCE_DIR)/linuxbios \ - $(LBV2_TAG) $(SOURCE_DIR)/$(LBV2_TARBALL) \ - > $(LBV2_FETCH_LOG) 2>&1 +$(SOURCE_DIR)/$(CBV2_TARBALL): + @ echo "Fetching the coreboot code..." + @ mkdir -p $(SOURCE_DIR)/coreboot + @ $(BIN_DIR)/fetchsvn.sh $(CBV2_URL) $(SOURCE_DIR)/coreboot \ + $(CBV2_TAG) $(SOURCE_DIR)/$(CBV2_TARBALL) \ + > $(CBV2_FETCH_LOG) 2>&1
-$(OUTPUT_DIR)/$(TARGET_ROM): $(LBV2_OUTPUT) +$(OUTPUT_DIR)/$(TARGET_ROM): $(CBV2_OUTPUT) @ mkdir -p $(OUTPUT_DIR) - @ cat $(LBV2_OUTPUT) > $@ + @ cat $(CBV2_OUTPUT) > $@ -linuxbios: $(OUTPUT_DIR)/$(TARGET_ROM) -linuxbios-clean: generic-linuxbios-clean -linuxbios-distclean: generic-linuxbios-distclean +coreboot: $(OUTPUT_DIR)/$(TARGET_ROM) +coreboot-clean: generic-coreboot-clean +coreboot-distclean: generic-coreboot-distclean
Modified: buildrom-devel/packages/linuxbios/msm800sev-linuxbios.mk =================================================================== --- buildrom-devel/packages/linuxbios/msm800sev-linuxbios.mk 2008-01-11 22:53:36 UTC (rev 95) +++ buildrom-devel/packages/linuxbios/msm800sev-linuxbios.mk 2008-01-18 16:57:20 UTC (rev 96) @@ -1,38 +1,38 @@ -# This is the Generic LinuxBIOS target +# This is the Generic coreboot target
ifeq ($(CONFIG_PLATFORM),y) -ifeq ($(LBV2_TAG),) +ifeq ($(CBV2_TAG),) $(error You need to specify a version to pull in your platform config) endif endif
-LBV2_BASE_DIR=svn -LBV2_URL=svn://openbios.org/repos/trunk/LinuxBIOSv2 -LBV2_TARBALL=linuxbios-svn-$(LBV2_TAG).tar.gz -LBV2_PAYLOAD_TARGET=$(LBV2_BUILD_DIR)/payload.elf +CBV2_BASE_DIR=svn +CBV2_URL=svn://coreboot.org/repos/trunk/coreboot-v2 +CBV2_TARBALL=coreboot-svn-$(CBV2_TAG).tar.gz +CBV2_PAYLOAD_TARGET=$(CBV2_BUILD_DIR)/payload.elf VSA_URL=http://www.amd.com/files/connectivitysolutions/geode/geode_lx/ -LBV2_VSA=lx_vsa.36k.bin -TARGET_ROM = $(LINUXBIOS_VENDOR)-$(LINUXBIOS_BOARD).rom +CBV2_VSA=lx_vsa.36k.bin +TARGET_ROM = $(COREBOOT_VENDOR)-$(COREBOOT_BOARD).rom
-include $(PACKAGE_DIR)/linuxbios/linuxbios.inc +include $(PACKAGE_DIR)/coreboot-v2/coreboot.inc
-$(SOURCE_DIR)/$(LBV2_VSA): +$(SOURCE_DIR)/$(CBV2_VSA): @ echo "Fetching the VSA code..." - wget -P $(SOURCE_DIR) $(VSA_URL)/$(LBV2_VSA).gz -O $@ + wget -P $(SOURCE_DIR) $(VSA_URL)/$(CBV2_VSA).gz -O $@
-$(SOURCE_DIR)/$(LBV2_TARBALL): - @ echo "Fetching the LinuxBIOS code..." - @ mkdir -p $(SOURCE_DIR)/linuxbios - @ $(BIN_DIR)/fetchsvn.sh $(LBV2_URL) $(SOURCE_DIR)/linuxbios \ - $(LBV2_TAG) $(SOURCE_DIR)/$(LBV2_TARBALL) \ - > $(LBV2_FETCH_LOG) 2>&1 +$(SOURCE_DIR)/$(CBV2_TARBALL): + @ echo "Fetching the coreboot code..." + @ mkdir -p $(SOURCE_DIR)/coreboot + @ $(BIN_DIR)/fetchsvn.sh $(CBV2_URL) $(SOURCE_DIR)/coreboot \ + $(CBV2_TAG) $(SOURCE_DIR)/$(CBV2_TARBALL) \ + > $(CBV2_FETCH_LOG) 2>&1
# Special rule - append the VSA
-$(OUTPUT_DIR)/$(TARGET_ROM): $(LBV2_OUTPUT) $(SOURCE_DIR)/$(LBV2_VSA) +$(OUTPUT_DIR)/$(TARGET_ROM): $(CBV2_OUTPUT) $(SOURCE_DIR)/$(CBV2_VSA) @ mkdir -p $(OUTPUT_DIR) - @ cat $(SOURCE_DIR)/$(LBV2_VSA) $(LBV2_OUTPUT) > $@ + @ cat $(SOURCE_DIR)/$(CBV2_VSA) $(CBV2_OUTPUT) > $@ -linuxbios: $(OUTPUT_DIR)/$(TARGET_ROM) -linuxbios-clean: generic-linuxbios-clean -linuxbios-distclean: generic-linuxbios-distclean +coreboot: $(OUTPUT_DIR)/$(TARGET_ROM) +coreboot-clean: generic-coreboot-clean +coreboot-distclean: generic-coreboot-distclean
Modified: buildrom-devel/packages/linuxbios/norwich-linuxbios.mk =================================================================== --- buildrom-devel/packages/linuxbios/norwich-linuxbios.mk 2008-01-11 22:53:36 UTC (rev 95) +++ buildrom-devel/packages/linuxbios/norwich-linuxbios.mk 2008-01-18 16:57:20 UTC (rev 96) @@ -1,40 +1,40 @@ -# This is the Generic LinuxBIOS target +# This is the Generic coreboot target
ifeq ($(CONFIG_PLATFORM),y) -ifeq ($(LBV2_TAG),) +ifeq ($(CBV2_TAG),) $(error You need to specify a version to pull in your platform config) else -$(warning You specified $(LBV2_TAG) a version to pull in your platform config) +$(warning You specified $(CBV2_TAG) a version to pull in your platform config) endif endif
-LBV2_BASE_DIR=svn -LBV2_URL=svn://openbios.org/repos/trunk/LinuxBIOSv2 -LBV2_TARBALL=linuxbios-svn-$(LBV2_TAG).tar.gz -LBV2_PAYLOAD_TARGET=$(LBV2_BUILD_DIR)/payload.elf +CBV2_BASE_DIR=svn +CBV2_URL=svn://coreboot.org/repos/trunk/coreboot-v2 +CBV2_TARBALL=coreboot-svn-$(CBV2_TAG).tar.gz +CBV2_PAYLOAD_TARGET=$(CBV2_BUILD_DIR)/payload.elf VSA_URL=http://www.amd.com/files/connectivitysolutions/geode/geode_lx/ -LBV2_VSA=lx_vsa.36k.bin -TARGET_ROM = $(LINUXBIOS_VENDOR)-$(LINUXBIOS_BOARD).rom +CBV2_VSA=lx_vsa.36k.bin +TARGET_ROM = $(COREBOOT_VENDOR)-$(COREBOOT_BOARD).rom
-include $(PACKAGE_DIR)/linuxbios/linuxbios.inc +include $(PACKAGE_DIR)/coreboot-v2/coreboot.inc
-$(SOURCE_DIR)/$(LBV2_VSA): +$(SOURCE_DIR)/$(CBV2_VSA): @ echo "Fetching the VSA code..." - wget -P $(SOURCE_DIR) $(VSA_URL)/$(LBV2_VSA).gz -O $@ + wget -P $(SOURCE_DIR) $(VSA_URL)/$(CBV2_VSA).gz -O $@
-$(SOURCE_DIR)/$(LBV2_TARBALL): - @ echo "Fetching the LinuxBIOS rev $(LBV2_TAG) code..." - @ mkdir -p $(SOURCE_DIR)/linuxbios - @ $(BIN_DIR)/fetchsvn.sh $(LBV2_URL) $(SOURCE_DIR)/linuxbios \ - $(LBV2_TAG) $(SOURCE_DIR)/$(LBV2_TARBALL) \ - > $(LBV2_FETCH_LOG) 2>&1 +$(SOURCE_DIR)/$(CBV2_TARBALL): + @ echo "Fetching the coreboot rev $(CBV2_TAG) code..." + @ mkdir -p $(SOURCE_DIR)/coreboot + @ $(BIN_DIR)/fetchsvn.sh $(CBV2_URL) $(SOURCE_DIR)/coreboot \ + $(CBV2_TAG) $(SOURCE_DIR)/$(CBV2_TARBALL) \ + > $(CBV2_FETCH_LOG) 2>&1
# Special rule - append the VSA
-$(OUTPUT_DIR)/$(TARGET_ROM): $(LBV2_OUTPUT) $(SOURCE_DIR)/$(LBV2_VSA) +$(OUTPUT_DIR)/$(TARGET_ROM): $(CBV2_OUTPUT) $(SOURCE_DIR)/$(CBV2_VSA) @ mkdir -p $(OUTPUT_DIR) - @ cat $(SOURCE_DIR)/$(LBV2_VSA) $(LBV2_OUTPUT) > $@ + @ cat $(SOURCE_DIR)/$(CBV2_VSA) $(CBV2_OUTPUT) > $@ -linuxbios: $(OUTPUT_DIR)/$(TARGET_ROM) -linuxbios-clean: generic-linuxbios-clean -linuxbios-distclean: generic-linuxbios-distclean +coreboot: $(OUTPUT_DIR)/$(TARGET_ROM) +coreboot-clean: generic-coreboot-clean +coreboot-distclean: generic-coreboot-distclean
Modified: buildrom-devel/packages/linuxbios/optionroms.inc =================================================================== --- buildrom-devel/packages/linuxbios/optionroms.inc 2008-01-11 22:53:36 UTC (rev 95) +++ buildrom-devel/packages/linuxbios/optionroms.inc 2008-01-18 16:57:20 UTC (rev 96) @@ -1,7 +1,7 @@ -# Rules to download option roms from the LinuxBIOS option rom +# Rules to download option roms from the coreboot option ROM(s) # repository
-OPTIONROMURL=http://www.linuxbios.org/data/optionroms/ +OPTIONROMURL=http://coreboot.org/data/optionroms/
$(OUTPUT_DIR)/$(OPTIONROM_ID).license: @ mkdir -p $(OUTPUT_DIR)
Modified: buildrom-devel/packages/linuxbios/qemu.mk =================================================================== --- buildrom-devel/packages/linuxbios/qemu.mk 2008-01-11 22:53:36 UTC (rev 95) +++ buildrom-devel/packages/linuxbios/qemu.mk 2008-01-18 16:57:20 UTC (rev 96) @@ -1,40 +1,40 @@ -# This is the QEMU LinuxBIOS target +# This is the QEMU coreboot target
ifeq ($(CONFIG_PLATFORM),y) -ifeq ($(LBV2_TAG),) +ifeq ($(CBV2_TAG),) $(error You need to specify a version to pull in your platform config) endif endif
-LBV2_PATCHES = +CBV2_PATCHES =
-LBV2_BASE_DIR=svn -TARGET_ROM = $(LINUXBIOS_VENDOR)-$(LINUXBIOS_BOARD).rom -LBV2_PAYLOAD_TARGET=$(LBV2_BUILD_DIR)/payload.elf +CBV2_BASE_DIR=svn +TARGET_ROM = $(COREBOOT_VENDOR)-$(COREBOOT_BOARD).rom +CBV2_PAYLOAD_TARGET=$(CBV2_BUILD_DIR)/payload.elf
ifeq ($(CONFIG_PAYLOAD_LAB),y) -LBV2_PATCHES += $(PACKAGE_DIR)/linuxbios/patches/qemu-lab.patch +CBV2_PATCHES += $(PACKAGE_DIR)/coreboot-v2/patches/qemu-lab.patch else -LBV2_PATCHES += $(PACKAGE_DIR)/linuxbios/patches/qemu-payload.patch +CBV2_PATCHES += $(PACKAGE_DIR)/coreboot-v2/patches/qemu-payload.patch endif
-LBV2_URL=svn://linuxbios.org/repos/trunk/LinuxBIOSv2 -LBV2_TARBALL=linuxbios-svn-$(LBV2_TAG).tar.gz -LBV2_SVN_DIR=$(SOURCE_DIR)/linuxbios +CBV2_URL=svn://coreboot.org/repos/trunk/coreboot-v2 +CBV2_TARBALL=coreboot-svn-$(CBV2_TAG).tar.gz +CBV2_SVN_DIR=$(SOURCE_DIR)/coreboot
-include $(PACKAGE_DIR)/linuxbios/linuxbios.inc +include $(PACKAGE_DIR)/coreboot-v2/coreboot.inc
-$(SOURCE_DIR)/$(LBV2_TARBALL): - @ echo "Fetching the LinuxBIOS code..." - @ mkdir -p $(SOURCE_DIR)/linuxbios - @ $(BIN_DIR)/fetchsvn.sh $(LBV2_URL) $(LBV2_SVN_DIR) \ - $(LBV2_TAG) $(SOURCE_DIR)/$(LBV2_TARBALL) \ - > $(LBV2_FETCH_LOG) 2>&1 +$(SOURCE_DIR)/$(CBV2_TARBALL): + @ echo "Fetching the coreboot code..." + @ mkdir -p $(SOURCE_DIR)/coreboot + @ $(BIN_DIR)/fetchsvn.sh $(CBV2_URL) $(CBV2_SVN_DIR) \ + $(CBV2_TAG) $(SOURCE_DIR)/$(CBV2_TARBALL) \ + > $(CBV2_FETCH_LOG) 2>&1
-$(OUTPUT_DIR)/$(TARGET_ROM): $(LBV2_OUTPUT) +$(OUTPUT_DIR)/$(TARGET_ROM): $(CBV2_OUTPUT) @ mkdir -p $(OUTPUT_DIR) @ cp $< $@
-linuxbios: $(OUTPUT_DIR)/$(TARGET_ROM) -linuxbios-clean: generic-linuxbios-clean -linuxbios-distclean: generic-linuxbios-distclean +coreboot: $(OUTPUT_DIR)/$(TARGET_ROM) +coreboot-clean: generic-coreboot-clean +coreboot-distclean: generic-coreboot-distclean
Modified: buildrom-devel/packages/linuxbios/serengeti_cheetah.mk =================================================================== --- buildrom-devel/packages/linuxbios/serengeti_cheetah.mk 2008-01-11 22:53:36 UTC (rev 95) +++ buildrom-devel/packages/linuxbios/serengeti_cheetah.mk 2008-01-18 16:57:20 UTC (rev 96) @@ -1,58 +1,58 @@ -# This is the Generic LinuxBIOS target +# This is the Generic coreboot target
ifeq ($(CONFIG_PLATFORM),y) -ifeq ($(LBV2_TAG),) +ifeq ($(CBV2_TAG),) $(error You need to specify a version to pull in your platform config) endif endif
-LBV2_PATCHES = +CBV2_PATCHES =
# Make sure we have the tools we need to accomplish this HAVE_IASL:=$(call find-tool,iasl)
ifeq ($(HAVE_IASL),n) -$(error To build LinuxBIOS, you need to install the 'iasl' tool) +$(error To build coreboot, you need to install the 'iasl' tool) endif
ifeq ($(CONFIG_PLATFORM_CHEETAH_FAM10),y) ifeq ($(CONFIG_PAYLOAD_LAB),y) - LBV2_PATCHES += $(PACKAGE_DIR)/linuxbios/patches/serengeti_cheetah_fam10-lab.patch + CBV2_PATCHES += $(PACKAGE_DIR)/coreboot-v2/patches/serengeti_cheetah_fam10-lab.patch endif endif
ifeq ($(CONFIG_PLATFORM_SERENGETI_CHEETAH),y) ifeq ($(CONFIG_PAYLOAD_LAB),y) - LBV2_PATCHES += $(PACKAGE_DIR)/linuxbios/patches/serengeti_cheetah-lab.patch + CBV2_PATCHES += $(PACKAGE_DIR)/coreboot-v2/patches/serengeti_cheetah-lab.patch else - LBV2_PATCHES += $(PACKAGE_DIR)/linuxbios/patches/serengeti_cheetah-payload.patch + CBV2_PATCHES += $(PACKAGE_DIR)/coreboot-v2/patches/serengeti_cheetah-payload.patch endif
ifeq ($(CONFIG_SIMNOW),y) -LBV2_PATCHES += $(PACKAGE_DIR)/linuxbios/patches/simnow.patch +CBV2_PATCHES += $(PACKAGE_DIR)/coreboot-v2/patches/simnow.patch endif endif
-LBV2_BASE_DIR=svn -LBV2_URL=svn://linuxbios.org/repos/trunk/LinuxBIOSv2 -LBV2_TARBALL=linuxbios-svn-$(LBV2_TAG).tar.gz -LBV2_PAYLOAD_TARGET=$(LBV2_BUILD_DIR)/payload.elf -TARGET_ROM = $(LINUXBIOS_VENDOR)-$(LINUXBIOS_BOARD).rom +CBV2_BASE_DIR=svn +CBV2_URL=svn://coreboot.org/repos/trunk/coreboot-v2 +CBV2_TARBALL=coreboot-svn-$(CBV2_TAG).tar.gz +CBV2_PAYLOAD_TARGET=$(CBV2_BUILD_DIR)/payload.elf +TARGET_ROM = $(COREBOOT_VENDOR)-$(COREBOOT_BOARD).rom
-include $(PACKAGE_DIR)/linuxbios/linuxbios.inc +include $(PACKAGE_DIR)/coreboot-v2/coreboot.inc
-$(SOURCE_DIR)/$(LBV2_TARBALL): - @ echo "Fetching the LinuxBIOS code..." - @ mkdir -p $(SOURCE_DIR)/linuxbios - @ $(BIN_DIR)/fetchsvn.sh $(LBV2_URL) $(SOURCE_DIR)/linuxbios \ - $(LBV2_TAG) $(SOURCE_DIR)/$(LBV2_TARBALL) \ - > $(LBV2_FETCH_LOG) 2>&1 +$(SOURCE_DIR)/$(CBV2_TARBALL): + @ echo "Fetching the coreboot code..." + @ mkdir -p $(SOURCE_DIR)/coreboot + @ $(BIN_DIR)/fetchsvn.sh $(CBV2_URL) $(SOURCE_DIR)/coreboot \ + $(CBV2_TAG) $(SOURCE_DIR)/$(CBV2_TARBALL) \ + > $(CBV2_FETCH_LOG) 2>&1
-$(OUTPUT_DIR)/$(TARGET_ROM): $(LBV2_OUTPUT) +$(OUTPUT_DIR)/$(TARGET_ROM): $(CBV2_OUTPUT) @ mkdir -p $(OUTPUT_DIR) @ cp $< $@
-linuxbios: $(OUTPUT_DIR)/$(TARGET_ROM) -linuxbios-clean: generic-linuxbios-clean -linuxbios-distclean: generic-linuxbios-distclean +coreboot: $(OUTPUT_DIR)/$(TARGET_ROM) +coreboot-clean: generic-coreboot-clean +coreboot-distclean: generic-coreboot-distclean
Modified: buildrom-devel/packages/linuxbios/supermicro-h8dmr-linuxbios.mk =================================================================== --- buildrom-devel/packages/linuxbios/supermicro-h8dmr-linuxbios.mk 2008-01-11 22:53:36 UTC (rev 95) +++ buildrom-devel/packages/linuxbios/supermicro-h8dmr-linuxbios.mk 2008-01-18 16:57:20 UTC (rev 96) @@ -1,49 +1,49 @@ -# This is the Generic LinuxBIOS target +# This is the Generic coreboot target
ifeq ($(CONFIG_PLATFORM),y) -ifeq ($(LBV2_TAG),) +ifeq ($(CBV2_TAG),) $(error You need to specify a version to pull in your platform config) endif endif
-LBV2_PATCHES = +CBV2_PATCHES =
ifeq ($(CONFIG_PAYLOAD_FILO),y) - LBV2_PATCHES += $(PACKAGE_DIR)/linuxbios/patches/supermicro-h8dmr-filo-and-etherboot-Config.lb.patch + CBV2_PATCHES += $(PACKAGE_DIR)/coreboot-v2/patches/supermicro-h8dmr-filo-and-etherboot-Config.lb.patch endif
ifeq ($(CONFIG_PAYLOAD_ETHERBOOT),y) - LBV2_PATCHES += $(PACKAGE_DIR)/linuxbios/patches/supermicro-h8dmr-filo-and-etherboot-Config.lb.patch + CBV2_PATCHES += $(PACKAGE_DIR)/coreboot-v2/patches/supermicro-h8dmr-filo-and-etherboot-Config.lb.patch endif
ifeq ($(CONFIG_PAYLOAD_KERNEL),y) - LBV2_PATCHES += $(PACKAGE_DIR)/linuxbios/patches/supermicro-h8dmr-kernel-and-lab-Config.lb.patch + CBV2_PATCHES += $(PACKAGE_DIR)/coreboot-v2/patches/supermicro-h8dmr-kernel-and-lab-Config.lb.patch endif
ifeq ($(CONFIG_PAYLOAD_LAB),y) - LBV2_PATCHES += $(PACKAGE_DIR)/linuxbios/patches/supermicro-h8dmr-kernel-and-lab-Config.lb.patch + CBV2_PATCHES += $(PACKAGE_DIR)/coreboot-v2/patches/supermicro-h8dmr-kernel-and-lab-Config.lb.patch endif
-LBV2_BASE_DIR=svn -LBV2_URL=svn://linuxbios.org/repos/trunk/LinuxBIOSv2 -LBV2_TARBALL=linuxbios-svn-$(LBV2_TAG).tar.gz -LBV2_PAYLOAD_TARGET=$(LBV2_BUILD_DIR)/payload.elf -TARGET_ROM = $(LINUXBIOS_VENDOR)-$(LINUXBIOS_BOARD).rom +CBV2_BASE_DIR=svn +CBV2_URL=svn://coreboot.org/repos/trunk/coreboot-v2 +CBV2_TARBALL=coreboot-svn-$(CBV2_TAG).tar.gz +CBV2_PAYLOAD_TARGET=$(CBV2_BUILD_DIR)/payload.elf +TARGET_ROM = $(COREBOOT_VENDOR)-$(COREBOOT_BOARD).rom
-include $(PACKAGE_DIR)/linuxbios/linuxbios.inc +include $(PACKAGE_DIR)/coreboot-v2/coreboot.inc
-$(SOURCE_DIR)/$(LBV2_TARBALL): - @ echo "Fetching the LinuxBIOS code..." - @ mkdir -p $(SOURCE_DIR)/linuxbios - @ $(BIN_DIR)/fetchsvn.sh $(LBV2_URL) $(SOURCE_DIR)/linuxbios \ - $(LBV2_TAG) $(SOURCE_DIR)/$(LBV2_TARBALL) \ - > $(LBV2_FETCH_LOG) 2>&1 +$(SOURCE_DIR)/$(CBV2_TARBALL): + @ echo "Fetching the coreboot code..." + @ mkdir -p $(SOURCE_DIR)/coreboot + @ $(BIN_DIR)/fetchsvn.sh $(CBV2_URL) $(SOURCE_DIR)/coreboot \ + $(CBV2_TAG) $(SOURCE_DIR)/$(CBV2_TARBALL) \ + > $(CBV2_FETCH_LOG) 2>&1
-$(OUTPUT_DIR)/$(TARGET_ROM): $(LBV2_OUTPUT) +$(OUTPUT_DIR)/$(TARGET_ROM): $(CBV2_OUTPUT) @ mkdir -p $(OUTPUT_DIR) - @ cat $(LBV2_OUTPUT) > $@ + @ cat $(CBV2_OUTPUT) > $@ -linuxbios: $(OUTPUT_DIR)/$(TARGET_ROM) -linuxbios-clean: generic-linuxbios-clean -linuxbios-distclean: generic-linuxbios-distclean +coreboot: $(OUTPUT_DIR)/$(TARGET_ROM) +coreboot-clean: generic-coreboot-clean +coreboot-distclean: generic-coreboot-distclean
Modified: buildrom-devel/packages/linuxbios/tyan-s2882-linuxbios.mk =================================================================== --- buildrom-devel/packages/linuxbios/tyan-s2882-linuxbios.mk 2008-01-11 22:53:36 UTC (rev 95) +++ buildrom-devel/packages/linuxbios/tyan-s2882-linuxbios.mk 2008-01-18 16:57:20 UTC (rev 96) @@ -1,45 +1,45 @@ -# This is the Generic LinuxBIOS target +# This is the Generic coreboot target
ifeq ($(CONFIG_PLATFORM),y) -ifeq ($(LBV2_TAG),) +ifeq ($(CBV2_TAG),) $(error You need to specify a version to pull in your platform config) endif endif
-LBV2_PATCHES = +CBV2_PATCHES =
ifeq ($(CONFIG_PAYLOAD_FILO),y) - LBV2_PATCHES += $(PACKAGE_DIR)/linuxbios/patches/tyan-s2882-filo-Config.lb.patch + CBV2_PATCHES += $(PACKAGE_DIR)/coreboot-v2/patches/tyan-s2882-filo-Config.lb.patch endif
ifeq ($(CONFIG_PAYLOAD_KERNEL),y) - LBV2_PATCHES += $(PACKAGE_DIR)/linuxbios/patches/tyan-s2882-kernel-and-lab-Config.lb.patch + CBV2_PATCHES += $(PACKAGE_DIR)/coreboot-v2/patches/tyan-s2882-kernel-and-lab-Config.lb.patch endif
ifeq ($(CONFIG_PAYLOAD_LAB),y) - LBV2_PATCHES += $(PACKAGE_DIR)/linuxbios/patches/tyan-s2882-kernel-and-lab-Config.lb.patch + CBV2_PATCHES += $(PACKAGE_DIR)/coreboot-v2/patches/tyan-s2882-kernel-and-lab-Config.lb.patch endif
-LBV2_BASE_DIR=svn -LBV2_URL=svn://linuxbios.org/repos/trunk/LinuxBIOSv2 -LBV2_TARBALL=linuxbios-svn-$(LBV2_TAG).tar.gz -LBV2_PAYLOAD_TARGET=$(LBV2_BUILD_DIR)/payload.elf -TARGET_ROM = $(LINUXBIOS_VENDOR)-$(LINUXBIOS_BOARD).rom +CBV2_BASE_DIR=svn +CBV2_URL=svn://coreboot.org/repos/trunk/coreboot-v2 +CBV2_TARBALL=coreboot-svn-$(CBV2_TAG).tar.gz +CBV2_PAYLOAD_TARGET=$(CBV2_BUILD_DIR)/payload.elf +TARGET_ROM = $(COREBOOT_VENDOR)-$(COREBOOT_BOARD).rom
-include $(PACKAGE_DIR)/linuxbios/linuxbios.inc +include $(PACKAGE_DIR)/coreboot-v2/coreboot.inc
-$(SOURCE_DIR)/$(LBV2_TARBALL): - @ echo "Fetching the LinuxBIOS code..." - @ mkdir -p $(SOURCE_DIR)/linuxbios - @ $(BIN_DIR)/fetchsvn.sh $(LBV2_URL) $(SOURCE_DIR)/linuxbios \ - $(LBV2_TAG) $(SOURCE_DIR)/$(LBV2_TARBALL) \ - > $(LBV2_FETCH_LOG) 2>&1 +$(SOURCE_DIR)/$(CBV2_TARBALL): + @ echo "Fetching the coreboot code..." + @ mkdir -p $(SOURCE_DIR)/coreboot + @ $(BIN_DIR)/fetchsvn.sh $(CBV2_URL) $(SOURCE_DIR)/coreboot \ + $(CBV2_TAG) $(SOURCE_DIR)/$(CBV2_TARBALL) \ + > $(CBV2_FETCH_LOG) 2>&1
-$(OUTPUT_DIR)/$(TARGET_ROM): $(LBV2_OUTPUT) +$(OUTPUT_DIR)/$(TARGET_ROM): $(CBV2_OUTPUT) @ mkdir -p $(OUTPUT_DIR) - @ cat $(LBV2_OUTPUT) > $@ + @ cat $(CBV2_OUTPUT) > $@ -linuxbios: $(OUTPUT_DIR)/$(TARGET_ROM) -linuxbios-clean: generic-linuxbios-clean -linuxbios-distclean: generic-linuxbios-distclean +coreboot: $(OUTPUT_DIR)/$(TARGET_ROM) +coreboot-clean: generic-coreboot-clean +coreboot-distclean: generic-coreboot-distclean
Modified: buildrom-devel/packages/linuxbios/tyan-s2891-linuxbios.mk =================================================================== --- buildrom-devel/packages/linuxbios/tyan-s2891-linuxbios.mk 2008-01-11 22:53:36 UTC (rev 95) +++ buildrom-devel/packages/linuxbios/tyan-s2891-linuxbios.mk 2008-01-18 16:57:20 UTC (rev 96) @@ -1,45 +1,45 @@ -# This is the Generic LinuxBIOS target +# This is the Generic coreboot target
ifeq ($(CONFIG_PLATFORM),y) -ifeq ($(LBV2_TAG),) +ifeq ($(CBV2_TAG),) $(error You need to specify a version to pull in your platform config) endif endif
-LBV2_PATCHES = +CBV2_PATCHES =
ifeq ($(CONFIG_PAYLOAD_FILO),y) - LBV2_PATCHES += $(PACKAGE_DIR)/linuxbios/patches/tyan-s2891-filo-Config.lb.patch + CBV2_PATCHES += $(PACKAGE_DIR)/coreboot-v2/patches/tyan-s2891-filo-Config.lb.patch endif
ifeq ($(CONFIG_PAYLOAD_KERNEL),y) - LBV2_PATCHES += $(PACKAGE_DIR)/linuxbios/patches/tyan-s2891-kernel-and-lab-Config.lb.patch + CBV2_PATCHES += $(PACKAGE_DIR)/coreboot-v2/patches/tyan-s2891-kernel-and-lab-Config.lb.patch endif
ifeq ($(CONFIG_PAYLOAD_LAB),y) - LBV2_PATCHES += $(PACKAGE_DIR)/linuxbios/patches/tyan-s2891-kernel-and-lab-Config.lb.patch + CBV2_PATCHES += $(PACKAGE_DIR)/coreboot-v2/patches/tyan-s2891-kernel-and-lab-Config.lb.patch endif
-LBV2_BASE_DIR=svn -LBV2_URL=svn://linuxbios.org/repos/trunk/LinuxBIOSv2 -LBV2_TARBALL=linuxbios-svn-$(LBV2_TAG).tar.gz -LBV2_PAYLOAD_TARGET=$(LBV2_BUILD_DIR)/payload.elf -TARGET_ROM = $(LINUXBIOS_VENDOR)-$(LINUXBIOS_BOARD).rom +CBV2_BASE_DIR=svn +CBV2_URL=svn://coreboot.org/repos/trunk/coreboot-v2 +CBV2_TARBALL=coreboot-svn-$(CBV2_TAG).tar.gz +CBV2_PAYLOAD_TARGET=$(CBV2_BUILD_DIR)/payload.elf +TARGET_ROM = $(COREBOOT_VENDOR)-$(COREBOOT_BOARD).rom
-include $(PACKAGE_DIR)/linuxbios/linuxbios.inc +include $(PACKAGE_DIR)/coreboot-v2/coreboot.inc
-$(SOURCE_DIR)/$(LBV2_TARBALL): - @ echo "Fetching the LinuxBIOS code..." - @ mkdir -p $(SOURCE_DIR)/linuxbios - @ $(BIN_DIR)/fetchsvn.sh $(LBV2_URL) $(SOURCE_DIR)/linuxbios \ - $(LBV2_TAG) $(SOURCE_DIR)/$(LBV2_TARBALL) \ - > $(LBV2_FETCH_LOG) 2>&1 +$(SOURCE_DIR)/$(CBV2_TARBALL): + @ echo "Fetching the coreboot code..." + @ mkdir -p $(SOURCE_DIR)/coreboot + @ $(BIN_DIR)/fetchsvn.sh $(CBV2_URL) $(SOURCE_DIR)/coreboot \ + $(CBV2_TAG) $(SOURCE_DIR)/$(CBV2_TARBALL) \ + > $(CBV2_FETCH_LOG) 2>&1
-$(OUTPUT_DIR)/$(TARGET_ROM): $(LBV2_OUTPUT) +$(OUTPUT_DIR)/$(TARGET_ROM): $(CBV2_OUTPUT) @ mkdir -p $(OUTPUT_DIR) - @ cat $(LBV2_OUTPUT) > $@ + @ cat $(CBV2_OUTPUT) > $@ -linuxbios: $(OUTPUT_DIR)/$(TARGET_ROM) -linuxbios-clean: generic-linuxbios-clean -linuxbios-distclean: generic-linuxbios-distclean +coreboot: $(OUTPUT_DIR)/$(TARGET_ROM) +coreboot-clean: generic-coreboot-clean +coreboot-distclean: generic-coreboot-distclean
Modified: buildrom-devel/packages/linuxbiosv3/linuxbiosv3.mk =================================================================== --- buildrom-devel/packages/linuxbiosv3/linuxbiosv3.mk 2008-01-11 22:53:36 UTC (rev 95) +++ buildrom-devel/packages/linuxbiosv3/linuxbiosv3.mk 2008-01-18 16:57:20 UTC (rev 96) @@ -1,76 +1,76 @@ -ifeq ($(LBV3_TAG),) +ifeq ($(CBV3_TAG),) $(error You need to specify a version to pull in your platform config) endif
-LBV3_URL=svn://openbios.org/repository/LinuxBIOSv3 -LBV3_TARBALL=linuxbios-svn-$(LBV3_TAG).tar.gz -LBV3_DIR=$(BUILD_DIR)/linuxbiosv3 -LBV3_SRC_DIR=$(LBV3_DIR)/svn +CBV3_URL=svn://coreboot.org/repository/coreboot-v3 +CBV3_TARBALL=coreboot-svn-$(CBV3_TAG).tar.gz +CBV3_DIR=$(BUILD_DIR)/coreboot-v3 +CBV3_SRC_DIR=$(CBV3_DIR)/svn
-LBV3_STAMP_DIR=$(LBV3_DIR)/stamps -LBV3_LOG_DIR=$(LBV3_DIR)/logs +CBV3_STAMP_DIR=$(CBV3_DIR)/stamps +CBV3_LOG_DIR=$(CBV3_DIR)/logs
ifeq ($(CONFIG_VERBOSE),y) -LBV3_FETCH_LOG=/dev/stdout -LBV3_CONFIG_LOG=/dev/stdout -LBV3_BUILD_LOG=/dev/stdout +CBV3_FETCH_LOG=/dev/stdout +CBV3_CONFIG_LOG=/dev/stdout +CBV3_BUILD_LOG=/dev/stdout else -LBV3_FETCH_LOG=$(LBV3_LOG_DIR)/fetch.log -LBV3_CONFIG_LOG=$(LBV3_LOG_DIR)/config.log -LBV3_BUILD_LOG=$(LBV3_LOG_DIR)/build.log +CBV3_FETCH_LOG=$(CBV3_LOG_DIR)/fetch.log +CBV3_CONFIG_LOG=$(CBV3_LOG_DIR)/config.log +CBV3_BUILD_LOG=$(CBV3_LOG_DIR)/build.log endif
-TARGET_ROM = $(LINUXBIOS_VENDOR)-$(LINUXBIOS_BOARD).rom +TARGET_ROM = $(COREBOOT_VENDOR)-$(COREBOOT_BOARD).rom
-LBV3_OUTPUT=$(LBV3_SRC_DIR)/build/linuxbios.rom +CBV3_OUTPUT=$(CBV3_SRC_DIR)/build/coreboot.rom
-LBV3_PATCHES ?= +CBV3_PATCHES ?=
-$(SOURCE_DIR)/$(LBV3_TARBALL): - @ mkdir -p $(SOURCE_DIR)/linuxbiosv3 - @ $(BIN_DIR)/fetchsvn.sh $(LBV3_URL) \ - $(SOURCE_DIR)/linuxbiosv3 $(LBV3_TAG) \ - $@ > $(LBV3_FETCH_LOG) 2>&1 +$(SOURCE_DIR)/$(CBV3_TARBALL): + @ mkdir -p $(SOURCE_DIR)/coreboot-v3 + @ $(BIN_DIR)/fetchsvn.sh $(CBV3_URL) \ + $(SOURCE_DIR)/coreboot-v3 $(CBV3_TAG) \ + $@ > $(CBV3_FETCH_LOG) 2>&1
-$(LBV3_STAMP_DIR)/.unpacked: $(SOURCE_DIR)/$(LBV3_TARBALL) - @echo "Unpacking LinuxBIOSv3..." - @ mkdir -p $(LBV3_DIR) - @ tar -C $(LBV3_DIR) -zxf $(SOURCE_DIR)/$(LBV3_TARBALL) +$(CBV3_STAMP_DIR)/.unpacked: $(SOURCE_DIR)/$(CBV3_TARBALL) + @echo "Unpacking coreboot v3..." + @ mkdir -p $(CBV3_DIR) + @ tar -C $(CBV3_DIR) -zxf $(SOURCE_DIR)/$(CBV3_TARBALL) @ touch $@
-$(LBV3_STAMP_DIR)/.patched: $(LBV3_STAMP_DIR)/.unpacked - @ echo "Patching LinuxBIOSv3..." - @ $(BIN_DIR)/doquilt.sh $(LBV3_SRC_DIR) $(LBV3_PATCHES) +$(CBV3_STAMP_DIR)/.patched: $(CBV3_STAMP_DIR)/.unpacked + @ echo "Patching coreboot v3..." + @ $(BIN_DIR)/doquilt.sh $(CBV3_SRC_DIR) $(CBV3_PATCHES) @ touch $@
-$(LBV3_STAMP_DIR)/.configured: $(LBV3_STAMP_DIR)/.patched - @ echo "Configuring LinuxBIOSv3..." - @ cp $(PACKAGE_DIR)/linuxbiosv3/conf/$(LBV3_CONFIG) $(LBV3_SRC_DIR)/.config - @ make -C $(LBV3_SRC_DIR) oldconfig > $(LBV3_CONFIG_LOG) 2>&1 +$(CBV3_STAMP_DIR)/.configured: $(CBV3_STAMP_DIR)/.patched + @ echo "Configuring coreboot v3..." + @ cp $(PACKAGE_DIR)/coreboot-v3/conf/$(CBV3_CONFIG) $(CBV3_SRC_DIR)/.config + @ make -C $(CBV3_SRC_DIR) oldconfig > $(CBV3_CONFIG_LOG) 2>&1 @ touch $@
-$(LBV3_OUTPUT): $(LBV3_STAMP_DIR)/.configured - @ echo "Building LinuxBIOSv3..." - @ $(MAKE) -C $(LBV3_SRC_DIR) > $(LBV3_BUILD_LOG) 2>&1 +$(CBV3_OUTPUT): $(CBV3_STAMP_DIR)/.configured + @ echo "Building coreboot v3..." + @ $(MAKE) -C $(CBV3_SRC_DIR) > $(CBV3_BUILD_LOG) 2>&1
-$(LBV3_SRC_DIR)/build/util/lar/lar: $(LBV3_STAMP_DIR)/.configured - @ $(MAKE) -C $(LBV3_SRC_DIR)/util lar > $(LBV3_BUILD_LOG) 2>&1 +$(CBV3_SRC_DIR)/build/util/lar/lar: $(CBV3_STAMP_DIR)/.configured + @ $(MAKE) -C $(CBV3_SRC_DIR)/util lar > $(CBV3_BUILD_LOG) 2>&1
-$(STAGING_DIR)/bin/lar: $(LBV3_SRC_DIR)/build/util/lar/lar +$(STAGING_DIR)/bin/lar: $(CBV3_SRC_DIR)/build/util/lar/lar @ mkdir -p $(STAGING_DIR)/bin @ cp $< $@
-$(LBV3_STAMP_DIR) $(LBV3_LOG_DIR): +$(CBV3_STAMP_DIR) $(CBV3_LOG_DIR): @ mkdir -p $@
-linuxbiosv3: $(LBV3_LOG_DIR) $(LBV3_STAMP_DIR) $(LBV3_OUTPUT) $(STAGING_DIR)/bin/lar +coreboot-v3: $(CBV3_LOG_DIR) $(CBV3_STAMP_DIR) $(CBV3_OUTPUT) $(STAGING_DIR)/bin/lar
-linuxbiosv3-clean: - @ echo "Cleaning linuxbiosv3..." - @ $(MAKE) -C $(LBV3_SRC_DIR) clean > /dev/null 2>&1 +coreboot-v3-clean: + @ echo "Cleaning coreboot v3..." + @ $(MAKE) -C $(CBV3_SRC_DIR) clean > /dev/null 2>&1
-linuxbiosv3-distclean: - @ rm -rf $(LBV3_DIR)/* +coreboot-v3-distclean: + @ rm -rf $(CBV3_DIR)/* @ rm -rf $(STAGING_DIR)/bin/lar
Modified: buildrom-devel/scripts/defconfig =================================================================== --- buildrom-devel/scripts/defconfig 2008-01-11 22:53:36 UTC (rev 95) +++ buildrom-devel/scripts/defconfig 2008-01-18 16:57:20 UTC (rev 96) @@ -8,11 +8,11 @@ # CONFIG_ADVANCED is not set
# -# LinuxBIOS configuration +# coreboot configuration # CONFIG_USE_LZMA=y -# CONFIG_LB_USE_BUILD is not set -CONFIG_LB_BUILDDIR="" +# CONFIG_CB_USE_BUILD is not set +CONFIG_CB_BUILDDIR="" CONFIG_PLATFORM=y CONFIG_PAYLOAD=y
-
svn＠openbios.org