Commit 5dac2c31 authored by Peter Korsgaard's avatar Peter Korsgaard
Browse files

u-boot: don't touch config.h unless explicitly requested by user 

Fixes the problem of important variables like serverip being overwritten
with empty strings if the network/default env stuff isn't used.
parent 7897a950

target/u-boot/Makefile.in

+7 −1
Original line number Diff line number Diff line
@@ -105,6 +105,7 @@ $(U_BOOT_DIR)/.configured: $(U_BOOT_DIR)/.patched 


$(U_BOOT_DIR)/.header_modified: $(U_BOOT_DIR)/.configured

	# Modify configuration header in $(U_BOOT_INC_CONF_FILE)

ifdef BR2_TARGET_UBOOT_DEFAULT_ENV

	@echo >> $(U_BOOT_INC_CONF_FILE)

	@echo "/* Add a wrapper around the values Buildroot sets. */" >> $(U_BOOT_INC_CONF_FILE)

	@echo "#ifndef __BR2_ADDED_CONFIG_H" >> $(U_BOOT_INC_CONF_FILE)
@@ -114,6 +115,8 @@ $(U_BOOT_DIR)/.header_modified: $(U_BOOT_DIR)/.configured 
ifneq ($(strip $(BR2_PROJECT)),"")

	$(call insert_define, CONFIG_HOSTNAME, $(BR2_PROJECT))

endif

endif # BR2_TARGET_UBOOT_DEFAULT_ENV

ifdef BR2_TARGET_UBOOT_NETWORK

ifneq ($(strip $(BR2_TARGET_UBOOT_IPADDR)),"")

	$(call insert_define, CONFIG_IPADDR, $(BR2_TARGET_UBOOT_IPADDR))

ifneq ($(strip $(BR2_TARGET_UBOOT_GATEWAY)),"")
@@ -134,9 +137,11 @@ ifneq ($(strip $(BR2_TARGET_UBOOT_ETH1ADDR)),"") 
	$(call insert_define, CONFIG_ETH1ADDR, $(BR2_TARGET_UBOOT_ETH1ADDR))

endif

endif

endif # BR2_TARGET_UBOOT_NETWORK

ifeq ($(BR2_TARGET_UBOOT_SILENT),y)

	$(call insert_define, CONFIG_SILENT_CONSOLE,)

endif

ifdef BR2_TARGET_UBOOT_DEFAULT_ENV

ifneq ($(strip $(BR2_TARGET_UBOOT_KERNEL_START)),"")

	$(call insert_define, KERNEL_START, $(BR2_TARGET_UBOOT_KERNEL_START))

endif
@@ -159,6 +164,7 @@ ifneq ($(strip $(BR2_TARGET_UBOOT_MEMORY_SIZE)),"") 
	$(call insert_define, MEMORY_SIZE, $(BR2_TARGET_UBOOT_MEMORY_SIZE))

endif

	@echo "#endif /* __BR2_ADDED_CONFIG_H */" >> $(U_BOOT_INC_CONF_FILE)

endif # BR2_TARGET_UBOOT_DEFAULT_ENV

	touch $@



$(U_BOOT_DIR)/$(U_BOOT_BIN): $(U_BOOT_DIR)/.header_modified