mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-12-28 05:53:54 +00:00
c82216803d
I'm also seeing the build failure that commit7d4776545benv: solve compilation error in SPL tried to fix, namely that the reference to env_flags_validate from env_htab cannot be satisfied when flags.o is not built in. However, that commit got reverted byd90fc9c3deRevert "env: solve compilation error in SPL" Necessary, but not sufficient conditions to see this are CONFIG_SPL=y (obviously) CONFIG_SPL_ENV_SUPPORT=n (so flags.o does not get compiled) CONFIG_SPL_LIBCOMMON_SUPPORT=y (so env/built-in.o is part of the SPL link) Now, these are satisfied for e.g. imx6q_logic_defconfig. But that builds just fine, and spl/u-boot-spl.map lists .data.env_htab among the discarded (garbage collected) sections. Yet, on our mpc8309-derived board, we do see the build failure, so perhaps the linker works a bit differently on ppc than on ARM, or there's yet some other configuration option needed to observe the break. This is another attempt at solving it, which also cleans up env/Makefile a bit: Introduce a def_bool y symbol CONFIG_ENV_SUPPORT which complements CONFIG_(SPL/TPL)_SUPPORT. Then use CONFIG_$(SPL_TPL_)ENV_SUPPORT to decide whether to include the five basic env/*.o files. For attr.o, flags.o and callback.o, this shouldn't change anything. Also, common.o and env.o still get unconditionally built for U-boot proper. But for TPL/SPL, those two are only included if CONFIG_(SPL/TPL)_SUPPORT is set. Having that symbol should also allow simplifying conditionals such as #if !defined(CONFIG_SPL_BUILD) || CONFIG_IS_ENABLED(ENV_SUPPORT) found in drivers/reset/reset-socfpga.c to just CONFIG_IS_ENABLED(ENV_SUPPORT). Signed-off-by: Rasmus Villemoes <rasmus.villemoes@prevas.dk>
33 lines
1.2 KiB
Makefile
33 lines
1.2 KiB
Makefile
# SPDX-License-Identifier: GPL-2.0+
|
|
#
|
|
# (C) Copyright 2004-2006
|
|
# Wolfgang Denk, DENX Software Engineering, wd@denx.de.
|
|
|
|
obj-$(CONFIG_$(SPL_TPL_)ENV_SUPPORT) += common.o
|
|
obj-$(CONFIG_$(SPL_TPL_)ENV_SUPPORT) += env.o
|
|
obj-$(CONFIG_$(SPL_TPL_)ENV_SUPPORT) += attr.o
|
|
obj-$(CONFIG_$(SPL_TPL_)ENV_SUPPORT) += flags.o
|
|
obj-$(CONFIG_$(SPL_TPL_)ENV_SUPPORT) += callback.o
|
|
|
|
ifndef CONFIG_SPL_BUILD
|
|
obj-$(CONFIG_ENV_IS_IN_EEPROM) += eeprom.o
|
|
extra-$(CONFIG_ENV_IS_EMBEDDED) += embedded.o
|
|
obj-$(CONFIG_ENV_IS_IN_EEPROM) += embedded.o
|
|
extra-$(CONFIG_ENV_IS_IN_FLASH) += embedded.o
|
|
obj-$(CONFIG_ENV_IS_IN_NVRAM) += embedded.o
|
|
obj-$(CONFIG_ENV_IS_IN_NVRAM) += nvram.o
|
|
obj-$(CONFIG_ENV_IS_IN_ONENAND) += onenand.o
|
|
obj-$(CONFIG_ENV_IS_IN_SATA) += sata.o
|
|
obj-$(CONFIG_ENV_IS_IN_REMOTE) += remote.o
|
|
obj-$(CONFIG_ENV_IS_IN_UBI) += ubi.o
|
|
endif
|
|
|
|
obj-$(CONFIG_$(SPL_TPL_)ENV_IS_NOWHERE) += nowhere.o
|
|
obj-$(CONFIG_$(SPL_TPL_)ENV_IS_IN_MMC) += mmc.o
|
|
obj-$(CONFIG_$(SPL_TPL_)ENV_IS_IN_FAT) += fat.o
|
|
obj-$(CONFIG_$(SPL_TPL_)ENV_IS_IN_EXT4) += ext4.o
|
|
obj-$(CONFIG_$(SPL_TPL_)ENV_IS_IN_NAND) += nand.o
|
|
obj-$(CONFIG_$(SPL_TPL_)ENV_IS_IN_SPI_FLASH) += sf.o
|
|
obj-$(CONFIG_$(SPL_TPL_)ENV_IS_IN_FLASH) += flash.o
|
|
|
|
CFLAGS_embedded.o := -Wa,--no-warn -DENV_CRC=$(shell tools/envcrc 2>/dev/null)
|