diff options
| author | Tom Rini <[email protected]> | 2022-12-23 22:19:39 -0500 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2022-12-23 22:19:39 -0500 |
| commit | 3e4cbe184a0f6537abb457d6afa61224396c4e46 (patch) | |
| tree | d6e95e03385c33f5d99775cc44710fc6f540b094 /scripts/Makefile.autoconf | |
| parent | 52d91e1c20b399ddab276e2c03e5788ed5e5fdd2 (diff) | |
| parent | 90c7888c9d6b3223c32f068668f3bc5a81010f8e (diff) | |
Merge branch '2022-12-23-complete-phase1-CONFIG-migration' into next
- Bring in the final series to complete the main portion of migrating
CONFIG symbols to either Kconfig or CFG namespace (or removing /
renaming entirely). With this, we have stricter CI tests as well now.
Diffstat (limited to 'scripts/Makefile.autoconf')
| -rw-r--r-- | scripts/Makefile.autoconf | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/scripts/Makefile.autoconf b/scripts/Makefile.autoconf index 5a4a1489553..0ade91642ae 100644 --- a/scripts/Makefile.autoconf +++ b/scripts/Makefile.autoconf @@ -112,8 +112,7 @@ vpl/include/autoconf.mk: vpl/u-boot.cfg # Prior to Kconfig, it was generated by mkconfig. Now it is created here. define filechk_config_h (echo "/* Automatically generated - do not edit */"; \ - echo \#define CONFIG_BOARDDIR board/$(if $(VENDOR),$(VENDOR)/)$(BOARD);\ - echo \#include \<config_uncmd_spl.h\>; \ + echo \#define CFG_BOARDDIR board/$(if $(VENDOR),$(VENDOR)/)$(BOARD);\ echo \#include \<configs/$(CONFIG_SYS_CONFIG_NAME).h\>; \ echo \#include \<asm/config.h\>; \ echo \#include \<linux/kconfig.h\>; \ |