diff options
| author | Patrick Georgi <pgeorgi@google.com> | 2019-11-22 16:55:58 +0100 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2021-07-13 20:28:14 +0000 |
| commit | 53ea1d44f0435ca419de04e275e08b1bd296922c (patch) | |
| tree | c1a3a39c36e9b53d0129f0e24a9a032bfea066ca /payloads/coreinfo | |
| parent | 8585eabc5d5b516f46b2980a40b25f49eef5e056 (diff) | |
util/kconfig: Uprev to Linux 5.13's kconfig
This was originally several commits that had to be squashed into one
because the intermediate states weren't able to build coreboot:
- one to remove everything that wasn't our own code, leaving only
regex.[ch], toada.c, description.md and Makefile.inc.
- one to copy in Linux 5.13's scripts/kconfig and adapt Makefile.inc
to make the original Makefile work again.
- adapt abuild to use olddefconfig, simplifying matters.
- apply patches in util/kconfig/patches.
- Some more adaptations to the libpayload build system.
The patches are now in util/kconfig/patches/, reverse applying them
should lead to a util/kconfig/ tree that contains exactly the Linux
version + our own 5 files.
Change-Id: Ia0e8fe4e9022b278f34ab113a433ef4d45e5c355
Signed-off-by: Patrick Georgi <pgeorgi@google.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/37152
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Raul Rangel <rrangel@chromium.org>
Diffstat (limited to 'payloads/coreinfo')
| -rw-r--r-- | payloads/coreinfo/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/payloads/coreinfo/Makefile b/payloads/coreinfo/Makefile index 57dca13c75..096e9c60cf 100644 --- a/payloads/coreinfo/Makefile +++ b/payloads/coreinfo/Makefile @@ -34,7 +34,7 @@ export KCONFIG_SPLITCONFIG := $(obj)/config export KCONFIG_TRISTATE := $(obj)/tristate.conf export KCONFIG_CONFIG := $(CURDIR)/.config export KCONFIG_NEGATIVES := 1 -export Kconfig := Kconfig +export KBUILD_KCONFIG := Kconfig CONFIG_SHELL := sh KBUILD_DEFCONFIG := configs/defconfig @@ -70,7 +70,7 @@ $(obj)/config.h: $(shell mkdir -p $(objk)/lxdialog $(KCONFIG_SPLITCONFIG)) -include $(srck)/Makefile +include $(srck)/Makefile.inc .PHONY: $(PHONY) prepare all real-all defaultbuild |