summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--recipes/linux/linux-2.6.28/mtcdp/linux-2.6.28-mach-at91.patch64
-rw-r--r--recipes/linux/linux-2.6.28/mtcdp/linux-2.6.28-sierra.patch1
2 files changed, 44 insertions, 21 deletions
diff --git a/recipes/linux/linux-2.6.28/mtcdp/linux-2.6.28-mach-at91.patch b/recipes/linux/linux-2.6.28/mtcdp/linux-2.6.28-mach-at91.patch
index a311c7fee1..7e42eda198 100644
--- a/recipes/linux/linux-2.6.28/mtcdp/linux-2.6.28-mach-at91.patch
+++ b/recipes/linux/linux-2.6.28/mtcdp/linux-2.6.28-mach-at91.patch
@@ -1,6 +1,6 @@
diff -uprN -X linux-2.6.28/Documentation/dontdiff linux-2.6.28-vanilla/arch/arm/mach-at91/at91sam9260_devices.c linux-2.6.28/arch/arm/mach-at91/at91sam9260_devices.c
--- linux-2.6.28-vanilla/arch/arm/mach-at91/at91sam9260_devices.c 2008-12-24 17:26:37.000000000 -0600
-+++ linux-2.6.28/arch/arm/mach-at91/at91sam9260_devices.c 2010-04-05 15:25:29.000000000 -0500
++++ linux-2.6.28/arch/arm/mach-at91/at91sam9260_devices.c 2010-10-18 09:38:23.000000000 -0500
@@ -183,9 +183,9 @@ void __init at91_add_device_eth(struct a
at91_set_B_periph(AT91_PIN_PA25, 0); /* ERX2 */
at91_set_B_periph(AT91_PIN_PA26, 0); /* ERX3 */
@@ -16,8 +16,16 @@ diff -uprN -X linux-2.6.28/Documentation/dontdiff linux-2.6.28-vanilla/arch/arm/
eth_data = *data;
diff -uprN -X linux-2.6.28/Documentation/dontdiff linux-2.6.28-vanilla/arch/arm/mach-at91/board-sam9g20ek.c linux-2.6.28/arch/arm/mach-at91/board-sam9g20ek.c
--- linux-2.6.28-vanilla/arch/arm/mach-at91/board-sam9g20ek.c 2008-12-24 17:26:37.000000000 -0600
-+++ linux-2.6.28/arch/arm/mach-at91/board-sam9g20ek.c 2010-05-03 14:46:54.000000000 -0500
-@@ -57,6 +57,9 @@ static void __init ek_map_io(void)
++++ linux-2.6.28/arch/arm/mach-at91/board-sam9g20ek.c 2010-10-18 09:30:44.000000000 -0500
+@@ -25,6 +25,7 @@
+ #include <linux/spi/spi.h>
+ #include <linux/spi/at73c213.h>
+ #include <linux/clk.h>
++#include <mach/at91_rtt.h>
+
+ #include <mach/hardware.h>
+ #include <asm/setup.h>
+@@ -57,12 +58,23 @@ static void __init ek_map_io(void)
/* USART1 on ttyS2. (Rx, Tx, RTS, CTS) */
at91_register_uart(AT91SAM9260_ID_US1, 2, ATMEL_UART_CTS | ATMEL_UART_RTS);
@@ -27,7 +35,21 @@ diff -uprN -X linux-2.6.28/Documentation/dontdiff linux-2.6.28-vanilla/arch/arm/
/* set serial console to ttyS0 (ie, DBGU) */
at91_set_serial_console(0);
}
-@@ -78,8 +81,8 @@ static struct at91_usbh_data __initdata
+
+ static void __init ek_init_irq(void)
+ {
++ /*
++ * Ensure RTT interrupts are disabled
++ */
++ u32 mr;
++ mr = __raw_readl(AT91_VA_BASE_SYS + AT91_RTT + AT91_RTT_MR);
++ __raw_writel(mr & ~(AT91_RTT_ALMIEN | AT91_RTT_RTTINCIEN),
++ AT91_VA_BASE_SYS + AT91_RTT + AT91_RTT_MR);
++
+ at91sam9260_init_interrupts(NULL);
+ }
+
+@@ -78,8 +90,8 @@ static struct at91_usbh_data __initdata
* USB Device port
*/
static struct at91_udc_data __initdata ek_udc_data = {
@@ -38,7 +60,7 @@ diff -uprN -X linux-2.6.28/Documentation/dontdiff linux-2.6.28-vanilla/arch/arm/
};
-@@ -103,6 +106,16 @@ static struct spi_board_info ek_spi_devi
+@@ -103,6 +115,16 @@ static struct spi_board_info ek_spi_devi
},
#endif
#endif
@@ -55,7 +77,7 @@ diff -uprN -X linux-2.6.28/Documentation/dontdiff linux-2.6.28-vanilla/arch/arm/
};
-@@ -111,7 +124,7 @@ static struct spi_board_info ek_spi_devi
+@@ -111,7 +133,7 @@ static struct spi_board_info ek_spi_devi
*/
static struct at91_eth_data __initdata ek_macb_data = {
.phy_irq_pin = AT91_PIN_PA7,
@@ -64,7 +86,7 @@ diff -uprN -X linux-2.6.28/Documentation/dontdiff linux-2.6.28-vanilla/arch/arm/
};
-@@ -120,22 +133,53 @@ static struct at91_eth_data __initdata e
+@@ -120,22 +142,53 @@ static struct at91_eth_data __initdata e
*/
static struct mtd_partition __initdata ek_nand_partition[] = {
{
@@ -74,28 +96,28 @@ diff -uprN -X linux-2.6.28/Documentation/dontdiff linux-2.6.28-vanilla/arch/arm/
+ .name = "MTNCG-NANDFlash",
+ .offset = 0,
+ .size = 256*1024*1024,
++ },
++ {
++ .name = "AT91Bootstrap",
++ .offset = 0,
++ .size = 128*1024,
++ },
++ {
++ .name = "UBoot",
++ .offset = 128*1024,
++ .size = 256*1024,
},
{
- .name = "Partition 1",
- .offset = MTDPART_OFS_NXTBLK,
- .size = 60 * SZ_1M,
-+ .name = "AT91Bootstrap",
-+ .offset = 0,
++ .name = "UBoot Config",
++ .offset = 384*1024,
+ .size = 128*1024,
},
{
- .name = "Partition 2",
- .offset = MTDPART_OFS_NXTBLK,
-+ .name = "UBoot",
-+ .offset = 128*1024,
-+ .size = 256*1024,
-+ },
-+ {
-+ .name = "UBoot Config",
-+ .offset = 384*1024,
-+ .size = 128*1024,
-+ },
-+ {
+ .name = "UBoot Redundant Config",
+ .offset = 512*1024,
+ .size = 128*1024,
@@ -126,7 +148,7 @@ diff -uprN -X linux-2.6.28/Documentation/dontdiff linux-2.6.28-vanilla/arch/arm/
static struct mtd_partition * __init nand_partitions(int size, int *num_partitions)
{
*num_partitions = ARRAY_SIZE(ek_nand_partition);
-@@ -159,11 +203,13 @@ static struct atmel_nand_data __initdata
+@@ -159,11 +212,13 @@ static struct atmel_nand_data __initdata
/*
* MCI (SD/MMC)
@@ -141,7 +163,7 @@ diff -uprN -X linux-2.6.28/Documentation/dontdiff linux-2.6.28-vanilla/arch/arm/
};
-@@ -171,17 +217,12 @@ static struct at91_mmc_data __initdata e
+@@ -171,17 +226,12 @@ static struct at91_mmc_data __initdata e
* LEDs
*/
static struct gpio_led ek_leds[] = {
diff --git a/recipes/linux/linux-2.6.28/mtcdp/linux-2.6.28-sierra.patch b/recipes/linux/linux-2.6.28/mtcdp/linux-2.6.28-sierra.patch
index 5d93c0edd3..c575acaf6d 100644
--- a/recipes/linux/linux-2.6.28/mtcdp/linux-2.6.28-sierra.patch
+++ b/recipes/linux/linux-2.6.28/mtcdp/linux-2.6.28-sierra.patch
@@ -1666,3 +1666,4 @@ diff -uprN -X linux-2.6.28/Documentation/dontdiff linux-2.6.28-vanilla/drivers/u
return 0;
+Binary files linux-2.6.28-vanilla/scripts/basic/hash and linux-2.6.28/scripts/basic/hash differ