[Armadeus-commitlog] armadeus branch, master, updated. release-3.3-317-g6bbf46a
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. release-3.3-317-g6bbf46a
|
From: Julien B a. A. <ar...@us...> - 2011-02-16 10:13:31
|
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 6bbf46af9672e1ea9b525e16158245c4b76ad5bc (commit)
via 28af32bf15c6f53353ca631928af32b6622b9942 (commit)
via 4c58b0cc3f7cfb38b70435db60f330a88bc91d92 (commit)
via 12fbeeb652b0d6ee334dfce5d6678ce38e093872 (commit)
via 06dfaeb7e7b5698d4b8f90aa72aad7465542a46d (commit)
from 6e06b1b14267f97e001fcaf8d2c05e61a12d02be (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 6bbf46af9672e1ea9b525e16158245c4b76ad5bc
Author: Julien Boibessot <jul...@ar...>
Date: Wed Feb 16 11:06:43 2011 +0100
[LINUX] Fixes comments in patches 090 & 091
commit 28af32bf15c6f53353ca631928af32b6622b9942
Author: Julien Boibessot <jul...@ar...>
Date: Wed Feb 16 10:57:57 2011 +0100
[BUILDROOT] [2010.11] Updates Linux firmware (libertas) to support latest kernel
commit 4c58b0cc3f7cfb38b70435db60f330a88bc91d92
Author: Julien Boibessot <jul...@ar...>
Date: Wed Feb 16 10:51:14 2011 +0100
[LINUX] 2.6.38: Updates APF27 default config
commit 12fbeeb652b0d6ee334dfce5d6678ce38e093872
Merge: 06dfaeb7e7b5698d4b8f90aa72aad7465542a46d 6e06b1b14267f97e001fcaf8d2c05e61a12d02be
Author: Julien Boibessot <jul...@ar...>
Date: Wed Feb 16 10:36:15 2011 +0100
Merge branch 'master' of ssh://artemys@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit 06dfaeb7e7b5698d4b8f90aa72aad7465542a46d
Author: Julien Boibessot <jul...@ar...>
Date: Wed Feb 16 10:28:11 2011 +0100
Fixes commit 9366157a494b4a6e5e636ddae2411d715c13cadf
-----------------------------------------------------------------------
Summary of changes:
.../armadeus/apf27/apf27-linux-2.6.38.config | 36 ++++++++-----------
.../090-armadeus-alsa-create_imx-alsa_h.patch | 3 --
...-armadeus-alsa-add_imx_ssi_tsc2102_driver.patch | 3 --
...e-add_infrastructure_to_install_firmwares.patch | 38 ++++++++++---------
patches/buildroot/2010.11/cleanup_buildroot.sh | 1 +
5 files changed, 36 insertions(+), 45 deletions(-)
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.38.config b/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.38.config
index 13a810d..19db7ba 100644
--- a/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.38.config
+++ b/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.38.config
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux/arm 2.6.38-rc3 Kernel Configuration
-# Tue Feb 8 11:03:24 2011
+# Mon Feb 14 16:03:29 2011
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -993,6 +993,7 @@ CONFIG_INPUT_TOUCHSCREEN=y
# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set
# CONFIG_TOUCHSCREEN_TOUCHWIN is not set
CONFIG_TOUCHSCREEN_TSC2102=m
+# CONFIG_TOUCHSCREEN_WM97XX is not set
# CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set
# CONFIG_TOUCHSCREEN_TOUCHIT213 is not set
# CONFIG_TOUCHSCREEN_TSC2007 is not set
@@ -1119,7 +1120,7 @@ CONFIG_SPI_IMX_VER_0_0=y
CONFIG_SPI_IMX=y
CONFIG_SPI_MXC_SELECT1=y
CONFIG_SPI_MXC_SELECT2=y
-CONFIG_SPI_MXC_SELECT3=y
+# CONFIG_SPI_MXC_SELECT3 is not set
# CONFIG_SPI_PXA2XX_PCI is not set
# CONFIG_SPI_XILINX is not set
# CONFIG_SPI_DESIGNWARE is not set
@@ -1293,6 +1294,7 @@ CONFIG_MFD_SUPPORT=y
# CONFIG_HTC_EGPIO is not set
# CONFIG_HTC_PASIC3 is not set
# CONFIG_HTC_I2CPLD is not set
+# CONFIG_UCB1400_CORE is not set
# CONFIG_TPS65010 is not set
# CONFIG_TPS6507X is not set
# CONFIG_TWL4030_CORE is not set
@@ -1537,12 +1539,6 @@ CONFIG_FB_CFB_IMAGEBLIT=y
# Frame buffer hardware drivers
#
CONFIG_FB_IMX=y
-# CONFIG_FB_IMX_CHIMEI_LW700AT9003_TFT is not set
-# CONFIG_FB_IMX_HITACHI_TX12D17VM1BDP_TFT is not set
-# CONFIG_FB_IMX_OPTREX_T51638D084_TFT is not set
-CONFIG_FB_IMX_SHARP_LQ043_TFT=y
-# CONFIG_FB_IMX_SHARP_LQ057_TFT is not set
-# CONFIG_FB_IMX_CUSTOM_LCD is not set
# CONFIG_FB_S1D13XXX is not set
# CONFIG_FB_UDL is not set
# CONFIG_FB_VIRTUAL is not set
@@ -1612,20 +1608,18 @@ CONFIG_SND_VERBOSE_PROCFS=y
# CONFIG_SND_OPL4_LIB_SEQ is not set
# CONFIG_SND_SBAWE_SEQ is not set
# CONFIG_SND_EMU10K1_SEQ is not set
-CONFIG_SND_DRIVERS=y
-# CONFIG_SND_DUMMY is not set
-# CONFIG_SND_ALOOP is not set
-# CONFIG_SND_MTPAV is not set
-# CONFIG_SND_SERIAL_U16550 is not set
-# CONFIG_SND_MPU401 is not set
-CONFIG_SND_ARM=y
-CONFIG_SND_SPI=y
-CONFIG_SND_USB=y
-# CONFIG_SND_USB_AUDIO is not set
-# CONFIG_SND_USB_UA101 is not set
-# CONFIG_SND_USB_CAIAQ is not set
-# CONFIG_SND_SOC is not set
+# CONFIG_SND_DRIVERS is not set
+# CONFIG_SND_ARM is not set
+# CONFIG_SND_SPI is not set
+# CONFIG_SND_USB is not set
+CONFIG_SND_SOC=m
+# CONFIG_SND_SOC_CACHE_LZO is not set
+CONFIG_SND_SOC_AC97_BUS=y
+CONFIG_SND_IMX_SOC=m
+CONFIG_SND_SOC_I2C_AND_SPI=m
+# CONFIG_SND_SOC_ALL_CODECS is not set
# CONFIG_SOUND_PRIME is not set
+CONFIG_AC97_BUS=m
CONFIG_HID_SUPPORT=y
CONFIG_HID=y
# CONFIG_HIDRAW is not set
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/090-armadeus-alsa-create_imx-alsa_h.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/090-armadeus-alsa-create_imx-alsa_h.patch
index a97c0c1..be59465 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/090-armadeus-alsa-create_imx-alsa_h.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/090-armadeus-alsa-create_imx-alsa_h.patch
@@ -1,6 +1,3 @@
-PATCH AUTOMATICALLY GENERATED
-DON'T EDIT IT OR YOUR MODIFICATIONS WILL BE LOST
-(Take a look at armadeus/target/linux/ directory to know how to generate it)
--- linux-2.6.27.13.original/arch/arm/mach-imx/include/mach/imx-alsa.h
+++ linux-2.6.27.13.mod/arch/arm/mach-imx/include/mach/imx-alsa.h
@@ -0,0 +1,152 @@
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/091-armadeus-alsa-add_imx_ssi_tsc2102_driver.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/091-armadeus-alsa-add_imx_ssi_tsc2102_driver.patch
index 51ba317..12311a3 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/091-armadeus-alsa-add_imx_ssi_tsc2102_driver.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/091-armadeus-alsa-add_imx_ssi_tsc2102_driver.patch
@@ -1,6 +1,3 @@
-PATCH AUTOMATICALLY GENERATED
-DON'T EDIT IT OR YOUR MODIFICATIONS WILL BE LOST
-(Take a look at armadeus/target/linux/ directory to know how to generate it)
Index: linux-2.6.29.6/sound/arm/imx-alsa.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
diff --git a/patches/buildroot/2010.11/106-firmware-add_infrastructure_to_install_firmwares.patch b/patches/buildroot/2010.11/106-firmware-add_infrastructure_to_install_firmwares.patch
index 3951149..5d66f61 100644
--- a/patches/buildroot/2010.11/106-firmware-add_infrastructure_to_install_firmwares.patch
+++ b/patches/buildroot/2010.11/106-firmware-add_infrastructure_to_install_firmwares.patch
@@ -5,8 +5,8 @@ Signed-off-by: Julien Boibessot <jul...@ar...>
Index: buildroot/package/Config.in
===================================================================
---- buildroot.orig/package/Config.in 2010-06-23 14:11:47.000000000 +0200
-+++ buildroot/package/Config.in 2010-06-23 14:12:57.000000000 +0200
+--- buildroot.orig/package/Config.in 2011-02-14 22:06:04.000000000 +0100
++++ buildroot/package/Config.in 2011-02-14 22:26:30.000000000 +0100
@@ -169,6 +169,7 @@
source "package/e2fsprogs/Config.in"
source "package/eeprog/Config.in"
@@ -18,7 +18,7 @@ Index: buildroot/package/Config.in
Index: buildroot/package/firmware/Config.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/firmware/Config.in 2010-06-23 14:12:57.000000000 +0200
++++ buildroot/package/firmware/Config.in 2011-02-14 22:06:04.000000000 +0100
@@ -0,0 +1,49 @@
+menuconfig BR2_PACKAGE_FIRMWARE
+ bool "linux-firmware"
@@ -72,8 +72,8 @@ Index: buildroot/package/firmware/Config.in
Index: buildroot/package/firmware/firmware.mk
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/firmware/firmware.mk 2010-06-23 14:12:57.000000000 +0200
-@@ -0,0 +1,71 @@
++++ buildroot/package/firmware/firmware.mk 2011-02-14 22:20:39.000000000 +0100
+@@ -0,0 +1,73 @@
+#############################################################
+#
+# Get and install some linux-firmware
@@ -88,16 +88,16 @@ Index: buildroot/package/firmware/firmware.mk
+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_helper.bin sd8686.bin
++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_helper.bin gspi8686.bin
-+endif
-+ifeq ($(strip $(BR2_PACKAGE_FIRMWARE_88W8686_SDIO_V8)),y)
-+FIRMWARE_88W8686_SDIO_VERSION:=_v8
-+else
-+FIRMWARE_88W8686_SDIO_VERSION:=_v9
++FIRMWARE_BINARIES+=gspi8686_$(FIRMWARE_88W8686_SDIO_VERSION)_helper.bin gspi8686_$(FIRMWARE_88W8686_SDIO_VERSION).bin
+endif
+
+$(DL_DIR)/$(FIRMWARE_SOURCE):
@@ -106,21 +106,23 @@ Index: buildroot/package/firmware/firmware.mk
+ git archive --prefix=$(FIRMWARE_NAME)/ $(FIRMWARE_VERSION) | \
+ gzip > $(DL_DIR)/$(FIRMWARE_SOURCE) )
+ rm -rf $(FIRMWARE_DIR)
-+# $(WGET) -O $(DL_DIR)/$(FIRMWARE_SOURCE) "$(FIRMWARE_URL)"
+
+$(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)
++ mkdir -p $(FIRMWARE_TARGET_DIR)/libertas
+ifeq ($(strip $(BR2_PACKAGE_FIRMWARE_88W8686_SDIO)),y)
-+ $(INSTALL) -D $(FIRMWARE_DIR)/libertas/sd8686_v9_helper.bin $(FIRMWARE_TARGET_DIR)/sd8686_helper.bin
-+ $(INSTALL) -D $(FIRMWARE_DIR)/libertas/sd8686_v9.bin $(FIRMWARE_TARGET_DIR)/sd8686.bin
++ $(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_v9_helper.bin $(FIRMWARE_TARGET_DIR)/gspi8686_helper.bin
-+ $(INSTALL) -D $(FIRMWARE_DIR)/libertas/gspi8686_v9.bin $(FIRMWARE_TARGET_DIR)/gspi8686.bin
++ $(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 $@
+
diff --git a/patches/buildroot/2010.11/cleanup_buildroot.sh b/patches/buildroot/2010.11/cleanup_buildroot.sh
index fd8d896..9b8fc8c 100755
--- a/patches/buildroot/2010.11/cleanup_buildroot.sh
+++ b/patches/buildroot/2010.11/cleanup_buildroot.sh
@@ -48,3 +48,4 @@ rm -rf buildroot/package/qwt/
rm -rf buildroot/fs/ubi/
rm -f buildroot/package/flex/flex-2.5.35-undefine_rpl_malloc_and_realloc.patch
rm -f buildroot/package/ncurses/ncurses-5.7-allows_build_with_old_ncurses_host_installation.patch
+rm -rf buildroot/package/mysql_client/
hooks/post-receive
--
armadeus
|
