Nico Huber has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/47636 )
Change subject: nvramcui: Use libpayload's new `Makefile.payload` ......................................................................
nvramcui: Use libpayload's new `Makefile.payload`
Change-Id: I34bf659c1a069ccc27ca613bbf86780d4da49259 Signed-off-by: Nico Huber nico.h@gmx.de --- M payloads/Makefile.inc M payloads/nvramcui/.gitignore M payloads/nvramcui/Makefile 3 files changed, 7 insertions(+), 37 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/36/47636/1
diff --git a/payloads/Makefile.inc b/payloads/Makefile.inc index 79e7748..a8c0772 100644 --- a/payloads/Makefile.inc +++ b/payloads/Makefile.inc @@ -10,7 +10,7 @@ img/coreinfo-compression := $(CBFS_SECONDARY_PAYLOAD_COMPRESS_FLAG)
cbfs-files-$(CONFIG_NVRAMCUI_SECONDARY_PAYLOAD) += img/nvramcui -img/nvramcui-file := payloads/nvramcui/nvramcui.elf +img/nvramcui-file := payloads/nvramcui/build/nvramcui.elf img/nvramcui-type := payload img/nvramcui-compression := $(CBFS_SECONDARY_PAYLOAD_COMPRESS_FLAG)
@@ -32,7 +32,7 @@ payloads/coreinfo/build/coreinfo.elf coreinfo: $(MAKE) -C payloads/coreinfo defaultbuild
-payloads/nvramcui/nvramcui.elf nvramcui: +payloads/nvramcui/build/nvramcui.elf nvramcui: $(MAKE) -C payloads/nvramcui
clean-payloads: diff --git a/payloads/nvramcui/.gitignore b/payloads/nvramcui/.gitignore index 4885853..19a985b 100644 --- a/payloads/nvramcui/.gitignore +++ b/payloads/nvramcui/.gitignore @@ -1,2 +1,2 @@ -build libpayload +.lp.config* diff --git a/payloads/nvramcui/Makefile b/payloads/nvramcui/Makefile index 269d558..c2c15a7 100644 --- a/payloads/nvramcui/Makefile +++ b/payloads/nvramcui/Makefile @@ -1,34 +1,4 @@ -LIBPAYLOAD_DIR=$(CURDIR)/libpayload -XCOMPILE=$(LIBPAYLOAD_DIR)/libpayload.xcompile -# build libpayload and put .config file in $(CURDIR) instead of ../libpayload -# to avoid pollute the libpayload source directory and possible conflicts -LPOPTS=obj="$(CURDIR)/build" DESTDIR="$(CURDIR)" DOTCONFIG="$(CURDIR)/.config" -CFLAGS += -Wall -Wvla -Werror -Os -ffreestanding -nostdinc -nostdlib - -all: nvramcui.elf - -$(LIBPAYLOAD_DIR): - $(MAKE) -C ../libpayload $(LPOPTS) defconfig - $(MAKE) -C ../libpayload $(LPOPTS) - $(MAKE) -C ../libpayload $(LPOPTS) install - -ifneq ($(strip $(wildcard libpayload)),) -include $(XCOMPILE) -LPGCC = CC="$(GCC_CC_x86_32)" "$(LIBPAYLOAD_DIR)/bin/lpgcc" -%.elf: %.c Makefile - $(LPGCC) $(CFLAGS) -o $*.elf $*.c -else -# If libpayload is not found, first build libpayload, -# then do the make, this time it'll find libpayload -# and generate the nvramcui.elf target -%.elf: $(LIBPAYLOAD_DIR) - $(MAKE) all -endif - -clean: - rm -rf build libpayload nvramcui.elf - -distclean: clean - rm -rf .config .config.old - -.PHONY: all clean distclean +ARCH = x86_32 +OBJS = $(obj)/nvramcui.o +TARGET = $(obj)/nvramcui.elf +include ../libpayload/Makefile.payload
Hello build bot (Jenkins), Patrick Georgi, Martin Roth,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/47636
to look at the new patch set (#2).
Change subject: nvramcui: Use libpayload's new `Makefile.payload` ......................................................................
nvramcui: Use libpayload's new `Makefile.payload`
Change-Id: I34bf659c1a069ccc27ca613bbf86780d4da49259 Signed-off-by: Nico Huber nico.h@gmx.de --- M payloads/Makefile.inc M payloads/nvramcui/.gitignore M payloads/nvramcui/Makefile 3 files changed, 7 insertions(+), 37 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/36/47636/2
Attention is currently required from: Nico Huber. Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/47636 )
Change subject: nvramcui: Use libpayload's new `Makefile.payload` ......................................................................
Patch Set 3:
(1 comment)
File payloads/nvramcui/Makefile:
https://review.coreboot.org/c/coreboot/+/47636/comment/a9763456_b8b8da7d PS3, Line 6: include ../libpayload/Makefile.payload Missing an `all` target, apparently.
Attention is currently required from: Angel Pons. Nico Huber has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/47636 )
Change subject: nvramcui: Use libpayload's new `Makefile.payload` ......................................................................
Patch Set 3:
(1 comment)
File payloads/nvramcui/Makefile:
https://review.coreboot.org/c/coreboot/+/47636/comment/fff3eb36_f07cd11a PS3, Line 6: include ../libpayload/Makefile.payload
Missing an `all` target, apparently.
Yeah, which makes me wonder. Do we ever build-test building payloads as part of coreboot? Or are they only build-tested stand-alone?
Attention is currently required from: Nico Huber. Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/47636 )
Change subject: nvramcui: Use libpayload's new `Makefile.payload` ......................................................................
Patch Set 3:
(1 comment)
File payloads/nvramcui/Makefile:
https://review.coreboot.org/c/coreboot/+/47636/comment/e2f94962_c521bf89 PS3, Line 6: include ../libpayload/Makefile.payload
Yeah, which makes me wonder. Do we ever build-test building payloads as part […]
I'd say there are no tests for building payloads as part of coreboot.
Hello build bot (Jenkins), Patrick Georgi, Martin Roth,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/47636
to look at the new patch set (#4).
Change subject: nvramcui: Use libpayload's new `Makefile.payload` ......................................................................
nvramcui: Use libpayload's new `Makefile.payload`
Change-Id: I34bf659c1a069ccc27ca613bbf86780d4da49259 Signed-off-by: Nico Huber nico.h@gmx.de --- M payloads/Makefile.inc M payloads/nvramcui/.gitignore M payloads/nvramcui/Makefile 3 files changed, 10 insertions(+), 33 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/36/47636/4
Attention is currently required from: Nico Huber. Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/47636 )
Change subject: nvramcui: Use libpayload's new `Makefile.payload` ......................................................................
Patch Set 4: Code-Review+1
Attention is currently required from: Nico Huber, Angel Pons. Nico Huber has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/47636 )
Change subject: nvramcui: Use libpayload's new `Makefile.payload` ......................................................................
Patch Set 4:
(1 comment)
File payloads/nvramcui/Makefile:
https://review.coreboot.org/c/coreboot/+/47636/comment/0af840e9_8a42b578 PS3, Line 6: include ../libpayload/Makefile.payload
I'd say there are no tests for building payloads as part of coreboot.
Done
Attention is currently required from: Nico Huber. Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/47636 )
Change subject: nvramcui: Use libpayload's new `Makefile.payload` ......................................................................
Patch Set 4: Code-Review+2
Nico Huber has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/47636 )
Change subject: nvramcui: Use libpayload's new `Makefile.payload` ......................................................................
Patch Set 4:
(1 comment)
File payloads/nvramcui/Makefile:
https://review.coreboot.org/c/coreboot/+/47636/comment/84e9f64e_b5cd67c1 PS4, Line 7: all: real-all Actually, this could be moved below and replace `real-all` because we know that $(TARGET) is the first rule in `Makefile.payload`. But having `all` on top might please people who think there should be an `all` target? *shrug*
Attention is currently required from: Nico Huber. Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/47636 )
Change subject: nvramcui: Use libpayload's new `Makefile.payload` ......................................................................
Patch Set 4:
(1 comment)
File payloads/nvramcui/Makefile:
https://review.coreboot.org/c/coreboot/+/47636/comment/9a47f14f_3373583f PS4, Line 7: all: real-all
Actually, this could be moved below and replace `real-all` because […]
Or we could stuff `all` inside Makefile.payload ?
Nico Huber has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/47636 )
Change subject: nvramcui: Use libpayload's new `Makefile.payload` ......................................................................
Patch Set 4:
(1 comment)
File payloads/nvramcui/Makefile:
https://review.coreboot.org/c/coreboot/+/47636/comment/1df7145b_563eb2b2 PS4, Line 7: all: real-all
Or we could stuff `all` inside Makefile. […]
I thought about it, but I don't like such implicit rules much. Maybe I should move it anyway? It would just be a dependency without recipe anyway, so the payload Makefile could still provide one.
Attention is currently required from: Nico Huber. Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/47636 )
Change subject: nvramcui: Use libpayload's new `Makefile.payload` ......................................................................
Patch Set 4:
(1 comment)
File payloads/nvramcui/Makefile:
https://review.coreboot.org/c/coreboot/+/47636/comment/8447a912_591ebfbf PS4, Line 7: all: real-all
I thought about it, but I don't like such implicit rules much. Maybe I should […]
I don't mind.
Nico Huber has submitted this change. ( https://review.coreboot.org/c/coreboot/+/47636 )
Change subject: nvramcui: Use libpayload's new `Makefile.payload` ......................................................................
nvramcui: Use libpayload's new `Makefile.payload`
Change-Id: I34bf659c1a069ccc27ca613bbf86780d4da49259 Signed-off-by: Nico Huber nico.h@gmx.de Reviewed-on: https://review.coreboot.org/c/coreboot/+/47636 Reviewed-by: Angel Pons th3fanbus@gmail.com Tested-by: build bot (Jenkins) no-reply@coreboot.org --- M payloads/Makefile.inc M payloads/nvramcui/.gitignore M payloads/nvramcui/Makefile 3 files changed, 10 insertions(+), 33 deletions(-)
Approvals: build bot (Jenkins): Verified Angel Pons: Looks good to me, approved
diff --git a/payloads/Makefile.inc b/payloads/Makefile.inc index 79e7748..a8c0772 100644 --- a/payloads/Makefile.inc +++ b/payloads/Makefile.inc @@ -10,7 +10,7 @@ img/coreinfo-compression := $(CBFS_SECONDARY_PAYLOAD_COMPRESS_FLAG)
cbfs-files-$(CONFIG_NVRAMCUI_SECONDARY_PAYLOAD) += img/nvramcui -img/nvramcui-file := payloads/nvramcui/nvramcui.elf +img/nvramcui-file := payloads/nvramcui/build/nvramcui.elf img/nvramcui-type := payload img/nvramcui-compression := $(CBFS_SECONDARY_PAYLOAD_COMPRESS_FLAG)
@@ -32,7 +32,7 @@ payloads/coreinfo/build/coreinfo.elf coreinfo: $(MAKE) -C payloads/coreinfo defaultbuild
-payloads/nvramcui/nvramcui.elf nvramcui: +payloads/nvramcui/build/nvramcui.elf nvramcui: $(MAKE) -C payloads/nvramcui
clean-payloads: diff --git a/payloads/nvramcui/.gitignore b/payloads/nvramcui/.gitignore index 4885853..19a985b 100644 --- a/payloads/nvramcui/.gitignore +++ b/payloads/nvramcui/.gitignore @@ -1,2 +1,2 @@ -build libpayload +.lp.config* diff --git a/payloads/nvramcui/Makefile b/payloads/nvramcui/Makefile index ebc48de..cfe279b 100644 --- a/payloads/nvramcui/Makefile +++ b/payloads/nvramcui/Makefile @@ -1,36 +1,13 @@ unexport $(COREBOOT_EXPORTS)
-LIBPAYLOAD_DIR=$(CURDIR)/libpayload -XCOMPILE=$(LIBPAYLOAD_DIR)/libpayload.xcompile -# build libpayload and put .config file in $(CURDIR) instead of ../libpayload -# to avoid pollute the libpayload source directory and possible conflicts -LPOPTS=obj="$(CURDIR)/build" DESTDIR="$(CURDIR)" DOTCONFIG="$(CURDIR)/.config" -CFLAGS += -Wall -Wvla -Werror -Os -ffreestanding -nostdinc -nostdlib +ARCH = x86_32 +OBJS = $(obj)/nvramcui.o +TARGET = $(obj)/nvramcui.elf
-all: nvramcui.elf +all: real-all
-$(LIBPAYLOAD_DIR): - $(MAKE) -C ../libpayload $(LPOPTS) defconfig - $(MAKE) -C ../libpayload $(LPOPTS) - $(MAKE) -C ../libpayload $(LPOPTS) install +include ../libpayload/Makefile.payload
-ifneq ($(strip $(wildcard libpayload)),) -include $(XCOMPILE) -LPGCC = CC="$(GCC_CC_x86_32)" "$(LIBPAYLOAD_DIR)/bin/lpgcc" -%.elf: %.c Makefile - $(LPGCC) $(CFLAGS) -o $*.elf $*.c -else -# If libpayload is not found, first build libpayload, -# then do the make, this time it'll find libpayload -# and generate the nvramcui.elf target -%.elf: $(LIBPAYLOAD_DIR) - $(MAKE) all -endif +real-all: $(TARGET)
-clean: - rm -rf build libpayload nvramcui.elf - -distclean: clean - rm -rf .config .config.old - -.PHONY: all clean distclean +.PHONY: all real-all