From b4aeef0f1c74cf35085e2cc4efcbe29e497f0bac Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Wed, 20 Aug 2008 20:04:14 +0000 Subject: u-boot: fix broken insert_define in Makefile Patch by Markus Heidelberg --- target/u-boot/Makefile.in | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/target/u-boot/Makefile.in b/target/u-boot/Makefile.in index 9148e05c5..0e761b075 100644 --- a/target/u-boot/Makefile.in +++ b/target/u-boot/Makefile.in @@ -34,7 +34,7 @@ define insert_define @echo "#ifdef $(strip $(1))" >> $(U_BOOT_INC_CONF_FILE) @echo "#undef $(strip $(1))" >> $(U_BOOT_INC_CONF_FILE) @echo "#endif" >> $(U_BOOT_INC_CONF_FILE) -@echo "#define $(strip $(1)) $(2)" >> $(U_BOOT_INC_CONF_FILE) +@echo '#define $(strip $(1)) $(2)' >> $(U_BOOT_INC_CONF_FILE) endef $(DL_DIR)/$(U_BOOT_SOURCE): @@ -78,36 +78,36 @@ $(U_BOOT_DIR)/.header_modified: $(U_BOOT_DIR)/.configured @echo "#ifndef __BR2_ADDED_CONFIG_H" >> $(U_BOOT_INC_CONF_FILE) @echo "#define __BR2_ADDED_CONFIG_H" >> $(U_BOOT_INC_CONF_FILE) ifneq ($(strip $(BR2_PROJECT)),"") - $(call insert_define, "CONFIG_HOSTNAME", $(BR2_PROJECT)) + $(call insert_define, CONFIG_HOSTNAME, $(BR2_PROJECT)) endif ifneq ($(strip $(BR2_TARGET_UBOOT_SERVERIP)),"") - $(call insert_define, "CONFIG_SERVERIP", $(BR2_TARGET_UBOOT_SERVERIP)) + $(call insert_define, CONFIG_SERVERIP, $(BR2_TARGET_UBOOT_SERVERIP)) endif ifneq ($(strip $(BR2_TARGET_UBOOT_IPADDR)),"") - $(call insert_define, "CONFIG_IPADDR", $(BR2_TARGET_UBOOT_IPADDR)) + $(call insert_define, CONFIG_IPADDR, $(BR2_TARGET_UBOOT_IPADDR)) ifneq ($(strip $(BR2_TARGET_UBOOT_GATEWAY)),"") - $(call insert_define, "CONFIG_GATEWAYIP", $(BR2_TARGET_UBOOT_GATEWAY)) + $(call insert_define, CONFIG_GATEWAYIP, $(BR2_TARGET_UBOOT_GATEWAY)) endif ifneq ($(strip $(BR2_TARGET_UBOOT_NETMASK)),"") - $(call insert_define, "CONFIG_NETMASK", $(BR2_TARGET_UBOOT_NETMASK)) + $(call insert_define, CONFIG_NETMASK, $(BR2_TARGET_UBOOT_NETMASK)) endif endif # end BR2_TARGET_U_BOOT_IPADDR ifneq ($(strip $(BR2_TARGET_UBOOT_ETHADDR)),"") - $(call insert_define, "CONFIG_ETHADDR", $(BR2_TARGET_UBOOT_ETHADDR)) + $(call insert_define, CONFIG_ETHADDR, $(BR2_TARGET_UBOOT_ETHADDR)) endif ifneq ($(strip $(BR2_TARGET_UBOOT_ETH1ADDR)),"") - $(call insert_define, "CONFIG_ETH2ADDR", $(BR2_TARGET_UBOOT_ETH1ADDR)) + $(call insert_define, CONFIG_ETH2ADDR, $(BR2_TARGET_UBOOT_ETH1ADDR)) endif ifneq ($(strip $(BR2_TARGET_UBOOT_BOOTARGS)),"") - $(call insert_define, "CONFIG_BOOTARGS", $(BR2_TARGET_UBOOT_BOOTARGS)) + $(call insert_define, CONFIG_BOOTARGS, $(BR2_TARGET_UBOOT_BOOTARGS)) endif ifneq ($(strip $(BR2_TARGET_UBOOT_BOOTCMD)),"") - $(call insert_define, "CONFIG_BOOTCOMMAND", $(BR2_TARGET_UBOOT_BOOTCMD)) + $(call insert_define, CONFIG_BOOTCOMMAND, $(BR2_TARGET_UBOOT_BOOTCMD)) endif -ifneq ($(strip $(BR2_TARGET_UBOOT_SILENT)),"") - $(call insert_define, "CONFIG_SILENT_CONSOLE", "") +ifeq ($(strip $(BR2_TARGET_UBOOT_SILENT)),y) + $(call insert_define, CONFIG_SILENT_CONSOLE,) endif @echo "#endif /* __BR2_ADDED_CONFIG_H */" >> $(U_BOOT_INC_CONF_FILE) touch $@ -- cgit v1.2.3