[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-641-ge72b5f2
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-641-ge72b5f2
|
From: Julien B a. A. <ar...@us...> - 2015-03-05 15:11:01
|
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 e72b5f2b2828b25fabeb10d3ad4f63913d72b1fd (commit)
from 0e81b13389ec09fca00f522c73fba81e1d88f4a0 (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 e72b5f2b2828b25fabeb10d3ad4f63913d72b1fd
Author: Julien Boibessot <jul...@ar...>
Date: Thu Mar 5 16:08:44 2015 +0100
[BUILDROOT] convert fpga_firmware package to BR state of the art
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf27_defconfig | 6 +-
buildroot/configs/apf27mainline_defconfig | 6 +-
buildroot/configs/apf27test_defconfig | 6 +-
buildroot/configs/apf27xenomai_defconfig | 6 +-
buildroot/configs/apf27xenomaimainline_defconfig | 6 +-
buildroot/configs/apf51_defconfig | 6 +-
buildroot/configs/apf51mainline_defconfig | 6 +-
buildroot/configs/apf51test_defconfig | 6 +-
buildroot/configs/apf9328_defconfig | 6 +-
buildroot/configs/apf9328test_defconfig | 6 +-
buildroot/configs/apf9328xenomai_defconfig | 6 +-
buildroot/configs/pps51_defconfig | 4 +-
buildroot/package/armadeus/fpga_firmware/Config.in | 18 ++++----
.../armadeus/fpga_firmware/fpga_firmware.mk | 49 ++++++++------------
14 files changed, 63 insertions(+), 74 deletions(-)
diff --git a/buildroot/configs/apf27_defconfig b/buildroot/configs/apf27_defconfig
index b87824e..20fabd6 100644
--- a/buildroot/configs/apf27_defconfig
+++ b/buildroot/configs/apf27_defconfig
@@ -40,9 +40,9 @@ BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-$(BR2_LINUX_KERNEL_VERSION).config"
BR2_PACKAGE_BUSYBOX_CONFIG="$(ARMADEUS_PATH)/busybox.config"
BR2_PACKAGE_FPGAREGS=y
-BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE=y
-BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE_CUSTOM_FILE="$(TOPDIR)/../firmware/leds/blinking_led/bin/blinking_led_apf27_200k.bit"
-BR2_PACKAGE_ARMADEUS_EXPORT_FPGA_FIRMWARE=y
+BR2_PACKAGE_FPGA_FIRMWARE=y
+BR2_PACKAGE_FPGA_FIRMWARE_CUSTOM_FILE="$(TOPDIR)/../firmware/leds/blinking_led/bin/blinking_led_apf27_200k.bit"
+BR2_PACKAGE_FPGA_FIRMWARE_EXPORT=y
BR2_PACKAGE_IMXREGS=y
BR2_PACKAGE_MAX5821CTRL=y
BR2_PACKAGE_AD9889CTRL=y
diff --git a/buildroot/configs/apf27mainline_defconfig b/buildroot/configs/apf27mainline_defconfig
index 495e57d..7e0289b 100644
--- a/buildroot/configs/apf27mainline_defconfig
+++ b/buildroot/configs/apf27mainline_defconfig
@@ -43,9 +43,9 @@ BR2_LINUX_KERNEL_DTS_SUPPORT=y
BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx27-apf27dev"
BR2_PACKAGE_BUSYBOX_CONFIG="$(ARMADEUS_PATH)/busybox.config"
BR2_PACKAGE_FPGAREGS=y
-BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE=y
-BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE_CUSTOM_FILE="$(TOPDIR)/../firmware/leds/blinking_led/bin/blinking_led_apf27_200k.bit"
-BR2_PACKAGE_ARMADEUS_EXPORT_FPGA_FIRMWARE=y
+BR2_PACKAGE_FPGA_FIRMWARE=y
+BR2_PACKAGE_FPGA_FIRMWARE_CUSTOM_FILE="$(TOPDIR)/../firmware/leds/blinking_led/bin/blinking_led_apf27_200k.bit"
+BR2_PACKAGE_FPGA_FIRMWARE_EXPORT=y
BR2_PACKAGE_IMXREGS=y
BR2_PACKAGE_MAX5821CTRL=y
BR2_PACKAGE_AD9889CTRL=y
diff --git a/buildroot/configs/apf27test_defconfig b/buildroot/configs/apf27test_defconfig
index 48bf6c9..d4e0d53 100644
--- a/buildroot/configs/apf27test_defconfig
+++ b/buildroot/configs/apf27test_defconfig
@@ -57,9 +57,9 @@ BR2_PACKAGE_ARMADEUS_DEMOS_SHOW_IMAGE=y
BR2_PACKAGE_ARMADEUS_DEMOS_TEST_LCD=y
BR2_PACKAGE_ARMADEUS_DEMOS_MCP25020=y
BR2_PACKAGE_FPGAREGS=y
-BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE=y
-BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE_CUSTOM_FILE="$(TOPDIR)/../firmware/leds/blinking_led/bin/blinking_led_apf27_200k.bit"
-BR2_PACKAGE_ARMADEUS_EXPORT_FPGA_FIRMWARE=y
+BR2_PACKAGE_FPGA_FIRMWARE=y
+BR2_PACKAGE_FPGA_FIRMWARE_CUSTOM_FILE="$(TOPDIR)/../firmware/leds/blinking_led/bin/blinking_led_apf27_200k.bit"
+BR2_PACKAGE_FPGA_FIRMWARE_EXPORT=y
BR2_PACKAGE_IMXREGS=y
BR2_PACKAGE_MAX5821CTRL=y
BR2_PACKAGE_TESTSUITE=y
diff --git a/buildroot/configs/apf27xenomai_defconfig b/buildroot/configs/apf27xenomai_defconfig
index 701092a..8db8920 100644
--- a/buildroot/configs/apf27xenomai_defconfig
+++ b/buildroot/configs/apf27xenomai_defconfig
@@ -42,9 +42,9 @@ BR2_LINUX_KERNEL_EXT_XENOMAI=y
BR2_LINUX_KERNEL_EXT_XENOMAI_ADEOS_PATCH_URL="ftp://ftp2.armadeus.com/armadeusw/adeos-ipipe-2.6.29-arm-1.13-05.patch"
BR2_PACKAGE_BUSYBOX_CONFIG="$(ARMADEUS_PATH)/busybox.config"
BR2_PACKAGE_FPGAREGS=y
-BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE=y
-BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE_CUSTOM_FILE="$(TOPDIR)/../firmware/leds/blinking_led/bin/blinking_led_apf27_200k.bit"
-BR2_PACKAGE_ARMADEUS_EXPORT_FPGA_FIRMWARE=y
+BR2_PACKAGE_FPGA_FIRMWARE=y
+BR2_PACKAGE_FPGA_FIRMWARE_CUSTOM_FILE="$(TOPDIR)/../firmware/leds/blinking_led/bin/blinking_led_apf27_200k.bit"
+BR2_PACKAGE_FPGA_FIRMWARE_EXPORT=y
BR2_PACKAGE_IMXREGS=y
BR2_PACKAGE_MAX5821CTRL=y
BR2_PACKAGE_AD9889CTRL=y
diff --git a/buildroot/configs/apf27xenomaimainline_defconfig b/buildroot/configs/apf27xenomaimainline_defconfig
index 0121ab6..8525bdc 100644
--- a/buildroot/configs/apf27xenomaimainline_defconfig
+++ b/buildroot/configs/apf27xenomaimainline_defconfig
@@ -44,9 +44,9 @@ BR2_LINUX_KERNEL_EXT_XENOMAI=y
BR2_LINUX_KERNEL_EXT_XENOMAI_ADEOS_PATCH_URL="http://download.gna.org/adeos/patches/v3.x/arm/ipipe-core-3.14.17-arm-4.patch"
BR2_PACKAGE_BUSYBOX_CONFIG="$(ARMADEUS_PATH)/busybox.config"
BR2_PACKAGE_FPGAREGS=y
-BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE=y
-BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE_CUSTOM_FILE="$(TOPDIR)/../firmware/leds/blinking_led/bin/blinking_led_apf27_200k.bit"
-BR2_PACKAGE_ARMADEUS_EXPORT_FPGA_FIRMWARE=y
+BR2_PACKAGE_FPGA_FIRMWARE=y
+BR2_PACKAGE_FPGA_FIRMWARE_CUSTOM_FILE="$(TOPDIR)/../firmware/leds/blinking_led/bin/blinking_led_apf27_200k.bit"
+BR2_PACKAGE_FPGA_FIRMWARE_EXPORT=y
BR2_PACKAGE_IMXREGS=y
BR2_PACKAGE_MAX5821CTRL=y
BR2_PACKAGE_AD9889CTRL=y
diff --git a/buildroot/configs/apf51_defconfig b/buildroot/configs/apf51_defconfig
index a8de5e5..85baf45 100644
--- a/buildroot/configs/apf51_defconfig
+++ b/buildroot/configs/apf51_defconfig
@@ -42,9 +42,9 @@ BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-$(BR2_LINUX_KERNEL_VERSION).config"
BR2_PACKAGE_BUSYBOX_CONFIG="$(ARMADEUS_PATH)/busybox.config"
BR2_PACKAGE_FPGAREGS=y
-BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE=y
-BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE_APF51_DUAL_UART=y
-BR2_PACKAGE_ARMADEUS_EXPORT_FPGA_FIRMWARE=y
+BR2_PACKAGE_FPGA_FIRMWARE=y
+BR2_PACKAGE_FPGA_FIRMWARE_APF51_DUAL_UART=y
+BR2_PACKAGE_FPGA_FIRMWARE_EXPORT=y
BR2_PACKAGE_IMXREGS=y
BR2_PACKAGE_TFP410CTRL=y
BR2_PACKAGE_ALSA_UTILS=y
diff --git a/buildroot/configs/apf51mainline_defconfig b/buildroot/configs/apf51mainline_defconfig
index 3e43ca1..1cf78cb 100644
--- a/buildroot/configs/apf51mainline_defconfig
+++ b/buildroot/configs/apf51mainline_defconfig
@@ -36,9 +36,9 @@ BR2_CPU_NAME="imx51"
BR2_TARGET_ARMADEUS_SDRAM_SIZE="256"
BR2_PACKAGE_BUSYBOX_CONFIG="$(ARMADEUS_PATH)/busybox.config"
BR2_PACKAGE_FPGAREGS=y
-BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE=y
-BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE_APF51_DUAL_UART=y
-BR2_PACKAGE_ARMADEUS_EXPORT_FPGA_FIRMWARE=y
+BR2_PACKAGE_FPGA_FIRMWARE=y
+BR2_PACKAGE_FPGA_FIRMWARE_APF51_DUAL_UART=y
+BR2_PACKAGE_FPGA_FIRMWARE_EXPORT=y
BR2_PACKAGE_IMXREGS=y
BR2_PACKAGE_TFP410CTRL=y
BR2_PACKAGE_ALSA_UTILS=y
diff --git a/buildroot/configs/apf51test_defconfig b/buildroot/configs/apf51test_defconfig
index 8d7b923..60778e0 100644
--- a/buildroot/configs/apf51test_defconfig
+++ b/buildroot/configs/apf51test_defconfig
@@ -58,9 +58,9 @@ BR2_PACKAGE_ARMADEUS_DEMOS_SHOW_IMAGE=y
BR2_PACKAGE_ARMADEUS_DEMOS_TEST_LCD=y
BR2_PACKAGE_ARMADEUS_DEMOS_MCP25020=y
BR2_PACKAGE_FPGAREGS=y
-BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE=y
-BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE_APF51_DUAL_UART=y
-BR2_PACKAGE_ARMADEUS_EXPORT_FPGA_FIRMWARE=y
+BR2_PACKAGE_FPGA_FIRMWARE=y
+BR2_PACKAGE_FPGA_FIRMWARE_APF51_DUAL_UART=y
+BR2_PACKAGE_FPGA_FIRMWARE_EXPORT=y
BR2_PACKAGE_IMXREGS=y
BR2_PACKAGE_TESTSUITE=y
BR2_PACKAGE_TFP410CTRL=y
diff --git a/buildroot/configs/apf9328_defconfig b/buildroot/configs/apf9328_defconfig
index f01f70c..af6931f 100644
--- a/buildroot/configs/apf9328_defconfig
+++ b/buildroot/configs/apf9328_defconfig
@@ -42,9 +42,9 @@ BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-$(BR2_LINUX_KERNEL_VERSION).config"
BR2_PACKAGE_BUSYBOX_CONFIG="$(ARMADEUS_PATH)/busybox.config"
BR2_PACKAGE_FPGAREGS=y
-BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE=y
-BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE_CUSTOM_FILE="$(TOPDIR)/../firmware/leds/blinking_led/bin/blinking_led_apf9328_200k.bit"
-BR2_PACKAGE_ARMADEUS_EXPORT_FPGA_FIRMWARE=y
+BR2_PACKAGE_FPGA_FIRMWARE=y
+BR2_PACKAGE_FPGA_FIRMWARE_CUSTOM_FILE="$(TOPDIR)/../firmware/leds/blinking_led/bin/blinking_led_apf9328_200k.bit"
+BR2_PACKAGE_FPGA_FIRMWARE_EXPORT=y
BR2_PACKAGE_IMXREGS=y
BR2_PACKAGE_MAX5821CTRL=y
BR2_PACKAGE_CH7024CTRL=y
diff --git a/buildroot/configs/apf9328test_defconfig b/buildroot/configs/apf9328test_defconfig
index 89f0d74..1a6be7e 100644
--- a/buildroot/configs/apf9328test_defconfig
+++ b/buildroot/configs/apf9328test_defconfig
@@ -58,9 +58,9 @@ BR2_PACKAGE_ARMADEUS_DEMOS_SHOW_IMAGE=y
BR2_PACKAGE_ARMADEUS_DEMOS_TEST_LCD=y
BR2_PACKAGE_ARMADEUS_DEMOS_MCP25020=y
BR2_PACKAGE_FPGAREGS=y
-BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE=y
-BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE_CUSTOM_FILE="$(TOPDIR)/../firmware/leds/blinking_led/bin/blinking_led_apf9328_200k.bit"
-BR2_PACKAGE_ARMADEUS_EXPORT_FPGA_FIRMWARE=y
+BR2_PACKAGE_FPGA_FIRMWARE=y
+BR2_PACKAGE_FPGA_FIRMWARE_CUSTOM_FILE="$(TOPDIR)/../firmware/leds/blinking_led/bin/blinking_led_apf9328_200k.bit"
+BR2_PACKAGE_FPGA_FIRMWARE_EXPORT=y
BR2_PACKAGE_IMXREGS=y
BR2_PACKAGE_MAX5821CTRL=y
BR2_PACKAGE_TESTSUITE=y
diff --git a/buildroot/configs/apf9328xenomai_defconfig b/buildroot/configs/apf9328xenomai_defconfig
index d97fd9d..25ab662 100644
--- a/buildroot/configs/apf9328xenomai_defconfig
+++ b/buildroot/configs/apf9328xenomai_defconfig
@@ -43,9 +43,9 @@ BR2_LINUX_KERNEL_EXT_XENOMAI=y
BR2_LINUX_KERNEL_EXT_XENOMAI_ADEOS_PATCH_URL="ftp://ftp2.armadeus.com/armadeusw/adeos-ipipe-2.6.29-arm-1.13-05.patch"
BR2_PACKAGE_BUSYBOX_CONFIG="$(ARMADEUS_PATH)/busybox.config"
BR2_PACKAGE_FPGAREGS=y
-BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE=y
-BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE_CUSTOM_FILE="$(TOPDIR)/../firmware/leds/blinking_led/bin/blinking_led_apf9328_200k.bit"
-BR2_PACKAGE_ARMADEUS_EXPORT_FPGA_FIRMWARE=y
+BR2_PACKAGE_FPGA_FIRMWARE=y
+BR2_PACKAGE_FPGA_FIRMWARE_CUSTOM_FILE="$(TOPDIR)/../firmware/leds/blinking_led/bin/blinking_led_apf9328_200k.bit"
+BR2_PACKAGE_FPGA_FIRMWARE_EXPORT=y
BR2_PACKAGE_IMXREGS=y
BR2_PACKAGE_MAX5821CTRL=y
BR2_PACKAGE_CH7024CTRL=y
diff --git a/buildroot/configs/pps51_defconfig b/buildroot/configs/pps51_defconfig
index 4f3761f..5a3ebb8 100644
--- a/buildroot/configs/pps51_defconfig
+++ b/buildroot/configs/pps51_defconfig
@@ -43,8 +43,8 @@ BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-$(BR2_LINUX_KERNEL_VERSION).config"
BR2_PACKAGE_BUSYBOX_CONFIG="$(ARMADEUS_PATH)/busybox.config"
BR2_PACKAGE_FPGAREGS=y
-BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE=y
-BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE_APF51_DUAL_UART=y
+BR2_PACKAGE_FPGA_FIRMWARE=y
+BR2_PACKAGE_FPGA_FIRMWARE_APF51_DUAL_UART=y
BR2_PACKAGE_IMXREGS=y
BR2_PACKAGE_TESTSUITE=y
BR2_PACKAGE_PPS=y
diff --git a/buildroot/package/armadeus/fpga_firmware/Config.in b/buildroot/package/armadeus/fpga_firmware/Config.in
index c519a06..6ad29ab 100644
--- a/buildroot/package/armadeus/fpga_firmware/Config.in
+++ b/buildroot/package/armadeus/fpga_firmware/Config.in
@@ -1,20 +1,20 @@
-config BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE
+config BR2_PACKAGE_FPGA_FIRMWARE
bool "FPGA Firmware"
help
Install some FPGA firmwares.
-if BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE
+if BR2_PACKAGE_FPGA_FIRMWARE
choice
prompt "Firmware(s) to install"
- default BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE_CUSTOM
+ default BR2_PACKAGE_FPGA_FIRMWARE_CUSTOM
-config BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE_APF51_DUAL_UART
+config BR2_PACKAGE_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 /lib/firmware/fpga/apf51_gsm_gps_firmware.bin.
-config BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE_CUSTOM
+config BR2_PACKAGE_FPGA_FIRMWARE_CUSTOM
bool "Custom list"
help
Use one or more custom FPGA binary files. The FPGA binary files will
@@ -22,13 +22,13 @@ config BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE_CUSTOM
endchoice
-config BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE_CUSTOM_FILE
+config BR2_PACKAGE_FPGA_FIRMWARE_CUSTOM_FILE
string "Firmware(s) path list"
- depends on BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE_CUSTOM
+ depends on BR2_PACKAGE_FPGA_FIRMWARE_CUSTOM
help
Path list to your custom FPGA binary files to install.
-config BR2_PACKAGE_ARMADEUS_EXPORT_FPGA_FIRMWARE
+config BR2_PACKAGE_FPGA_FIRMWARE_EXPORT
bool "Export the FPGA firmware to Buildroot output/images/ folder"
help
Build a link from Buildroot output/images/ folder to the FPGA
@@ -36,4 +36,4 @@ config BR2_PACKAGE_ARMADEUS_EXPORT_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
+endif # BR2_PACKAGE_FPGA_FIRMWARE
diff --git a/buildroot/package/armadeus/fpga_firmware/fpga_firmware.mk b/buildroot/package/armadeus/fpga_firmware/fpga_firmware.mk
index b34f72e..b1c991a 100644
--- a/buildroot/package/armadeus/fpga_firmware/fpga_firmware.mk
+++ b/buildroot/package/armadeus/fpga_firmware/fpga_firmware.mk
@@ -4,47 +4,36 @@
#
#############################################################
-ifeq ($(strip $(BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE_APF51_DUAL_UART)),y)
-FPGA_FIRMWARE = $(BASE_DIR)/../../firmware/pod_scripts/apf51_gsm_gps_firmware.bin
+FPGA_FIRMWARE_VERSION = 6.0
+FPGA_FIRMWARE_SITE = $(TOPDIR)/../firmware
+FPGA_FIRMWARE_SITE_METHOD = local
+
+ifeq ($(strip $(BR2_PACKAGE_FPGA_FIRMWARE_APF51_DUAL_UART)),y)
+FPGA_FIRMWARE = $(TOPDIR)/../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))
+ifeq ($(strip $(BR2_PACKAGE_FPGA_FIRMWARE_CUSTOM)),y)
+FPGA_FIRMWARE = $(call qstrip,$(BR2_PACKAGE_FPGA_FIRMWARE_CUSTOM_FILE))
endif
FIRMWARES += $(FPGA_FIRMWARE)
-FPGA_FIRMWARE_TARGET_DIR:=/lib/firmware/fpga/
+FPGA_FIRMWARE_TARGET_DIR = $(TARGET_DIR)/lib/firmware/fpga/
-$(STAMP_DIR)/.fpga_firmware_installed:
- @$(call MESSAGE,"Installing some FPGA firmwares")
- mkdir -p $(TARGET_DIR)/$(FPGA_FIRMWARE_TARGET_DIR)
- for firmware in $(FIRMWARES); do \
- $(INSTALL) -m 0755 $$firmware $(TARGET_DIR)/$(FPGA_FIRMWARE_TARGET_DIR) ; \
- done
-ifeq ($(BR2_PACKAGE_ARMADEUS_EXPORT_FPGA_FIRMWARE),y)
+ifeq ($(BR2_PACKAGE_FPGA_FIRMWARE_EXPORT),y)
+define FPGA_FIRMWARE_EXPORT
# 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
+endef
endif
- touch $@
-
-fpga-firmware: $(STAMP_DIR)/.fpga_firmware_installed
-fpga-firmware-clean:
- @$(call MESSAGE,"Cleaning FPGA firmwares")
+define FPGA_FIRMWARE_INSTALL_TARGET_CMDS
+ @$(call MESSAGE,"Installing some FPGA firmwares")
+ mkdir -p $(FPGA_FIRMWARE_TARGET_DIR)
for firmware in $(FIRMWARES); do \
- firmname=`basename $$firmware` ; \
- rm -f $(TARGET_DIR)/$(FPGA_FIRMWARE_TARGET_DIR)/$$firmname ; \
+ $(INSTALL) -m 0755 $$firmware $(FPGA_FIRMWARE_TARGET_DIR) ; \
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_EXPORT)
+endef
-fpga-firmware-rebuild: fpga-firmware-clean fpga-firmware
-
-ifeq ($(strip $(BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE)),y)
-TARGETS+=fpga-firmware
-endif
+$(eval $(generic-package))
hooks/post-receive
--
armadeus
|