mirror of
https://github.com/brain-hackers/u-boot-brain
synced 2024-09-29 08:00:26 +09:00
tools: make it possible to build tools unconfigured
On Sunday, June 19, 2011 13:55:13 Ilya Yanok wrote: > On 18.06.2011 23:03, Mike Frysinger wrote: > >> - tools/Makefile put common/env_embedded.o and envcrc.o to object list > >> > >> conditionally. This fixes errors during dependency generation. > > > > pretty sure this breaks board builds. if the only thing this fixes is a > > I'm sorry but I can't see how this can break the builds. Could you > please be more specific? I've tried to build some boards, it actually > works... i might be thinking of a different env_embedded situation. a different problem with your patch to tools/Makefile: you copied the same logic multiple times which means more bitrot. why dont you do something like: > > harmless warning when generating dependency files, then i say ignore it. > > after all, this is how it has always worked in the past and no one really > > cared. > > Yep, they are harmless but they are not warnings but rather scary errors > actually. ;) I think it's better to fix them. i guess my threshold for being scared is a bit higher :p -mike
This commit is contained in:
parent
28abd48f50
commit
2ad6e27dcd
@ -48,17 +48,21 @@ CONFIG_NETCONSOLE = y
|
|||||||
CONFIG_SHA1_CHECK_UB_IMG = y
|
CONFIG_SHA1_CHECK_UB_IMG = y
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
# Merge all the different vars for envcrc into one
|
||||||
|
ENVCRC-$(CONFIG_ENV_IS_EMBEDDED) = y
|
||||||
|
ENVCRC-$(CONFIG_ENV_IS_IN_DATAFLASH) = y
|
||||||
|
ENVCRC-$(CONFIG_ENV_IS_IN_EEPROM) = y
|
||||||
|
ENVCRC-$(CONFIG_ENV_IS_IN_FLASH) = y
|
||||||
|
ENVCRC-$(CONFIG_ENV_IS_IN_ONENAND) = y
|
||||||
|
ENVCRC-$(CONFIG_ENV_IS_IN_NAND) = y
|
||||||
|
ENVCRC-$(CONFIG_ENV_IS_IN_NVRAM) = y
|
||||||
|
ENVCRC-$(CONFIG_ENV_IS_IN_SPI_FLASH) = y
|
||||||
|
CONFIG_BUILD_ENVCRC ?= $(ENVCRC-y)
|
||||||
|
|
||||||
# Generated executable files
|
# Generated executable files
|
||||||
BIN_FILES-$(CONFIG_LCD_LOGO) += bmp_logo$(SFX)
|
BIN_FILES-$(CONFIG_LCD_LOGO) += bmp_logo$(SFX)
|
||||||
BIN_FILES-$(CONFIG_VIDEO_LOGO) += bmp_logo$(SFX)
|
BIN_FILES-$(CONFIG_VIDEO_LOGO) += bmp_logo$(SFX)
|
||||||
BIN_FILES-$(CONFIG_ENV_IS_EMBEDDED) += envcrc$(SFX)
|
BIN_FILES-$(CONFIG_BUILD_ENVCRC) += envcrc$(SFX)
|
||||||
BIN_FILES-$(CONFIG_ENV_IS_IN_DATAFLASH) += envcrc$(SFX)
|
|
||||||
BIN_FILES-$(CONFIG_ENV_IS_IN_EEPROM) += envcrc$(SFX)
|
|
||||||
BIN_FILES-$(CONFIG_ENV_IS_IN_FLASH) += envcrc$(SFX)
|
|
||||||
BIN_FILES-$(CONFIG_ENV_IS_IN_ONENAND) += envcrc$(SFX)
|
|
||||||
BIN_FILES-$(CONFIG_ENV_IS_IN_NAND) += envcrc$(SFX)
|
|
||||||
BIN_FILES-$(CONFIG_ENV_IS_IN_NVRAM) += envcrc$(SFX)
|
|
||||||
BIN_FILES-$(CONFIG_ENV_IS_IN_SPI_FLASH) += envcrc$(SFX)
|
|
||||||
BIN_FILES-$(CONFIG_CMD_NET) += gen_eth_addr$(SFX)
|
BIN_FILES-$(CONFIG_CMD_NET) += gen_eth_addr$(SFX)
|
||||||
BIN_FILES-$(CONFIG_CMD_LOADS) += img2srec$(SFX)
|
BIN_FILES-$(CONFIG_CMD_LOADS) += img2srec$(SFX)
|
||||||
BIN_FILES-$(CONFIG_INCA_IP) += inca-swap-bytes$(SFX)
|
BIN_FILES-$(CONFIG_INCA_IP) += inca-swap-bytes$(SFX)
|
||||||
@ -67,7 +71,7 @@ BIN_FILES-$(CONFIG_NETCONSOLE) += ncb$(SFX)
|
|||||||
BIN_FILES-$(CONFIG_SHA1_CHECK_UB_IMG) += ubsha1$(SFX)
|
BIN_FILES-$(CONFIG_SHA1_CHECK_UB_IMG) += ubsha1$(SFX)
|
||||||
|
|
||||||
# Source files which exist outside the tools directory
|
# Source files which exist outside the tools directory
|
||||||
EXT_OBJ_FILES-y += common/env_embedded.o
|
EXT_OBJ_FILES-$(CONFIG_BUILD_ENVCRC) += common/env_embedded.o
|
||||||
EXT_OBJ_FILES-y += common/image.o
|
EXT_OBJ_FILES-y += common/image.o
|
||||||
EXT_OBJ_FILES-y += lib/crc32.o
|
EXT_OBJ_FILES-y += lib/crc32.o
|
||||||
EXT_OBJ_FILES-y += lib/md5.o
|
EXT_OBJ_FILES-y += lib/md5.o
|
||||||
@ -77,7 +81,7 @@ EXT_OBJ_FILES-y += lib/sha1.o
|
|||||||
OBJ_FILES-$(CONFIG_LCD_LOGO) += bmp_logo.o
|
OBJ_FILES-$(CONFIG_LCD_LOGO) += bmp_logo.o
|
||||||
OBJ_FILES-$(CONFIG_VIDEO_LOGO) += bmp_logo.o
|
OBJ_FILES-$(CONFIG_VIDEO_LOGO) += bmp_logo.o
|
||||||
NOPED_OBJ_FILES-y += default_image.o
|
NOPED_OBJ_FILES-y += default_image.o
|
||||||
OBJ_FILES-y += envcrc.o
|
OBJ_FILES-$(CONFIG_BUILD_ENVCRC) += envcrc.o
|
||||||
NOPED_OBJ_FILES-y += fit_image.o
|
NOPED_OBJ_FILES-y += fit_image.o
|
||||||
OBJ_FILES-$(CONFIG_CMD_NET) += gen_eth_addr.o
|
OBJ_FILES-$(CONFIG_CMD_NET) += gen_eth_addr.o
|
||||||
OBJ_FILES-$(CONFIG_CMD_LOADS) += img2srec.o
|
OBJ_FILES-$(CONFIG_CMD_LOADS) += img2srec.o
|
||||||
|
Loading…
Reference in New Issue
Block a user