svn@coreboot.org wrote:
Author: jcrouse Date: 2008-10-21 23:49:48 +0200 (Tue, 21 Oct 2008) New Revision: 3681
Modified: trunk/payloads/libpayload/Makefile trunk/payloads/libpayload/drivers/video/video.c trunk/payloads/libpayload/sample/hello.c Log: [PATCH] fix video console init
Move console_add_output-driver() inside the for() loop
Signed-off-by: Jordan Crouse jordan.crouse@amd.com Acked-by: Jordan Crouse jordan.crouse@amd.com
Modified: trunk/payloads/libpayload/Makefile
--- trunk/payloads/libpayload/Makefile 2008-10-21 16:27:38 UTC (rev 3680) +++ trunk/payloads/libpayload/Makefile 2008-10-21 21:49:48 UTC (rev 3681) @@ -115,6 +115,8 @@ $(Q)printf " AR $(subst $(shell pwd)/,,$(@))\n" $(Q)$(AR) rc $@ $(OBJS)
+include util/kconfig/Makefile
$(obj)/%.o: $(src)/%.c $(Q)printf " CC $(subst $(shell pwd)/,,$(@))\n" $(Q)$(CC) -m32 $(CFLAGS) -c -o $@ $< @@ -164,7 +166,6 @@ $(Q)rm -rf build $(Q)rm -f .config .config.old ..config.tmp .kconfig.d .tmpconfig*
-include util/kconfig/Makefile
.PHONY: $(PHONY) prepare clean distclean doxygen doxy
This part is not mentioned in the changelog of the commit. I assume it has been committed by accident, because it breaks libpayload here:
ra:libpayload stepan$ make menuconfig make: *** No rule to make target `menuconfig'. Stop. ra:libpayload stepan$ make config make: *** No rule to make target `config'. Stop. ra:libpayload stepan$
On Wed, Oct 22, 2008 at 12:48:02PM +0200, Stefan Reinauer wrote:
svn@coreboot.org wrote:
Author: jcrouse Date: 2008-10-21 23:49:48 +0200 (Tue, 21 Oct 2008) New Revision: 3681
Modified: trunk/payloads/libpayload/Makefile trunk/payloads/libpayload/drivers/video/video.c trunk/payloads/libpayload/sample/hello.c Log: [PATCH] fix video console init
Move console_add_output-driver() inside the for() loop
Signed-off-by: Jordan Crouse jordan.crouse@amd.com Acked-by: Jordan Crouse jordan.crouse@amd.com
Modified: trunk/payloads/libpayload/Makefile
--- trunk/payloads/libpayload/Makefile 2008-10-21 16:27:38 UTC (rev 3680) +++ trunk/payloads/libpayload/Makefile 2008-10-21 21:49:48 UTC (rev 3681) @@ -115,6 +115,8 @@ $(Q)printf " AR $(subst $(shell pwd)/,,$(@))\n" $(Q)$(AR) rc $@ $(OBJS)
+include util/kconfig/Makefile
$(obj)/%.o: $(src)/%.c $(Q)printf " CC $(subst $(shell pwd)/,,$(@))\n" $(Q)$(CC) -m32 $(CFLAGS) -c -o $@ $< @@ -164,7 +166,6 @@ $(Q)rm -rf build $(Q)rm -f .config .config.old ..config.tmp .kconfig.d .tmpconfig*
-include util/kconfig/Makefile
.PHONY: $(PHONY) prepare clean distclean doxygen doxy
This part is not mentioned in the changelog of the commit. I assume it has been committed by accident, because it breaks libpayload here:
ra:libpayload stepan$ make menuconfig make: *** No rule to make target `menuconfig'. Stop. ra:libpayload stepan$ make config make: *** No rule to make target `config'. Stop. ra:libpayload stepan$
Yep, was committed accidentally I think. Moving that include as above is also not sufficient, I think, as the 'ifeq' part in the Makefile is not honored.
Please try attached patch, works for me. I hope this will also fix Myles' compile problems.
Uwe.
On Wed, Oct 22, 2008 at 01:08:19PM +0200, Uwe Hermann wrote:
On Wed, Oct 22, 2008 at 12:48:02PM +0200, Stefan Reinauer wrote:
svn@coreboot.org wrote:
Author: jcrouse Date: 2008-10-21 23:49:48 +0200 (Tue, 21 Oct 2008) New Revision: 3681
Modified: trunk/payloads/libpayload/Makefile trunk/payloads/libpayload/drivers/video/video.c trunk/payloads/libpayload/sample/hello.c Log: [PATCH] fix video console init
Move console_add_output-driver() inside the for() loop
Signed-off-by: Jordan Crouse jordan.crouse@amd.com Acked-by: Jordan Crouse jordan.crouse@amd.com
Modified: trunk/payloads/libpayload/Makefile
--- trunk/payloads/libpayload/Makefile 2008-10-21 16:27:38 UTC (rev 3680) +++ trunk/payloads/libpayload/Makefile 2008-10-21 21:49:48 UTC (rev 3681) @@ -115,6 +115,8 @@ $(Q)printf " AR $(subst $(shell pwd)/,,$(@))\n" $(Q)$(AR) rc $@ $(OBJS)
+include util/kconfig/Makefile
$(obj)/%.o: $(src)/%.c $(Q)printf " CC $(subst $(shell pwd)/,,$(@))\n" $(Q)$(CC) -m32 $(CFLAGS) -c -o $@ $< @@ -164,7 +166,6 @@ $(Q)rm -rf build $(Q)rm -f .config .config.old ..config.tmp .kconfig.d .tmpconfig*
-include util/kconfig/Makefile
.PHONY: $(PHONY) prepare clean distclean doxygen doxy
This part is not mentioned in the changelog of the commit. I assume it has been committed by accident, because it breaks libpayload here:
ra:libpayload stepan$ make menuconfig make: *** No rule to make target `menuconfig'. Stop. ra:libpayload stepan$ make config make: *** No rule to make target `config'. Stop. ra:libpayload stepan$
Yep, was committed accidentally I think. Moving that include as above is also not sufficient, I think, as the 'ifeq' part in the Makefile is not honored.
Please try attached patch, works for me. I hope this will also fix Myles' compile problems.
Uwe.
http://www.hermann-uwe.de | http://www.holsham-traders.de http://www.crazy-hacks.org | http://www.unmaintained-free-software.org
-- coreboot mailing list: coreboot@coreboot.org http://www.coreboot.org/mailman/listinfo/coreboot
Forgot the patch.
Uwe.
-----Original Message----- From: Uwe Hermann [mailto:uwe@hermann-uwe.de] Sent: Wednesday, October 22, 2008 5:12 AM To: Stefan Reinauer Cc: Jordan Crouse; Myles Watson; coreboot@coreboot.org Subject: Re: [coreboot] r3681 libpayload build failure
On Wed, Oct 22, 2008 at 01:08:19PM +0200, Uwe Hermann wrote:
On Wed, Oct 22, 2008 at 12:48:02PM +0200, Stefan Reinauer wrote:
svn@coreboot.org wrote:
Author: jcrouse Date: 2008-10-21 23:49:48 +0200 (Tue, 21 Oct 2008) New Revision: 3681
Modified: trunk/payloads/libpayload/Makefile trunk/payloads/libpayload/drivers/video/video.c trunk/payloads/libpayload/sample/hello.c Log: [PATCH] fix video console init
Move console_add_output-driver() inside the for() loop
Signed-off-by: Jordan Crouse jordan.crouse@amd.com Acked-by: Jordan Crouse jordan.crouse@amd.com
Modified: trunk/payloads/libpayload/Makefile
--- trunk/payloads/libpayload/Makefile 2008-10-21 16:27:38 UTC
(rev 3680)
+++ trunk/payloads/libpayload/Makefile 2008-10-21 21:49:48 UTC
(rev 3681)
@@ -115,6 +115,8 @@ $(Q)printf " AR $(subst $(shell pwd)/,,$(@))\n" $(Q)$(AR) rc $@ $(OBJS)
+include util/kconfig/Makefile
$(obj)/%.o: $(src)/%.c $(Q)printf " CC $(subst $(shell pwd)/,,$(@))\n" $(Q)$(CC) -m32 $(CFLAGS) -c -o $@ $< @@ -164,7 +166,6 @@ $(Q)rm -rf build $(Q)rm -f .config .config.old ..config.tmp .kconfig.d
.tmpconfig*
-include util/kconfig/Makefile
.PHONY: $(PHONY) prepare clean distclean doxygen doxy
This part is not mentioned in the changelog of the commit. I assume it has been committed by accident, because it breaks libpayload here:
ra:libpayload stepan$ make menuconfig make: *** No rule to make target `menuconfig'. Stop. ra:libpayload stepan$ make config make: *** No rule to make target `config'. Stop. ra:libpayload stepan$
Yep, was committed accidentally I think. Moving that include as above is also not sufficient, I think, as the 'ifeq' part in the Makefile is not honored.
Please try attached patch, works for me. I hope this will also fix Myles' compile problems.
My build failure got cleared up as of 3685, and still works with this patch applied.
Acked-by: Myles Watson mylesgw@gmail.com
Thanks, Myles
On 22/10/08 13:12 +0200, Uwe Hermann wrote:
On Wed, Oct 22, 2008 at 01:08:19PM +0200, Uwe Hermann wrote:
On Wed, Oct 22, 2008 at 12:48:02PM +0200, Stefan Reinauer wrote:
svn@coreboot.org wrote:
Author: jcrouse Date: 2008-10-21 23:49:48 +0200 (Tue, 21 Oct 2008) New Revision: 3681
Modified: trunk/payloads/libpayload/Makefile trunk/payloads/libpayload/drivers/video/video.c trunk/payloads/libpayload/sample/hello.c Log: [PATCH] fix video console init
Move console_add_output-driver() inside the for() loop
Signed-off-by: Jordan Crouse jordan.crouse@amd.com Acked-by: Jordan Crouse jordan.crouse@amd.com
Modified: trunk/payloads/libpayload/Makefile
--- trunk/payloads/libpayload/Makefile 2008-10-21 16:27:38 UTC (rev 3680) +++ trunk/payloads/libpayload/Makefile 2008-10-21 21:49:48 UTC (rev 3681) @@ -115,6 +115,8 @@ $(Q)printf " AR $(subst $(shell pwd)/,,$(@))\n" $(Q)$(AR) rc $@ $(OBJS)
+include util/kconfig/Makefile
$(obj)/%.o: $(src)/%.c $(Q)printf " CC $(subst $(shell pwd)/,,$(@))\n" $(Q)$(CC) -m32 $(CFLAGS) -c -o $@ $< @@ -164,7 +166,6 @@ $(Q)rm -rf build $(Q)rm -f .config .config.old ..config.tmp .kconfig.d .tmpconfig*
-include util/kconfig/Makefile
.PHONY: $(PHONY) prepare clean distclean doxygen doxy
This part is not mentioned in the changelog of the commit. I assume it has been committed by accident, because it breaks libpayload here:
ra:libpayload stepan$ make menuconfig make: *** No rule to make target `menuconfig'. Stop. ra:libpayload stepan$ make config make: *** No rule to make target `config'. Stop. ra:libpayload stepan$
Yep, was committed accidentally I think. Moving that include as above is also not sufficient, I think, as the 'ifeq' part in the Makefile is not honored.
Please try attached patch, works for me. I hope this will also fix Myles' compile problems.
Uwe.
http://www.hermann-uwe.de | http://www.holsham-traders.de http://www.crazy-hacks.org | http://www.unmaintained-free-software.org
-- coreboot mailing list: coreboot@coreboot.org http://www.coreboot.org/mailman/listinfo/coreboot
Forgot the patch.
Uwe.
http://www.hermann-uwe.de | http://www.holsham-traders.de http://www.crazy-hacks.org | http://www.unmaintained-free-software.org
Fix ordering problem in the libpayload Makefile. The include of 'include util/kconfig/Makefile' must come before certain pattern rules for compilation of kconfig files, otherwise the build would break in most situations.
Signed-off-by: Uwe Hermann uwe@hermann-uwe.de
Acked-by: Jordan Crouse jordan.crouse@amd.com
Sorry about that - I wasn't paying attention.
r3686
Index: Makefile
--- Makefile (Revision 3683) +++ Makefile (Arbeitskopie) @@ -115,16 +115,6 @@ $(Q)printf " AR $(subst $(shell pwd)/,,$(@))\n" $(Q)$(AR) rc $@ $(OBJS)
-include util/kconfig/Makefile
-$(obj)/%.o: $(src)/%.c
- $(Q)printf " CC $(subst $(shell pwd)/,,$(@))\n"
- $(Q)$(CC) -m32 $(CFLAGS) -c -o $@ $<
-$(obj)/%.S.o: $(src)/%.S
- $(Q)printf " CC $(subst $(shell pwd)/,,$(@))\n"
- $(Q)$(CC) -m32 $(CFLAGS) -c -o $@ $<
endif
install: lib @@ -169,6 +159,22 @@ $(Q)rm -rf build $(Q)rm -f .config .config.old ..config.tmp .kconfig.d .tmpconfig*
+# This include must come _before_ the pattern rules below! +# Order _does_ matter for pattern rules. +include util/kconfig/Makefile
+ifeq ($(strip $(HAVE_DOTCONFIG)),) +else
+$(obj)/%.o: $(src)/%.c
- $(Q)printf " CC $(subst $(shell pwd)/,,$(@))\n"
- $(Q)$(CC) -m32 $(CFLAGS) -c -o $@ $<
+$(obj)/%.S.o: $(src)/%.S
- $(Q)printf " CC $(subst $(shell pwd)/,,$(@))\n"
- $(Q)$(CC) -m32 $(CFLAGS) -c -o $@ $<
+endif
.PHONY: $(PHONY) prepare clean distclean doxygen doxy
On 22/10/08 13:08 +0200, Uwe Hermann wrote:
On Wed, Oct 22, 2008 at 12:48:02PM +0200, Stefan Reinauer wrote:
svn@coreboot.org wrote:
Author: jcrouse Date: 2008-10-21 23:49:48 +0200 (Tue, 21 Oct 2008) New Revision: 3681
Modified: trunk/payloads/libpayload/Makefile trunk/payloads/libpayload/drivers/video/video.c trunk/payloads/libpayload/sample/hello.c Log: [PATCH] fix video console init
Move console_add_output-driver() inside the for() loop
Signed-off-by: Jordan Crouse jordan.crouse@amd.com Acked-by: Jordan Crouse jordan.crouse@amd.com
Modified: trunk/payloads/libpayload/Makefile
--- trunk/payloads/libpayload/Makefile 2008-10-21 16:27:38 UTC (rev 3680) +++ trunk/payloads/libpayload/Makefile 2008-10-21 21:49:48 UTC (rev 3681) @@ -115,6 +115,8 @@ $(Q)printf " AR $(subst $(shell pwd)/,,$(@))\n" $(Q)$(AR) rc $@ $(OBJS)
+include util/kconfig/Makefile
$(obj)/%.o: $(src)/%.c $(Q)printf " CC $(subst $(shell pwd)/,,$(@))\n" $(Q)$(CC) -m32 $(CFLAGS) -c -o $@ $< @@ -164,7 +166,6 @@ $(Q)rm -rf build $(Q)rm -f .config .config.old ..config.tmp .kconfig.d .tmpconfig*
-include util/kconfig/Makefile
.PHONY: $(PHONY) prepare clean distclean doxygen doxy
This part is not mentioned in the changelog of the commit. I assume it has been committed by accident, because it breaks libpayload here:
ra:libpayload stepan$ make menuconfig make: *** No rule to make target `menuconfig'. Stop. ra:libpayload stepan$ make config make: *** No rule to make target `config'. Stop. ra:libpayload stepan$
Yep, was committed accidentally I think. Moving that include as above is also not sufficient, I think, as the 'ifeq' part in the Makefile is not honored.
Please try attached patch, works for me. I hope this will also fix Myles' compile problems.
Dang! Sorry about that - I wasn't paying enough attention.
What still needs to be fixed?
Jordan
-
Jordan Crouse -
Myles Watson -
Stefan Reinauer -
Uwe Hermann