Merge pull request 'Remove warning for coreboot images build without a payload' (#65) from nic3-14159/lbmk:remove-no-payload-warning into master
Reviewed-on: https://codeberg.org/libreboot/lbmk/pulls/65fsdg20230625
Leah Rowe
commit
75ad8b0d46
|
|
@ -0,0 +1,38 @@
|
||||||
|
From 1ce4f118b024a6367382b46016781f30fe622e3e Mon Sep 17 00:00:00 2001
|
||||||
|
From: Nicholas Chin <nic.c3.14@gmail.com>
|
||||||
|
Date: Fri, 12 May 2023 19:55:15 -0600
|
||||||
|
Subject: [PATCH] Remove warning for coreboot images built without a payload
|
||||||
|
|
||||||
|
I added this in upstream to prevent people from accidentally flashing
|
||||||
|
roms without a payload resulting in a no boot situation, but in
|
||||||
|
libreboot lbmk handles the payload and thus this warning always comes
|
||||||
|
up. This has caused confusion and concern so just patch it out.
|
||||||
|
---
|
||||||
|
payloads/Makefile.inc | 13 +------------
|
||||||
|
1 file changed, 1 insertion(+), 12 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/payloads/Makefile.inc b/payloads/Makefile.inc
|
||||||
|
index e735443a76..4f1692a873 100644
|
||||||
|
--- a/payloads/Makefile.inc
|
||||||
|
+++ b/payloads/Makefile.inc
|
||||||
|
@@ -49,16 +49,5 @@ distclean-payloads:
|
||||||
|
print-repo-info-payloads:
|
||||||
|
-$(foreach payload, $(PAYLOADS_LIST), $(MAKE) -C $(payload) print-repo-info 2>/dev/null; )
|
||||||
|
|
||||||
|
-ifeq ($(CONFIG_PAYLOAD_NONE),y)
|
||||||
|
-files_added:: warn_no_payload
|
||||||
|
-endif
|
||||||
|
-
|
||||||
|
-warn_no_payload:
|
||||||
|
- printf "\n\t** WARNING **\n"
|
||||||
|
- printf "coreboot has been built without a payload. Writing\n"
|
||||||
|
- printf "a coreboot image without a payload to your board's\n"
|
||||||
|
- printf "flash chip will result in a non-booting system. You\n"
|
||||||
|
- printf "can use cbfstool to add a payload to the image.\n\n"
|
||||||
|
-
|
||||||
|
.PHONY: force-payload coreinfo nvramcui
|
||||||
|
-.PHONY: clean-payloads distclean-payloads print-repo-info-payloads warn_no_payload
|
||||||
|
+.PHONY: clean-payloads distclean-payloads print-repo-info-payloads
|
||||||
|
--
|
||||||
|
2.40.1
|
||||||
|
|
||||||
|
|
@ -0,0 +1,38 @@
|
||||||
|
From 1ce4f118b024a6367382b46016781f30fe622e3e Mon Sep 17 00:00:00 2001
|
||||||
|
From: Nicholas Chin <nic.c3.14@gmail.com>
|
||||||
|
Date: Fri, 12 May 2023 19:55:15 -0600
|
||||||
|
Subject: [PATCH] Remove warning for coreboot images built without a payload
|
||||||
|
|
||||||
|
I added this in upstream to prevent people from accidentally flashing
|
||||||
|
roms without a payload resulting in a no boot situation, but in
|
||||||
|
libreboot lbmk handles the payload and thus this warning always comes
|
||||||
|
up. This has caused confusion and concern so just patch it out.
|
||||||
|
---
|
||||||
|
payloads/Makefile.inc | 13 +------------
|
||||||
|
1 file changed, 1 insertion(+), 12 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/payloads/Makefile.inc b/payloads/Makefile.inc
|
||||||
|
index e735443a76..4f1692a873 100644
|
||||||
|
--- a/payloads/Makefile.inc
|
||||||
|
+++ b/payloads/Makefile.inc
|
||||||
|
@@ -49,16 +49,5 @@ distclean-payloads:
|
||||||
|
print-repo-info-payloads:
|
||||||
|
-$(foreach payload, $(PAYLOADS_LIST), $(MAKE) -C $(payload) print-repo-info 2>/dev/null; )
|
||||||
|
|
||||||
|
-ifeq ($(CONFIG_PAYLOAD_NONE),y)
|
||||||
|
-files_added:: warn_no_payload
|
||||||
|
-endif
|
||||||
|
-
|
||||||
|
-warn_no_payload:
|
||||||
|
- printf "\n\t** WARNING **\n"
|
||||||
|
- printf "coreboot has been built without a payload. Writing\n"
|
||||||
|
- printf "a coreboot image without a payload to your board's\n"
|
||||||
|
- printf "flash chip will result in a non-booting system. You\n"
|
||||||
|
- printf "can use cbfstool to add a payload to the image.\n\n"
|
||||||
|
-
|
||||||
|
.PHONY: force-payload coreinfo nvramcui
|
||||||
|
-.PHONY: clean-payloads distclean-payloads print-repo-info-payloads warn_no_payload
|
||||||
|
+.PHONY: clean-payloads distclean-payloads print-repo-info-payloads
|
||||||
|
--
|
||||||
|
2.40.1
|
||||||
|
|
||||||
|
|
@ -0,0 +1,38 @@
|
||||||
|
From 1ce4f118b024a6367382b46016781f30fe622e3e Mon Sep 17 00:00:00 2001
|
||||||
|
From: Nicholas Chin <nic.c3.14@gmail.com>
|
||||||
|
Date: Fri, 12 May 2023 19:55:15 -0600
|
||||||
|
Subject: [PATCH] Remove warning for coreboot images built without a payload
|
||||||
|
|
||||||
|
I added this in upstream to prevent people from accidentally flashing
|
||||||
|
roms without a payload resulting in a no boot situation, but in
|
||||||
|
libreboot lbmk handles the payload and thus this warning always comes
|
||||||
|
up. This has caused confusion and concern so just patch it out.
|
||||||
|
---
|
||||||
|
payloads/Makefile.inc | 13 +------------
|
||||||
|
1 file changed, 1 insertion(+), 12 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/payloads/Makefile.inc b/payloads/Makefile.inc
|
||||||
|
index e735443a76..4f1692a873 100644
|
||||||
|
--- a/payloads/Makefile.inc
|
||||||
|
+++ b/payloads/Makefile.inc
|
||||||
|
@@ -49,16 +49,5 @@ distclean-payloads:
|
||||||
|
print-repo-info-payloads:
|
||||||
|
-$(foreach payload, $(PAYLOADS_LIST), $(MAKE) -C $(payload) print-repo-info 2>/dev/null; )
|
||||||
|
|
||||||
|
-ifeq ($(CONFIG_PAYLOAD_NONE),y)
|
||||||
|
-files_added:: warn_no_payload
|
||||||
|
-endif
|
||||||
|
-
|
||||||
|
-warn_no_payload:
|
||||||
|
- printf "\n\t** WARNING **\n"
|
||||||
|
- printf "coreboot has been built without a payload. Writing\n"
|
||||||
|
- printf "a coreboot image without a payload to your board's\n"
|
||||||
|
- printf "flash chip will result in a non-booting system. You\n"
|
||||||
|
- printf "can use cbfstool to add a payload to the image.\n\n"
|
||||||
|
-
|
||||||
|
.PHONY: force-payload coreinfo nvramcui
|
||||||
|
-.PHONY: clean-payloads distclean-payloads print-repo-info-payloads warn_no_payload
|
||||||
|
+.PHONY: clean-payloads distclean-payloads print-repo-info-payloads
|
||||||
|
--
|
||||||
|
2.40.1
|
||||||
|
|
||||||
Loading…
Reference in New Issue