|
@@ -1,18 +1,18 @@
|
|
|
-diff -Nur linux-2.6.36.orig/arch/arm/Kconfig linux-2.6.36/arch/arm/Kconfig
|
|
|
---- linux-2.6.36.orig/arch/arm/Kconfig 2010-10-20 22:30:22.000000000 +0200
|
|
|
-+++ linux-2.6.36/arch/arm/Kconfig 2010-12-25 17:49:20.000000000 +0100
|
|
|
-@@ -21,6 +21,8 @@
|
|
|
- select HAVE_FUNCTION_TRACER if (!XIP_KERNEL)
|
|
|
+diff -Nur linux-2.6.37.orig/arch/arm/Kconfig linux-2.6.37/arch/arm/Kconfig
|
|
|
+--- linux-2.6.37.orig/arch/arm/Kconfig 2011-01-05 01:50:19.000000000 +0100
|
|
|
++++ linux-2.6.37/arch/arm/Kconfig 2011-01-19 22:07:18.000000000 +0100
|
|
|
+@@ -16,6 +16,8 @@
|
|
|
+ select HAVE_DYNAMIC_FTRACE if (!XIP_KERNEL)
|
|
|
select HAVE_GENERIC_DMA_COHERENT
|
|
|
select HAVE_KERNEL_GZIP
|
|
|
+ select HAVE_KERNEL_BZIP2
|
|
|
+ select HAVE_KERNEL_LZMA
|
|
|
select HAVE_KERNEL_LZO
|
|
|
select HAVE_KERNEL_LZMA
|
|
|
- select HAVE_PERF_EVENTS
|
|
|
-diff -Nur linux-2.6.36.orig/arch/arm/include/asm/setup.h linux-2.6.36/arch/arm/include/asm/setup.h
|
|
|
---- linux-2.6.36.orig/arch/arm/include/asm/setup.h 2010-10-20 22:30:22.000000000 +0200
|
|
|
-+++ linux-2.6.36/arch/arm/include/asm/setup.h 2010-12-25 17:49:20.000000000 +0100
|
|
|
+ select HAVE_IRQ_WORK
|
|
|
+diff -Nur linux-2.6.37.orig/arch/arm/include/asm/setup.h linux-2.6.37/arch/arm/include/asm/setup.h
|
|
|
+--- linux-2.6.37.orig/arch/arm/include/asm/setup.h 2011-01-05 01:50:19.000000000 +0100
|
|
|
++++ linux-2.6.37/arch/arm/include/asm/setup.h 2011-01-19 22:07:18.000000000 +0100
|
|
|
@@ -18,6 +18,8 @@
|
|
|
|
|
|
#define COMMAND_LINE_SIZE 1024
|
|
@@ -22,10 +22,10 @@ diff -Nur linux-2.6.36.orig/arch/arm/include/asm/setup.h linux-2.6.36/arch/arm/i
|
|
|
/* The list ends with an ATAG_NONE node. */
|
|
|
#define ATAG_NONE 0x00000000
|
|
|
|
|
|
-diff -Nur linux-2.6.36.orig/arch/arm/kernel/setup.c linux-2.6.36/arch/arm/kernel/setup.c
|
|
|
---- linux-2.6.36.orig/arch/arm/kernel/setup.c 2010-10-20 22:30:22.000000000 +0200
|
|
|
-+++ linux-2.6.36/arch/arm/kernel/setup.c 2010-12-25 17:49:20.000000000 +0100
|
|
|
-@@ -899,8 +899,12 @@
|
|
|
+diff -Nur linux-2.6.37.orig/arch/arm/kernel/setup.c linux-2.6.37/arch/arm/kernel/setup.c
|
|
|
+--- linux-2.6.37.orig/arch/arm/kernel/setup.c 2011-01-05 01:50:19.000000000 +0100
|
|
|
++++ linux-2.6.37/arch/arm/kernel/setup.c 2011-01-19 22:07:18.000000000 +0100
|
|
|
+@@ -935,8 +935,12 @@
|
|
|
|
|
|
static int c_show(struct seq_file *m, void *v)
|
|
|
{
|
|
@@ -38,12 +38,12 @@ diff -Nur linux-2.6.36.orig/arch/arm/kernel/setup.c linux-2.6.36/arch/arm/kernel
|
|
|
seq_printf(m, "Processor\t: %s rev %d (%s)\n",
|
|
|
cpu_name, read_cpuid_id() & 15, elf_platform);
|
|
|
|
|
|
-diff -Nur linux-2.6.36.orig/arch/arm/mach-at91/Kconfig linux-2.6.36/arch/arm/mach-at91/Kconfig
|
|
|
---- linux-2.6.36.orig/arch/arm/mach-at91/Kconfig 2010-10-20 22:30:22.000000000 +0200
|
|
|
-+++ linux-2.6.36/arch/arm/mach-at91/Kconfig 2010-12-25 17:49:20.000000000 +0100
|
|
|
-@@ -364,6 +364,15 @@
|
|
|
- evaluation board.
|
|
|
- <http://www.taskit.de/en/>
|
|
|
+diff -Nur linux-2.6.37.orig/arch/arm/mach-at91/Kconfig linux-2.6.37/arch/arm/mach-at91/Kconfig
|
|
|
+--- linux-2.6.37.orig/arch/arm/mach-at91/Kconfig 2011-01-05 01:50:19.000000000 +0100
|
|
|
++++ linux-2.6.37/arch/arm/mach-at91/Kconfig 2011-01-19 22:08:47.000000000 +0100
|
|
|
+@@ -347,6 +347,15 @@
|
|
|
+ Select this if you are using Atmel's AT91SAM9G20-EK Evaluation Kit
|
|
|
+ that embeds only one SD/MMC slot.
|
|
|
|
|
|
+config MACH_FOXG20
|
|
|
+ bool "Acme Systems FOX G20"
|
|
@@ -54,15 +54,15 @@ diff -Nur linux-2.6.36.orig/arch/arm/mach-at91/Kconfig linux-2.6.36/arch/arm/mac
|
|
|
+ Select this if you are using Acme Systems
|
|
|
+ FOX Board G20 <http://netus.acmesystems.it>
|
|
|
+
|
|
|
- endif
|
|
|
-
|
|
|
- if (ARCH_AT91SAM9260 || ARCH_AT91SAM9G20)
|
|
|
-diff -Nur linux-2.6.36.orig/arch/arm/mach-at91/Makefile linux-2.6.36/arch/arm/mach-at91/Makefile
|
|
|
---- linux-2.6.36.orig/arch/arm/mach-at91/Makefile 2010-10-20 22:30:22.000000000 +0200
|
|
|
-+++ linux-2.6.36/arch/arm/mach-at91/Makefile 2010-12-25 17:49:20.000000000 +0100
|
|
|
-@@ -72,6 +72,9 @@
|
|
|
+ config MACH_AT91SAM9G20EK_2MMC
|
|
|
+ depends on MACH_AT91SAM9G20EK
|
|
|
+ bool "Atmel AT91SAM9G20-EK Evaluation Kit with 2 SD/MMC Slots"
|
|
|
+diff -Nur linux-2.6.37.orig/arch/arm/mach-at91/Makefile linux-2.6.37/arch/arm/mach-at91/Makefile
|
|
|
+--- linux-2.6.37.orig/arch/arm/mach-at91/Makefile 2011-01-05 01:50:19.000000000 +0100
|
|
|
++++ linux-2.6.37/arch/arm/mach-at91/Makefile 2011-01-19 22:07:18.000000000 +0100
|
|
|
+@@ -73,6 +73,9 @@
|
|
|
# AT91SAM9G45 board-specific support
|
|
|
- obj-$(CONFIG_MACH_AT91SAM9G45EKES) += board-sam9m10g45ek.o
|
|
|
+ obj-$(CONFIG_MACH_AT91SAM9M10G45EK) += board-sam9m10g45ek.o
|
|
|
|
|
|
+# FOXG20 board-specific support
|
|
|
+obj-$(CONFIG_MACH_FOXG20) += board-foxg20.o
|
|
@@ -70,9 +70,9 @@ diff -Nur linux-2.6.36.orig/arch/arm/mach-at91/Makefile linux-2.6.36/arch/arm/ma
|
|
|
# AT91CAP9 board-specific support
|
|
|
obj-$(CONFIG_MACH_AT91CAP9ADK) += board-cap9adk.o
|
|
|
|
|
|
-diff -Nur linux-2.6.36.orig/arch/arm/mach-at91/at91sam9260_devices.c linux-2.6.36/arch/arm/mach-at91/at91sam9260_devices.c
|
|
|
---- linux-2.6.36.orig/arch/arm/mach-at91/at91sam9260_devices.c 2010-10-20 22:30:22.000000000 +0200
|
|
|
-+++ linux-2.6.36/arch/arm/mach-at91/at91sam9260_devices.c 2010-12-25 17:49:20.000000000 +0100
|
|
|
+diff -Nur linux-2.6.37.orig/arch/arm/mach-at91/at91sam9260_devices.c linux-2.6.37/arch/arm/mach-at91/at91sam9260_devices.c
|
|
|
+--- linux-2.6.37.orig/arch/arm/mach-at91/at91sam9260_devices.c 2011-01-05 01:50:19.000000000 +0100
|
|
|
++++ linux-2.6.37/arch/arm/mach-at91/at91sam9260_devices.c 2011-01-19 22:07:18.000000000 +0100
|
|
|
@@ -454,7 +454,15 @@
|
|
|
.sda_is_open_drain = 1,
|
|
|
.scl_pin = AT91_PIN_PA24,
|
|
@@ -89,10 +89,10 @@ diff -Nur linux-2.6.36.orig/arch/arm/mach-at91/at91sam9260_devices.c linux-2.6.3
|
|
|
};
|
|
|
|
|
|
static struct platform_device at91sam9260_twi_device = {
|
|
|
-diff -Nur linux-2.6.36.orig/arch/arm/mach-at91/board-foxg20.c linux-2.6.36/arch/arm/mach-at91/board-foxg20.c
|
|
|
---- linux-2.6.36.orig/arch/arm/mach-at91/board-foxg20.c 1970-01-01 01:00:00.000000000 +0100
|
|
|
-+++ linux-2.6.36/arch/arm/mach-at91/board-foxg20.c 2010-12-25 17:49:20.000000000 +0100
|
|
|
-@@ -0,0 +1,376 @@
|
|
|
+diff -Nur linux-2.6.37.orig/arch/arm/mach-at91/board-foxg20.c linux-2.6.37/arch/arm/mach-at91/board-foxg20.c
|
|
|
+--- linux-2.6.37.orig/arch/arm/mach-at91/board-foxg20.c 1970-01-01 01:00:00.000000000 +0100
|
|
|
++++ linux-2.6.37/arch/arm/mach-at91/board-foxg20.c 2011-01-19 22:30:43.000000000 +0100
|
|
|
+@@ -0,0 +1,374 @@
|
|
|
+/*
|
|
|
+ * Copyright (C) 2005 SAN People
|
|
|
+ * Copyright (C) 2008 Atmel
|
|
@@ -461,18 +461,16 @@ diff -Nur linux-2.6.36.orig/arch/arm/mach-at91/board-foxg20.c linux-2.6.36/arch/
|
|
|
+
|
|
|
+MACHINE_START(AT91SAM9G20EK, "Acme Systems FOXG20")
|
|
|
+ /* Maintainer: Lee McLoughlin */
|
|
|
-+ .phys_io = AT91_BASE_SYS,
|
|
|
-+ .io_pg_offst = (AT91_VA_BASE_SYS >> 18) & 0xfffc,
|
|
|
+ .boot_params = AT91_SDRAM_BASE + 0x100,
|
|
|
+ .timer = &at91sam926x_timer,
|
|
|
+ .map_io = foxg20_map_io,
|
|
|
+ .init_irq = foxg20_init_irq,
|
|
|
+ .init_machine = foxg20_board_init,
|
|
|
+MACHINE_END
|
|
|
-diff -Nur linux-2.6.36.orig/drivers/mmc/host/Kconfig linux-2.6.36/drivers/mmc/host/Kconfig
|
|
|
---- linux-2.6.36.orig/drivers/mmc/host/Kconfig 2010-10-20 22:30:22.000000000 +0200
|
|
|
-+++ linux-2.6.36/drivers/mmc/host/Kconfig 2010-12-25 19:15:17.000000000 +0100
|
|
|
-@@ -208,12 +208,12 @@
|
|
|
+diff -Nur linux-2.6.37.orig/drivers/mmc/host/Kconfig linux-2.6.37/drivers/mmc/host/Kconfig
|
|
|
+--- linux-2.6.37.orig/drivers/mmc/host/Kconfig 2011-01-05 01:50:19.000000000 +0100
|
|
|
++++ linux-2.6.37/drivers/mmc/host/Kconfig 2011-01-19 22:07:18.000000000 +0100
|
|
|
+@@ -230,12 +230,12 @@
|
|
|
|
|
|
If unsure, say N.
|
|
|
|
|
@@ -491,7 +489,7 @@ diff -Nur linux-2.6.36.orig/drivers/mmc/host/Kconfig linux-2.6.36/drivers/mmc/ho
|
|
|
|
|
|
config MMC_AT91
|
|
|
tristate "AT91 SD/MMC Card Interface support"
|
|
|
-@@ -223,17 +223,17 @@
|
|
|
+@@ -245,17 +245,17 @@
|
|
|
|
|
|
If unsure, say N.
|
|
|
|