[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-385-g80d2c9d

[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  80d2c9d3e2975120f20db063d0688aedd027d3ff (commit)
      from  daa18e5df129783c67cef271ea0d80093101ef64 (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 80d2c9d3e2975120f20db063d0688aedd027d3ff
Author: Julien Boibessot <jul...@ar...>
Date:   Sun Jun 17 21:14:05 2012 +0200

    [BUILDROOT] Fixes linux-firmware usage on APF51

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

Summary of changes:
 buildroot/configs/apf51_defconfig                  |    4 ++--
 ...-linux-firmware-add_marvell_libertas_8686.patch |   15 ++++++++-------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/buildroot/configs/apf51_defconfig b/buildroot/configs/apf51_defconfig
index e4d5fac..0516c2f 100644
--- a/buildroot/configs/apf51_defconfig
+++ b/buildroot/configs/apf51_defconfig
@@ -47,9 +47,9 @@ BR2_PACKAGE_ALSA_UTILS_SPEAKER_TEST=y
 BR2_PACKAGE_STRACE=y
 BR2_PACKAGE_FBV=y
 BR2_PACKAGE_DBUS=y
-BR2_PACKAGE_FIRMWARE=y
-BR2_PACKAGE_FIRMWARE_88W8686=y
 BR2_PACKAGE_I2C_TOOLS=y
+BR2_PACKAGE_LINUX_FIRMWARE=y
+BR2_PACKAGE_LINUX_FIRMWARE_88W8686=y
 BR2_PACKAGE_MTD=y
 BR2_PACKAGE_MTD_JFFS2DUMP=y
 BR2_PACKAGE_MTD_MKFSJFFS2=y
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
index b60882d..9d7509c 100644
--- 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
@@ -4,8 +4,8 @@ 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
+--- buildroot.orig/package/linux-firmware/Config.in	2012-02-29 23:19:47.000000000 +0100
++++ buildroot/package/linux-firmware/Config.in	2012-06-17 21:01:54.000000000 +0200
 @@ -8,6 +8,37 @@
  
  if BR2_PACKAGE_LINUX_FIRMWARE
@@ -46,8 +46,8 @@ Index: buildroot/package/linux-firmware/Config.in
  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
+--- buildroot.orig/package/linux-firmware/linux-firmware.mk	2012-02-29 23:19:47.000000000 +0100
++++ buildroot/package/linux-firmware/linux-firmware.mk	2012-06-17 21:07:42.000000000 +0200
 @@ -3,10 +3,25 @@
  # linux-firmware
  #
@@ -75,13 +75,14 @@ Index: buildroot/package/linux-firmware/linux-firmware.mk
  # 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 @@
+@@ -52,6 +67,10 @@
  	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
++	cd $(TARGET_DIR)/lib/firmware; \
++		ln -sf ./libertas/sd8686_$(LINUX_FIRMWARE_88W8686_VERSION)_helper.bin ./sd8686_helper.bin ; \
++		ln -sf ./libertas/sd8686_$(LINUX_FIRMWARE_88W8686_VERSION).bin ./sd8686.bin
  endef
  
  endif


hooks/post-receive
-- 
armadeus