[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-381-gdb36ede

[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  db36edecbf48dc80942d3e0d3aeea3eda6ecf9e2 (commit)
      from  bcfd76b8de9d3113336c85bda6d08b853e2a6e43 (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 db36edecbf48dc80942d3e0d3aeea3eda6ecf9e2
Author: Eric Jarrige <eri...@ar...>
Date:   Wed Aug 14 17:23:55 2013 +0200

    [BUILDROOT] fpga_firmware: add option to use some custom fpga firmware and provide a link to be used by U-Boot

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

Summary of changes:
 buildroot/package/armadeus/fpga_firmware/Config.in |   32 ++++++++++++++++---
 .../armadeus/fpga_firmware/fpga_firmware.mk        |   19 ++++++++++-
 2 files changed, 44 insertions(+), 7 deletions(-)

diff --git a/buildroot/package/armadeus/fpga_firmware/Config.in b/buildroot/package/armadeus/fpga_firmware/Config.in
index 41f9604..40c97e8 100644
--- a/buildroot/package/armadeus/fpga_firmware/Config.in
+++ b/buildroot/package/armadeus/fpga_firmware/Config.in
@@ -1,15 +1,37 @@
 config BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE
 	bool "FPGA Firmware"
 	help
-	  Install some required/mandatory FPGA firmwares.
+	  Install some FPGA firmwares.
 
-menu "Choose the firmware to install"
-	depends on BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE
+if BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE
+choice
+	prompt "Firmware to install"
+	default BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE_CUSTOM
 
 config BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE_APF51_DUAL_UART
 	bool "APF51 dual UARTs (GSM/GPS)"
 	help
 	  Required if your want to use GSM or GPS on the APF51Dev. Firmware
-	  will be named /firmware/fpga/apf51_gsm_gps_firmware.bin.
+	  will be named /lib/firmware/fpga/apf51_gsm_gps_firmware.bin.
 
-endmenu
+config BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE_CUSTOM
+	bool "Install a custom FPGA firmware"
+	help
+	  Use a custom FPGA binary file. The FPGA binary file 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"
+	depends on BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE_CUSTOM
+	help
+	  Path to your custom FPGA binary file to install.
+
+config BR2_PACKAGE_ARMADEUS_EXPORT_FPGA_FIRMWARE
+	bool "Export this file to Buildroot images folder"
+	help
+	  Build a link from Buildroot binary folder to the fpga firmware.
+	  This link will be named $(BOARD_NAME)-firmware.bin 
+
+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 96dbfed..46b913f 100644
--- a/buildroot/package/armadeus/fpga_firmware/fpga_firmware.mk
+++ b/buildroot/package/armadeus/fpga_firmware/fpga_firmware.mk
@@ -4,9 +4,14 @@
 #
 #############################################################
 
-ifneq ($(strip $(BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE_APF51_DUAL_UART)),)
-FIRMWARES += $(BASE_DIR)/../../firmware/pod_scripts/apf51_gsm_gps_firmware.bin
+ifeq ($(strip $(BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE_APF51_DUAL_UART)),y)
+FPGA_FIRMWARE = $(BASE_DIR)/../../firmware/pod_scripts/apf51_gsm_gps_firmware.bin
 endif
+ifeq ($(strip $(BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE_CUSTOM)),y)
+FPGA_FIRMWARE = $(call qstrip,$(BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE_CUSTOM_FILE))
+endif
+
+FIRMWARES += $(FPGA_FIRMWARE)
 FPGA_FIRMWARE_TARGET_DIR:=/lib/firmware/fpga/
 
 $(STAMP_DIR)/.fpga_firmware_installed:
@@ -15,6 +20,9 @@ $(STAMP_DIR)/.fpga_firmware_installed:
 	for firmware in $(FIRMWARES); do \
 		$(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
+endif
 	touch $@
 
 fpga-firmware: $(STAMP_DIR)/.fpga_firmware_installed
@@ -26,6 +34,13 @@ fpga-firmware-clean:
 		rm -f $(TARGET_DIR)/$(FPGA_FIRMWARE_TARGET_DIR)/$$firmname ; \
 	done
 	rm -f $(STAMP_DIR)/.fpga_firmware_installed
+ifeq ($(BR2_PACKAGE_ARMADEUS_EXPORT_FPGA_FIRMWARE),y)
+	rm -f $(BINARIES_DIR)/$(BOARD_NAME)-firmware.bin
+endif
+
+fpga-firmware-dirclean: fpga-firmware-clean
+
+fpga-firmware-rebuild: fpga-firmware-clean fpga-firmware
 
 ifeq ($(strip $(BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE)),y)
 TARGETS+=fpga-firmware


hooks/post-receive
-- 
armadeus