diff options
| author | Tom Rini <[email protected]> | 2021-11-12 10:14:24 -0500 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2021-11-12 10:14:24 -0500 |
| commit | 515bf78ff975d474f895bf86b4e16eade51c8dbd (patch) | |
| tree | 49114762efa8154f2a2f75d8718cf650e7f0fc09 /scripts | |
| parent | 1e72ad6b387c599f477f83cda67ab525c089a9b0 (diff) | |
| parent | 6f84e809d9a373961d34f5b408bf44702b8c978c (diff) | |
Merge branch '2021-11-12-assorted-updates'
- A number of pxe related cleanups and related re-organization.
- A few related pxe/sysboot/extlinux improvements
- Remove some dead code.
- Update Azure to use a newer Windows build environment
- Add a .get_maintainer.conf file
- A few minor TI SoC platform updates
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/Makefile.spl | 4 | ||||
| -rw-r--r-- | scripts/config_whitelist.txt | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/scripts/Makefile.spl b/scripts/Makefile.spl index 1bb2844913f..83a95ee4aa2 100644 --- a/scripts/Makefile.spl +++ b/scripts/Makefile.spl @@ -92,10 +92,10 @@ libs-y += common/init/ # Special handling for a few options which support SPL/TPL ifeq ($(CONFIG_TPL_BUILD),y) -libs-$(CONFIG_TPL_LIBCOMMON_SUPPORT) += common/ cmd/ env/ +libs-$(CONFIG_TPL_LIBCOMMON_SUPPORT) += boot/ common/ cmd/ env/ libs-$(CONFIG_TPL_LIBGENERIC_SUPPORT) += lib/ else -libs-$(CONFIG_SPL_LIBCOMMON_SUPPORT) += common/ cmd/ env/ +libs-$(CONFIG_SPL_LIBCOMMON_SUPPORT) += boot/ common/ cmd/ env/ libs-$(CONFIG_SPL_LIBGENERIC_SUPPORT) += lib/ ifdef CONFIG_SPL_FRAMEWORK libs-$(CONFIG_PARTITIONS) += disk/ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index f6ca93fa5cf..34c9ef0ced0 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -741,7 +741,6 @@ CONFIG_LQ038J7DH53 CONFIG_LS102XA_STREAM_ID CONFIG_LSCHLV2 CONFIG_LSXHL -CONFIG_LYNXKDI CONFIG_M41T94_SPI_CS CONFIG_M520x CONFIG_M5301x |