[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-426-ged76c44

[Julien B a. A. <ar...@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  ed76c44f81ac61919d599e80f1e07b03e8fd7184 (commit)
      from  6638aee53f75d26cde187fc62224a124d65f44c1 (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 ed76c44f81ac61919d599e80f1e07b03e8fd7184
Author: Julien Boibessot <jul...@ar...>
Date:   Fri Aug 30 20:29:26 2013 +0200

    [BUILDROOT][2013.05] fpga_firmware: add some precisions to help (more than one FPGA firmware can be installed at a time in linux rootfs) and fixes a bug for FPGA symlink in output/images/

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

Summary of changes:
 buildroot/package/armadeus/fpga_firmware/Config.in |   20 +++++++++++---------
 .../armadeus/fpga_firmware/fpga_firmware.mk        |    5 ++++-
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/buildroot/package/armadeus/fpga_firmware/Config.in b/buildroot/package/armadeus/fpga_firmware/Config.in
index 40c97e8..c519a06 100644
--- a/buildroot/package/armadeus/fpga_firmware/Config.in
+++ b/buildroot/package/armadeus/fpga_firmware/Config.in
@@ -5,7 +5,7 @@ config BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE
 
 if BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE
 choice
-	prompt "Firmware to install"
+	prompt "Firmware(s) to install"
 	default BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE_CUSTOM
 
 config BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE_APF51_DUAL_UART
@@ -15,23 +15,25 @@ config BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE_APF51_DUAL_UART
 	  will be named /lib/firmware/fpga/apf51_gsm_gps_firmware.bin.
 
 config BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE_CUSTOM
-	bool "Install a custom FPGA firmware"
+	bool "Custom list"
 	help
-	  Use a custom FPGA binary file. The FPGA binary file will be
-	  installed in /lib/firmware/fpga/ on the target.
+	  Use one or more custom FPGA binary files. The FPGA binary files will
+	  be installed in /lib/firmware/fpga/ on the target.
 
 endchoice
 
 config BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE_CUSTOM_FILE
-	string "FPGA binary file path to install"
+	string "Firmware(s) path list"
 	depends on BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE_CUSTOM
 	help
-	  Path to your custom FPGA binary file to install.
+	  Path list to your custom FPGA binary files to install.
 
 config BR2_PACKAGE_ARMADEUS_EXPORT_FPGA_FIRMWARE
-	bool "Export this file to Buildroot images folder"
+	bool "Export the FPGA firmware to Buildroot output/images/ folder"
 	help
-	  Build a link from Buildroot binary folder to the fpga firmware.
-	  This link will be named $(BOARD_NAME)-firmware.bin 
+	  Build a link from Buildroot output/images/ folder to the FPGA
+	  firmware.
+	  This link will be named $(BOARD_NAME)-firmware.bin (default name
+	  looked by U-Boot when asking for firmware update).
 
 endif # BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE
diff --git a/buildroot/package/armadeus/fpga_firmware/fpga_firmware.mk b/buildroot/package/armadeus/fpga_firmware/fpga_firmware.mk
index 46b913f..b34f72e 100644
--- a/buildroot/package/armadeus/fpga_firmware/fpga_firmware.mk
+++ b/buildroot/package/armadeus/fpga_firmware/fpga_firmware.mk
@@ -21,7 +21,10 @@ $(STAMP_DIR)/.fpga_firmware_installed:
 		$(INSTALL) -m 0755 $$firmware $(TARGET_DIR)/$(FPGA_FIRMWARE_TARGET_DIR) ; \
 	done
 ifeq ($(BR2_PACKAGE_ARMADEUS_EXPORT_FPGA_FIRMWARE),y)
-	ln -sf $(FPGA_FIRMWARE) $(BINARIES_DIR)/$(BOARD_NAME)-firmware.bin
+	# Only last file in previous list will remain as symlink
+	for firmware in $(FIRMWARES); do \
+		ln -sf $$firmware $(BINARIES_DIR)/$(BOARD_NAME)-firmware.bin ; \
+	done
 endif
 	touch $@
 


hooks/post-receive
-- 
armadeus