[coreboot] r168 - in buildrom-devel: . config/payloads

svn at coreboot.org svn at coreboot.org
Fri Apr 25 20:29:28 CEST 2008


Author: myles
Date: 2008-04-25 20:29:27 +0200 (Fri, 25 Apr 2008)
New Revision: 168

Modified:
   buildrom-devel/Makefile
   buildrom-devel/config/payloads/coreinfo.conf
   buildrom-devel/config/payloads/etherboot.conf
   buildrom-devel/config/payloads/filo.conf
   buildrom-devel/config/payloads/grub2.conf
   buildrom-devel/config/payloads/kernel.conf
   buildrom-devel/config/payloads/lab.conf
   buildrom-devel/config/payloads/memtest.conf
   buildrom-devel/config/payloads/ofw.conf
   buildrom-devel/config/payloads/tint.conf
Log:
This patch changes the Makefile and the config/payloads/*.conf files so that
only the payload .mk files that are needed are included.  It still includes
nrv2b.mk, lzma.mk, kernel.mk, roms.mk and geodevsa.mk every time, but that 
seemed like a separate change.

Thanks,
Myles

Signed-off-by: Myles Watson <mylesgw at gmail.com>
Acked-by: Ward Vandewege <ward at gnu.org>



Modified: buildrom-devel/Makefile
===================================================================
--- buildrom-devel/Makefile	2008-04-25 17:18:00 UTC (rev 167)
+++ buildrom-devel/Makefile	2008-04-25 18:29:27 UTC (rev 168)
@@ -115,9 +115,14 @@
 # The following code gets all the make targets, but filters out the kernel
 # targets which are implicitly set by the platform configuration
 
-MKTARGETS:= $(shell ls $(PACKAGE_DIR)/*/*.mk)
+ifneq ($(PAYLOAD_AND_DEP_MK),)
+include $(PAYLOAD_AND_DEP_MK)
+endif
 
-include $(filter-out $(PACKAGE_DIR)/kernel/% $(PACKAGE_DIR)/coreboot-v2/% $(PACKAGE_DIR)/coreboot-v3/%,$(MKTARGETS))
+include $(PACKAGE_DIR)/nrv2b/nrv2b.mk
+include $(PACKAGE_DIR)/lzma/lzma.mk
+include $(PACKAGE_DIR)/geodevsa/geodevsa.mk
+include $(PACKAGE_DIR)/roms/roms.mk
 
 include $(KERNEL_MK)
 

Modified: buildrom-devel/config/payloads/coreinfo.conf
===================================================================
--- buildrom-devel/config/payloads/coreinfo.conf	2008-04-25 17:18:00 UTC (rev 167)
+++ buildrom-devel/config/payloads/coreinfo.conf	2008-04-25 18:29:27 UTC (rev 168)
@@ -11,4 +11,5 @@
 PAYLOAD=coreinfo
 
 # Add libpayload as a dependency
+PAYLOAD_AND_DEP_MK=$(PACKAGE_DIR)/coreinfo/coreinfo.mk $(PACKAGE_DIR)/libpayload/libpayload.mk
 DEPENDS-y=libpayload

Modified: buildrom-devel/config/payloads/etherboot.conf
===================================================================
--- buildrom-devel/config/payloads/etherboot.conf	2008-04-25 17:18:00 UTC (rev 167)
+++ buildrom-devel/config/payloads/etherboot.conf	2008-04-25 18:29:27 UTC (rev 168)
@@ -8,3 +8,4 @@
 PAYLOAD_COMPRESSED=$(OUTPUT_DIR)/etherboot-payload.elf.lzma
 
 PAYLOAD-y=etherboot
+PAYLOAD_AND_DEP_MK=$(PACKAGE_DIR)/etherboot/etherboot.mk

Modified: buildrom-devel/config/payloads/filo.conf
===================================================================
--- buildrom-devel/config/payloads/filo.conf	2008-04-25 17:18:00 UTC (rev 167)
+++ buildrom-devel/config/payloads/filo.conf	2008-04-25 18:29:27 UTC (rev 168)
@@ -8,6 +8,7 @@
 PAYLOAD_COMPRESSED=$(OUTPUT_DIR)/filo-payload.elf.lzma
 
 PAYLOAD-y=filo
+PAYLOAD_AND_DEP_MK=$(PACKAGE_DIR)/filo/filo.mk
 
 PAYLOAD=filo
 

