|
@@ -1,6 +1,6 @@
|
|
|
-diff -Nur linux-2.6.32.2.orig/arch/arm/include/asm/setup.h linux-2.6.32.2/arch/arm/include/asm/setup.h
|
|
|
---- linux-2.6.32.2.orig/arch/arm/include/asm/setup.h 2009-12-18 23:27:07.000000000 +0100
|
|
|
-+++ linux-2.6.32.2/arch/arm/include/asm/setup.h 2010-02-23 21:40:33.000000000 +0100
|
|
|
+diff -Nur linux-2.6.33.orig/arch/arm/include/asm/setup.h linux-2.6.33/arch/arm/include/asm/setup.h
|
|
|
+--- linux-2.6.33.orig/arch/arm/include/asm/setup.h 2010-02-24 19:52:17.000000000 +0100
|
|
|
++++ linux-2.6.33/arch/arm/include/asm/setup.h 2010-02-27 19:32:30.150085477 +0100
|
|
|
@@ -18,6 +18,8 @@
|
|
|
|
|
|
#define COMMAND_LINE_SIZE 1024
|
|
@@ -10,23 +10,22 @@ diff -Nur linux-2.6.32.2.orig/arch/arm/include/asm/setup.h linux-2.6.32.2/arch/a
|
|
|
/* The list ends with an ATAG_NONE node. */
|
|
|
#define ATAG_NONE 0x00000000
|
|
|
|
|
|
-diff -Nur linux-2.6.32.2.orig/arch/arm/Kconfig linux-2.6.32.2/arch/arm/Kconfig
|
|
|
---- linux-2.6.32.2.orig/arch/arm/Kconfig 2009-12-18 23:27:07.000000000 +0100
|
|
|
-+++ linux-2.6.32.2/arch/arm/Kconfig 2010-02-23 21:18:53.000000000 +0100
|
|
|
-@@ -18,6 +18,9 @@
|
|
|
- select HAVE_KRETPROBES if (HAVE_KPROBES)
|
|
|
+diff -Nur linux-2.6.33.orig/arch/arm/Kconfig linux-2.6.33/arch/arm/Kconfig
|
|
|
+--- linux-2.6.33.orig/arch/arm/Kconfig 2010-02-24 19:52:17.000000000 +0100
|
|
|
++++ linux-2.6.33/arch/arm/Kconfig 2010-02-27 20:23:52.139866005 +0100
|
|
|
+@@ -19,6 +19,8 @@
|
|
|
select HAVE_FUNCTION_TRACER if (!XIP_KERNEL)
|
|
|
select HAVE_GENERIC_DMA_COHERENT
|
|
|
-+ select HAVE_KERNEL_GZIP
|
|
|
+ select HAVE_KERNEL_GZIP
|
|
|
+ select HAVE_KERNEL_BZIP2
|
|
|
+ select HAVE_KERNEL_LZMA
|
|
|
+ select HAVE_KERNEL_LZO
|
|
|
help
|
|
|
The ARM series is a line of low-power-consumption RISC chip designs
|
|
|
- licensed by ARM Ltd and targeted at embedded applications and
|
|
|
-diff -Nur linux-2.6.32.2.orig/arch/arm/kernel/setup.c linux-2.6.32.2/arch/arm/kernel/setup.c
|
|
|
---- linux-2.6.32.2.orig/arch/arm/kernel/setup.c 2009-12-18 23:27:07.000000000 +0100
|
|
|
-+++ linux-2.6.32.2/arch/arm/kernel/setup.c 2010-02-23 21:29:01.000000000 +0100
|
|
|
-@@ -806,8 +806,12 @@
|
|
|
+diff -Nur linux-2.6.33.orig/arch/arm/kernel/setup.c linux-2.6.33/arch/arm/kernel/setup.c
|
|
|
+--- linux-2.6.33.orig/arch/arm/kernel/setup.c 2010-02-24 19:52:17.000000000 +0100
|
|
|
++++ linux-2.6.33/arch/arm/kernel/setup.c 2010-02-27 19:32:30.212085837 +0100
|
|
|
+@@ -807,8 +807,12 @@
|
|
|
|
|
|
static int c_show(struct seq_file *m, void *v)
|
|
|
{
|
|
@@ -39,9 +38,9 @@ diff -Nur linux-2.6.32.2.orig/arch/arm/kernel/setup.c linux-2.6.32.2/arch/arm/ke
|
|
|
seq_printf(m, "Processor\t: %s rev %d (%s)\n",
|
|
|
cpu_name, read_cpuid_id() & 15, elf_platform);
|
|
|
|
|
|
-diff -Nur linux-2.6.32.2.orig/arch/arm/mach-at91/at91sam9260_devices.c linux-2.6.32.2/arch/arm/mach-at91/at91sam9260_devices.c
|
|
|
---- linux-2.6.32.2.orig/arch/arm/mach-at91/at91sam9260_devices.c 2009-12-18 23:27:07.000000000 +0100
|
|
|
-+++ linux-2.6.32.2/arch/arm/mach-at91/at91sam9260_devices.c 2010-02-23 21:18:53.000000000 +0100
|
|
|
+diff -Nur linux-2.6.33.orig/arch/arm/mach-at91/at91sam9260_devices.c linux-2.6.33/arch/arm/mach-at91/at91sam9260_devices.c
|
|
|
+--- linux-2.6.33.orig/arch/arm/mach-at91/at91sam9260_devices.c 2010-02-24 19:52:17.000000000 +0100
|
|
|
++++ linux-2.6.33/arch/arm/mach-at91/at91sam9260_devices.c 2010-02-27 19:32:30.233294964 +0100
|
|
|
@@ -454,7 +454,15 @@
|
|
|
.sda_is_open_drain = 1,
|
|
|
.scl_pin = AT91_PIN_PA24,
|
|
@@ -58,9 +57,9 @@ diff -Nur linux-2.6.32.2.orig/arch/arm/mach-at91/at91sam9260_devices.c linux-2.6
|
|
|
};
|
|
|
|
|
|
static struct platform_device at91sam9260_twi_device = {
|
|
|
-diff -Nur linux-2.6.32.2.orig/arch/arm/mach-at91/board-foxg20.c linux-2.6.32.2/arch/arm/mach-at91/board-foxg20.c
|
|
|
---- linux-2.6.32.2.orig/arch/arm/mach-at91/board-foxg20.c 1970-01-01 01:00:00.000000000 +0100
|
|
|
-+++ linux-2.6.32.2/arch/arm/mach-at91/board-foxg20.c 2010-02-23 21:33:34.000000000 +0100
|
|
|
+diff -Nur linux-2.6.33.orig/arch/arm/mach-at91/board-foxg20.c linux-2.6.33/arch/arm/mach-at91/board-foxg20.c
|
|
|
+--- linux-2.6.33.orig/arch/arm/mach-at91/board-foxg20.c 1970-01-01 01:00:00.000000000 +0100
|
|
|
++++ linux-2.6.33/arch/arm/mach-at91/board-foxg20.c 2010-02-27 19:32:30.235748629 +0100
|
|
|
@@ -0,0 +1,376 @@
|
|
|
+/*
|
|
|
+ * Copyright (C) 2005 SAN People
|
|
@@ -438,15 +437,17 @@ diff -Nur linux-2.6.32.2.orig/arch/arm/mach-at91/board-foxg20.c linux-2.6.32.2/a
|
|
|
+ .init_irq = foxg20_init_irq,
|
|
|
+ .init_machine = foxg20_board_init,
|
|
|
+MACHINE_END
|
|
|
-diff -Nur linux-2.6.32.2.orig/arch/arm/mach-at91/Kconfig linux-2.6.32.2/arch/arm/mach-at91/Kconfig
|
|
|
---- linux-2.6.32.2.orig/arch/arm/mach-at91/Kconfig 2009-12-18 23:27:07.000000000 +0100
|
|
|
-+++ linux-2.6.32.2/arch/arm/mach-at91/Kconfig 2010-02-23 21:18:53.000000000 +0100
|
|
|
-@@ -333,6 +333,13 @@
|
|
|
+diff -Nur linux-2.6.33.orig/arch/arm/mach-at91/Kconfig linux-2.6.33/arch/arm/mach-at91/Kconfig
|
|
|
+--- linux-2.6.33.orig/arch/arm/mach-at91/Kconfig 2010-02-24 19:52:17.000000000 +0100
|
|
|
++++ linux-2.6.33/arch/arm/mach-at91/Kconfig 2010-02-27 20:22:57.467867560 +0100
|
|
|
+@@ -354,6 +354,15 @@
|
|
|
Select this if you are using a Eukrea Electromatique's
|
|
|
CPU9G20 Board <http://www.eukrea.com/>
|
|
|
|
|
|
+config MACH_FOXG20
|
|
|
+ bool "Acme Systems FOX G20"
|
|
|
++ select HAVE_AT91_DATAFLASH_CARD
|
|
|
++ select HAVE_NAND_ATMEL_BUSWIDTH_16
|
|
|
+ depends on ARCH_AT91SAM9G20
|
|
|
+ help
|
|
|
+ Select this if you are using Acme Systems
|
|
@@ -455,26 +456,10 @@ diff -Nur linux-2.6.32.2.orig/arch/arm/mach-at91/Kconfig linux-2.6.32.2/arch/arm
|
|
|
endif
|
|
|
|
|
|
# ----------------------------------------------------------
|
|
|
-@@ -388,13 +395,13 @@
|
|
|
-
|
|
|
- config MTD_AT91_DATAFLASH_CARD
|
|
|
- bool "Enable DataFlash Card support"
|
|
|
-- depends on (ARCH_AT91RM9200DK || MACH_AT91RM9200EK || MACH_AT91SAM9260EK || MACH_AT91SAM9261EK || MACH_AT91SAM9G10EK || MACH_AT91SAM9263EK || MACH_AT91SAM9G20EK || MACH_ECBAT91 || MACH_SAM9_L9260 || MACH_AT91CAP9ADK || MACH_NEOCORE926)
|
|
|
-+ depends on (ARCH_AT91RM9200DK || MACH_AT91RM9200EK || MACH_AT91SAM9260EK || MACH_AT91SAM9261EK || MACH_AT91SAM9G10EK || MACH_AT91SAM9263EK || MACH_AT91SAM9G20EK || MACH_ECBAT91 || MACH_SAM9_L9260 || MACH_AT91CAP9ADK || MACH_NEOCORE926 || MACH_FOXG20)
|
|
|
- help
|
|
|
- Enable support for the DataFlash card.
|
|
|
-
|
|
|
- config MTD_NAND_ATMEL_BUSWIDTH_16
|
|
|
- bool "Enable 16-bit data bus interface to NAND flash"
|
|
|
-- depends on (MACH_AT91SAM9260EK || MACH_AT91SAM9261EK || MACH_AT91SAM9G10EK || MACH_AT91SAM9263EK || MACH_AT91SAM9G20EK || MACH_AT91SAM9G20EK_2MMC || MACH_AT91SAM9G45EKES || MACH_AT91CAP9ADK)
|
|
|
-+ depends on (MACH_AT91SAM9260EK || MACH_AT91SAM9261EK || MACH_AT91SAM9G10EK || MACH_AT91SAM9263EK || MACH_AT91SAM9G20EK || MACH_AT91SAM9G20EK_2MMC || MACH_AT91SAM9G45EKES || MACH_AT91CAP9ADK || MACH_FOXG20)
|
|
|
- help
|
|
|
- On AT91SAM926x boards both types of NAND flash can be present
|
|
|
- (8 and 16 bit data bus width).
|
|
|
-diff -Nur linux-2.6.32.2.orig/arch/arm/mach-at91/Makefile linux-2.6.32.2/arch/arm/mach-at91/Makefile
|
|
|
---- linux-2.6.32.2.orig/arch/arm/mach-at91/Makefile 2009-12-18 23:27:07.000000000 +0100
|
|
|
-+++ linux-2.6.32.2/arch/arm/mach-at91/Makefile 2010-02-23 21:18:53.000000000 +0100
|
|
|
-@@ -65,6 +65,9 @@
|
|
|
+diff -Nur linux-2.6.33.orig/arch/arm/mach-at91/Makefile linux-2.6.33/arch/arm/mach-at91/Makefile
|
|
|
+--- linux-2.6.33.orig/arch/arm/mach-at91/Makefile 2010-02-24 19:52:17.000000000 +0100
|
|
|
++++ linux-2.6.33/arch/arm/mach-at91/Makefile 2010-02-27 19:32:30.295749847 +0100
|
|
|
+@@ -66,6 +66,9 @@
|
|
|
# AT91SAM9G45 board-specific support
|
|
|
obj-$(CONFIG_MACH_AT91SAM9G45EKES) += board-sam9m10g45ek.o
|
|
|
|
|
@@ -484,9 +469,9 @@ diff -Nur linux-2.6.32.2.orig/arch/arm/mach-at91/Makefile linux-2.6.32.2/arch/ar
|
|
|
# AT91CAP9 board-specific support
|
|
|
obj-$(CONFIG_MACH_AT91CAP9ADK) += board-cap9adk.o
|
|
|
|
|
|
-diff -Nur linux-2.6.32.2.orig/drivers/mmc/host/at91_mci.c linux-2.6.32.2/drivers/mmc/host/at91_mci.c
|
|
|
---- linux-2.6.32.2.orig/drivers/mmc/host/at91_mci.c 2009-12-18 23:27:07.000000000 +0100
|
|
|
-+++ linux-2.6.32.2/drivers/mmc/host/at91_mci.c 2010-02-23 21:18:53.000000000 +0100
|
|
|
+diff -Nur linux-2.6.33.orig/drivers/mmc/host/at91_mci.c linux-2.6.33/drivers/mmc/host/at91_mci.c
|
|
|
+--- linux-2.6.33.orig/drivers/mmc/host/at91_mci.c 2010-02-24 19:52:17.000000000 +0100
|
|
|
++++ linux-2.6.33/drivers/mmc/host/at91_mci.c 2010-02-27 19:32:30.295749847 +0100
|
|
|
@@ -461,7 +461,7 @@
|
|
|
at91_mci_write(host, AT91_MCI_DTOR, AT91_MCI_DTOMUL_1M | AT91_MCI_DTOCYC);
|
|
|
mr = AT91_MCI_PDCMODE | 0x34a;
|