[Armadeus-commitlog] SF.net SVN: armadeus:[1326] trunk/buildroot/target/device/armadeus/linux/ kern
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] SF.net SVN: armadeus:[1326] trunk/buildroot/target/device/armadeus/linux/ kernel-patches/2.6.29
|
From: <ar...@us...> - 2009-06-04 09:04:18
|
Revision: 1326
http://armadeus.svn.sourceforge.net/armadeus/?rev=1326&view=rev
Author: artemys
Date: 2009-06-04 09:04:09 +0000 (Thu, 04 Jun 2009)
Log Message:
-----------
[LINUX] Updates some 2.6.29 patches to prevent warnings when applying them
Modified Paths:
--------------
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/015-armadeus-logo-add_armadeus-project_tux.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/018-armadeus-i2c-imx-add_driver_to_linux_build_system.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/023-armadeus-fblcd-kconfig.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/024-armadeus-apf9328-add_board_to_linux_build_system.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/040-armadeus-imxmmc-correct_some_freezes.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/041-armadeus-imx_irq.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/050-armadeus-add_custom_drivers_to_kconfig.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/073-armadeus-tsc2102_integrate_driver_to_linux_build_system.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/092-armadeus-alsa-imx-ssi-tsc2102-integrate_driver_to_linux_build_system.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/332-armadeus-imxfb-improvements.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/334-armadeus-imxfb-supports_8bpp_in_tft_mode.patch
Modified: trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/015-armadeus-logo-add_armadeus-project_tux.patch
===================================================================
--- trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/015-armadeus-logo-add_armadeus-project_tux.patch 2009-06-04 07:48:59 UTC (rev 1325)
+++ trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/015-armadeus-logo-add_armadeus-project_tux.patch 2009-06-04 09:04:09 UTC (rev 1326)
@@ -1,6 +1,8 @@
---- linux-2.6.23/drivers/video/logo/Kconfig 2006-09-20 05:42:06.000000000 +0200
-+++ linux-2.6.23-imx/drivers/video/logo/Kconfig 2006-10-01 14:22:39.000000000 +0200
-@@ -70,5 +70,12 @@ config LOGO_M32R_CLUT224
+Index: linux-2.6.29.4/drivers/video/logo/Kconfig
+===================================================================
+--- linux-2.6.29.4.orig/drivers/video/logo/Kconfig 2009-03-24 00:12:14.000000000 +0100
++++ linux-2.6.29.4/drivers/video/logo/Kconfig 2009-06-04 09:54:16.000000000 +0200
+@@ -82,4 +82,11 @@
depends on M32R
default y
@@ -12,9 +14,10 @@
+ Choose this if you want to have the Armadeus Tux as boot logo
+
endif # LOGO
-
---- linux-2.6.23/drivers/video/logo/logo_armadeus_clut224.ppm 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.23-imx/drivers/video/logo/logo_armadeus_clut224.ppm 2006-10-01 14:22:39.000000000 +0200
+Index: linux-2.6.29.4/drivers/video/logo/logo_armadeus_clut224.ppm
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ linux-2.6.29.4/drivers/video/logo/logo_armadeus_clut224.ppm 2009-06-04 09:54:16.000000000 +0200
@@ -0,0 +1,19205 @@
+P3
+# CREATOR: The GIMP's PNM Filter Version 1.0
@@ -19221,17 +19224,19 @@
+0
+0
+0
---- linux-2.6.23/drivers/video/logo/logo.c 2006-09-20 05:42:06.000000000 +0200
-+++ linux-2.6.23-imx/drivers/video/logo/logo.c 2006-10-01 14:22:39.000000000 +0200
-@@ -33,6 +33,7 @@ extern const struct linux_logo logo_supe
+Index: linux-2.6.29.4/drivers/video/logo/logo.c
+===================================================================
+--- linux-2.6.29.4.orig/drivers/video/logo/logo.c 2009-03-24 00:12:14.000000000 +0100
++++ linux-2.6.29.4/drivers/video/logo/logo.c 2009-06-04 09:54:16.000000000 +0200
+@@ -35,6 +35,7 @@
extern const struct linux_logo logo_superh_vga16;
extern const struct linux_logo logo_superh_clut224;
extern const struct linux_logo logo_m32r_clut224;
+extern const struct linux_logo logo_armadeus_clut224;
-
- const struct linux_logo *fb_find_logo(int depth)
-@@ -101,6 +102,10 @@ const struct linux_logo *fb_find_logo(in
+ static int nologo;
+ module_param(nologo, bool, 0);
+@@ -115,6 +116,10 @@
/* M32R Linux logo */
logo = &logo_m32r_clut224;
#endif
@@ -19242,13 +19247,15 @@
}
return logo;
}
---- linux-2.6.23/drivers/video/logo/Makefile 2006-09-20 05:42:06.000000000 +0200
-+++ linux-2.6.23-imx/drivers/video/logo/Makefile 2006-10-01 14:22:39.000000000 +0200
-@@ -13,6 +13,7 @@ obj-$(CONFIG_LOGO_SUPERH_MONO) += logo_
+Index: linux-2.6.29.4/drivers/video/logo/Makefile
+===================================================================
+--- linux-2.6.29.4.orig/drivers/video/logo/Makefile 2009-03-24 00:12:14.000000000 +0100
++++ linux-2.6.29.4/drivers/video/logo/Makefile 2009-06-04 09:54:16.000000000 +0200
+@@ -15,6 +15,7 @@
obj-$(CONFIG_LOGO_SUPERH_VGA16) += logo_superh_vga16.o
obj-$(CONFIG_LOGO_SUPERH_CLUT224) += logo_superh_clut224.o
obj-$(CONFIG_LOGO_M32R_CLUT224) += logo_m32r_clut224.o
+obj-$(CONFIG_LOGO_ARMADEUS_CLUT224) += logo_armadeus_clut224.o
- # How to generate logo's
+ obj-$(CONFIG_SPU_BASE) += logo_spe_clut224.o
Modified: trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/018-armadeus-i2c-imx-add_driver_to_linux_build_system.patch
===================================================================
--- trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/018-armadeus-i2c-imx-add_driver_to_linux_build_system.patch 2009-06-04 07:48:59 UTC (rev 1325)
+++ trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/018-armadeus-i2c-imx-add_driver_to_linux_build_system.patch 2009-06-04 09:04:09 UTC (rev 1326)
@@ -1,21 +1,25 @@
---- ref/linux-2.6.27/drivers/i2c/busses/Kconfig 2006-10-14 05:34:03.000000000 +0200
-+++ linux-2.6.27/drivers/i2c/busses/Kconfig 2007-01-14 00:35:15.000000000 +0100
-@@ -612,6 +612,12 @@ config I2C_PCA_ISA
-
+Index: linux-2.6.29.4/drivers/i2c/busses/Kconfig
+===================================================================
+--- linux-2.6.29.4.orig/drivers/i2c/busses/Kconfig 2009-06-04 10:07:14.000000000 +0200
++++ linux-2.6.29.4/drivers/i2c/busses/Kconfig 2009-06-04 10:37:46.000000000 +0200
+@@ -628,6 +628,12 @@
This driver can also be built as a module. If so, the module
will be called i2c-pca-isa.
-+
+
+config I2C_IMX
+ tristate "i2c bus on i.MX"
-+ depends on I2C
++ depends on I2C
+ help
+ i2c implementation on i.MX Freescale processors
-
++
This device is almost undetectable and using this driver on a
system which doesn't have this device will result in long
---- ref/linux-2.6.27/drivers/i2c/busses/Makefile 2006-10-14 05:34:03.000000000 +0200
-+++ linux-2.6.27/drivers/i2c/busses/Makefile 2007-01-14 00:35:15.000000000 +0100
-@@ -43,6 +43,7 @@ # Embebbed system I2C/SMBus host controller drivers
+ delays when I2C/SMBus chip drivers are loaded (e.g. at boot
+Index: linux-2.6.29.4/drivers/i2c/busses/Makefile
+===================================================================
+--- linux-2.6.29.4.orig/drivers/i2c/busses/Makefile 2009-06-04 10:07:14.000000000 +0200
++++ linux-2.6.29.4/drivers/i2c/busses/Makefile 2009-06-04 10:37:09.000000000 +0200
+@@ -44,6 +44,7 @@
obj-$(CONFIG_I2C_PXA) += i2c-pxa.o
obj-$(CONFIG_I2C_S3C2410) += i2c-s3c2410.o
obj-$(CONFIG_I2C_SH7760) += i2c-sh7760.o
Modified: trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/023-armadeus-fblcd-kconfig.patch
===================================================================
--- trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/023-armadeus-fblcd-kconfig.patch 2009-06-04 07:48:59 UTC (rev 1325)
+++ trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/023-armadeus-fblcd-kconfig.patch 2009-06-04 09:04:09 UTC (rev 1326)
@@ -1,6 +1,8 @@
---- linux-org/drivers/video/Kconfig 2006-10-14 05:34:03.000000000 +0200
-+++ linux-imx/drivers/video/Kconfig 2007-01-07 22:24:25.000000000 +0100
-@@ -384,6 +384,7 @@ config FB_SA1100
+Index: linux-2.6.29.4/drivers/video/Kconfig
+===================================================================
+--- linux-2.6.29.4.orig/drivers/video/Kconfig 2009-03-24 00:12:14.000000000 +0100
++++ linux-2.6.29.4/drivers/video/Kconfig 2009-06-04 10:03:43.000000000 +0200
+@@ -395,6 +395,7 @@
If you plan to use the LCD display with your SA-1100 system, say
Y here.
@@ -8,7 +10,7 @@
config FB_IMX
tristate "Motorola i.MX LCD support"
depends on FB && ARM && ARCH_IMX
-@@ -392,6 +393,42 @@ config FB_IMX
+@@ -402,6 +403,42 @@
select FB_CFB_COPYAREA
select FB_CFB_IMAGEBLIT
Modified: trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/024-armadeus-apf9328-add_board_to_linux_build_system.patch
===================================================================
--- trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/024-armadeus-apf9328-add_board_to_linux_build_system.patch 2009-06-04 07:48:59 UTC (rev 1325)
+++ trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/024-armadeus-apf9328-add_board_to_linux_build_system.patch 2009-06-04 09:04:09 UTC (rev 1326)
@@ -1,5 +1,7 @@
---- linux-org/arch/arm/mach-imx/include/mach/hardware.h
-+++ linux/arch/arm/mach-imx/include/mach/hardware.h
+Index: linux-2.6.29.4/arch/arm/mach-imx/include/mach/hardware.h
+===================================================================
+--- linux-2.6.29.4.orig/arch/arm/mach-imx/include/mach/hardware.h 2009-03-24 00:12:14.000000000 +0100
++++ linux-2.6.29.4/arch/arm/mach-imx/include/mach/hardware.h 2009-06-04 10:05:01.000000000 +0200
@@ -88,4 +88,8 @@
#include "mx1ads.h"
#endif
@@ -9,13 +11,14 @@
+#endif
+
#endif
---- linux-org/arch/arm/mach-imx/Kconfig
-+++ linux/arch/arm/mach-imx/Kconfig
+Index: linux-2.6.29.4/arch/arm/mach-imx/Kconfig
+===================================================================
+--- linux-2.6.29.4.orig/arch/arm/mach-imx/Kconfig 2009-03-24 00:12:14.000000000 +0100
++++ linux-2.6.29.4/arch/arm/mach-imx/Kconfig 2009-06-04 09:54:16.000000000 +0200
@@ -1,6 +1,10 @@
menu "IMX Implementations"
depends on ARCH_IMX
--
-+
+
+choice
+ prompt "Development board selection"
+ depends on ARCH_IMX
@@ -23,7 +26,7 @@
config ARCH_MX1ADS
bool "mx1ads"
depends on ARCH_IMX
-@@ -12,4 +16,38 @@
+@@ -8,4 +12,38 @@
help
Say Y here if you are using the Motorola MX1ADS board
@@ -62,8 +65,10 @@
+endchoice
+
endmenu
---- linux-org/arch/arm/mach-imx/Makefile
-+++ linux/arch/arm/mach-imx/Makefile
+Index: linux-2.6.29.4/arch/arm/mach-imx/Makefile
+===================================================================
+--- linux-2.6.29.4.orig/arch/arm/mach-imx/Makefile 2009-03-24 00:12:14.000000000 +0100
++++ linux-2.6.29.4/arch/arm/mach-imx/Makefile 2009-06-04 09:54:16.000000000 +0200
@@ -10,6 +10,7 @@
# Specific board support
@@ -72,9 +77,11 @@
# Support for blinky lights
led-y := leds.o
---- linux-org/arch/arm/mach-imx/Makefile.boot
-+++ linux/arch/arm/mach-imx/Makefile.boot
-@@ -1,1 +1,2 @@
+Index: linux-2.6.29.4/arch/arm/mach-imx/Makefile.boot
+===================================================================
+--- linux-2.6.29.4.orig/arch/arm/mach-imx/Makefile.boot 2009-03-24 00:12:14.000000000 +0100
++++ linux-2.6.29.4/arch/arm/mach-imx/Makefile.boot 2009-06-04 09:54:16.000000000 +0200
+@@ -1,2 +1,3 @@
zreladdr-$(CONFIG_ARCH_MX1ADS) := 0x08008000
+ zreladdr-$(CONFIG_MACH_APF9328) := 0x08008000
-\ No newline at end of file
+
Modified: trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/040-armadeus-imxmmc-correct_some_freezes.patch
===================================================================
--- trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/040-armadeus-imxmmc-correct_some_freezes.patch 2009-06-04 07:48:59 UTC (rev 1325)
+++ trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/040-armadeus-imxmmc-correct_some_freezes.patch 2009-06-04 09:04:09 UTC (rev 1326)
@@ -1,3 +1,9 @@
+
+With some SD cards i.MXL SDHC may hang up at detection stage. This patch
+tries to fix some cases.
+
+Signed-off-by: Nicolas Colombain <nic...@ar...>
+
Index: linux-2.6.29/drivers/mmc/host/imxmmc.c
===================================================================
--- linux-2.6.29.orig/drivers/mmc/host/imxmmc.c 2009-03-30 11:05:58.000000000 +0200
Modified: trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/041-armadeus-imx_irq.patch
===================================================================
--- trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/041-armadeus-imx_irq.patch 2009-06-04 07:48:59 UTC (rev 1325)
+++ trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/041-armadeus-imx_irq.patch 2009-06-04 09:04:09 UTC (rev 1326)
@@ -1,7 +1,9 @@
---- linux-org/arch/arm/mach-imx/irq.c 2006-09-20 05:42:06.000000000 +0200
-+++ linux-imx/arch/arm/mach-imx/irq.c 2006-12-09 17:37:53.386928000 +0100
-@@ -103,6 +103,12 @@ imx_unmask_irq(unsigned int irq)
- }
+Index: linux-2.6.29.4/arch/arm/mach-imx/irq.c
+===================================================================
+--- linux-2.6.29.4.orig/arch/arm/mach-imx/irq.c 2009-03-24 00:12:14.000000000 +0100
++++ linux-2.6.29.4/arch/arm/mach-imx/irq.c 2009-06-04 09:54:16.000000000 +0200
+@@ -122,6 +122,12 @@
+ #endif /* CONFIG_FIQ */
static int
+imx_irq_type(unsigned int _irq, unsigned int type)
@@ -13,7 +15,7 @@
imx_gpio_irq_type(unsigned int _irq, unsigned int type)
{
unsigned int irq_type = 0, irq, reg, bit;
-@@ -239,6 +245,7 @@ static struct irq_chip imx_internal_chip
+@@ -256,6 +262,7 @@
.ack = imx_mask_irq,
.mask = imx_mask_irq,
.unmask = imx_unmask_irq,
@@ -21,4 +23,3 @@
};
static struct irq_chip imx_gpio_chip = {
-
Modified: trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/050-armadeus-add_custom_drivers_to_kconfig.patch
===================================================================
--- trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/050-armadeus-add_custom_drivers_to_kconfig.patch 2009-06-04 07:48:59 UTC (rev 1325)
+++ trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/050-armadeus-add_custom_drivers_to_kconfig.patch 2009-06-04 09:04:09 UTC (rev 1326)
@@ -1,20 +1,24 @@
This patch adds the possibility to have custom Armadeus drivers built in kernel or compiled as modules
---- linux-org/drivers/usb/Kconfig 2006-10-14 05:34:03.000000000 +0200
-+++ linux-imx/drivers/usb/Kconfig 2006-12-06 22:28:32.000000000 +0100
-@@ -148,3 +148,5 @@
- source "drivers/usb/gadget/Kconfig"
-
+Index: linux-2.6.29.4/drivers/usb/Kconfig
+===================================================================
+--- linux-2.6.29.4.orig/drivers/usb/Kconfig 2009-03-24 00:12:14.000000000 +0100
++++ linux-2.6.29.4/drivers/usb/Kconfig 2009-06-04 10:03:42.000000000 +0200
+@@ -153,3 +153,5 @@
+ source "drivers/usb/otg/Kconfig"
+
endif # USB_SUPPORT
+
+source "drivers/armadeus/Kconfig"
---- linux-org/drivers/Makefile.org 2007-05-09 10:48:51.000000000 +0200
-+++ linux-imx/drivers/Makefile 2007-05-09 10:57:09.000000000 +0200
-@@ -96,6 +96,7 @@
+Index: linux-2.6.29.4/drivers/Makefile
+===================================================================
+--- linux-2.6.29.4.orig/drivers/Makefile 2009-03-24 00:12:14.000000000 +0100
++++ linux-2.6.29.4/drivers/Makefile 2009-06-04 09:54:16.000000000 +0200
+@@ -102,6 +102,7 @@
obj-$(CONFIG_HID) += hid/
obj-$(CONFIG_PPC_PS3) += ps3/
obj-$(CONFIG_OF) += of/
+obj-$(CONFIG_ARMADEUS_DRIVERS) += armadeus/
obj-$(CONFIG_SSB) += ssb/
obj-$(CONFIG_VIRTIO) += virtio/
- obj-$(CONFIG_REGULATOR) += regulator/
+ obj-$(CONFIG_STAGING) += staging/
Modified: trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/073-armadeus-tsc2102_integrate_driver_to_linux_build_system.patch
===================================================================
--- trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/073-armadeus-tsc2102_integrate_driver_to_linux_build_system.patch 2009-06-04 07:48:59 UTC (rev 1325)
+++ trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/073-armadeus-tsc2102_integrate_driver_to_linux_build_system.patch 2009-06-04 09:04:09 UTC (rev 1326)
@@ -1,6 +1,8 @@
---- linux-org/drivers/spi/Kconfig 2007-09-22 02:39:35.000000000 +0200
-+++ linux/drivers/spi/Kconfig 2007-09-16 11:08:17.000000000 +0200
-@@ -243,6 +243,14 @@ comment "SPI Protocol Masters"
+Index: linux-2.6.29.4/drivers/spi/Kconfig
+===================================================================
+--- linux-2.6.29.4.orig/drivers/spi/Kconfig 2009-03-24 00:12:14.000000000 +0100
++++ linux-2.6.29.4/drivers/spi/Kconfig 2009-06-04 10:03:41.000000000 +0200
+@@ -248,6 +248,14 @@
sysfs interface, with each line presented as a kind of GPIO
exposing both switch control and diagnostic feedback.
@@ -15,10 +17,12 @@
#
# Add new SPI protocol masters in alphabetical order above this line
#
---- linux-2.6.23.original/drivers/spi/Makefile 2007-09-22 02:39:35.000000000 +0200
-+++ linux-2.6.23.mod/drivers/spi/Makefile 2007-09-16 11:08:16.000000000 +0200
-@@ -35,6 +35,7 @@
- obj-$(CONFIG_SPI_AT25) += at25.o
+Index: linux-2.6.29.4/drivers/spi/Makefile
+===================================================================
+--- linux-2.6.29.4.orig/drivers/spi/Makefile 2009-03-24 00:12:14.000000000 +0100
++++ linux-2.6.29.4/drivers/spi/Makefile 2009-06-04 09:54:16.000000000 +0200
+@@ -35,6 +35,7 @@
+ # SPI protocol drivers (device/link on bus)
obj-$(CONFIG_SPI_SPIDEV) += spidev.o
obj-$(CONFIG_SPI_TLE62X0) += tle62x0.o
+obj-$(CONFIG_SPI_TSC2102) += tsc2102.o
Modified: trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/092-armadeus-alsa-imx-ssi-tsc2102-integrate_driver_to_linux_build_system.patch
===================================================================
--- trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/092-armadeus-alsa-imx-ssi-tsc2102-integrate_driver_to_linux_build_system.patch 2009-06-04 07:48:59 UTC (rev 1325)
+++ trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/092-armadeus-alsa-imx-ssi-tsc2102-integrate_driver_to_linux_build_system.patch 2009-06-04 09:04:09 UTC (rev 1326)
@@ -1,6 +1,8 @@
---- linux-org/sound/arm/Kconfig 2007-10-12 18:43:44.000000000 +0200
-+++ linux/sound/arm/Kconfig 2008-07-17 17:39:17.000000000 +0200
-@@ -41,6 +41,18 @@
+Index: linux-2.6.29.4/sound/arm/Kconfig
+===================================================================
+--- linux-2.6.29.4.orig/sound/arm/Kconfig 2009-03-24 00:12:14.000000000 +0100
++++ linux-2.6.29.4/sound/arm/Kconfig 2009-06-04 10:03:42.000000000 +0200
+@@ -50,5 +50,17 @@
Say Y or M if you want to support any AC97 codec attached to
the PXA2xx AC97 interface.
@@ -18,11 +20,12 @@
+
endif # SND_ARM
+Index: linux-2.6.29.4/sound/arm/Makefile
+===================================================================
+--- linux-2.6.29.4.orig/sound/arm/Makefile 2009-03-24 00:12:14.000000000 +0100
++++ linux-2.6.29.4/sound/arm/Makefile 2009-06-04 10:03:42.000000000 +0200
+@@ -17,3 +17,7 @@
---- linux-org/sound/arm/Makefile 2007-10-12 18:43:44.000000000 +0200
-+++ linux/sound/arm/Makefile 2008-07-17 15:53:07.000000000 +0200
-@@ -13,3 +13,7 @@
-
obj-$(CONFIG_SND_PXA2XX_AC97) += snd-pxa2xx-ac97.o
snd-pxa2xx-ac97-objs := pxa2xx-ac97.o
+
Modified: trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/332-armadeus-imxfb-improvements.patch
===================================================================
--- trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/332-armadeus-imxfb-improvements.patch 2009-06-04 07:48:59 UTC (rev 1325)
+++ trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/332-armadeus-imxfb-improvements.patch 2009-06-04 09:04:09 UTC (rev 1326)
@@ -7,11 +7,11 @@
Signed-off-by: Julien Boibessot <jul...@ar...>
-Index: linux-2.6.29/drivers/video/imxfb.c
+Index: linux-2.6.29.4/drivers/video/imxfb.c
===================================================================
---- linux-2.6.29.orig/drivers/video/imxfb.c 2009-05-26 19:52:35.000000000 +0200
-+++ linux-2.6.29/drivers/video/imxfb.c 2009-05-27 09:14:31.000000000 +0200
-@@ -466,6 +466,7 @@
+--- linux-2.6.29.4.orig/drivers/video/imxfb.c 2009-06-04 10:38:09.000000000 +0200
++++ linux-2.6.29.4/drivers/video/imxfb.c 2009-06-04 10:39:02.000000000 +0200
+@@ -471,6 +471,7 @@
pr_debug("var: yres=%d vslen=%d um=%d bm=%d\n",
var->yres, var->vsync_len,
var->upper_margin, var->lower_margin);
@@ -19,7 +19,7 @@
#if DEBUG_VAR
if (var->xres < 16 || var->xres > 1024)
-@@ -523,9 +524,6 @@
+@@ -528,9 +529,6 @@
pcr |= fbi->pcr & ~0x3F;
writel(pcr, fbi->regs + LCDC_PCR);
@@ -29,7 +29,7 @@
return 0;
}
-@@ -719,6 +717,12 @@
+@@ -724,6 +722,12 @@
goto failed_cmap;
imxfb_set_par(info);
Modified: trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/334-armadeus-imxfb-supports_8bpp_in_tft_mode.patch
===================================================================
--- trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/334-armadeus-imxfb-supports_8bpp_in_tft_mode.patch 2009-06-04 07:48:59 UTC (rev 1325)
+++ trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/334-armadeus-imxfb-supports_8bpp_in_tft_mode.patch 2009-06-04 09:04:09 UTC (rev 1326)
@@ -6,10 +6,10 @@
Signed-off-by: Julien Boibessot <jul...@ar...>
-Index: linux-2.6.29/arch/arm/mach-imx/include/mach/imxfb.h
+Index: linux-2.6.29.4/arch/arm/mach-imx/include/mach/imxfb.h
===================================================================
---- linux-2.6.29.orig/arch/arm/mach-imx/include/mach/imxfb.h 2009-05-27 20:07:17.000000000 +0200
-+++ linux-2.6.29/arch/arm/mach-imx/include/mach/imxfb.h 2009-05-27 21:11:01.000000000 +0200
+--- linux-2.6.29.4.orig/arch/arm/mach-imx/include/mach/imxfb.h 2009-06-04 10:38:07.000000000 +0200
++++ linux-2.6.29.4/arch/arm/mach-imx/include/mach/imxfb.h 2009-06-04 10:38:09.000000000 +0200
@@ -14,6 +14,7 @@
#define PCR_BPIX_8 (3 << 25)
#define PCR_BPIX_12 (4 << 25)
@@ -18,10 +18,10 @@
#define PCR_PIXPOL (1 << 24)
#define PCR_FLMPOL (1 << 23)
#define PCR_LPPOL (1 << 22)
-Index: linux-2.6.29/arch/arm/plat-mxc/include/mach/imxfb.h
+Index: linux-2.6.29.4/arch/arm/plat-mxc/include/mach/imxfb.h
===================================================================
---- linux-2.6.29.orig/arch/arm/plat-mxc/include/mach/imxfb.h 2009-05-27 21:09:24.000000000 +0200
-+++ linux-2.6.29/arch/arm/plat-mxc/include/mach/imxfb.h 2009-05-27 21:11:39.000000000 +0200
+--- linux-2.6.29.4.orig/arch/arm/plat-mxc/include/mach/imxfb.h 2009-06-04 10:38:09.000000000 +0200
++++ linux-2.6.29.4/arch/arm/plat-mxc/include/mach/imxfb.h 2009-06-04 10:38:09.000000000 +0200
@@ -19,6 +19,7 @@
#define PCR_BPIX_16 (5 << 25)
#define PCR_BPIX_18 (6 << 25)
@@ -30,11 +30,11 @@
#define PCR_PIXPOL (1 << 24)
#define PCR_FLMPOL (1 << 23)
#define PCR_LPPOL (1 << 22)
-Index: linux-2.6.29/drivers/video/imxfb.c
+Index: linux-2.6.29.4/drivers/video/imxfb.c
===================================================================
---- linux-2.6.29.orig/drivers/video/imxfb.c 2009-05-27 21:07:41.000000000 +0200
-+++ linux-2.6.29/drivers/video/imxfb.c 2009-05-27 21:11:01.000000000 +0200
-@@ -523,7 +523,17 @@
+--- linux-2.6.29.4.orig/drivers/video/imxfb.c 2009-06-04 10:38:09.000000000 +0200
++++ linux-2.6.29.4/drivers/video/imxfb.c 2009-06-04 10:38:47.000000000 +0200
+@@ -528,7 +528,17 @@
/* add sync polarities */
pcr |= fbi->pcr & ~0x3F;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
