[coreboot-gerrit] Patch set updated for coreboot: 6aaf65b Makefile: fix config.h leaking to the next build when using CONFIG_UPDATE_IMAGE.

[Denis Carikli (GNUtoo@no-log.org)]

Denis Carikli (GNUtoo at no-log.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/3585

-gerrit

commit 6aaf65b28434bf40aaf5c1258bc16cbff6ab1c99
Author: Denis 'GNUtoo' Carikli <GNUtoo at no-log.org>
Date:   Mon Jul 1 08:39:51 2013 +0200

    Makefile: fix config.h leaking to the next build when using CONFIG_UPDATE_IMAGE.
    
    When we build a first image with the fallback/ prefix,
      with the CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT option,
      and without CONFIG_UPDATE_IMAGE, the image builds fine,
      and build/coreboot.rom is generated.
    
    Then if when we run "make menuconfig" and select CONFIG_UPDATE_IMAGE
      along with different options( here we will unselect
      the CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT ), we then have
      a build failure like that:
        build/generated/coreboot_ram.o: In function `gma_func0_init':
        [...]/src/northbridge/intel/i945/gma.c:62: undefined reference to `i915lightup'
        build/generated/coreboot_ram.o: In function `lb_framebuffer':
        [...]/src/lib/coreboot_table.c:176: undefined reference to `vbe_mode_info_valid'
        [...]/src/lib/coreboot_table.c:182: undefined reference to `fill_lb_framebuffer'
        collect2: error: ld returned 1 exit status
      despite of having #if CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT
      and #endif surrounding the usage of i915lightup
      in [...]/src/northbridge/intel/i945/gma.c
      It is due to the fact that build/config.h has
      #define CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT 1
      in it, despite of having selected CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT
      only in the first build(the one with the /fallback prefix).
    
    Change-Id: I345c2359876918eba1019f25d86d1392f4ee85e1
    Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo at no-log.org>
---
 Makefile | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index dec32e5..fbe68fa 100644
--- a/Makefile
+++ b/Makefile
@@ -82,7 +82,10 @@ HOSTCXXFLAGS := -g
 DOXYGEN := doxygen
 DOXYGEN_OUTPUT_DIR := doxygen
 
-all: real-all
+all: clean-config real-all
+
+clean-config:
+	rm -f $(obj)/config.h
 
 # This include must come _before_ the pattern rules below!
 # Order _does_ matter for pattern rules.