Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit afcbce07e9323c0e8aeb783ba7ce6104860fd7a7

Authored by Wolfgang Denk
1 parent a31e091ad7
Exists in master and in 55 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, emb_lf_v2023.04, imx_v2015.04_4.1.15_1.0.0_ga, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-emmc-imx_v2014.04_3.10.53_1.1.0_ga, smarc-emmc-imx_v2014.04_3.14.28_1.0.0_ga, smarc-imx-l5.0.0_1.0.0-ga, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2017.03_4.9.11_1.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2014.04_3.14.28_1.0.0_ga, smarc-imx_v2015.04_4.1.15_1.0.0_ga, smarc-imx_v2017.03_4.9.11_1.0.0_ga, smarc-imx_v2017.03_4.9.88_2.0.0_ga, smarc-imx_v2017.03_o8.1.0_1.3.0_8m, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_2.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0, smarc_8mq_lf_v2020.04, ti-u-boot-2015.07, u-boot-2013.01.y, v2013.10, v2013.10-smarct33, v2013.10-smartmen, v2014.01, v2014.04, v2014.04-smarct33, v2014.04-smarct33-emmc, v2014.04-smartmen, v2014.07, v2014.07-smarct33, v2014.07-smartmen, v2015.07-smarct33, v2015.07-smarct33-emmc, v2015.07-smarct4x, v2016.05-dlt, v2016.05-smarct3x, v2016.05-smarct3x-emmc, v2016.05-smarct4x, v2017.01-smarct3x, v2017.01-smarct3x-emmc, v2017.01-smarct4x

Fix building of env_embedded.o 

Since commit a706bfc7 common/env_embedded.o and tools/envcrc were
only built when CONFIG_ENV_IS_EMBEDDED was set, but this breaks
building for many boards.

We always have to build these files when CONFIG_ENV_IS_IN_FLASH is
set.

Signed-off-by: Wolfgang Denk <wd@denx.de>

Showing 2 changed files with 3 additions and 1 deletions Side-by-side Diff

... ... @@ -52,6 +52,7 @@
52 52 COBJS-$(CONFIG_ENV_IS_IN_DATAFLASH) += env_dataflash.o
53 53 COBJS-$(CONFIG_ENV_IS_IN_EEPROM) += env_eeprom.o
54 54 COBJS-$(CONFIG_ENV_IS_EMBEDDED) += env_embedded.o
  55 +COBJS-$(CONFIG_ENV_IS_IN_FLASH) += env_embedded.o
55 56 COBJS-$(CONFIG_ENV_IS_IN_FLASH) += env_flash.o
56 57 COBJS-$(CONFIG_ENV_IS_IN_MG_DISK) += env_mgdisk.o
57 58 COBJS-$(CONFIG_ENV_IS_IN_NAND) += env_nand.o
... ... @@ -69,6 +69,7 @@
69 69 BIN_FILES-$(CONFIG_CMD_LOADS) += img2srec$(SFX)
70 70 BIN_FILES-y += mkimage$(SFX)
71 71 BIN_FILES-$(CONFIG_ENV_IS_EMBEDDED) += envcrc$(SFX)
  72 +BIN_FILES-$(CONFIG_ENV_IS_IN_FLASH) += envcrc$(SFX)
72 73 BIN_FILES-$(CONFIG_SHA1_CHECK_UB_IMG) += ubsha1$(SFX)
73 74 BIN_FILES-$(CONFIG_CMD_NET) += gen_eth_addr$(SFX)
74 75 BIN_FILES-$(CONFIG_LCD_LOGO) += bmp_logo$(SFX)
... ... @@ -124,7 +125,7 @@
124 125 SRCS += $(addprefix $(SRCTREE)/,$(EXT_OBJ_FILES-y:.o=.c))
125 126 SRCS += $(addprefix $(SRCTREE)/tools/,$(OBJ_FILES-y:.o=.c))
126 127 SRCS += $(addprefix $(SRCTREE)/libfdt/,$(LIBFDT_OBJ_FILES-y:.o=.c))
127   -BINS := $(addprefix $(obj),$(BIN_FILES-y))
  128 +BINS := $(addprefix $(obj),$(sort $(BIN_FILES-y)))
128 129 LIBFDT_OBJS := $(addprefix $(obj),$(LIBFDT_OBJ_FILES-y))
129 130  
130 131 #