[Buildroot] [PATCH] u-boot: fix wrong syntax in Makefile

Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed

* [Buildroot] [PATCH] u-boot: fix wrong syntax in Makefile
@ 2008-08-09 12:03 Markus Heidelberg
  2008-08-11 20:09 ` Markus Heidelberg
  2008-08-20 20:05 ` Peter Korsgaard
  0 siblings, 2 replies; 3+ messages in thread
From: Markus Heidelberg @ 2008-08-09 12:03 UTC (permalink / raw)
  To: buildroot

u-boot: fix wrong syntax in Makefile

Some $(call insert_define, ..., ...) calls were lacking the comma after the
variable. That didn't lead to a syntax error but it didn't have any effect on
the output u-boot/include/config.h
---
 target/u-boot/Makefile.in |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/target/u-boot/Makefile.in b/target/u-boot/Makefile.in
index d7af24c..9148e05 100644
--- a/target/u-boot/Makefile.in
+++ b/target/u-boot/Makefile.in
@@ -98,16 +98,16 @@ ifneq ($(strip $(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", "")
+	$(call insert_define, "CONFIG_SILENT_CONSOLE", "")
 endif
 	@echo "#endif /* __BR2_ADDED_CONFIG_H */" >> $(U_BOOT_INC_CONF_FILE)
 	touch $@

^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [Buildroot] [PATCH] u-boot: fix wrong syntax in Makefile
  2008-08-09 12:03 [Buildroot] [PATCH] u-boot: fix wrong syntax in Makefile Markus Heidelberg
@ 2008-08-11 20:09 ` Markus Heidelberg
  2008-08-20 20:05 ` Peter Korsgaard
  1 sibling, 0 replies; 3+ messages in thread
From: Markus Heidelberg @ 2008-08-11 20:09 UTC (permalink / raw)
  To: buildroot

Hello,

today I've noticed, that the previous patch has some issues. There are no ""
around the value of CONFIG_BOOTARGS and the make run may stop with an error
when echoing CONFIG_BOOTCOMMAND into U-Boots config.h. This time I have tested
it with different configurations, on Friday the time was short.


u-boot: fix broken insert_define in Makefile

---
 target/u-boot/Makefile.in |   25 +++++++++++++------------
 1 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/target/u-boot/Makefile.in b/target/u-boot/Makefile.in
index d7af24c..d63bea5 100644
--- a/target/u-boot/Makefile.in
+++ b/target/u-boot/Makefile.in
@@ -31,10 +31,11 @@ endif
 
 # Define a helper function
 define insert_define
+ at echo "" >> $(U_BOOT_INC_CONF_FILE)
 @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)
- at echo "#define $(strip $(1)) $(2)" >> $(U_BOOT_INC_CONF_FILE)
+ at echo '#define $(strip $(1)) $(2)' >> $(U_BOOT_INC_CONF_FILE)
 endef
 
 $(DL_DIR)/$(U_BOOT_SOURCE):
@@ -78,36 +79,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 $@
-- 
1.5.6.4

^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [Buildroot] [PATCH] u-boot: fix wrong syntax in Makefile
  2008-08-09 12:03 [Buildroot] [PATCH] u-boot: fix wrong syntax in Makefile Markus Heidelberg
  2008-08-11 20:09 ` Markus Heidelberg
@ 2008-08-20 20:05 ` Peter Korsgaard
  1 sibling, 0 replies; 3+ messages in thread
From: Peter Korsgaard @ 2008-08-20 20:05 UTC (permalink / raw)
  To: buildroot

>>>>> "Markus" == Markus Heidelberg <markus.heidelberg@web.de> writes:

 Markus> u-boot: fix wrong syntax in Makefile

Thanks, both patches are committed to trunk.

-- 
Bye, Peter Korsgaard

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2008-08-20 20:05 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-08-09 12:03 [Buildroot] [PATCH] u-boot: fix wrong syntax in Makefile Markus Heidelberg
2008-08-11 20:09 ` Markus Heidelberg
2008-08-20 20:05 ` Peter Korsgaard

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox