diff options
| author | Simon Glass <sjg@chromium.org> | 2016-09-13 05:18:25 (GMT) |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-09-16 21:03:39 (GMT) |
| commit | 76f1f38816d8763b51e5f1d6ca099a88aa1fd077 (patch) | |
| tree | e407c3bf5d6b690df6f5bec7b78d265103463063 /scripts/Makefile.spl | |
| parent | 218d0d5b9b29b71c9c4db62bc735a54755e8ee1b (diff) | |
| download | u-boot-76f1f38816d8763b51e5f1d6ca099a88aa1fd077.tar.xz | |
Use separate options for TPL support
At present TPL uses the same options as SPL support. In a few cases the board
config enables or disables the SPL options depending on whether
CONFIG_TPL_BUILD is defined.
With the move to Kconfig, options are determined for the whole build and
(without a hack like an #undef in a header file) cannot be controlled in this
way.
Create new TPL options for these and update users. This will allow Kconfig
conversion to proceed for these boards.
Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'scripts/Makefile.spl')
| -rw-r--r-- | scripts/Makefile.spl | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/scripts/Makefile.spl b/scripts/Makefile.spl index 3ba9742..4994fa8 100644 --- a/scripts/Makefile.spl +++ b/scripts/Makefile.spl @@ -54,12 +54,20 @@ libs-$(HAVE_VENDOR_COMMON_LIB) += board/$(VENDOR)/common/ libs-$(CONFIG_SPL_FRAMEWORK) += common/spl/ 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/ +libs-$(CONFIG_TPL_LIBGENERIC_SUPPORT) += lib/ +else libs-$(CONFIG_SPL_LIBCOMMON_SUPPORT) += common/ cmd/ +libs-$(CONFIG_SPL_LIBGENERIC_SUPPORT) += lib/ +endif + libs-$(CONFIG_SPL_LIBDISK_SUPPORT) += disk/ libs-y += drivers/ libs-y += dts/ libs-y += fs/ -libs-$(CONFIG_SPL_LIBGENERIC_SUPPORT) += lib/ libs-$(CONFIG_SPL_POST_MEM_SUPPORT) += post/drivers/ libs-$(CONFIG_SPL_NET_SUPPORT) += net/ |