[PATCH] v3: Fix option table related makefile rules

[Carl-Daniel Hailfinger]

Thanks to Ron for spotting this bug.
The option table C file is a generated file and lives inside the build
directory. Look for it there.
Introduce the STAGE0_DYNAMIC_SRC makefile variable to handle this and
other generated stage1 code.

Signed-off-by: Carl-Daniel Hailfinger

Index: corebootv3-optiontable_makefile_stag0_dynamic/mainboard/amd/serengeti/Makefile
===================================================================
--- corebootv3-optiontable_makefile_stag0_dynamic/mainboard/amd/serengeti/Makefile	(Revision 934)
+++ corebootv3-optiontable_makefile_stag0_dynamic/mainboard/amd/serengeti/Makefile	(Arbeitskopie)
@@ -22,7 +22,6 @@
    		
 STAGE0_MAINBOARD_SRC := $(src)/lib/clog2.c \
    		$(src)/mainboard/$(MAINBOARDDIR)/stage1.c \
-			$(src)/mainboard/$(MAINBOARDDIR)/option_table.c \
    		$(src)/arch/x86/stage1_mtrr.c \
    		$(src)/arch/x86/amd/model_fxx/dualcore_id.c \
    		$(src)/arch/x86/amd/model_fxx/stage1.c \
@@ -33,6 +32,8 @@
    		$(src)/southbridge/amd/amd8111/stage1_ctrl.c \
    		$(src)/southbridge/amd/amd8111/stage1_enable_rom.c \

+STAGE0_DYNAMIC_SRC :=	$(obj)/mainboard/$(MAINBOARDDIR)/option_table.c
+
 INITRAM_SRC= $(src)/mainboard/$(MAINBOARDDIR)/initram.c \
    		$(src)/northbridge/amd/k8/raminit.c \
    		$(src)/northbridge/amd/k8/dqs.c \
Index: corebootv3-optiontable_makefile_stag0_dynamic/mainboard/gigabyte/m57sli/Makefile
===================================================================
--- corebootv3-optiontable_makefile_stag0_dynamic/mainboard/gigabyte/m57sli/Makefile	(Revision 934)
+++ corebootv3-optiontable_makefile_stag0_dynamic/mainboard/gigabyte/m57sli/Makefile	(Arbeitskopie)
@@ -21,7 +21,6 @@

STAGE0_MAINBOARD_SRC := $(src)/lib/clog2.c \
    		$(src)/mainboard/$(MAINBOARDDIR)/stage1.c \
-			$(src)/mainboard/$(MAINBOARDDIR)/option_table.c \
    		$(src)/arch/x86/stage1_mtrr.c \
    		$(src)/arch/x86/amd/model_fxx/dualcore_id.c \
    		$(src)/arch/x86/amd/model_fxx/stage1.c \
@@ -31,6 +30,8 @@
    		$(src)/southbridge/nvidia/mcp55/stage1_smbus.c \
    		$(src)/southbridge/nvidia/mcp55/stage1_enable_rom.c \

+STAGE0_DYNAMIC_SRC :=	$(obj)/mainboard/$(MAINBOARDDIR)/option_table.c
+
 INITRAM_SRC= $(src)/mainboard/$(MAINBOARDDIR)/initram.c \
    		$(src)/northbridge/amd/k8/raminit.c \
    		$(src)/northbridge/amd/k8/dqs.c \
Index: corebootv3-optiontable_makefile_stag0_dynamic/arch/x86/Makefile
===================================================================
--- corebootv3-optiontable_makefile_stag0_dynamic/arch/x86/Makefile	(Revision 934)
+++ corebootv3-optiontable_makefile_stag0_dynamic/arch/x86/Makefile	(Arbeitskopie)
@@ -147,6 +147,7 @@
          $(STAGE0_MAINBOARD_SRC) $(STAGE0_CHIPSET_SRC)

STAGE0_OBJ := $(patsubst $(src)/%.c,$(obj)/%.o,$(STAGE0_SRC)) \
+	      $(patsubst $(obj)/%.c,$(obj)/%.o,$(STAGE0_DYNAMIC_SRC)) \
          $(patsubst %,$(obj)/arch/x86/%,$(STAGE0_CAR_OBJ))

$(obj)/stage0.o $(obj)/stage0.init $(obj)/stage0-prefixed.o: $(STAGE0_OBJ)

[ron minnich]

Acked-by: Ronald G. Minnich

[Carl-Daniel Hailfinger]

On 16.10.2008 18:48, ron minnich wrote:
> Acked-by: Ronald G. Minnich

Thanks, r935.

Regards,
Carl-Daniel

[Peter Stuge]

Carl-Daniel Hailfinger wrote:
> Introduce the STAGE0_DYNAMIC_SRC makefile variable to handle this
> and other generated stage1 code.

STAGE0 vs. stage1. Which is it?

Is there a glitch in stage numbering between the code and the build
system?

//Peter

[Carl-Daniel Hailfinger]

On 17.10.2008 01:49, Peter Stuge wrote:
> Carl-Daniel Hailfinger wrote:
> > Introduce the STAGE0_DYNAMIC_SRC makefile variable to handle this
> > and other generated stage1 code.
>
> STAGE0 vs. stage1. Which is it?
>
> Is there a glitch in stage numbering between the code and the build
> system?

Yes, there is. Back when I tripped over it, I was too inexperienced to
dare to change it and now I have lots of more pressing stuff to fix.
Patches appreciated. I can do it, but it's at the end of my todo list.

Regards,
Carl-Daniel