aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authorClaudio Mignanti <c.mignanti@gmail.com>2011-03-20 22:49:27 +0000
committerClaudio Mignanti <c.mignanti@gmail.com>2011-03-20 22:49:27 +0000
commiteb4fc36bfe80fd744017ca6ba4ebd936b7f189d5 (patch)
tree76a90805fc6f10be56d2dd64c66b9a1e6e62dcec /target/linux
parent4c85b8562da5b3a10f7914f0228f3707ca9689b6 (diff)
downloadupstream-eb4fc36bfe80fd744017ca6ba4ebd936b7f189d5.tar.gz
upstream-eb4fc36bfe80fd744017ca6ba4ebd936b7f189d5.tar.bz2
upstream-eb4fc36bfe80fd744017ca6ba4ebd936b7f189d5.zip
Update to 2.6.38
SVN-Revision: 26246
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/at91/Makefile2
-rw-r--r--target/linux/at91/patches/200-experimenta_adc_driver.patch17
-rwxr-xr-xtarget/linux/at91/patches/800-netus-support.patch68
3 files changed, 10 insertions, 77 deletions
diff --git a/target/linux/at91/Makefile b/target/linux/at91/Makefile
index 0ef55e6410..9808255bce 100644
--- a/target/linux/at91/Makefile
+++ b/target/linux/at91/Makefile
@@ -14,7 +14,7 @@ FEATURES:=squashfs jffs2 targz
CFLAGS:=-Os -pipe -march=armv5te -mtune=arm926ej-s -funit-at-a-time
SUBTARGETS:=netus tqma9263
-LINUX_VERSION:=2.6.35.11
+LINUX_VERSION:=2.6.38
DEVICE_TYPE=
include $(INCLUDE_DIR)/target.mk
diff --git a/target/linux/at91/patches/200-experimenta_adc_driver.patch b/target/linux/at91/patches/200-experimenta_adc_driver.patch
index fc32017ec2..625b377976 100644
--- a/target/linux/at91/patches/200-experimenta_adc_driver.patch
+++ b/target/linux/at91/patches/200-experimenta_adc_driver.patch
@@ -1,8 +1,8 @@
-Index: linux-2.6.35.9/drivers/misc/Kconfig
+Index: linux-2.6.38/drivers/misc/Kconfig
===================================================================
---- linux-2.6.35.9.orig/drivers/misc/Kconfig 2010-12-20 19:06:11.185139238 +0100
-+++ linux-2.6.35.9/drivers/misc/Kconfig 2010-12-20 19:07:31.000000000 +0100
-@@ -95,6 +95,10 @@
+--- linux-2.6.38.orig/drivers/misc/Kconfig 2011-03-15 02:20:32.000000000 +0100
++++ linux-2.6.38/drivers/misc/Kconfig 2011-03-20 22:54:33.114794033 +0100
+@@ -104,6 +104,10 @@
TC can be used for other purposes, such as PWM generation and
interval timing.
@@ -13,15 +13,16 @@ Index: linux-2.6.35.9/drivers/misc/Kconfig
config IBM_ASM
tristate "Device driver for IBM RSA service processor"
depends on X86 && PCI && INPUT && EXPERIMENTAL
-Index: linux-2.6.35.9/drivers/misc/Makefile
+Index: linux-2.6.38/drivers/misc/Makefile
===================================================================
---- linux-2.6.35.9.orig/drivers/misc/Makefile 2010-12-20 19:04:59.494200153 +0100
-+++ linux-2.6.35.9/drivers/misc/Makefile 2010-12-20 19:06:04.000000000 +0100
+--- linux-2.6.38.orig/drivers/misc/Makefile 2011-03-15 02:20:32.000000000 +0100
++++ linux-2.6.38/drivers/misc/Makefile 2011-03-20 22:55:18.000000000 +0100
@@ -9,6 +9,7 @@
obj-$(CONFIG_ATMEL_PWM) += atmel_pwm.o
obj-$(CONFIG_ATMEL_SSC) += atmel-ssc.o
obj-$(CONFIG_ATMEL_TCLIB) += atmel_tclib.o
+obj-$(CONFIG_AT91_ADC) += at91-adc.o
+ obj-$(CONFIG_BMP085) += bmp085.o
obj-$(CONFIG_ICS932S401) += ics932s401.o
obj-$(CONFIG_LKDTM) += lkdtm.o
- obj-$(CONFIG_TIFM_CORE) += tifm_core.o
+
diff --git a/target/linux/at91/patches/800-netus-support.patch b/target/linux/at91/patches/800-netus-support.patch
deleted file mode 100755
index ad33017625..0000000000
--- a/target/linux/at91/patches/800-netus-support.patch
+++ /dev/null
@@ -1,68 +0,0 @@
---- a/arch/arm/mach-at91/Kconfig
-+++ b/arch/arm/mach-at91/Kconfig
-@@ -354,6 +354,13 @@ config MACH_CPU9G20
- Select this if you are using a Eukrea Electromatique's
- CPU9G20 Board <http://www.eukrea.com/>
-
-+config MACH_NETUS_FOXBOARD
-+ bool "Acmesystems NetusG20 board"
-+ depends on ARCH_AT91SAM9G20
-+ help
-+ Select this if you are using a Acmesystems NetusG20
-+ board <http://netus.acmesystems.it/>
-+
- endif
-
- # ----------------------------------------------------------
-@@ -444,6 +451,40 @@
- On AT91SAM926x boards both types of NAND flash can be present
- (8 and 16 bit data bus width).
-
-+config NETUS_HEARTBEAT_LED
-+ bool "Use heartbeat trigger for led"
-+ depends on MACH_NETUS_FOXBOARD
-+ select LEDS_TRIGGER_HEARTBEAT
-+ help
-+ Select this option to enable default trigger heartbeart for
-+ FoxBoardG20 user led.
-+
-+config NETUS_SERIALS
-+ bool "Enable serials"
-+ depends on MACH_NETUS_FOXBOARD
-+ help
-+ Select this option to enable serials interface /dev/ttyS1,
-+ /dev/ttyS2 and /dev/ttyS5 (for oLed interface)
-+
-+config NETUS_USE_DATAFLASH
-+ bool "Enable the dataflash"
-+ select MTD_DATAFLASH
-+ select MTD_PARTITIONS
-+ select MTD_CMDLINE_PARTS
-+ select MTD_CHAR
-+ select MTD_BLOCK
-+ depends on MACH_NETUS_FOXBOARD
-+ help
-+ Select this option to use the dataflash.
-+
-+config NETUS_FOXGM
-+ bool "Enable support for FoxGM board"
-+ depends on MACH_NETUS_FOXBOARD
-+ select LEDS_TRIGGER_HEARTBEAT
-+ help
-+ Select this option to auto-configure leds and
-+ serial ports according to FOXGM board.
-+
- # ----------------------------------------------------------
-
- comment "AT91 Feature Selections"
---- linux-2.6.35.4.orig/arch/arm/mach-at91/Makefile 2010-09-18 13:29:33.000000000 +0200
-+++ linux-2.6.35.4/arch/arm/mach-at91/Makefile 2010-09-18 13:31:31.000000000 +0200
-@@ -65,6 +65,7 @@
- obj-$(CONFIG_MACH_CPU9G20) += board-cpu9krea.o
- obj-$(CONFIG_MACH_STAMP9G20) += board-stamp9g20.o
- obj-$(CONFIG_MACH_PORTUXG20) += board-stamp9g20.o
-+obj-$(CONFIG_MACH_NETUS_FOXBOARD) += board-netus-foxboard.o
-
- # AT91SAM9G45 board-specific support
- obj-$(CONFIG_MACH_AT91SAM9G45EKES) += board-sam9m10g45ek.o
-