Modified: buildrom-devel/config/payloads/grub2.conf
===================================================================
--- buildrom-devel/config/payloads/grub2.conf	2008-04-25 17:18:00 UTC (rev 167)
+++ buildrom-devel/config/payloads/grub2.conf	2008-04-25 18:29:27 UTC (rev 168)
@@ -9,3 +9,5 @@
 
 PAYLOAD-y=grub2
 PAYLOAD=grub2
+
+PAYLOAD_AND_DEP_MK=$(PACKAGE_DIR)/grub2/grub2.mk

Modified: buildrom-devel/config/payloads/kernel.conf
===================================================================
--- buildrom-devel/config/payloads/kernel.conf	2008-04-25 17:18:00 UTC (rev 167)
+++ buildrom-devel/config/payloads/kernel.conf	2008-04-25 18:29:27 UTC (rev 168)
@@ -19,3 +19,4 @@
 PAYLOAD=kernel
 
 HOSTTOOLS-y = mkelfimage
+PAYLOAD_AND_DEP_MK=$(PACKAGE_DIR)/mkelfimage/mkelfimage.mk

Modified: buildrom-devel/config/payloads/lab.conf
===================================================================
--- buildrom-devel/config/payloads/lab.conf	2008-04-25 17:18:00 UTC (rev 167)
+++ buildrom-devel/config/payloads/lab.conf	2008-04-25 18:29:27 UTC (rev 168)
@@ -33,3 +33,19 @@
 PAYLOAD=lab
 
 HOSTTOOLS-y = mkelfimage unifdef
+PAYLOAD_AND_DEP_MK=$(PACKAGE_DIR)/mkelfimage/mkelfimage.mk
+PAYLOAD_AND_DEP_MK+=$(PACKAGE_DIR)/uclibc/uclibc.mk
+PAYLOAD_AND_DEP_MK+=$(PACKAGE_DIR)/unifdef/unifdef.mk
+
+ifeq ($(CONFIG_KBL),y)
+	PAYLOAD_AND_DEP_MK+=$(PACKAGE_DIR)/kexec-boot-loader/kexec-boot-loader.mk
+endif
+ifeq ($(CONFIG_BUSYBOX),y)
+	PAYLOAD_AND_DEP_MK+=$(PACKAGE_DIR)/busybox/busybox.mk
+endif
+ifeq ($(CONFIG_BOOTMENU),y)
+	PAYLOAD_AND_DEP_MK+=$(PACKAGE_DIR)/bootmenu/bootmenu.mk
+endif
+ifeq ($(CONFIG_OLPCFLASH),y)
+	PAYLOAD_AND_DEP_MK+=$(PACKAGE_DIR)/olpcflash/olpcflash.mk
+endif

Modified: buildrom-devel/config/payloads/memtest.conf
===================================================================
--- buildrom-devel/config/payloads/memtest.conf	2008-04-25 17:18:00 UTC (rev 167)
+++ buildrom-devel/config/payloads/memtest.conf	2008-04-25 18:29:27 UTC (rev 168)
@@ -1,4 +1,4 @@
-# Configuration file for the etherboot payload
+# Configuration file for the memtest payload
 
 # Common configuration options
 
@@ -8,3 +8,5 @@
 PAYLOAD_COMPRESSED=$(OUTPUT_DIR)/memtest-payload.elf.lzma
 
 PAYLOAD-y=memtest
+
+PAYLOAD_AND_DEP_MK=$(PACKAGE_DIR)/memtest/memtest.mk

Modified: buildrom-devel/config/payloads/ofw.conf
===================================================================
--- buildrom-devel/config/payloads/ofw.conf	2008-04-25 17:18:00 UTC (rev 167)
+++ buildrom-devel/config/payloads/ofw.conf	2008-04-25 18:29:27 UTC (rev 168)
@@ -12,3 +12,4 @@
 
 PAYLOAD-y=ofw
 #HOSTTOOLS-y=crc32sum
+PAYLOAD_AND_DEP_MK=$(PACKAGE_DIR)/ofw/ofw.mk

Modified: buildrom-devel/config/payloads/tint.conf
===================================================================
--- buildrom-devel/config/payloads/tint.conf	2008-04-25 17:18:00 UTC (rev 167)
+++ buildrom-devel/config/payloads/tint.conf	2008-04-25 18:29:27 UTC (rev 168)
@@ -10,5 +10,7 @@
 PAYLOAD-y=tint
 PAYLOAD=tint
 
+PAYLOAD_AND_DEP_MK=$(PACKAGE_DIR)/libpayload/libpayload.mk $(PACKAGE_DIR)/tint/tint.mk
+
 # Add libpayload as a dependency
 DEPENDS-y=libpayload





More information about the coreboot mailing list