[Armadeus-commitlog] armadeus branch, master, updated. release-3.3-131-gd701edd
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. release-3.3-131-gd701edd
|
From: Julien B a. A. <ar...@us...> - 2010-11-25 11:22:02
|
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 d701edd3422ebb660b610c7f58e806b9aa7f6fc8 (commit)
via c163330ba2f918a387ff36e62b2e59b2fe4997ad (commit)
via 8e98c104b00592173aca944c3628c0221be48d5a (commit)
via aead97ba57e5c6757f74df2eaf1a49c8fb0233da (commit)
from 8e60094543363ec4398dd40e8cecdee60953d9ae (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 d701edd3422ebb660b610c7f58e806b9aa7f6fc8
Merge: c163330ba2f918a387ff36e62b2e59b2fe4997ad 8e60094543363ec4398dd40e8cecdee60953d9ae
Author: Julien Boibessot <jul...@ar...>
Date: Thu Nov 25 12:21:36 2010 +0100
Merge branch 'master' of ssh://artemys@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit c163330ba2f918a387ff36e62b2e59b2fe4997ad
Author: Julien Boibessot <jul...@ar...>
Date: Thu Nov 25 12:20:32 2010 +0100
Updates buildroot/package/.gitignore
commit 8e98c104b00592173aca944c3628c0221be48d5a
Author: Julien Boibessot <jul...@ar...>
Date: Thu Nov 25 12:19:24 2010 +0100
[LINUX] 2.6.36: Port of patches 301, 314 and 315 from 2.6.29 ones
commit aead97ba57e5c6757f74df2eaf1a49c8fb0233da
Author: Julien Boibessot <jul...@ar...>
Date: Thu Nov 25 10:42:11 2010 +0100
[BUILDROOT] [2010.11] If U-Boot config file is a symbolic link, dereference it when copying it
-----------------------------------------------------------------------
Summary of changes:
buildroot/package/.gitignore | 2 +-
...us-mx2_ssi-SSIn_TXD_are_ouputs_not_inputs.patch | 27 +++++++
.../314-armadeus-ad9889-add_driver.patch} | 78 ++++++++++---------
.../315-darius-imx_wdt-add_watchdog_driver.patch} | 41 ++++++-----
...d_possibility_to_choose_board_header_file.patch | 10 +-
5 files changed, 96 insertions(+), 62 deletions(-)
create mode 100644 buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/301-armadeus-mx2_ssi-SSIn_TXD_are_ouputs_not_inputs.patch
copy buildroot/target/device/armadeus/linux/kernel-patches/{2.6.29/314-apf27-armadeus-ad9889.patch => 2.6.36/314-armadeus-ad9889-add_driver.patch} (94%)
copy buildroot/target/device/armadeus/linux/kernel-patches/{2.6.29/315-apf27-darius-mxc-watchdog.patch => 2.6.36/315-darius-imx_wdt-add_watchdog_driver.patch} (91%)
diff --git a/buildroot/package/.gitignore b/buildroot/package/.gitignore
index 31747f1..0500b9e 100644
--- a/buildroot/package/.gitignore
+++ b/buildroot/package/.gitignore
@@ -6,7 +6,7 @@
/Makefile.autotools.in
/Makefile.package.in
/Makefile.in
-/buildroot-libtool.patch
+/buildroot-libtool*.patch
# except:
!/armadeus/
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/301-armadeus-mx2_ssi-SSIn_TXD_are_ouputs_not_inputs.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/301-armadeus-mx2_ssi-SSIn_TXD_are_ouputs_not_inputs.patch
new file mode 100644
index 0000000..00e661a
--- /dev/null
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/301-armadeus-mx2_ssi-SSIn_TXD_are_ouputs_not_inputs.patch
@@ -0,0 +1,27 @@
+TXD signal of SSI modules is an ouput not an input.
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: linux-2.6.36/arch/arm/plat-mxc/include/mach/iomux-mx2x.h
+===================================================================
+--- linux-2.6.36.orig/arch/arm/plat-mxc/include/mach/iomux-mx2x.h 2010-11-25 10:54:08.000000000 +0100
++++ linux-2.6.36/arch/arm/plat-mxc/include/mach/iomux-mx2x.h 2010-11-25 10:55:06.000000000 +0100
+@@ -78,15 +78,15 @@
+ #define PC15_PF_TIN (GPIO_PORTC | GPIO_PF | 15)
+ #define PC20_PF_SSI1_FS (GPIO_PORTC | GPIO_PF | GPIO_IN | 20)
+ #define PC21_PF_SSI1_RXD (GPIO_PORTC | GPIO_PF | GPIO_IN | 21)
+-#define PC22_PF_SSI1_TXD (GPIO_PORTC | GPIO_PF | GPIO_IN | 22)
++#define PC22_PF_SSI1_TXD (GPIO_PORTC | GPIO_PF | GPIO_OUT | 22)
+ #define PC23_PF_SSI1_CLK (GPIO_PORTC | GPIO_PF | GPIO_IN | 23)
+ #define PC24_PF_SSI2_FS (GPIO_PORTC | GPIO_PF | GPIO_IN | 24)
+ #define PC25_PF_SSI2_RXD (GPIO_PORTC | GPIO_PF | GPIO_IN | 25)
+-#define PC26_PF_SSI2_TXD (GPIO_PORTC | GPIO_PF | GPIO_IN | 26)
++#define PC26_PF_SSI2_TXD (GPIO_PORTC | GPIO_PF | GPIO_OUT | 26)
+ #define PC27_PF_SSI2_CLK (GPIO_PORTC | GPIO_PF | GPIO_IN | 27)
+ #define PC28_PF_SSI3_FS (GPIO_PORTC | GPIO_PF | GPIO_IN | 28)
+ #define PC29_PF_SSI3_RXD (GPIO_PORTC | GPIO_PF | GPIO_IN | 29)
+-#define PC30_PF_SSI3_TXD (GPIO_PORTC | GPIO_PF | GPIO_IN | 30)
++#define PC30_PF_SSI3_TXD (GPIO_PORTC | GPIO_PF | GPIO_OUT | 30)
+ #define PC31_PF_SSI3_CLK (GPIO_PORTC | GPIO_PF | GPIO_IN | 31)
+ #define PD17_PF_I2C_DATA (GPIO_PORTD | GPIO_PF | GPIO_OUT | 17)
+ #define PD18_PF_I2C_CLK (GPIO_PORTD | GPIO_PF | GPIO_OUT | 18)
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/314-apf27-armadeus-ad9889.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/314-armadeus-ad9889-add_driver.patch
similarity index 94%
copy from buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/314-apf27-armadeus-ad9889.patch
copy to buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/314-armadeus-ad9889-add_driver.patch
index 03f43f5..5bbb959 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/314-apf27-armadeus-ad9889.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/314-armadeus-ad9889-add_driver.patch
@@ -1,7 +1,44 @@
-Index: linux-2.6.29.6/drivers/media/video/ad9889.c
+Adds a driver for Analog Devices AD9889 digital video encoder.
+
+Signed-off-by: Nicolas Colombain <nic...@ar...>
+
+Index: linux-2.6.36/drivers/media/video/Makefile
+===================================================================
+--- linux-2.6.36.orig/drivers/media/video/Makefile 2010-10-20 22:30:22.000000000 +0200
++++ linux-2.6.36/drivers/media/video/Makefile 2010-11-25 11:05:40.000000000 +0100
+@@ -44,6 +44,7 @@
+ obj-$(CONFIG_VIDEO_SAA7127) += saa7127.o
+ obj-$(CONFIG_VIDEO_SAA7185) += saa7185.o
+ obj-$(CONFIG_VIDEO_SAA7191) += saa7191.o
++obj-$(CONFIG_VIDEO_AD9889) += ad9889.o
+ obj-$(CONFIG_VIDEO_ADV7170) += adv7170.o
+ obj-$(CONFIG_VIDEO_ADV7175) += adv7175.o
+ obj-$(CONFIG_VIDEO_ADV7180) += adv7180.o
+Index: linux-2.6.36/drivers/media/video/Kconfig
+===================================================================
+--- linux-2.6.36.orig/drivers/media/video/Kconfig 2010-10-20 22:30:22.000000000 +0200
++++ linux-2.6.36/drivers/media/video/Kconfig 2010-11-25 11:05:40.000000000 +0100
+@@ -448,6 +448,16 @@
+ To compile this driver as a module, choose M here: the
+ module will be called saa7185.
+
++config VIDEO_AD9889
++ tristate "Analog Devices AD9889 digital video encoders"
++ depends on VIDEO_V4L2 && I2C
++ ---help---
++ Support for the Analog Devices AD9889 digital video encoders.
++
++ To compile this driver as a module, choose M here: the
++ module will be called ad9889.
++
++
+ config VIDEO_ADV7170
+ tristate "Analog Devices ADV7170 video encoder"
+ depends on VIDEO_V4L2 && I2C
+Index: linux-2.6.36/drivers/media/video/ad9889.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.29.6/drivers/media/video/ad9889.c 2009-11-23 16:00:24.000000000 +0100
++++ linux-2.6.36/drivers/media/video/ad9889.c 2010-11-25 11:05:40.000000000 +0100
@@ -0,0 +1,513 @@
+/*
+ * ad9889 - Analog Devices AD9889 video encoder driver
@@ -516,10 +553,10 @@ Index: linux-2.6.29.6/drivers/media/video/ad9889.c
+ .remove = ad9889_remove,
+ .id_table = ad9889_id,
+};
-Index: linux-2.6.29.6/include/media/ad9889.h
+Index: linux-2.6.36/include/media/ad9889.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.29.6/include/media/ad9889.h 2009-11-23 15:55:20.000000000 +0100
++++ linux-2.6.36/include/media/ad9889.h 2010-11-25 11:05:40.000000000 +0100
@@ -0,0 +1,34 @@
+/*
+ * AD9889 driver
@@ -555,36 +592,3 @@ Index: linux-2.6.29.6/include/media/ad9889.h
+
+
+#endif /* __LINUX_VIDE0_AD9889_H */
-Index: linux-2.6.29.6/drivers/media/video/Makefile
-===================================================================
---- linux-2.6.29.6.orig/drivers/media/video/Makefile 2009-11-23 15:54:46.000000000 +0100
-+++ linux-2.6.29.6/drivers/media/video/Makefile 2009-11-23 16:00:36.000000000 +0100
-@@ -50,6 +50,7 @@
- obj-$(CONFIG_VIDEO_SAA7127) += saa7127.o
- obj-$(CONFIG_VIDEO_SAA7185) += saa7185.o
- obj-$(CONFIG_VIDEO_SAA7191) += saa7191.o
-+obj-$(CONFIG_VIDEO_AD9889) += ad9889.o
- obj-$(CONFIG_VIDEO_ADV7170) += adv7170.o
- obj-$(CONFIG_VIDEO_ADV7175) += adv7175.o
- obj-$(CONFIG_VIDEO_VPX3220) += vpx3220.o
-Index: linux-2.6.29.6/drivers/media/video/Kconfig
-===================================================================
---- linux-2.6.29.6.orig/drivers/media/video/Kconfig 2009-11-23 15:54:46.000000000 +0100
-+++ linux-2.6.29.6/drivers/media/video/Kconfig 2009-11-23 16:00:36.000000000 +0100
-@@ -428,6 +428,16 @@
- To compile this driver as a module, choose M here: the
- module will be called saa7185.
-
-+config VIDEO_AD9889
-+ tristate "Analog Devices AD9889 digital video encoders"
-+ depends on VIDEO_V4L2 && I2C
-+ ---help---
-+ Support for the Analog Devices AD9889 digital video encoders.
-+
-+ To compile this driver as a module, choose M here: the
-+ module will be called ad9889.
-+
-+
- config VIDEO_ADV7170
- tristate "Analog Devices ADV7170 video encoder"
- depends on VIDEO_V4L1 && I2C
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/315-apf27-darius-mxc-watchdog.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/315-darius-imx_wdt-add_watchdog_driver.patch
similarity index 91%
copy from buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/315-apf27-darius-mxc-watchdog.patch
copy to buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/315-darius-imx_wdt-add_watchdog_driver.patch
index 07e5974..11e4bf5 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/315-apf27-darius-mxc-watchdog.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/315-darius-imx_wdt-add_watchdog_driver.patch
@@ -1,20 +1,23 @@
From: Darius Augulis <aug...@gm...>
+JB:
Driver for watchdog timer on Freesale IMX processors.
+Even if it can support MX1, MX2 and MX3 this driver will only be used
+for MX1/L platforms as it has been replaced by mx2_wdt on mainline.
Signed-off-by: Darius Augulis <aug...@gm...>
-Index: linux-2.6.29/drivers/watchdog/Kconfig
+Index: linux-2.6.36/drivers/watchdog/Kconfig
===================================================================
---- linux-2.6.29.orig/drivers/watchdog/Kconfig 2009-03-24 00:12:14.000000000 +0100
-+++ linux-2.6.29/drivers/watchdog/Kconfig 2009-03-31 12:02:58.000000000 +0200
-@@ -66,6 +66,18 @@
+--- linux-2.6.36.orig/drivers/watchdog/Kconfig 2010-10-20 22:30:22.000000000 +0200
++++ linux-2.6.36/drivers/watchdog/Kconfig 2010-11-25 11:41:19.000000000 +0100
+@@ -73,6 +73,18 @@
# ARM Architecture
+config IMX_WDT
+ tristate "IMX Watchdog"
-+ depends on ARCH_MXC
++ depends on ARCH_MX1
+ help
+ This is the driver for the hardware watchdog
+ on the Freescale IMX processors.
@@ -24,25 +27,25 @@ Index: linux-2.6.29/drivers/watchdog/Kconfig
+ To compile this driver as a module, choose M here: the
+ module will be called imx_wdt.
+
- config AT91RM9200_WATCHDOG
- tristate "AT91RM9200 watchdog"
- depends on ARCH_AT91RM9200
-Index: linux-2.6.29/drivers/watchdog/Makefile
+ config ARM_SP805_WATCHDOG
+ tristate "ARM SP805 Watchdog"
+ depends on ARM_AMBA
+Index: linux-2.6.36/drivers/watchdog/Makefile
===================================================================
---- linux-2.6.29.orig/drivers/watchdog/Makefile 2009-03-24 00:12:14.000000000 +0100
-+++ linux-2.6.29/drivers/watchdog/Makefile 2009-03-31 12:03:30.000000000 +0200
-@@ -41,6 +41,7 @@
- obj-$(CONFIG_IOP_WATCHDOG) += iop_wdt.o
- obj-$(CONFIG_DAVINCI_WATCHDOG) += davinci_wdt.o
- obj-$(CONFIG_ORION5X_WATCHDOG) += orion5x_wdt.o
+--- linux-2.6.36.orig/drivers/watchdog/Makefile 2010-10-20 22:30:22.000000000 +0200
++++ linux-2.6.36/drivers/watchdog/Makefile 2010-11-25 11:38:08.000000000 +0100
+@@ -49,6 +49,7 @@
+ obj-$(CONFIG_ADX_WATCHDOG) += adx_wdt.o
+ obj-$(CONFIG_TS72XX_WATCHDOG) += ts72xx_wdt.o
+ obj-$(CONFIG_IMX2_WDT) += imx2_wdt.o
+obj-$(CONFIG_IMX_WDT) += imx-wdt.o
- # ARM26 Architecture
-
-Index: linux-2.6.29/drivers/watchdog/imx-wdt.c
+ # AVR32 Architecture
+ obj-$(CONFIG_AT32AP700X_WDT) += at32ap700x_wdt.o
+Index: linux-2.6.36/drivers/watchdog/imx-wdt.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.29/drivers/watchdog/imx-wdt.c 2009-03-31 12:02:58.000000000 +0200
++++ linux-2.6.36/drivers/watchdog/imx-wdt.c 2010-11-25 11:38:08.000000000 +0100
@@ -0,0 +1,432 @@
+/*
+ * Watchdog driver for IMX processors
diff --git a/patches/buildroot/2010.11/051d-u-boot-add_possibility_to_choose_board_header_file.patch b/patches/buildroot/2010.11/051d-u-boot-add_possibility_to_choose_board_header_file.patch
index 9a0e8a5..076c98b 100644
--- a/patches/buildroot/2010.11/051d-u-boot-add_possibility_to_choose_board_header_file.patch
+++ b/patches/buildroot/2010.11/051d-u-boot-add_possibility_to_choose_board_header_file.patch
@@ -7,8 +7,8 @@ So this patch reverts the removing + refines it.
Index: buildroot/boot/u-boot/Config.in
===================================================================
---- buildroot.orig/boot/u-boot/Config.in 2010-10-20 11:59:43.000000000 +0200
-+++ buildroot/boot/u-boot/Config.in 2010-10-20 12:03:30.000000000 +0200
+--- buildroot.orig/boot/u-boot/Config.in 2010-11-25 10:14:04.000000000 +0100
++++ buildroot/boot/u-boot/Config.in 2010-11-25 10:15:53.000000000 +0100
@@ -11,6 +11,14 @@
One of U-Boot supported boards to be built.
This will be suffixed with _config to meet U-Boot standard naming.
@@ -26,8 +26,8 @@ Index: buildroot/boot/u-boot/Config.in
default BR2_TARGET_UBOOT_2010_06
Index: buildroot/boot/u-boot/u-boot.mk
===================================================================
---- buildroot.orig/boot/u-boot/u-boot.mk 2010-10-20 11:59:43.000000000 +0200
-+++ buildroot/boot/u-boot/u-boot.mk 2010-10-20 12:09:50.000000000 +0200
+--- buildroot.orig/boot/u-boot/u-boot.mk 2010-11-25 10:14:04.000000000 +0100
++++ buildroot/boot/u-boot/u-boot.mk 2010-11-25 10:17:02.000000000 +0100
@@ -45,7 +45,11 @@
U_BOOT_ARCH=$(KERNEL_ARCH:powerpc=ppc)
endif
@@ -47,7 +47,7 @@ Index: buildroot/boot/u-boot/u-boot.mk
-$(U_BOOT_DIR)/.configured: $(U_BOOT_DIR)/.patched
+$(U_BOOT_DIR)/.config_header_copied: $(U_BOOT_DIR)/.patched
+ifneq ($(strip $(BR2_TARGET_U_BOOT_CONFIG_HEADER_FILE)),)
-+ cp -dpf $(BR2_TARGET_U_BOOT_CONFIG_HEADER_FILE) $(U_BOOT_INC_CONF_FILE)
++ cp -pf $(BR2_TARGET_U_BOOT_CONFIG_HEADER_FILE) $(U_BOOT_INC_CONF_FILE)
+endif
+ touch $@
+
hooks/post-receive
--
armadeus
|
