[coreboot] buildrom bug

[Ward Vandewege]

Hi Myles,

On Fri, Apr 25, 2008 at 08:49:00AM -0600, Myles Watson wrote:
> 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
> kernel.mk, roms.mk and geodevsa.mk every time, but that seemed like a separate
> change.

Great start.

Don't we need that PAYLOAD_AND_DEP_MK change for every payload?

Also; looks like we need one extra small change (see below).

> Index: config/payloads/etherboot.conf
> ===================================================================
> --- config/payloads/etherboot.conf	(revision 160)
> +++ config/payloads/etherboot.conf	(working copy)
> @@ -8,3 +8,4 @@
>  PAYLOAD_COMPRESSED=$(OUTPUT_DIR)/etherboot-payload.elf.lzma
>  
>  PAYLOAD-y=etherboot
> +PAYLOAD_AND_DEP_MK=$(PACKAGE_DIR)/etherboot/etherboot.mk
> Index: config/payloads/ofw.conf
> ===================================================================
> --- config/payloads/ofw.conf	(revision 160)
> +++ config/payloads/ofw.conf	(working copy)
> @@ -12,3 +12,4 @@
>  
>  PAYLOAD-y=ofw
>  #HOSTTOOLS-y=crc32sum
> +PAYLOAD_AND_DEP_MK=$(PACKAGE_DIR)/ofw/ofw.mk
> Index: config/payloads/memtest.conf
> ===================================================================
> --- config/payloads/memtest.conf	(revision 160)
> +++ config/payloads/memtest.conf	(working copy)
> @@ -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
> Index: config/payloads/tint.conf
> ===================================================================
> --- config/payloads/tint.conf	(revision 160)
> +++ config/payloads/tint.conf	(working copy)
> @@ -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
> Index: config/payloads/grub2.conf
> ===================================================================
> --- config/payloads/grub2.conf	(revision 160)
> +++ config/payloads/grub2.conf	(working copy)
> @@ -9,3 +9,5 @@
>  
>  PAYLOAD-y=grub2
>  PAYLOAD=grub2
> +
> +PAYLOAD_AND_DEP_MK=$(PACKAGE_DIR)/grub2/grub2.mk
> Index: config/payloads/coreinfo.conf
> ===================================================================
> --- config/payloads/coreinfo.conf	(revision 160)
> +++ config/payloads/coreinfo.conf	(working copy)
> @@ -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
> Index: config/payloads/filo.conf
> ===================================================================
> --- config/payloads/filo.conf	(revision 160)
> +++ config/payloads/filo.conf	(working copy)
> @@ -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
>  
> Index: Makefile
> ===================================================================
> --- Makefile	(revision 160)
> +++ Makefile	(working copy)
> @@ -117,9 +117,10 @@
>  # 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)
> +include $(PAYLOAD_AND_DEP_MK)
>  
> -include $(filter-out $(PACKAGE_DIR)/kernel/% $(PACKAGE_DIR)/coreboot-v2/% $(PACKAGE_DIR)/coreboot-v3/%,$(MKTARGETS))
> +include $(PACKAGE_DIR)/geodevsa/geodevsa.mk
> +include $(PACKAGE_DIR)/roms/roms.mk

I needed to add

+include $(PACKAGE_DIR)/utils/nrv2b.mk

to get make to behave.

This also brings up the question why nrv2b.mk is in the 'utils' directory,
instead of the $(PACKAGE_DIR)/nrv2b/ directory?

Thanks,
Ward.

-- 
Ward Vandewege <ward at fsf.org>
Free Software Foundation - Senior System Administrator