u-boot: update 2012.10 mtocgd patch, bump

2 files changed, 37 insertions, 11 deletions

diff --git a/multitech/recipes/u-boot/u-boot-2012.10/mtocgd/u-boot-2012.10-mtocgd.patch b/multitech/recipes/u-boot/u-boot-2012.10/mtocgd/u-boot-2012.10-mtocgd.patch
index aba2dba..ce5f789 100644
--- a/multitech/recipes/u-boot/u-boot-2012.10/mtocgd/u-boot-2012.10-mtocgd.patch
+++ b/multitech/recipes/u-boot/u-boot-2012.10/mtocgd/u-boot-2012.10-mtocgd.patch
@@ -1,7 +1,7 @@
 Index: git/include/configs/at91sam9x5ek.h
 ===================================================================
---- git.orig/include/configs/at91sam9x5ek.h	2013-02-11 10:22:38.000000000 -0600
-+++ git/include/configs/at91sam9x5ek.h	2013-02-11 15:17:13.480341903 -0600
+--- git.orig/include/configs/at91sam9x5ek.h	2013-02-12 07:10:12.000000000 -0600
++++ git/include/configs/at91sam9x5ek.h	2013-04-30 16:04:17.741510411 -0500
 @@ -54,6 +54,7 @@
  #define CONFIG_USART_ID		ATMEL_ID_SYS
  
@@ -10,15 +10,18 @@ Index: git/include/configs/at91sam9x5ek.h
  #define CONFIG_LCD
  #define LCD_BPP			LCD_COLOR16
  #define LCD_OUTPUT_BPP		24
-@@ -65,6 +66,7 @@
+@@ -65,6 +66,10 @@
  #define CONFIG_ATMEL_HLCD
  #define CONFIG_ATMEL_LCD_RGB565
  #define CONFIG_SYS_CONSOLE_IS_IN_ENV
 +*/
++
++/*STATUS LED*/
++#define BOOT_STATUS_LED AT91_PIN_PC21
  
  #define CONFIG_BOOTDELAY	3
  
-@@ -120,12 +122,14 @@
+@@ -120,12 +125,14 @@
  /* our CLE is AD22 */
  #define CONFIG_SYS_NAND_MASK_CLE	(1 << 22)
  #define CONFIG_SYS_NAND_ENABLE_PIN	AT91_PIN_PD4
@@ -35,7 +38,7 @@ Index: git/include/configs/at91sam9x5ek.h
  #define CONFIG_PMECC_SECTOR_SIZE	512
  #define CONFIG_PMECC_INDEX_TABLE_OFFSET	0x8000
  
-@@ -140,9 +144,12 @@
+@@ -140,9 +147,12 @@
  
  /* Ethernet */
  #define CONFIG_MACB
@@ -49,7 +52,7 @@ Index: git/include/configs/at91sam9x5ek.h
  
  #define CONFIG_SYS_LOAD_ADDR		0x22000000	/* load address */
  
-@@ -155,9 +162,8 @@
+@@ -155,9 +165,8 @@
  #define CONFIG_ENV_OFFSET		0xc0000
  #define CONFIG_ENV_OFFSET_REDUND	0x100000
  #define CONFIG_ENV_SIZE		0x20000		/* 1 sector = 128 kB */
@@ -61,7 +64,7 @@ Index: git/include/configs/at91sam9x5ek.h
  #else
  #ifdef CONFIG_SYS_USE_SPIFLASH
  /* bootstrap + u-boot + env + linux in spi flash */
-@@ -172,11 +178,8 @@
+@@ -172,11 +181,8 @@
  #endif
  #endif
  
@@ -75,7 +78,7 @@ Index: git/include/configs/at91sam9x5ek.h
  
  #define CONFIG_BAUDRATE		115200
  
-@@ -199,4 +202,22 @@
+@@ -199,4 +205,22 @@
  #error CONFIG_USE_IRQ not supported
  #endif
  
@@ -100,8 +103,8 @@ Index: git/include/configs/at91sam9x5ek.h
  #endif
 Index: git/board/atmel/at91sam9x5ek/at91sam9x5ek.c
 ===================================================================
---- git.orig/board/atmel/at91sam9x5ek/at91sam9x5ek.c	2013-02-11 15:17:48.480015992 -0600
-+++ git/board/atmel/at91sam9x5ek/at91sam9x5ek.c	2013-02-11 15:18:19.468536809 -0600
+--- git.orig/board/atmel/at91sam9x5ek/at91sam9x5ek.c	2013-02-12 07:10:12.000000000 -0600
++++ git/board/atmel/at91sam9x5ek/at91sam9x5ek.c	2013-04-30 16:46:35.241458532 -0500
 @@ -61,7 +61,8 @@
  	csa = readl(&matrix->ebicsa);
  	csa |= AT91_MATRIX_EBI_CS3A_SMC_SMARTMEDIA;
@@ -112,3 +115,26 @@ Index: git/board/atmel/at91sam9x5ek/at91sam9x5ek.c
  
  	/* Configure IO drive */
  	csa &= ~AT91_MATRIX_EBI_EBI_IOSR_NORMAL;
+@@ -266,6 +267,9 @@
+ 
+ int board_init(void)
+ {
++	/* Set Status LED High */
++	at91_set_gpio_output(BOOT_STATUS_LED, 0);
++
+ 	/* arch number of AT91SAM9X5EK-Board */
+ 	gd->bd->bi_arch_number = MACH_TYPE_AT91SAM9X5EK;
+ 
+@@ -288,6 +292,7 @@
+ #ifdef CONFIG_LCD
+ 	at91sam9x5ek_lcd_hw_init();
+ #endif
++
+ 	return 0;
+ }
+ 
+@@ -297,3 +302,4 @@
+ 					CONFIG_SYS_SDRAM_SIZE);
+ 	return 0;
+ }
++
diff --git a/multitech/recipes/u-boot/u-boot_2012.10.bb b/multitech/recipes/u-boot/u-boot_2012.10.bb
index 64b7c80..a91ec92 100644
--- a/multitech/recipes/u-boot/u-boot_2012.10.bb
+++ b/multitech/recipes/u-boot/u-boot_2012.10.bb
@@ -1,4 +1,4 @@
-PR = "r0"
+PR = "r1"
 require recipes/u-boot/u-boot.inc
 
 DEFAULT_PREFERENCE = "-1"