[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-575-gd42cb15

[jorasse <jo...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".

The branch, master has been updated
       via  d42cb157071e99f1d104e39143e882f875ccdba0 (commit)
      from  372197f597a4d2affbb2d8539c69cc88cafc7e96 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit d42cb157071e99f1d104e39143e882f875ccdba0
Author: Eric Jarrige <eri...@ar...>
Date:   Wed Feb 11 13:22:45 2015 +0100

    [BUILDROOT] 2013.11: fix network options to work with recent U-Boot release

-----------------------------------------------------------------------

Summary of changes:
 ...ot-Fix_config_options_with_newer_releases.patch |   53 ++++++++++++++++++++
 1 files changed, 53 insertions(+), 0 deletions(-)
 create mode 100644 patches/buildroot/2013.11/051-U-Boot-Fix_config_options_with_newer_releases.patch

diff --git a/patches/buildroot/2013.11/051-U-Boot-Fix_config_options_with_newer_releases.patch b/patches/buildroot/2013.11/051-U-Boot-Fix_config_options_with_newer_releases.patch
new file mode 100644
index 0000000..cabc8e0
--- /dev/null
+++ b/patches/buildroot/2013.11/051-U-Boot-Fix_config_options_with_newer_releases.patch
@@ -0,0 +1,53 @@
+U-Boot: Quick fix network options to work with recent versions of U-Boot.
+To be replaced ASAP by any better solution...
+
+Signed-off-by: Eric Jarrige <eri...@ar...>
+---
+--- a/boot/uboot/uboot.mk
++++ b/boot/uboot/uboot.mk
+@@ -63,16 +63,16 @@ UBOOT_MAKE_OPTS += \
+ 	CROSS_COMPILE="$(CCACHE) $(TARGET_CROSS)" \
+ 	ARCH=$(UBOOT_ARCH)
+ 
+-# Helper function to fill the U-Boot config.h file.
++# Helper function to fill U-Boot configs/$(UBOOT_BOARD_NAME).h file.
+ # Argument 1: option name
+ # Argument 2: option value
+ # If the option value is empty, this function does nothing.
+ define insert_define
+ $(if $(call qstrip,$(2)),
+-	@echo "#ifdef $(strip $(1))" >> $(@D)/include/config.h
+-	@echo "#undef $(strip $(1))" >> $(@D)/include/config.h
+-	@echo "#endif" >> $(@D)/include/config.h
+-	@echo '#define $(strip $(1)) $(call qstrip,$(2))' >> $(@D)/include/config.h)
++	@echo "#ifdef $(strip $(1))" >> $(@D)/include/configs/$(UBOOT_BOARD_NAME).h
++	@echo "#undef $(strip $(1))" >> $(@D)/include/configs/$(UBOOT_BOARD_NAME).h
++	@echo "#endif" >> $(@D)/include/configs/$(UBOOT_BOARD_NAME).h
++	@echo '#define $(strip $(1)) $(call qstrip,$(2))' >> $(@D)/include/configs/$(UBOOT_BOARD_NAME).h)
+ endef
+ 
+ ifneq ($(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR)),)
+@@ -91,10 +91,10 @@ define UBOOT_CONFIGURE_CMDS
+ 	$(TARGET_CONFIGURE_OPTS) $(UBOOT_CONFIGURE_OPTS) 	\
+ 		$(MAKE) -C $(@D) $(UBOOT_MAKE_OPTS)		\
+ 		$(UBOOT_BOARD_NAME)_config
+-	@echo >> $(@D)/include/config.h
+-	@echo "/* Add a wrapper around the values Buildroot sets. */" >> $(@D)/include/config.h
+-	@echo "#ifndef __BR2_ADDED_CONFIG_H" >> $(@D)/include/config.h
+-	@echo "#define __BR2_ADDED_CONFIG_H" >> $(@D)/include/config.h
++	@echo >> $(@D)/include/configs/$(UBOOT_BOARD_NAME).h
++	@echo "/* Add a wrapper around the values Buildroot sets. */" >> $(@D)/include/configs/$(UBOOT_BOARD_NAME).h
++	@echo "#ifndef __BR2_ADDED_CONFIG_H" >> $(@D)/include/configs/$(UBOOT_BOARD_NAME).h
++	@echo "#define __BR2_ADDED_CONFIG_H" >> $(@D)/include/configs/$(UBOOT_BOARD_NAME).h
+ 	$(call insert_define,DATE,$(DATE))
+ 	$(call insert_define,CONFIG_LOAD_SCRIPTS,1)
+ 	$(call insert_define,CONFIG_IPADDR,$(BR2_TARGET_UBOOT_IPADDR))
+@@ -103,7 +103,7 @@ define UBOOT_CONFIGURE_CMDS
+ 	$(call insert_define,CONFIG_SERVERIP,$(BR2_TARGET_UBOOT_SERVERIP))
+ 	$(call insert_define,CONFIG_ETHADDR,$(BR2_TARGET_UBOOT_ETHADDR))
+ 	$(call insert_define,CONFIG_ETH1ADDR,$(BR2_TARGET_UBOOT_ETH1ADDR))
+-	@echo "#endif /* __BR2_ADDED_CONFIG_H */" >> $(@D)/include/config.h
++	@echo "#endif /* __BR2_ADDED_CONFIG_H */" >> $(@D)/include/configs/$(UBOOT_BOARD_NAME).h
+ endef
+ 
+ define UBOOT_BUILD_CMDS


hooks/post-receive
-- 
armadeus