[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-292-g9d1ccd2
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-292-g9d1ccd2
|
From: Julien B a. A. <ar...@us...> - 2012-05-04 12:52:57
|
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 9d1ccd2dab25022f95a542e17163b97a5e17c1f3 (commit)
via a6d9b98ec8e1d23829869d14c461934d73055a2a (commit)
from 5e34956b53bfa966849edc51249e8bbb14df7f8e (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 9d1ccd2dab25022f95a542e17163b97a5e17c1f3
Merge: a6d9b98 5e34956
Author: Julien Boibessot <jul...@ar...>
Date: Fri May 4 14:51:44 2012 +0200
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
Conflicts:
patches/buildroot/2012.02/cleanup_buildroot.sh
commit a6d9b98ec8e1d23829869d14c461934d73055a2a
Author: Julien Boibessot <jul...@ar...>
Date: Fri May 4 14:48:42 2012 +0200
[BUILDROOT] Merge Armadeus specific firmware package with Buildroot linux-firmware one
-----------------------------------------------------------------------
Summary of changes:
...e-add_infrastructure_to_install_firmwares.patch | 149 --------------------
...-linux-firmware-add_marvell_libertas_8686.patch | 87 ++++++++++++
patches/buildroot/2012.02/cleanup_buildroot.sh | 3 +-
3 files changed, 88 insertions(+), 151 deletions(-)
delete mode 100644 patches/buildroot/2012.02/106-firmware-add_infrastructure_to_install_firmwares.patch
create mode 100644 patches/buildroot/2012.02/186-linux-firmware-add_marvell_libertas_8686.patch
diff --git a/patches/buildroot/2012.02/106-firmware-add_infrastructure_to_install_firmwares.patch b/patches/buildroot/2012.02/106-firmware-add_infrastructure_to_install_firmwares.patch
deleted file mode 100644
index e838ffc..0000000
--- a/patches/buildroot/2012.02/106-firmware-add_infrastructure_to_install_firmwares.patch
+++ /dev/null
@@ -1,149 +0,0 @@
-Add infrastructure to download linux-firmwares.
-Currently only libertas 88W8686 firmwares are handled.
-
-Signed-off-by: Julien Boibessot <jul...@ar...>
-
-Index: buildroot/package/Config.in
-===================================================================
---- buildroot.orig/package/Config.in 2012-02-21 16:44:42.000000000 +0100
-+++ buildroot/package/Config.in 2012-02-21 16:44:50.000000000 +0100
-@@ -182,6 +182,7 @@
- source "package/e2fsprogs/Config.in"
- source "package/eeprog/Config.in"
- source "package/fconfig/Config.in"
-+source "package/firmware/Config.in"
- source "package/fis/Config.in"
- source "package/gadgetfs-test/Config.in"
- source "package/gdisk/Config.in"
-Index: buildroot/package/firmware/Config.in
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/firmware/Config.in 2012-02-21 16:44:50.000000000 +0100
-@@ -0,0 +1,49 @@
-+menuconfig BR2_PACKAGE_FIRMWARE
-+ bool "linux-firmware"
-+ help
-+ Install selected firmware from linux-firmware.git repository.
-+
-+ This repository was setup by David Woodhouse in order to:
-+ "include firmware files from vendors who have chosen not to
-+ contribute their firmware to be distributed as part of the GPL'd
-+ kernel source tree, but would still like their firmware to be readily
-+ available to Linux users."
-+
-+
-+if BR2_PACKAGE_FIRMWARE
-+
-+comment "Video"
-+
-+comment "WiFi chipsets"
-+
-+config BR2_PACKAGE_FIRMWARE_88W8686
-+ bool "Marvell's 88W8686 (Libertas)"
-+
-+config BR2_PACKAGE_FIRMWARE_88W8686_SDIO
-+ bool "SDIO"
-+ default y
-+ depends on BR2_PACKAGE_FIRMWARE_88W8686
-+
-+choice
-+ prompt "Firmware version"
-+ default BR2_PACKAGE_FIRMWARE_88W8686_SDIO_V9
-+ depends on BR2_PACKAGE_FIRMWARE_88W8686_SDIO
-+ help
-+ SDIO firmware is available in v8 or v9 version.
-+
-+config BR2_PACKAGE_FIRMWARE_88W8686_SDIO_V8
-+ bool "v8"
-+
-+config BR2_PACKAGE_FIRMWARE_88W8686_SDIO_V9
-+ bool "v9"
-+
-+endchoice
-+
-+config BR2_PACKAGE_FIRMWARE_88W8686_GSPI
-+ bool "GSPI"
-+ depends on BR2_PACKAGE_FIRMWARE_88W8686
-+
-+comment "Others"
-+
-+endif
-+
-Index: buildroot/package/firmware/firmware.mk
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/firmware/firmware.mk 2012-02-21 16:44:50.000000000 +0100
-@@ -0,0 +1,73 @@
-+#############################################################
-+#
-+# Get and install some linux-firmware
-+#
-+#############################################################
-+FIRMWARE_VERSION:=af5222c5ded5d944267acfbd001571409bea7eeb
-+FIRMWARE_SOURCE:=firmware-$(FIRMWARE_VERSION).tar.gz
-+FIRMWARE_GIT:=git://git.kernel.org/pub/scm/linux/kernel/git/dwmw2/linux-firmware.git
-+FIRMWARE_DIR:=$(BUILD_DIR)/firmware-$(FIRMWARE_VERSION)
-+FIRMWARE_TARGET_DIR:=$(TARGET_DIR)/lib/firmware
-+FIRMWARE_CAT:=$(ZCAT)
-+FIRMWARE_NAME:=firmware-$(FIRMWARE_VERSION)
-+
-+
-+ifeq ($(strip $(BR2_PACKAGE_FIRMWARE_88W8686_SDIO_V8)),y)
-+FIRMWARE_88W8686_SDIO_VERSION:=v8
-+else
-+FIRMWARE_88W8686_SDIO_VERSION:=v9
-+endif
-+ifeq ($(strip $(BR2_PACKAGE_FIRMWARE_88W8686_SDIO)),y)
-+FIRMWARE_BINARIES+=sd8686_$(FIRMWARE_88W8686_SDIO_VERSION)_helper.bin sd8686_$(FIRMWARE_88W8686_SDIO_VERSION).bin
-+endif
-+ifeq ($(strip $(BR2_PACKAGE_FIRMWARE_88W8686_GSPI)),y)
-+FIRMWARE_BINARIES+=gspi8686_$(FIRMWARE_88W8686_SDIO_VERSION)_helper.bin gspi8686_$(FIRMWARE_88W8686_SDIO_VERSION).bin
-+endif
-+
-+$(DL_DIR)/$(FIRMWARE_SOURCE):
-+ git clone $(FIRMWARE_GIT) $(FIRMWARE_DIR)
-+ (cd $(FIRMWARE_DIR); \
-+ git archive --prefix=$(FIRMWARE_NAME)/ $(FIRMWARE_VERSION) | \
-+ gzip > $(DL_DIR)/$(FIRMWARE_SOURCE) )
-+ rm -rf $(FIRMWARE_DIR)
-+
-+$(FIRMWARE_DIR)/.unpacked: $(DL_DIR)/$(FIRMWARE_SOURCE)
-+ $(FIRMWARE_CAT) $(DL_DIR)/$(FIRMWARE_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-+ touch $@
-+
-+$(FIRMWARE_DIR)/.installed: $(FIRMWARE_DIR)/.unpacked
-+ mkdir -p $(FIRMWARE_TARGET_DIR)/libertas
-+ifeq ($(strip $(BR2_PACKAGE_FIRMWARE_88W8686_SDIO)),y)
-+ $(INSTALL) -D $(FIRMWARE_DIR)/libertas/sd8686_$(FIRMWARE_88W8686_SDIO_VERSION)_helper.bin $(FIRMWARE_TARGET_DIR)/libertas/
-+ $(INSTALL) -D $(FIRMWARE_DIR)/libertas/sd8686_$(FIRMWARE_88W8686_SDIO_VERSION).bin $(FIRMWARE_TARGET_DIR)/libertas/
-+ # To be compatible with old kernels:
-+ ln -sf ./libertas/sd8686_$(FIRMWARE_88W8686_SDIO_VERSION)_helper.bin $(FIRMWARE_TARGET_DIR)/sd8686_helper.bin
-+ ln -sf ./libertas/sd8686_$(FIRMWARE_88W8686_SDIO_VERSION).bin $(FIRMWARE_TARGET_DIR)/sd8686.bin
-+endif
-+ifeq ($(strip $(BR2_PACKAGE_FIRMWARE_88W8686_GSPI)),y)
-+ $(INSTALL) -D $(FIRMWARE_DIR)/libertas/gspi8686_$(FIRMWARE_88W8686_SDIO_VERSION)_helper.bin $(FIRMWARE_TARGET_DIR)/libertas/
-+ $(INSTALL) -D $(FIRMWARE_DIR)/libertas/gspi8686_$(FIRMWARE_88W8686_SDIO_VERSION).bin $(FIRMWARE_TARGET_DIR)/libertas/
-+endif
-+ touch $@
-+
-+firmware: $(FIRMWARE_DIR)/.installed
-+
-+firmware-source: $(DL_DIR)/$(FIRMWARE_SOURCE)
-+
-+firmware-clean:
-+ rm -f $(FIRMWARE_DIR)/.installed
-+ (for file in $(FIRMWARE_BINARIES); do \
-+ rm -f "$(FIRMWARE_TARGET_DIR)/$$file"; \
-+ done)
-+
-+firmware-dirclean:
-+ rm -rf $(FIRMWARE_DIR)
-+
-+#############################################################
-+#
-+# Toplevel Makefile options
-+#
-+#############################################################
-+ifeq ($(strip $(BR2_PACKAGE_FIRMWARE)),y)
-+TARGETS+=firmware
-+endif
diff --git a/patches/buildroot/2012.02/186-linux-firmware-add_marvell_libertas_8686.patch b/patches/buildroot/2012.02/186-linux-firmware-add_marvell_libertas_8686.patch
new file mode 100644
index 0000000..b60882d
--- /dev/null
+++ b/patches/buildroot/2012.02/186-linux-firmware-add_marvell_libertas_8686.patch
@@ -0,0 +1,87 @@
+Add Marvell Libertas 88W8686 to linux-firmware.
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: buildroot/package/linux-firmware/Config.in
+===================================================================
+--- buildroot.orig/package/linux-firmware/Config.in 2012-05-03 21:00:53.000000000 +0200
++++ buildroot/package/linux-firmware/Config.in 2012-05-03 21:37:17.000000000 +0200
+@@ -8,6 +8,37 @@
+
+ if BR2_PACKAGE_LINUX_FIRMWARE
+
++menu "Marvell"
++
++config BR2_PACKAGE_LINUX_FIRMWARE_88W8686
++ bool "88W8686 (Libertas)"
++
++choice
++ prompt "Firmware version"
++ default BR2_PACKAGE_LINUX_FIRMWARE_88W8686_V9
++ depends on BR2_PACKAGE_LINUX_FIRMWARE_88W8686
++ help
++ SDIO firmware is available in v8 or v9 version.
++
++config BR2_PACKAGE_LINUX_FIRMWARE_88W8686_V8
++ bool "v8"
++
++config BR2_PACKAGE_LINUX_FIRMWARE_88W8686_V9
++ bool "v9"
++
++endchoice
++
++config BR2_PACKAGE_LINUX_FIRMWARE_88W8686_SDIO
++ bool "SDIO"
++ default y
++ depends on BR2_PACKAGE_LINUX_FIRMWARE_88W8686
++
++config BR2_PACKAGE_LINUX_FIRMWARE_88W8686_GSPI
++ bool "GSPI"
++ depends on BR2_PACKAGE_LINUX_FIRMWARE_88W8686
++
++endmenu
++
+ menu "Ralink"
+
+ config BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT61
+Index: buildroot/package/linux-firmware/linux-firmware.mk
+===================================================================
+--- buildroot.orig/package/linux-firmware/linux-firmware.mk 2012-05-03 21:01:00.000000000 +0200
++++ buildroot/package/linux-firmware/linux-firmware.mk 2012-05-03 21:34:45.000000000 +0200
+@@ -3,10 +3,25 @@
+ # linux-firmware
+ #
+ #############################################################
+-LINUX_FIRMWARE_VERSION = a2995d38c234e3d767df7223d84a0f33a1a24997
++#LINUX_FIRMWARE_VERSION = a2995d38c234e3d767df7223d84a0f33a1a24997
++LINUX_FIRMWARE_VERSION = af5222c5ded5d944267acfbd001571409bea7eeb
+ LINUX_FIRMWARE_SITE = git://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git
+ LINUX_FIRMWARE_SITE_METHOD = git
+
++# Libertas 88W8686
++ifeq ($(strip $(BR2_PACKAGE_LINUX_FIRMWARE_88W8686_V8)),y)
++LINUX_FIRMWARE_88W8686_VERSION = v8
++else
++LINUX_FIRMWARE_88W8686_VERSION = v9
++endif
++LINUX_FIRMWARE_FILES_$(BR2_PACKAGE_LINUX_FIRMWARE_88W8686_SDIO) += \
++ libertas/sd8686_$(LINUX_FIRMWARE_88W8686_VERSION)_helper.bin \
++ libertas/sd8686_$(LINUX_FIRMWARE_88W8686_VERSION).bin
++
++LINUX_FIRMWARE_FILES_$(BR2_PACKAGE_LINUX_FIRMWARE_88W8686_GSPI) += \
++ libertas/gspi8686_$(LINUX_FIRMWARE_88W8686_VERSION)_helper.bin \
++ libertas/gspi8686_$(LINUX_FIRMWARE_88W8686_VERSION).bin
++
+ # rt2501/rt61
+ LINUX_FIRMWARE_FILES_$(BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT61) += \
+ rt2561.bin rt2561s.bin rt2661.bin LICENCE.ralink-firmware.txt
+@@ -52,6 +67,9 @@
+ mkdir -p $(TARGET_DIR)/lib/firmware
+ $(TAR) c -C $(@D) $(LINUX_FIRMWARE_FILES_y) | \
+ $(TAR) x -C $(TARGET_DIR)/lib/firmware
++ # To be compatible with old Armadeus kernels:
++ ln -sf ./libertas/sd8686_$(LINUX_FIRMWARE_88W8686_SDIO_VERSION)_helper.bin $(FIRMWARE_TARGET_DIR)/sd8686_helper.bin
++ ln -sf ./libertas/sd8686_$(LINUX_FIRMWARE_88W8686_SDIO_VERSION).bin $(FIRMWARE_TARGET_DIR)/sd8686.bin
+ endef
+
+ endif
diff --git a/patches/buildroot/2012.02/cleanup_buildroot.sh b/patches/buildroot/2012.02/cleanup_buildroot.sh
index da47017..83d6ed6 100755
--- a/patches/buildroot/2012.02/cleanup_buildroot.sh
+++ b/patches/buildroot/2012.02/cleanup_buildroot.sh
@@ -15,7 +15,6 @@ rm -rf buildroot/package/multimedia/flite/
rm -rf buildroot/package/libcurl/
rm -f buildroot/package/multimedia/mplayer/mplayer-1.0rc2-add_pld_asm_inst_for_non_armv5_arch.patch
rm -f buildroot/package/multimedia/madplay/madplay-audio-alsa.patch
-rm -rf buildroot/package/firmware/
rm -f buildroot/toolchain/gcc/4.2.1/999-4.2.1-armeabi-aapcs-linux.patch
rm -f buildroot/toolchain/gcc/4.2.4/999-4.2.4-armeabi-aapcs-linux.patch
rm -rf buildroot/package/games/wolf4sdl/
@@ -71,5 +70,5 @@ rm -rf buildroot/package/e2fsprogs/
rm -rf buildroot/package/firmware-imx/
rm -rf buildroot/package/multimedia/gst-fsl-plugin/
rm -rf buildroot/package/multimedia/fsl-mm-codeclib/
+rm -rf buildroot/package/linux-firmware/
rm -rf buildroot/package/uboot-tools/
-
hooks/post-receive
--
armadeus
|
