diff options
| author | Tom Rini <trini@konsulko.com> | 2022-12-04 10:14:13 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-12-23 10:15:13 -0500 |
| commit | 0478dac62a9add8c73981a900ceaa6da732ae2bb (patch) | |
| tree | 9fac1da2ae69ad7aad9a1c9c649076bf78112c4b /scripts | |
| parent | e95bcfb56c6599ba6d00a54fc2f857b6680481c4 (diff) | |
| download | u-boot-0478dac62a9add8c73981a900ceaa6da732ae2bb.zip u-boot-0478dac62a9add8c73981a900ceaa6da732ae2bb.tar.gz u-boot-0478dac62a9add8c73981a900ceaa6da732ae2bb.tar.bz2 | |
kbuild: Remove uncmd_spl logic
At this point in the conversion there should be no need to have logic to
disable some symbol during the SPL build as all symbols should have an
SPL counterpart.
The main real changes done here are that we now must make proper use of
CONFIG_IS_ENABLED(DM_SERIAL) rather than many of the odd tricks we
developed prior to CONFIG_IS_ENABLED() being available.
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/Makefile.autoconf | 1 | ||||
| -rw-r--r-- | scripts/Makefile.build | 1 | ||||
| -rw-r--r-- | scripts/Makefile.uncmd_spl | 14 |
3 files changed, 0 insertions, 16 deletions
diff --git a/scripts/Makefile.autoconf b/scripts/Makefile.autoconf index f5f5e4a..0ade916 100644 --- a/scripts/Makefile.autoconf +++ b/scripts/Makefile.autoconf @@ -113,7 +113,6 @@ vpl/include/autoconf.mk: vpl/u-boot.cfg define filechk_config_h (echo "/* Automatically generated - do not edit */"; \ echo \#define CFG_BOARDDIR board/$(if $(VENDOR),$(VENDOR)/)$(BOARD);\ - echo \#include \<config_uncmd_spl.h\>; \ echo \#include \<configs/$(CONFIG_SYS_CONFIG_NAME).h\>; \ echo \#include \<asm/config.h\>; \ echo \#include \<linux/kconfig.h\>; \ diff --git a/scripts/Makefile.build b/scripts/Makefile.build index 3b8c9d8..97dd4a6 100644 --- a/scripts/Makefile.build +++ b/scripts/Makefile.build @@ -48,7 +48,6 @@ subdir-ccflags-y := # Modified for U-Boot -include include/config/auto.conf -include $(prefix)/include/autoconf.mk -include scripts/Makefile.uncmd_spl include scripts/Kbuild.include diff --git a/scripts/Makefile.uncmd_spl b/scripts/Makefile.uncmd_spl deleted file mode 100644 index 6ea097d..0000000 --- a/scripts/Makefile.uncmd_spl +++ /dev/null @@ -1,14 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0+ -# Makefile version of include/config_uncmd_spl.h -# TODO: Invent a better way - -ifdef CONFIG_SPL_BUILD - -ifndef CONFIG_SPL_DM -CONFIG_DM_SERIAL= -CONFIG_DM_I2C= -CONFIG_DM_SPI= -CONFIG_DM_SPI_FLASH= -endif - -endif |