armadeus-commitlog Mailing List for armadeus (Page 77)

Brought to you by: sszy

armadeus-commitlog — Armadeus GIT commit logs

You can subscribe to this list here.

2006	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec (1)
2007	Jan (43)	Feb (8)	Mar (7)	Apr (8)	May (14)	Jun (6)	Jul (4)	Aug (17)	Sep (18)	Oct (19)	Nov (52)	Dec (30)
2008	Jan (6)	Feb (6)	Mar (15)	Apr (22)	May (13)	Jun (11)	Jul (41)	Aug (10)	Sep (14)	Oct (21)	Nov (4)	Dec (66)
2009	Jan (67)	Feb (57)	Mar (90)	Apr (54)	May (64)	Jun (76)	Jul (14)	Aug (18)	Sep (18)	Oct (20)	Nov (15)	Dec (36)
2010	Jan (28)	Feb (25)	Mar (32)	Apr (23)	May (22)	Jun (62)	Jul (36)	Aug (16)	Sep (12)	Oct (20)	Nov (44)	Dec (25)
2011	Jan (36)	Feb (49)	Mar (28)	Apr (38)	May (26)	Jun (52)	Jul (33)	Aug (32)	Sep (19)	Oct (26)	Nov (13)	Dec (32)
2012	Jan (38)	Feb (34)	Mar (91)	Apr (35)	May (31)	Jun (72)	Jul (23)	Aug (13)	Sep (33)	Oct (47)	Nov (18)	Dec (22)
2013	Jan (31)	Feb (22)	Mar (26)	Apr (11)	May (38)	Jun (15)	Jul (37)	Aug (68)	Sep (34)	Oct (11)	Nov (26)	Dec (31)
2014	Jan (60)	Feb (55)	Mar (21)	Apr (31)	May (17)	Jun (35)	Jul (24)	Aug (17)	Sep (11)	Oct (23)	Nov (10)	Dec (23)
2015	Jan (15)	Feb (34)	Mar (46)	Apr (23)	May (12)	Jun (14)	Jul (18)	Aug (22)	Sep (6)	Oct (2)	Nov (1)	Dec (6)
2016	Jan (5)	Feb (7)	Mar (10)	Apr (10)	May (17)	Jun (6)	Jul (4)	Aug (6)	Sep (22)	Oct (8)	Nov (9)	Dec (5)
2017	Jan (11)	Feb (12)	Mar (27)	Apr (9)	May (1)	Jun (5)	Jul (11)	Aug (10)	Sep (6)	Oct (10)	Nov (4)	Dec (6)
2018	Jan (6)	Feb (13)	Mar (9)	Apr (7)	May (10)	Jun (9)	Jul (21)	Aug (13)	Sep (10)	Oct (4)	Nov (6)	Dec (1)
2019	Jan (6)	Feb (2)	Mar (5)	Apr (6)	May (19)	Jun (14)	Jul (18)	Aug (3)	Sep (5)	Oct (7)	Nov (8)	Dec (4)
2020	Jan (10)	Feb (3)	Mar (9)	Apr (7)	May (2)	Jun (18)	Jul (3)	Aug	Sep	Oct (7)	Nov	Dec (1)
2021	Jan (9)	Feb (6)	Mar (4)	Apr (11)	May (7)	Jun (5)	Jul (2)	Aug (4)	Sep (10)	Oct (9)	Nov (5)	Dec
2022	Jan (2)	Feb (12)	Mar (3)	Apr (5)	May (1)	Jun (3)	Jul (2)	Aug (1)	Sep (4)	Oct (4)	Nov (1)	Dec (3)
2023	Jan (5)	Feb (3)	Mar (3)	Apr (2)	May (1)	Jun (3)	Jul (3)	Aug (2)	Sep (1)	Oct (1)	Nov	Dec (4)
2024	Jan (2)	Feb (3)	Mar (8)	Apr (4)	May (1)	Jun (13)	Jul (7)	Aug (1)	Sep (6)	Oct (5)	Nov (11)	Dec (7)
2025	Jan (3)	Feb (1)	Mar (6)	Apr (4)	May (4)	Jun (1)	Jul (1)	Aug (7)	Sep (4)	Oct (4)	Nov (4)	Dec (1)
2026	Jan (3)	Feb (7)	Mar (3)	Apr (1)	May (6)	Jun (3)	Jul (1)	Aug	Sep	Oct	Nov	Dec

Flat | Threaded

<< < 1 .. 75 76 77 78 79 .. 153 > >> (Page 77 of 153)

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-280-geded072

From: jorasse <jo...@us...> - 2012-04-20 10:13:16

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".

The branch, master has been updated
       via  eded072706c3595f717fdbf051d3761830d81240 (commit)
      from  88493df210c67eb2ccb1c27f9e1c95370ff7ba30 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit eded072706c3595f717fdbf051d3761830d81240
Author: Eric Jarrige <eri...@ar...>
Date:   Fri Apr 20 12:24:42 2012 +0200

    [UBOOT] APF51: fix dcdshow command

-----------------------------------------------------------------------

Summary of changes:
 patches/u-boot/2011.12/401-apf51.patch |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/patches/u-boot/2011.12/401-apf51.patch b/patches/u-boot/2011.12/401-apf51.patch
index 5ef9f71..75036b8 100644
--- a/patches/u-boot/2011.12/401-apf51.patch
+++ b/patches/u-boot/2011.12/401-apf51.patch
@@ -1244,7 +1244,7 @@ Index: u-boot-2011.12/board/armadeus/apf51/apf51.c
 +
 +/***************************************************/
 +
-+U_BOOT_CMD(dcdshow, 0, 1, do_mx51_show_dcd_tab,
++U_BOOT_CMD(dcdshow, 1, 1, do_mx51_show_dcd_tab,
 +	   "display mx51 dcd tab\n", "");
 +#endif /* CONFIG_CMD_BSP */
 Index: u-boot-2011.12/board/armadeus/apf51/Makefile


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-279-g88493df

From: jorasse <jo...@us...> - 2012-04-20 10:11:44

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".

The branch, master has been updated
       via  88493df210c67eb2ccb1c27f9e1c95370ff7ba30 (commit)
      from  d289c434f204eb6a1c49ecb31df6e5610483b9fc (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 88493df210c67eb2ccb1c27f9e1c95370ff7ba30
Author: Eric Jarrige <eri...@ar...>
Date:   Fri Apr 20 12:22:54 2012 +0200

    [TOOLS] APF51: support U-Boot version with RAM detect and reduced set of variables

-----------------------------------------------------------------------

Summary of changes:
 software/uboot_recover/apf51_recover.py |  123 ++++++++++++++++--------------
 1 files changed, 66 insertions(+), 57 deletions(-)

diff --git a/software/uboot_recover/apf51_recover.py b/software/uboot_recover/apf51_recover.py
index 634d1b5..efb96b4 100644
--- a/software/uboot_recover/apf51_recover.py
+++ b/software/uboot_recover/apf51_recover.py
@@ -245,47 +245,47 @@ class apf51Bootloader:
     def initIOMUX(self):
         print "SDRAM INIT IOMUX APF",
         # RAS
-        self.put("73FA84A4","00000006","l")
+        self.put("73FA84A4","00000005","l")
         # CAS
-        self.put("73FA84A8","00000006","l")
+        self.put("73FA84A8","00000005","l")
         # SDWE
-        self.put("73FA84AC","000000E6","l")
+        self.put("73FA84AC","000000E5","l")
         # SDCKE0
-        self.put("73FA84B0","000000E6","l")
+        self.put("73FA84B0","000000E5","l")
         # SDCKE1
-        self.put("73FA84B4","000000E6","l")
+        self.put("73FA84B4","000000E5","l")
         # SDCLK
-        self.put("73FA84B8","000000E6","l")
+        self.put("73FA84B8","000000E7","l")
         # SDQS0
-        self.put("73FA84BC","000000C6","l")
+        self.put("73FA84BC","000000C4","l")
         # SDQS1
-        self.put("73FA84C0","000000C6","l")
+        self.put("73FA84C0","000000C4","l")
         # SDQS2
-        self.put("73FA84C4","000000C6","l")
+        self.put("73FA84C4","000000C4","l")
         # SDQS3
-        self.put("73FA84C8","000000C6","l")
+        self.put("73FA84C8","000000C4","l")
         # CS0
-        self.put("73FA84CC","000000E6","l")
+        self.put("73FA84CC","000000E5","l")
         # CS1
-        self.put("73FA84D0","000000E6","l")
+        self.put("73FA84D0","000000E4","l")
         # DQM0
-        self.put("73FA84D4","000000E6","l")
+        self.put("73FA84D4","000000E4","l")
         # DQM1
-        self.put("73FA84D8","000000E6","l")
+        self.put("73FA84D8","000000E4","l")
         # DQM2
-        self.put("73FA84DC","000000E6","l")
+        self.put("73FA84DC","000000E4","l")
         # DQM3
-        self.put("73FA84E0","000000E6","l")
+        self.put("73FA84E0","000000E4","l")
         # DDRPKS
         self.put("73FA8820","00000040","l")
         # DRAM_B4
-        self.put("73FA882C","00000006","l")
+        self.put("73FA882C","00000004","l")
         # PKEDDR
         self.put("73FA8838","00000080","l")
         # DDR_A0
-        self.put("73FA883C","00000006","l")
+        self.put("73FA883C","00000004","l")
         # DDR_A1
-        self.put("73FA8848","00000006","l")
+        self.put("73FA8848","00000004","l")
         # DRAM_SR_B0
         self.put("73FA8878","00000000","l")
         # DDRAPKS
@@ -301,42 +301,20 @@ class apf51Bootloader:
         # DRAM_SR_B4
         self.put("73FA889C","00000000","l")
         # DRAM_B0
-        self.put("73FA88A4","00000006","l")
+        self.put("73FA88A4","00000004","l")
         # DRAM_B1
-        self.put("73FA88AC","00000006","l")
+        self.put("73FA88AC","00000004","l")
         # DDR_SR_A0
-        self.put("73FA88B0","00000000","l")
+        self.put("73FA88B0","00000001","l")
         # DRAM_B2
-        self.put("73FA88B8","00000006","l")
+        self.put("73FA88B8","00000004","l")
         # DDR_SR_A1
-        self.put("73FA88BC","00000000","l")
+        self.put("73FA88BC","00000001","l")
 
-    def initSDRAM2(self):
-        print "SDRAM INIT2 APF",
-        #ESDCTL0: 13 ROW, 10 COL, 32Bit
-        self.put("83FD9008","82220000","l")
-        #ESDSCR: Precharge command 
-        self.put("83FD9014","0400800C","l")
-        #ESDSCR: Refresh command
-        self.put("83FD9014","00008014","l")
-        #ESDSCR: Refresh command
-        self.put("83FD9014","00008014","l")
-        #ESDSCR: LMR with CAS=3 and BL=3 (Burst Length = 8)
-        self.put("83FD9014","0033801C","l")
-        #ESDSCR: EMR with full Drive strength
-        self.put("83FD9014","0000801E","l")
-        #ESDCTL0: 13 ROW, 10 COL, 32Bit, SREF=4
-        self.put("83FD9008","B2420000","l") 
-        #ESDCFG0: tRFC:22clks, tXSR:28clks, tXP:3clks, tWTR:2clk, tRP:3clks, tMRD:2clks
-        #tRAS:8clks, tRRD:2clks, tWR:3clks, tRCD:3clks, tRC:11clks 
-        self.put("83FD900C","C33574AA","l") 
-        #ESDMISC: AP=10, Bank interleaving on, MIF3 en, RALAT=2
-        self.put("83FD9010","000a1700","l")
-
-    def initSDRAM1(self, sdramType):
+    def initSDRAM1(self):
         print "SDRAM INIT1 APF",
         #ESDCTL0: 13 ROW, 10 COL, 32Bit
-        self.put("83FD9000","82220000","l")
+        self.put("83FD9000","83220000","l")
 #        self.put("83FD9000","82120000","l") # 64MB
         #ESDSCR: Precharge command 
         self.put("83FD9014","04008008","l") 
@@ -348,15 +326,39 @@ class apf51Bootloader:
         self.put("83FD9014","00338018","l")
         #ESDSCR: EMR with full Drive strength
         self.put("83FD9014","0000801a","l")
+        self.put("83FD9014","00008000","l")
         #ESDCTL0: 13 ROW, 10 COL, 32Bit, SREF=4
-        self.put("83FD9000","B2220000","l")
+        self.put("83FD9000","B3220000","l")
 #        self.put("83FD9000","D2120000","l") # 64MB
         #ESDCFG0: tRFC:22clks, tXSR:28clks, tXP:3clks, tWTR:2clk, tRP:3clks, tMRD:2clks
         #tRAS:8clks, tRRD:2clks, tWR:3clks, tRCD:3clks, tRC:11clks
-        self.put("83FD9004","c33574aa","l")
+        self.put("83FD9004","501574AA","l")
 #        self.put("83FD9004","FFFFFFFF","l") # 64MB
         #ESDMISC: AP=10, Bank interleaving on, MIF3 en, RALAT=2
-        self.put("83FD9010","c00a5680","l")
+        #self.put("83FD9010","c00a5680","l")
+
+    def initSDRAM2(self):
+        print "SDRAM INIT2 APF",
+        #ESDCTL0: 13 ROW, 10 COL, 32Bit
+        self.put("83FD9008","83220000","l")
+        #ESDSCR: Precharge command 
+        self.put("83FD9014","0400800C","l")
+        #ESDSCR: Refresh command
+        self.put("83FD9014","00008014","l")
+        #ESDSCR: Refresh command
+        self.put("83FD9014","00008014","l")
+        #ESDSCR: LMR with CAS=3 and BL=3 (Burst Length = 8)
+        self.put("83FD9014","0033801C","l")
+        #ESDSCR: EMR with full Drive strength
+        self.put("83FD9014","0000801E","l")
+        self.put("83FD9014","00008004","l")
+        #ESDCTL0: 13 ROW, 10 COL, 32Bit, SREF=4
+        self.put("83FD9008","B3220000","l") 
+        #ESDCFG0: tRFC:22clks, tXSR:28clks, tXP:3clks, tWTR:2clk, tRP:3clks, tMRD:2clks
+        #tRAS:8clks, tRRD:2clks, tWR:3clks, tRCD:3clks, tRC:11clks 
+        self.put("83FD900C","501574AA","l") 
+        #ESDMISC: AP=10, Bank interleaving on, MIF3 en, RALAT=2
+        self.put("83FD9010","000A5680","l")
 
     def consoleDump(tid):
         while 1:
@@ -436,10 +438,10 @@ class UBoot:
             self.serial.write("\003")
         return self.__getOutput()
 
-    def flash(self):
+    def flash(self, addr, size):
         """ Ask U-Boot to flash itself """
         self.serial.flushInput()
-        self.serial.write("run flash_uboot\n")
+        self.serial.write("setenv fileaddr "+addr+"; setenv filesize "+fsize+";run flash_uboot\n")
         try:
             ret = self.__getOutput()
         except Error,e:
@@ -538,7 +540,7 @@ if __name__ == "__main__":
         port = '/dev/ttyACM0'
 
     try:
-        ser = serial.Serial(port, SPEED, timeout=2)
+        ser = serial.Serial(port, SPEED, timeout=4)
     except Exception, msg:
         print "unable to open serial port %s !" % port
         print msg
@@ -552,9 +554,16 @@ if __name__ == "__main__":
 
     apfBootloader.getStatus()
     apfBootloader.initIOMUX()
-    apfBootloader.initSDRAM1("APF51")
+    apfBootloader.initSDRAM1()
+    apfBootloader.initSDRAM2()
     #clear configuration request
-    apfBootloader.put("83FD9014","00000000","l")
+    apfBootloader.put("83FD9014", "00000000","l")
+    apfBootloader.put("83FD9034", "20020000", "l")
+    apfBootloader.put("83FD9020", "00F48000", "l")
+    apfBootloader.put("83FD9024", "00F48000", "l")
+    apfBootloader.put("83FD9028", "00F48000", "l")
+    apfBootloader.put("83FD902C", "00F48000", "l")
+    apfBootloader.put("83FD9030", "00F48000", "l")
     #testRAM()
 
     print "--- Successfully initialized APF51, now loading U-Boot"
@@ -573,7 +582,7 @@ if __name__ == "__main__":
     eraseAll = raw_input('\n--- Would you like to erase the environment variables ? y/N: ')
     if eraseAll == 'y':
         uboot.resetEnv()
-    uboot.flash()
+    uboot.flash("90000000", fsize)
     print "\n--- U-Boot successfully recovered !"
     print "--- Now you can remove miniUSB OTG cable and bootstrap jumper. Then, restart your board"
 


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-278-gd289c43

From: jorasse <jo...@us...> - 2012-04-19 23:35:35

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".

The branch, master has been updated
       via  d289c434f204eb6a1c49ecb31df6e5610483b9fc (commit)
      from  35902a27e059d1edd7372115b4aa261b30875d35 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit d289c434f204eb6a1c49ecb31df6e5610483b9fc
Author: Eric Jarrige <eri...@ar...>
Date:   Fri Apr 20 01:46:48 2012 +0200

    [UBOOT][APF9328] remove predefined var filesize/fileaddr - fix typo

-----------------------------------------------------------------------

Summary of changes:
 .../armadeus/apf9328/apf9328-u-boot-2011.12.h      |   28 +++++++++----------
 patches/u-boot/2011.12/103-apf9328.patch           |    8 +++---
 2 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/buildroot/target/device/armadeus/apf9328/apf9328-u-boot-2011.12.h b/buildroot/target/device/armadeus/apf9328/apf9328-u-boot-2011.12.h
index e6f7343..2f1f0b8 100644
--- a/buildroot/target/device/armadeus/apf9328/apf9328-u-boot-2011.12.h
+++ b/buildroot/target/device/armadeus/apf9328/apf9328-u-boot-2011.12.h
@@ -23,8 +23,8 @@
 #define __CONFIG_H
 
 #define CONFIG_VERSION_VARIABLE
-#define CONFIG_ENV_VERSION 	"5.0"
-#define CONFIG_IDENT_STRING	" apf9328 patch 5.0"
+#define CONFIG_ENV_VERSION 	"5.1"
+#define CONFIG_IDENT_STRING	" apf9328 patch 5.1"
 #define CONFIG_BOARD_NAME	apf9328
 
 /*
@@ -112,14 +112,14 @@
  */
 #define	CONFIG_SYS_MONITOR_BASE	0x10000000
 #define	CONFIG_SYS_MONITOR_LEN	0x00040000	/* 256kB ( 2 flash sector ) */
-#define	CONFIG_ENV_IS_IN_FLASH	1
+#define	CONFIG_ENV_IS_IN_FLASH
+#define	CONFIG_ENV_OVERWRITE
 #define	CONFIG_ENV_ADDR		0x10040000	/* absolute address for now */
 #define	CONFIG_ENV_SIZE		0x00020000
 #define	CONFIG_ENV_SECT_SIZE	0x00020000
 #define	CONFIG_ENV_ADDR_REDUND	\
 		(CONFIG_ENV_ADDR + CONFIG_ENV_SIZE)	/* +128kB */
 #define	CONFIG_ENV_SIZE_REDUND	CONFIG_ENV_SIZE	/* 128kB */
-#define	CONFIG_ENV_OVERWRITE	1		/* env is writable now */
 #define	CONFIG_FIRMWARE_ADDR	0x10080000
 #define	CONFIG_FIRMWARE_LEN	0x00040000	/* 256kB ( 2 flash sector ) */
 #define	CONFIG_KERNEL_ADDR	0x100C0000
@@ -186,8 +186,6 @@
  */
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	"env_version="		CONFIG_ENV_VERSION		"\0"	\
-	"fileaddr="		MK_STR(CONFIG_SYS_LOAD_ADDR)	"\0"	\
-	"filesize="		MK_STR(CONFIG_SYS_MONITOR_LEN)	"\0"	\
 	"consoledev="		MK_STR(ACFG_CONSOLE_DEV)	"\0"	\
 	"mtdparts="		MTDPARTS_DEFAULT		"\0"	\
 	"partition=nor0,5\0"				\
@@ -272,12 +270,12 @@
 #define CONFIG_SYS_MAX_FLASH_SECT	256	/* max 32MB of FLASH memory */
 #define CONFIG_SYS_FLASH_BASE		0x10000000 /* location of flash memory*/
 
-#define	CONFIG_SYS_FLASH_CFI			1
-#define CONFIG_FLASH_CFI_DRIVER			1
+#define	CONFIG_SYS_FLASH_CFI
+#define CONFIG_FLASH_CFI_DRIVER
 #define CONFIG_FLASH_CFI_MTD
-#define CONFIG_SYS_FLASH_USE_BUFFER_WRITE 	1
-#define CONFIG_SYS_FLASH_PROTECTION		1
-#define CONFIG_SYS_DIRECT_FLASH_TFTP		1
+#define CONFIG_SYS_FLASH_USE_BUFFER_WRITE
+#define CONFIG_SYS_FLASH_PROTECTION
+#define CONFIG_SYS_DIRECT_FLASH_TFTP
 #define CONFIG_FLASH_SHOW_PROGRESS		45
 /*
  * This is setting for JFFS2 support in u-boot.
@@ -291,11 +289,11 @@
 /* DM9000 ethernet chipset assigned to CS4 */
 /* For the apf board DM9000 base is 0x15C00000 and data is base+2	*/
 /* For the apm board DM9000 base is 0x15C3FFFC and data is base+4	*/
-#define CONFIG_DRIVER_DM9000	1
+#define CONFIG_DRIVER_DM9000
 #define CONFIG_DM9000_BASE	0x15C00000
 #define DM9000_IO		CONFIG_DM9000_BASE
 #define DM9000_DATA		(CONFIG_DM9000_BASE+2)
-#define CONFIG_NETCONSOLE 1
+#define CONFIG_NETCONSOLE
 
 /*
  * FPGA
@@ -320,13 +318,13 @@
 /*
  * I2C bus
  */
-#define	CONFIG_HARD_I2C		1	/* I2C with hardware support	*/
+#define	CONFIG_HARD_I2C			/* I2C with hardware support	*/
 
 #define CONFIG_SYS_I2C_SPEED		400000	/* 400 kHz */
 #define CONFIG_SYS_I2C_SLAVE		0x7F
 
 #define CONFIG_SYS_I2C_EEPROM_ADDR	0x50	/* EEPROM 24LC256	*/
-#define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 2	/* bytes of address	*/
+#define CONFIG_SYS_I2C_EEPROM_ADDR_LEN	2	/* bytes of address	*/
 /* mask of address bits that overflow into the "EEPROM chip address"	*/
 /*#define CONFIG_SYS_I2C_EEPROM_ADDR_OVERFLOW	0x00*/
 #define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS	6
diff --git a/patches/u-boot/2011.12/103-apf9328.patch b/patches/u-boot/2011.12/103-apf9328.patch
index 752743b..37cd173 100644
--- a/patches/u-boot/2011.12/103-apf9328.patch
+++ b/patches/u-boot/2011.12/103-apf9328.patch
@@ -149,11 +149,11 @@ Index: u-boot-custom/board/armadeus/apf9328/apf9328.c
 +{
 +	char *s;
 +
-+#if (CONFIG_FPGA)
++#ifdef CONFIG_FPGA
 +	apf9328_init_fpga();
 +#endif
 +
-+#if (CONFIG_DRIVER_DM9000)
++#ifdef CONFIG_DRIVER_DM9000
 +	imx_gpio_mode(GPIO_PORTB | GPIO_DR | GPIO_IN | 14);
 +#endif
 +
@@ -234,7 +234,7 @@ Index: u-boot-custom/board/armadeus/apf9328/apf9328fpga.c
 +#include <asm/io.h>
 +#include "apf9328fpga.h"
 +
-+#if (CONFIG_FPGA)
++#ifdef CONFIG_FPGA
 +DECLARE_GLOBAL_DATA_PTR;
 +/* Note that these are pointers to code that is in Flash.  They will be
 + * relocated at runtime.
@@ -451,7 +451,7 @@ Index: u-boot-custom/board/armadeus/apf9328/fpga.c
 + */
 +#include <common.h>
 +
-+#if (CONFIG_FPGA)
++#ifdef CONFIG_FPGA
 +
 +#include <asm/arch/imx-regs.h>
 +#include <asm/io.h>


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-277-g35902a2

From: jorasse <jo...@us...> - 2012-04-19 22:05:20

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".

The branch, master has been updated
       via  35902a27e059d1edd7372115b4aa261b30875d35 (commit)
      from  8e9e4003e53446f39a9a87770bb4e1afe73dab88 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 35902a27e059d1edd7372115b4aa261b30875d35
Author: Eric Jarrige <eri...@ar...>
Date:   Fri Apr 20 00:16:26 2012 +0200

    [BUILDROOT] fix uboot-tools to support all the APF boards

-----------------------------------------------------------------------

Summary of changes:
 ...nore-env_sectors-on-NOR-and-SPI-dataflash.patch |   46 ++++++++++++++++++++
 patches/buildroot/2012.02/cleanup_buildroot.sh     |    6 ++-
 2 files changed, 50 insertions(+), 2 deletions(-)
 create mode 100644 patches/buildroot/2012.02/186-uboot-tools-2011.03-Ignore-env_sectors-on-NOR-and-SPI-dataflash.patch

diff --git a/patches/buildroot/2012.02/186-uboot-tools-2011.03-Ignore-env_sectors-on-NOR-and-SPI-dataflash.patch b/patches/buildroot/2012.02/186-uboot-tools-2011.03-Ignore-env_sectors-on-NOR-and-SPI-dataflash.patch
new file mode 100644
index 0000000..02b47b9
--- /dev/null
+++ b/patches/buildroot/2012.02/186-uboot-tools-2011.03-Ignore-env_sectors-on-NOR-and-SPI-dataflash.patch
@@ -0,0 +1,46 @@
+[uboot-tools] Ignore env_sectors on NOR and SPI-dataflash 
+
+fw_env doc declare that 'the "Number of sectors" is ignored on NOR and 
+SPI-dataflash' but it is wrong and would be usefull to use the same
+configuration file for different boards. This patch aims to fix this issue for
+all the Armadeus boards.
+
+Signed-off-by: Eric Jarrige <eri...@ar...>
+---
+Index: buildroot/package/uboot-tools/uboot-tools-2011.03-Ignore-env_sectors-on-NOR-and-SPI-dataflash.patch
+===================================================================
+--- buildroot/package/uboot-tools/uboot-tools-2011.03-Ignore-env_sectors-on-NOR-and-SPI-dataflash.patch
++++ buildroot/package/uboot-tools/uboot-tools-2011.03-Ignore-env_sectors-on-NOR-and-SPI-dataflash.patch
+@@ -0,0 +1,32 @@
++[PATCH] Ignore env_sectors on NOR and SPI-dataflash
++
++fw_env doc declare that 'the "Number of sectors" is ignored on NOR and 
++SPI-dataflash' but it is wrong and would be usefull to use the same
++configuration file for different boards. This patch aims to fix this issue for
++all the Armadeus boards.
++
++Signed-off-by: Eric Jarrige <eri...@ar...>
++---
++Index: u-boot-2011.03/tools/env/fw_env.c
++===================================================================
++--- uboot-tools-2011.03/tools/env/fw_env.c
+++++ uboot-tools-2011.03/tools/env/fw_env.c
++@@ -777,9 +777,15 @@ static int flash_write_buf (int dev, int
++ 
++ 	blocklen = DEVESIZE (dev);
++ 
++-	/* Erase sector size is always a power of 2 */
++-	top_of_range = (DEVOFFSET (dev) & ~(blocklen - 1)) +
++-		ENVSECTORS (dev) * blocklen;
+++	/* Ignored env_sectors on NOR and SPI-dataflash */
+++	if (mtd_type == MTD_NANDFLASH) {
+++		/* Erase sector size is always a power of 2 */
+++		top_of_range = (DEVOFFSET (dev) & ~(blocklen - 1)) +
+++			ENVSECTORS (dev) * blocklen;
+++	} else {
+++		top_of_range = (DEVOFFSET (dev) & ~(blocklen - 1)) +
+++			blocklen;
+++	}
++ 
++ 	erase_offset = offset & ~(blocklen - 1);
++ 
diff --git a/patches/buildroot/2012.02/cleanup_buildroot.sh b/patches/buildroot/2012.02/cleanup_buildroot.sh
index c988b60..da47017 100755
--- a/patches/buildroot/2012.02/cleanup_buildroot.sh
+++ b/patches/buildroot/2012.02/cleanup_buildroot.sh
@@ -69,5 +69,7 @@ rm -rf buildroot/package/imx-lib/
 rm -rf buildroot/package/imx-test/
 rm -rf buildroot/package/e2fsprogs/
 rm -rf buildroot/package/firmware-imx/
-rm -rf  buildroot/package/multimedia/gst-fsl-plugin/
-rm -rf  buildroot/package/multimedia/fsl-mm-codeclib/
+rm -rf buildroot/package/multimedia/gst-fsl-plugin/
+rm -rf buildroot/package/multimedia/fsl-mm-codeclib/
+rm -rf buildroot/package/uboot-tools/
+


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-276-g8e9e400

From: jorasse <jo...@us...> - 2012-04-19 15:30:20

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".

The branch, master has been updated
       via  8e9e4003e53446f39a9a87770bb4e1afe73dab88 (commit)
      from  fc3002de7891e356c505d9490cddf6a34c9cfb5b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 8e9e4003e53446f39a9a87770bb4e1afe73dab88
Author: Eric Jarrige <eri...@ar...>
Date:   Thu Apr 19 17:41:24 2012 +0200

    [ROOTFS] add fw_printenv/fw_setenv configuration file - this file aims to be compliant with all the Armadeus boards

-----------------------------------------------------------------------

Summary of changes:
 .../rootfs/target_skeleton/etc/fw_env.config       |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)
 create mode 100644 buildroot/target/device/armadeus/rootfs/target_skeleton/etc/fw_env.config

diff --git a/buildroot/target/device/armadeus/rootfs/target_skeleton/etc/fw_env.config b/buildroot/target/device/armadeus/rootfs/target_skeleton/etc/fw_env.config
new file mode 100644
index 0000000..4a05c29
--- /dev/null
+++ b/buildroot/target/device/armadeus/rootfs/target_skeleton/etc/fw_env.config
@@ -0,0 +1,12 @@
+# Configuration file for fw_(printenv/saveenv) utility.
+# Up to two entries are valid, in this case the redundant
+# environment sector is assumed present.
+# Notice, that the "Number of sectors" is ignored on NOR and SPI-dataflash.
+# Futhermore, if the Flash sector size is ommitted, this value is assumed to
+# be the same as the Environment size, which is valid for NOR and SPI-dataflash
+
+# Armadeus boards default environment configuration
+# MTD device name	Device offset	Env. size	Flash sector size	Number of sectors
+/dev/mtd1		0x0000		0x20000		0x20000			4
+/dev/mtd2		0x0000		0x20000		0x20000			4
+


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-275-gfc3002d

From: jorasse <jo...@us...> - 2012-04-18 23:44:00

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".

The branch, master has been updated
       via  fc3002de7891e356c505d9490cddf6a34c9cfb5b (commit)
       via  afad0dd4e4338c71a6ffc095ea3aba3bc25b12ad (commit)
      from  21440c21c5195299324e64253b9435501f28f6ab (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit fc3002de7891e356c505d9490cddf6a34c9cfb5b
Merge: afad0dd 21440c2
Author: Eric Jarrige <eri...@ar...>
Date:   Thu Apr 19 01:55:18 2012 +0200

    Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus

commit afad0dd4e4338c71a6ffc095ea3aba3bc25b12ad
Author: Eric Jarrige <eri...@ar...>
Date:   Thu Apr 19 01:54:26 2012 +0200

    [UBOOT][APF51] Refactor config file + support redundant environment + cleanup

-----------------------------------------------------------------------

Summary of changes:
 .../device/armadeus/apf51/apf51-u-boot-2011.12.h   |  202 +++++++-------------
 1 files changed, 70 insertions(+), 132 deletions(-)

diff --git a/buildroot/target/device/armadeus/apf51/apf51-u-boot-2011.12.h b/buildroot/target/device/armadeus/apf51/apf51-u-boot-2011.12.h
index 929b366..c6f3261 100644
--- a/buildroot/target/device/armadeus/apf51/apf51-u-boot-2011.12.h
+++ b/buildroot/target/device/armadeus/apf51/apf51-u-boot-2011.12.h
@@ -24,8 +24,8 @@
 #define __CONFIG_H
 
 #define CONFIG_VERSION_VARIABLE
-#define CONFIG_ENV_VERSION 	"0.9"
-#define CONFIG_IDENT_STRING	" apf51 patch 0.11"
+#define CONFIG_ENV_VERSION 	"1.0"
+#define CONFIG_IDENT_STRING	" apf51 patch 1.0"
 #define CONFIG_BOARD_NAME	apf51
 
 /*
@@ -78,7 +78,6 @@
 */
 
 #define CONFIG_HOSTNAME		CONFIG_BOARD_NAME
-#define CONFIG_SRV_PATH		""
 #define CONFIG_ROOTPATH		"/tftpboot/" MK_STR(CONFIG_BOARD_NAME) "-root"
 
 /*
@@ -99,7 +98,6 @@
 #define CONFIG_CMD_NAND_TRIMFFS
 #define CONFIG_CMD_NFS
 #define CONFIG_CMD_PING		/* ping support                 */
-/*#define CONFIG_CMD_SAVES*/	/* save S record dump		*/
 /*#define CONFIG_CMD_SETEXPR*/	/* setexpr support		*/
 /*#define CONFIG_CMD_UBI*/
 /*#define CONFIG_CMD_UBIFS*/
@@ -110,9 +108,9 @@
 #define CONFIG_NR_DRAM_POPULATED	1
 #define CONFIG_NR_DRAM_BANKS		2
 #define CONFIG_SYS_SDRAM_BASE		CSD0_BASE_ADDR	/* SDRAM bank #1 */
-#define PHYS_SDRAM_SIZE 256
-#define PHYS_SDRAM_1_SIZE	(PHYS_SDRAM_SIZE) * 1024 * 1024
-#define PHYS_SDRAM_2_SIZE	(PHYS_SDRAM_SIZE) * 1024 * 1024
+#define PHYS_SDRAM_SIZE			256
+#define PHYS_SDRAM_1_SIZE		(PHYS_SDRAM_SIZE) * 1024 * 1024
+#define PHYS_SDRAM_2_SIZE		(PHYS_SDRAM_SIZE) * 1024 * 1024
 #define CONFIG_SYS_MALLOC_LEN		(CONFIG_ENV_SIZE + (2 * 1024 * 1024) )
 #define CONFIG_SYS_MEMTEST_START	0x90000000	/* memtest works on */
 #define CONFIG_SYS_MEMTEST_END		0x90100000	/* 1st MiB in DRAM */
@@ -120,9 +118,8 @@
 #define CONFIG_SYS_INIT_RAM_ADDR	(IRAM_BASE_ADDR)
 #define CONFIG_SYS_INIT_RAM_SIZE	(IRAM_SIZE)
 
-#define CONFIG_SYS_GBL_DATA_OFFSET \
+#define CONFIG_SYS_INIT_SP_OFFSET \
 	(CONFIG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE)
-#define CONFIG_SYS_INIT_SP_OFFSET	CONFIG_SYS_GBL_DATA_OFFSET
 #define CONFIG_SYS_INIT_SP_ADDR \
 	(CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
 
@@ -133,22 +130,29 @@
  */
 #define	CONFIG_SYS_MONITOR_OFFSET	0x00000000	/* offset in NAND */
 #define	CONFIG_SYS_MONITOR_LEN		0x00100000	/* 1MB */
+#define CONFIG_ENV_IS_IN_NAND
+#define	CONFIG_ENV_OVERWRITE
 #define	CONFIG_ENV_OFFSET		0x00100000	/* NAND offset */
 #define	CONFIG_ENV_SIZE			0x00020000	/* 128kB  */
-#define CONFIG_ENV_RANGE		0x00100000	/* 1MB */
+#define CONFIG_ENV_RANGE		0x00080000	/* 512kB */
+#define	CONFIG_ENV_OFFSET_REDUND	\
+		(CONFIG_ENV_OFFSET + CONFIG_ENV_RANGE)	/* +512kB */
+#define	CONFIG_ENV_SIZE_REDUND		CONFIG_ENV_SIZE	/* 512kB */
 #define	CONFIG_FIRMWARE_OFFSET		0x00200000
-#define	CONFIG_FIRMWARE_LEN		0x00100000	/* 1MB */
-#define	CONFIG_KERNEL_OFFSET		0x00300000
-#define	CONFIG_KERNEL_LEN		0x00800000	/* 8MB (BB ready) */
-#define	CONFIG_ROOTFS_OFFSET		0x00B00000
-#define	CONFIG_ROOTFS_LEN	/* entire flash if not specified */
-
-#define CONFIG_MTDMAP   "mxc_nand"
-#define MTDIDS_DEFAULT	"nand0=" CONFIG_MTDMAP
-#define MTDPARTS_DEFAULT "mtdparts=" CONFIG_MTDMAP ":1M(U-boot)ro,"	\
-			"1M(U-boot_env),1M(firmware),"			\
-			"8M(kernel),"	\
-			"-(rootfs)"
+#define	CONFIG_KERNEL_OFFSET		0x00400000
+#define	CONFIG_ROOTFS_OFFSET		0x00C00000
+
+#define CONFIG_MTDMAP   		"mxc_nand"
+#define MTDIDS_DEFAULT			"nand0=" CONFIG_MTDMAP
+#define MTDPARTS_DEFAULT	"mtdparts=" CONFIG_MTDMAP \
+				":1M(u-boot)ro," \
+				"512K(env),"	\
+				"512K(env2),"	\
+				"1M(firmware)," \
+				"512K(dtb),"	\
+				"512K(splash),"	\
+				"8M(kernel),"	\
+				"-(rootfs)"
 
 /*
  * U-Boot general configurations
@@ -180,17 +184,18 @@
 
 #define CONFIG_BOOTDELAY	5
 #define CONFIG_ZERO_BOOTDELAY_CHECK
-#define	CONFIG_BOOTFILE		"${board_name}-linux.bin"
-#define CONFIG_BOOTARGS \
-	CONFIG_CONSOLE " root=/dev/mtdblock4 rootfstype=ubifs " MTDPARTS_DEFAULT
+#define	CONFIG_BOOTFILE		MK_STR(CONFIG_BOARD_NAME) "-linux.bin"
+#define CONFIG_BOOTARGS 	"console=" MK_STR(ACFG_CONSOLE_DEV) "," \
+				MK_STR(CONFIG_BAUDRATE) " " MTDPARTS_DEFAULT \
+			" ubi.mtd=rootfs root=ubi0:rootfs rootfstype=ubifs "
 
-#define CONFIG_CONSOLE "console=ttymxc2,"MK_STR(CONFIG_BAUDRATE)
+#define ACFG_CONSOLE_DEV	ttymxc2
 #define CONFIG_BOOTCOMMAND	"run ubifsboot"
 #define CONFIG_SYS_AUTOLOAD	"no"
 /*
  * Default load address for user programs and kernel
  */
-#define CONFIG_LOADADDR		0x90000000
+#define CONFIG_LOADADDR			0x90000000
 #define CONFIG_SYS_LOAD_ADDR		CONFIG_LOADADDR
 #define CONFIG_SYS_TFTP_LOADADDR	CONFIG_LOADADDR
 
@@ -199,79 +204,62 @@
  */
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	"env_version="		CONFIG_ENV_VERSION			"\0" \
-	"fileaddr="		MK_STR(CONFIG_SYS_LOAD_ADDR)		"\0" \
-	"filesize="		MK_STR(CONFIG_SYS_MONITOR_LEN)		"\0" \
-	"console="		CONFIG_CONSOLE				"\0" \
+	"consoledev="		MK_STR(ACFG_CONSOLE_DEV)		"\0" \
 	"mtdparts="		MTDPARTS_DEFAULT			"\0" \
-	"partition=nand0,4\0"						\
-	"uboot_offset="		MK_STR(CONFIG_SYS_MONITOR_OFFSET)	"\0" \
-	"uboot_len="		MK_STR(CONFIG_SYS_MONITOR_LEN)		"\0" \
-	"env_offset="		MK_STR(CONFIG_ENV_OFFSET)		"\0" \
-	"env_len="		MK_STR(CONFIG_ENV_RANGE)		"\0" \
-	"firmware_offset="	MK_STR(CONFIG_FIRMWARE_OFFSET)		"\0" \
-	"firmware_len="		MK_STR(CONFIG_FIRMWARE_LEN)		"\0" \
-	"kernel_offset="	MK_STR(CONFIG_KERNEL_OFFSET)		"\0" \
-	"kernel_len="		MK_STR(CONFIG_KERNEL_LEN)		"\0" \
-	"rootfs_offset="	MK_STR(CONFIG_ROOTFS_OFFSET)		"\0" \
-	"rootfs_len="		MK_STR(CONFIG_ROOTFS_LEN)		"\0" \
+	"partition=nand0,7\0"						\
+	"uboot_addr="		MK_STR(CONFIG_SYS_MONITOR_OFFSET)	"\0" \
+	"env_addr="		MK_STR(CONFIG_ENV_OFFSET)		"\0" \
+	"firmware_addr="	MK_STR(CONFIG_FIRMWARE_OFFSET)		"\0" \
+	"kernel_addr="		MK_STR(CONFIG_KERNEL_OFFSET)		"\0" \
+	"rootfs_addr="		MK_STR(CONFIG_ROOTFS_OFFSET)		"\0" \
 	"board_name="		MK_STR(CONFIG_BOARD_NAME)		"\0" \
-	"serverpath="		MK_STR(CONFIG_SRV_PATH)			"\0" \
-	"ntpserverip=217.147.208.1\0"					\
-	"mmcroot=/dev/mmcblk0p1\0"					\
-	"mmcrootfstype=ext2\0"						\
 	"addnfsargs=setenv bootargs ${bootargs} "			\
 		"root=/dev/nfs rw nfsroot=${serverip}:${rootpath}\0"    \
 	"addubifsargs=setenv bootargs ${bootargs} "			\
 		"ubi.mtd=rootfs root=ubi0:rootfs rootfstype=ubifs\0"    \
 	"addmmcargs=setenv bootargs ${bootargs} "			\
-		"root=${mmcroot} rootfstype=${mmcrootfstype}\0"   	\
+		"root=/dev/mmcblk0p1 rootfstype=ext2\0"   		\
 	"addipargs=setenv bootargs ${bootargs} "			\
 		"ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:"	\
 		"${hostname}:eth0:off\0"				\
-	"nfsboot=setenv bootargs ${console} ${mtdparts};"		\
-		"run addnfsargs addipargs; setenv autostart yes;"	\
-		"nboot 90800000 0 ${kernel_offset}\0"		\
-	"ubifsboot=setenv bootargs ${console} ${mtdparts};"		\
-		"run addubifsargs addipargs; setenv autostart yes;"	\
-		"nboot 90800000 0 ${kernel_offset}\0"		\
-	"mmcboot=setenv bootargs ${console} ${mtdparts};"		\
-		"run addmmcargs addipargs; setenv autostart yes;"	\
-		"nboot 90800000 0 ${kernel_offset}\0"		\
+	"nfsboot=setenv bootargs console=${consoledev},${baudrate} "	\
+		"${mtdparts}; run addnfsargs addipargs; setenv autostart yes;" \
+		"nboot 90800000 0 ${kernel_addr}\0"			\
+	"ubifsboot=setenv bootargs console=${consoledev},${baudrate} "	\
+		"${mtdparts};run addubifsargs addipargs; setenv autostart yes;"\
+		"nboot 90800000 0 ${kernel_addr}\0"			\
+	"mmcboot=setenv bootargs console=${consoledev},${baudrate} "	\
+		"${mtdparts}; run addmmcargs addipargs; setenv autostart yes;" \
+		"nboot 90800000 0 ${kernel_addr}\0"			\
 	"firmware_autoload=0\0"						\
-	"flash_uboot=nand unlock ${uboot_offset} ${uboot_len};"		\
-		"nand erase ${uboot_offset} ${uboot_len};"		\
-		"if nand write.trimffs ${fileaddr} ${uboot_offset} ${filesize};" \
-			"then nand lock; nand unlock ${env_offset};"	\
+	"flash_uboot=nand unlock ${uboot_addr} ;"			\
+		"nand erase.part u-boot;"				\
+		"if nand write.trimffs ${fileaddr} ${uboot_addr} ${filesize};"\
+			"then nand lock; nand unlock ${env_addr};"	\
 				"echo Flashing of uboot succeed;"	\
 			"else echo Flashing of uboot failed;"		\
 		"fi; \0"						\
-	"flash_firmware=nand erase ${firmware_offset} ${firmware_len};" \
-		"if nand write.trimffs ${fileaddr} ${firmware_offset}"	\
+	"flash_firmware=nand erase.part firmware;" \
+		"if nand write.trimffs ${fileaddr} ${firmware_addr}"	\
 			" ${filesize};"					\
 			"then echo Flashing of Firmware succeed;"	\
 			"else echo Flashing of Firmware failed;"	\
 		"fi\0"							\
-	"fpga_config=tftpboot ${fileaddr} $firmware_name;"		\
-		"run flash_firmware;"					\
-		"fpga load 0 ${fileaddr} ${firmware_len};\0"		\
-	"flash_kernel=nand erase ${kernel_offset} ${kernel_len};"	\
-		"if nand write.trimffs ${fileaddr} ${kernel_offset} ${filesize};"\
+	"flash_kernel=nand erase.part kernel;"	\
+		"if nand write.trimffs ${fileaddr} ${kernel_addr} ${filesize};"\
 			"then echo Flashing of kernel succeed;"		\
 			"else echo Flashing of kernel failed;"		\
 		"fi\0"							\
 	"flash_rootfs=nand erase.part rootfs;"	\
-		"if nand write.trimffs ${fileaddr} ${rootfs_offset} ${filesize};"\
+		"if nand write.trimffs ${fileaddr} ${rootfs_addr} ${filesize};"\
 			"then echo Flashing of rootfs succeed;"		\
 			"else echo Flashing of rootfs failed;"		\
 		"fi\0"							\
 	"flash_reset_env=env default -f; saveenv;"			\
 		"echo Flash environment variables erased!\0"		\
-	"download_uboot=tftpboot ${loadaddr} "				\
-		" ${serverpath}${board_name}-u-boot-nand.bin\0"		\
-	"download_kernel=tftpboot ${loadaddr} "				\
-		" ${serverpath}${board_name}-linux.bin\0"		\
-	"download_rootfs=tftpboot ${loadaddr} "				\
-		" ${serverpath}${board_name}-rootfs.ubi\0"		\
+	"download_uboot=tftpboot ${loadaddr} ${board_name}-u-boot-nand.bin\0" \
+	"download_kernel=tftpboot ${loadaddr} ${board_name}-linux.bin\0" \
+	"download_rootfs=tftpboot ${loadaddr} ${board_name}-rootfs.ubi\0" \
 	"update_uboot=run download_uboot flash_uboot\0"			\
 	"update_kernel=run download_kernel flash_kernel\0"		\
 	"update_rootfs=run download_rootfs flash_rootfs\0"		\
@@ -283,9 +271,9 @@
  * Serial Driver
  */
 #define CONFIG_MXC_UART
-#define CONFIG_MXC_UART_BASE	UART3_BASE
-#define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 }
-#define CONFIG_BAUDRATE		115200
+#define CONFIG_MXC_UART_BASE		UART3_BASE
+#define CONFIG_SYS_BAUDRATE_TABLE 	{ 9600, 19200, 38400, 57600, 115200 }
+#define CONFIG_BAUDRATE			115200
 
 /*
  * GPIO
@@ -312,10 +300,6 @@
 #define CONFIG_FLASH_SHOW_PROGRESS	45
 #define CONFIG_SYS_NAND_QUIET		1
 
-/* Environment is in NAND */
-#define CONFIG_ENV_IS_IN_NAND
-#define	CONFIG_ENV_OVERWRITE			/* env is writable now   */
-
 /*
  * Partitions & Filsystems
  */
@@ -417,9 +401,9 @@
 /*
  * Clocks
  */
-#define	CONFIG_SYS_HZ		1000	/* Ticks per second */
-#define CONFIG_SYS_MX5_CLK32	32768
-#define CONFIG_SYS_MX5_HCLK	1024*CONFIG_SYS_MX5_CLK32
+#define	CONFIG_SYS_HZ			1000	/* Ticks per second */
+#define CONFIG_SYS_MX5_CLK32		32768
+#define CONFIG_SYS_MX5_HCLK		1024*CONFIG_SYS_MX5_CLK32
 #define CONFIG_MX51_PLL_ERRATA
 
 /* external bus frequencies */
@@ -502,51 +486,6 @@
  * ACFG_SDRAM_SINGLE_ACCESS	1= single access; 0 = Burst mode
  *
  */
-#if (PHYS_SDRAM_SIZE == 64)	/* micron MT46H16M32LF -6 */
-/* micron 64MB */
-#define ACFG_SDRAM_NUM_COL		9	/* 8..11 column address bits */
-#define ACFG_SDRAM_NUM_ROW		13	/* 11..13 row address bits */
-#define ACFG_SDRAM_REFRESH		3	/* 0=OFF 1=2048 2=4096 3=8192.*/
-#define ACFG_SDRAM_XSR_DELAY		138	/* ns Exit self refresh */
-#define ACFG_SDRAM_EXIT_PWD		10	/* ns exit power down delay */
-#define ACFG_SDRAM_W2R_DELAY		1	/* 0=1ck 1=2ck  */
-#define ACFG_SDRAM_ROW_PRECHARGE_DELAY	15	/* ns (>2 x ddr_clk) */
-#define ACFG_SDRAM_TMRD_DELAY		2	/* 1..4 */
-#define ACFG_SDRAM_TWR_DELAY		1	/* DDR: 0=2ck 1=3ck */
-#define ACFG_SDRAM_RAS_DELAY		40	/* ns ACTIVE-to-PRECHARGE*/
-#define ACFG_SDRAM_RRD_DELAY		10	/* ns ACTIVE-to-ACTIVE delay*/
-#define ACFG_SDRAM_RCD_DELAY		15	/* ns Row to Column delay */
-#define ACFG_SDRAM_RC_DELAY		55	/* ns Row cycle delay */
-#define ACFG_SDRAM_RFC_DELAY		110	/* ns (> 10xddr_clk) */
-#define ACFG_SDRAM_PARTIAL_ARRAY_SR	0	/* 0..4 */
-#define ACFG_SDRAM_DRIVE_STRENGH	0	/* 0..3 */
-#define ACFG_SDRAM_BURST_LENGTH		3	/* 2^N BYTES (N=0..3) */
-#define ACFG_SDRAM_SINGLE_ACCESS	0	/* 0..1 */
-#endif
-
-#if (PHYS_SDRAM_SIZE == 128)
-/* micron 128MB */
-#define ACFG_SDRAM_NUM_COL		10	/* 8..11 column address bits */
-#define ACFG_SDRAM_NUM_ROW		13	/* 11..13 row address bits */
-#define ACFG_SDRAM_REFRESH		3	/* 0=OFF 1=2048 2=4096 3=8192.*/
-#define ACFG_SDRAM_XSR_DELAY		138	/* ns Exit self refresh */
-#define ACFG_SDRAM_EXIT_PWD		10	/* ns exit power down delay */
-#define ACFG_SDRAM_W2R_DELAY		1	/* 0=1ck 1=2ck  */
-#define ACFG_SDRAM_ROW_PRECHARGE_DELAY	15	/* ns (>2 x ddr_clk) */
-#define ACFG_SDRAM_TMRD_DELAY		2	/* 1..4 */
-#define ACFG_SDRAM_TWR_DELAY		1	/* DDR: 0=2ck 1=3ck */
-#define ACFG_SDRAM_RAS_DELAY		40	/* ns ACTIVE-to-PRECHARGE */
-#define ACFG_SDRAM_RRD_DELAY		10	/* ns ACTIVE-to-ACTIVE delay */
-#define ACFG_SDRAM_RCD_DELAY		15	/* ns Row to Column delay */
-#define ACFG_SDRAM_RC_DELAY		55	/* ns Row cycle delay */
-#define ACFG_SDRAM_RFC_DELAY		110	/* ns (> 10xddr_clk) */
-#define ACFG_SDRAM_PARTIAL_ARRAY_SR	0	/* 0..4 */
-#define ACFG_SDRAM_DRIVE_STRENGH	0	/* 0..3 */
-#define ACFG_SDRAM_BURST_LENGTH		3	/* 2^N BYTES (N=0..3) */
-#define ACFG_SDRAM_SINGLE_ACCESS	0	/* 0..1 */
-#endif
-
-#if (PHYS_SDRAM_SIZE == 256)
 /* micron 256MB */
 #define ACFG_SDRAM_NUM_COL		10	/* 8..11 column address bits */
 #define ACFG_SDRAM_NUM_ROW		14	/* 11..13 row address bits */
@@ -566,14 +505,13 @@
 #define ACFG_SDRAM_DRIVE_STRENGH	0	/* 0..3 */
 #define ACFG_SDRAM_BURST_LENGTH		3	/* 2^N BYTES (N=0..3) */
 #define ACFG_SDRAM_SINGLE_ACCESS	0	/* 0..1 */
-#endif
 
 /*
  * External interface
  */
   /* force BCLK free run */
-#define ACFG_WCR_VALUE	0x00000021
-#define ACFG_WIAR_VALUE	0x00000010
+#define ACFG_WCR_VALUE		0x00000021
+#define ACFG_WIAR_VALUE		0x00000010
 
 /* CS1 */
 #define ACFG_CS1GCR1_VALUE	ACFG_FPGA_GCR1_VALUE
@@ -642,7 +580,7 @@
 	(((ACFG_SDRAM_PARTIAL_ARRAY_SR&0x7)<<0)\
 	| ((ACFG_SDRAM_DRIVE_STRENGH&0x7)<<(5)))
 
-#define ACFG_SDRAM_ESDGPR_REGISTER_VAL	0x20020000
+#define ACFG_SDRAM_ESDGPR_REGISTER_VAL		0x20020000
 #define ACFG_SDRAM_ESDCDLY1_REGISTER_VAL	0x00F48000
 #define ACFG_SDRAM_ESDCDLY2_REGISTER_VAL	0x00F48000
 #define ACFG_SDRAM_ESDCDLY3_REGISTER_VAL	0x00F48000


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-273-g21440c2

From: jorasse <jo...@us...> - 2012-04-18 21:45:29

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".

The branch, master has been updated
       via  21440c21c5195299324e64253b9435501f28f6ab (commit)
      from  e47daff1bca2e6e8cd6dd5250be7b9501b9bf1b5 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 21440c21c5195299324e64253b9435501f28f6ab
Author: Eric Jarrige <eri...@ar...>
Date:   Wed Apr 18 23:56:46 2012 +0200

    [UBOOT]APF27, PPS: fix typo

-----------------------------------------------------------------------

Summary of changes:
 .../device/armadeus/apf27/apf27-u-boot-2011.12.h   |    2 +-
 .../device/armadeus/pps/pps-u-boot-2011.12.h       |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/buildroot/target/device/armadeus/apf27/apf27-u-boot-2011.12.h b/buildroot/target/device/armadeus/apf27/apf27-u-boot-2011.12.h
index e8b4071..8428fbb 100644
--- a/buildroot/target/device/armadeus/apf27/apf27-u-boot-2011.12.h
+++ b/buildroot/target/device/armadeus/apf27/apf27-u-boot-2011.12.h
@@ -141,7 +141,7 @@
 				":1M(u-boot)ro," \
 				"512K(env)," \
 				"512K(env2)," \
-				"512k(firmware)," \
+				"512K(firmware)," \
 				"512K(dtb)," \
 				"5M(kernel)," \
 				"-(rootfs)"
diff --git a/buildroot/target/device/armadeus/pps/pps-u-boot-2011.12.h b/buildroot/target/device/armadeus/pps/pps-u-boot-2011.12.h
index 2f97910..19da50f 100644
--- a/buildroot/target/device/armadeus/pps/pps-u-boot-2011.12.h
+++ b/buildroot/target/device/armadeus/pps/pps-u-boot-2011.12.h
@@ -141,7 +141,7 @@
 				":1M(u-boot)ro," \
 				"512K(env)," \
 				"512K(env2)," \
-				"512k(firmware)," \
+				"512K(firmware)," \
 				"512K(dtb)," \
 				"5M(kernel)," \
 				"-(rootfs)"


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-272-ge47daff

From: jorasse <jo...@us...> - 2012-04-18 21:22:53

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".

The branch, master has been updated
       via  e47daff1bca2e6e8cd6dd5250be7b9501b9bf1b5 (commit)
      from  ab8fcf6f1d02b5e285f84aeba0ea350ac108998b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit e47daff1bca2e6e8cd6dd5250be7b9501b9bf1b5
Author: Eric Jarrige <eri...@ar...>
Date:   Wed Apr 18 23:34:02 2012 +0200

    [UBOOT][PPS] Refactore config file + support redundant environment + cleanup

-----------------------------------------------------------------------

Summary of changes:
 .../device/armadeus/pps/pps-u-boot-2011.12.h       |  305 +++++++-------------
 1 files changed, 109 insertions(+), 196 deletions(-)

diff --git a/buildroot/target/device/armadeus/pps/pps-u-boot-2011.12.h b/buildroot/target/device/armadeus/pps/pps-u-boot-2011.12.h
index ab5baf9..2f97910 100644
--- a/buildroot/target/device/armadeus/pps/pps-u-boot-2011.12.h
+++ b/buildroot/target/device/armadeus/pps/pps-u-boot-2011.12.h
@@ -24,8 +24,8 @@
 #define __CONFIG_H
 
 #define CONFIG_VERSION_VARIABLE
-#define CONFIG_ENV_VERSION 	"2.3"
-#define CONFIG_IDENT_STRING	" pps patch 2.10"
+#define CONFIG_ENV_VERSION 	"3.0"
+#define CONFIG_IDENT_STRING	" pps patch 3.0"
 #define CONFIG_BOARD_NAME	pps
 
 /*
@@ -68,7 +68,6 @@
 #define CONFIG_BOOTP_DNS2
 
 #define CONFIG_HOSTNAME		CONFIG_BOARD_NAME
-#define CONFIG_SRV_PATH		""
 #define CONFIG_ROOTPATH		"/tftpboot/" MK_STR(CONFIG_BOARD_NAME) "-root"
 
 /*
@@ -93,9 +92,7 @@
 #define CONFIG_CMD_NAND_TRIMFFS
 #define CONFIG_CMD_NFS		/* NFS support			*/
 #define CONFIG_CMD_PING		/* ping support			*/
-/*#define CONFIG_CMD_SAVES*/	/* save S record dump		*/
 #define CONFIG_CMD_SETEXPR	/* setexpr support		*/
-/*#define CONFIG_CMD_SNTP */		/* SNTP support			*/
 #define CONFIG_CMD_UBI
 #define CONFIG_CMD_UBIFS
 
@@ -107,17 +104,13 @@
 
 #define CONFIG_SYS_SDRAM_MBYTE_SYZE 64
 
-#define PHYS_SDRAM_1 		0xA0000000
-#define PHYS_SDRAM_2 		0xB0000000
-#define CONFIG_SYS_SDRAM_BASE	PHYS_SDRAM_1
-
+#define PHYS_SDRAM_1 			0xA0000000
+#define PHYS_SDRAM_2 			0xB0000000
+#define CONFIG_SYS_SDRAM_BASE		PHYS_SDRAM_1
 #define CONFIG_SYS_MALLOC_LEN		(CONFIG_ENV_SIZE + (512<<10) )
+#define CONFIG_SYS_GBL_DATA_SIZE	256		/* Initial data */
 #define CONFIG_SYS_MEMTEST_START	0xA0000000	/* memtest test area  */
-#define CONFIG_SYS_MEMTEST_END		0xA0300000	/*64MiB -1MiB*/
-
-#define CONFIG_SYS_GBL_DATA_SIZE	256	/* size in bytes reserved for initial data */
-
-/*#define CONFIG_STACKSIZE	(256<<10)*//* stack size                 */
+#define CONFIG_SYS_MEMTEST_END		0xA0300000	/* 3 MiB RAM test */
 
 #define CONFIG_SYS_INIT_SP_ADDR	(CONFIG_SYS_SDRAM_BASE	\
 		+ PHYS_SDRAM_1_SIZE - 0x0100000)
@@ -127,25 +120,31 @@
 /*
  * FLASH organization
  */
-#define	CONFIG_SYS_MONITOR_BASE	0xAFF00000
+/*#define	CONFIG_SYS_MONITOR_BASE	0xAFF00000*/
 #define	CONFIG_SYS_MONITOR_OFFSET	0x00000000
-#define	CONFIG_SYS_MONITOR_LEN		0x000A0000	/* 640kB ( 5 flash blocks )  */
-#define	CONFIG_ENV_OFFSET		0x000A0000	/* NAND offset address for now*/
-#define	CONFIG_ENV_SIZE		0x00020000	/* 128kB  */
-#define CONFIG_ENV_RANGE       0X00060000  /* 384kB ( 3 flash blocks )  */
-#define	CONFIG_FIRMWARE_OFFSET	0x00100000
-#define	CONFIG_FIRMWARE_LEN	0x00080000	/* 512kB ( 4 flash blocks )  */
-#define	CONFIG_KERNEL_OFFSET	0x00180000
-#define	CONFIG_KERNEL_LEN	0x00500000	/* 5.0MB */
-#define	CONFIG_ROOTFS_OFFSET	0x00680000
-#define	CONFIG_ROOTFS_LEN			/* entire flash if not specified ~116MB*/
-
-#define CONFIG_MTDMAP   "mxc_nand.0"
-#define MTDIDS_DEFAULT	"nand0=" CONFIG_MTDMAP
-#define MTDPARTS_DEFAULT "mtdparts=" CONFIG_MTDMAP ":640k(U-boot)ro,"	\
-			"384k(U-boot_env),512k(firmware),"		\
-			"5M(kernel),"	\
-			"-(rootfs)"
+#define	CONFIG_SYS_MONITOR_LEN		0x00100000	/* 1MiB */
+#define CONFIG_ENV_IS_IN_NAND
+#define	CONFIG_ENV_OVERWRITE
+#define	CONFIG_ENV_OFFSET		0x00100000	/* NAND offset */
+#define	CONFIG_ENV_SIZE			0x00020000	/* 128kB  */
+#define CONFIG_ENV_RANGE		0X00080000	/* 512kB */
+#define	CONFIG_ENV_OFFSET_REDUND	\
+		(CONFIG_ENV_OFFSET + CONFIG_ENV_RANGE)	/* +512kB */
+#define	CONFIG_ENV_SIZE_REDUND		CONFIG_ENV_SIZE	/* 512kB */
+#define	CONFIG_FIRMWARE_OFFSET		0x00200000
+#define	CONFIG_KERNEL_OFFSET		0x00300000
+#define	CONFIG_ROOTFS_OFFSET		0x00800000
+
+#define CONFIG_MTDMAP			"mxc_nand.0"
+#define MTDIDS_DEFAULT			"nand0=" CONFIG_MTDMAP
+#define MTDPARTS_DEFAULT	"mtdparts=" CONFIG_MTDMAP \
+				":1M(u-boot)ro," \
+				"512K(env)," \
+				"512K(env2)," \
+				"512k(firmware)," \
+				"512K(dtb)," \
+				"5M(kernel)," \
+				"-(rootfs)"
 
 /*
  * U-Boot general configurations
@@ -177,16 +176,17 @@
 #define CONFIG_BOOTDELAY	1
 #define CONFIG_ZERO_BOOTDELAY_CHECK
 #define	CONFIG_BOOTFILE		MK_STR(CONFIG_BOARD_NAME) "-linux.bin"
-#define CONFIG_BOOTARGS \
-	CONFIG_CONSOLE " root=/dev/mtdblock4 rootfstype=ubifs " MTDPARTS_DEFAULT
+#define CONFIG_BOOTARGS 	"console=" MK_STR(ACFG_CONSOLE_DEV) "," \
+				MK_STR(CONFIG_BAUDRATE) " " MTDPARTS_DEFAULT \
+			" ubi.mtd=rootfs root=ubi0:rootfs rootfstype=ubifs "
 
-#define CONFIG_CONSOLE "console=ttySMX0,"MK_STR(CONFIG_BAUDRATE)" otg_mode=device"
+#define ACFG_CONSOLE_DEV	ttySMX0
 #define CONFIG_BOOTCOMMAND	"run ubifsboot"
 #define CONFIG_SYS_AUTOLOAD	"no"
 /*
  * Default load address for user programs and kernel
  */
-#define CONFIG_LOADADDR		0xA0000000
+#define CONFIG_LOADADDR			0xA0000000
 #define	CONFIG_SYS_LOAD_ADDR		CONFIG_LOADADDR
 #define CONFIG_SYS_TFTP_LOADADDR	CONFIG_LOADADDR
 
@@ -194,50 +194,44 @@
  * Extra Environments
  */
 #define CONFIG_EXTRA_ENV_SETTINGS \
-	"env_version="		CONFIG_ENV_VERSION		"\0"	\
-	"fileaddr="		MK_STR(CONFIG_SYS_LOAD_ADDR)		"\0"	\
-	"filesize="		MK_STR(0x00080000)		"\0"	\
-	"console="		CONFIG_CONSOLE			"\0"	\
-	"mtdparts="		MTDPARTS_DEFAULT		"\0"	\
-	"partition=nand0,4\0"						\
-	"uboot_offset="		MK_STR(CONFIG_SYS_MONITOR_OFFSET)	"\0"	\
-	"uboot_len="		MK_STR(CONFIG_SYS_MONITOR_LEN)		"\0"	\
-	"env_offset="		MK_STR(CONFIG_ENV_OFFSET)		"\0"	\
-	"env_len="		MK_STR(CONFIG_ENV_SIZE)		"\0"	\
-	"firmware_offset="	MK_STR(CONFIG_FIRMWARE_OFFSET)	"\0"	\
-	"firmware_len="	MK_STR(CONFIG_FIRMWARE_LEN)	"\0"	\
-	"kernel_offset="	MK_STR(CONFIG_KERNEL_OFFSET)	"\0"	\
-	"kernel_len="		MK_STR(CONFIG_KERNEL_LEN)	"\0"	\
-	"rootfs_offset="	MK_STR(CONFIG_ROOTFS_OFFSET)	"\0"	\
-	"rootfs_len="		MK_STR(CONFIG_ROOTFS_LEN)	"\0"	\
-	"board_name="		MK_STR(CONFIG_BOARD_NAME)	"\0"	\
-	"serverpath="		MK_STR(CONFIG_SRV_PATH)		"\0"	\
-	"ntpserverip=217.147.208.1\0"					\
-	"mmcroot=/dev/mmcblk0p1\0"					\
-	"mmcrootfstype=ext2\0"						\
+	"env_version="		CONFIG_ENV_VERSION			"\0" \
+	"consoledev="		MK_STR(ACFG_CONSOLE_DEV)		"\0" \
+	"mtdparts="		MTDPARTS_DEFAULT			"\0" \
+	"partition=nand0,6\0"						\
+	"u-boot_addr="		MK_STR(CONFIG_SYS_MONITOR_OFFSET)	"\0" \
+	"env_addr="		MK_STR(CONFIG_ENV_OFFSET)		"\0" \
+	"firmware_addr="	MK_STR(CONFIG_FIRMWARE_OFFSET)		"\0" \
+	"kernel_addr="		MK_STR(CONFIG_KERNEL_OFFSET)		"\0" \
+	"rootfs_addr="		MK_STR(CONFIG_ROOTFS_OFFSET)		"\0" \
+	"board_name="		MK_STR(CONFIG_BOARD_NAME)		"\0" \
 	"addnfsargs=setenv bootargs ${bootargs} "			\
 		"root=/dev/nfs rw nfsroot=${serverip}:${rootpath}\0"    \
 	"addubifsargs=setenv bootargs ${bootargs} "			\
 		"ubi.mtd=rootfs root=ubi0:rootfs rootfstype=ubifs\0"    \
 	"addmmcargs=setenv bootargs ${bootargs} "			\
-		"root=${mmcroot} rootfstype=${mmcrootfstype}\0"   	\
+		"root=/dev/mmcblk0p1 rootfstype=ext2\0"   		\
 	"addipargs=setenv bootargs ${bootargs} "			\
-		"ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}::off \0"\
-	"nfsboot=setenv bootargs ${console} ${mtdparts};"		\
-		"run addnfsargs addipargs; setenv autostart yes;"	\
-		"nboot A0000000 0 ${kernel_offset}\0"		\
-	"nfsboot2=setenv bootargs ${console} ${mtdparts};"		\
+		"ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:"	\
+		"${hostname}:eth0:off \0"				\
+	"nfsboot=setenv bootargs console=${consoledev},${baudrate} "	\
+		"${mtdparts} otg_mode=device; "				\
+		"run addnfsargs addipargs; setenv autostart yes;" 	\
+		"nboot kernel\0"					\
+	"nfsboot2=setenv bootargs console=${consoledev},${baudrate} "	\
+		"${mtdparts} otg_mode=device; "				\
 		"run addnfsargs addipargs; setenv autostart yes;"	\
 		"setenv kernel_image ${board_name}-linux.bin;"		\
 		"nfs ${loadaddr} "					\
 			"${serverip}:${rootpath}/${kernel_image};"	\
 		"bootm\0"						\
-	"ubifsboot=setenv bootargs ${console} ${mtdparts};"		\
+	"ubifsboot=setenv bootargs console=${consoledev},${baudrate} "	\
+		"${mtdparts} otg_mode=device; "				\
 		"run addubifsargs addipargs; setenv autostart yes;"	\
-		"nboot A0000000 0 ${kernel_offset}\0"		\
-	"mmcboot=setenv bootargs ${console} ${mtdparts};"		\
+		"nboot kernel\0"					\
+	"mmcboot=setenv bootargs console=${consoledev},${baudrate} "	\
+		"${mtdparts} otg_mode=device; "				\
 		"run addmmcargs addipargs; setenv autostart yes;"	\
-		"nboot A0000000 0 ${kernel_offset}\0"		\
+		"nboot kernel\0"					\
 	"boot_nfs_fallback_flash=if ping ${serverip};"			\
 			"then echo Boot over NFS; run nfsboot;"		\
 			"else echo Boot from the board; run ubifsboot;"	\
@@ -246,40 +240,34 @@
 			"then echo Boot over NFS; run nfsboot2;"	\
 			"else echo Boot from the board; run ubifsboot;"	\
 		"fi\0"							\
-	"firmware_autoload=0\0"					\
-	"flash_uboot=nand unlock ${uboot_offset} ${uboot_len};"		\
-		"nand erase ${uboot_offset} ${uboot_len};"		\
-		"if nand write.trimffs ${fileaddr} ${uboot_offset} ${filesize};"	\
-			"then nand lock; nand unlock ${env_offset};"	\
-				"echo Flashing of uboot succeed;"		\
+	"firmware_autoload=0\0"						\
+	"flash_uboot=nand unlock ${u-boot_addr} ;"			\
+		"nand erase.part u-boot;"		\
+		"if nand write.trimffs ${fileaddr} ${u-boot_addr} ${filesize};"\
+			"then nand lock; nand unlock ${env_addr};"	\
+				"echo Flashing of uboot succeed;"	\
 			"else echo Flashing of uboot failed;"		\
 		"fi; \0"						\
-	"flash_firmware=nand erase ${firmware_offset} ${firmware_len};"\
-		"if nand write.trimffs ${fileaddr} ${firmware_offset} ${filesize} ;"\
-			"then echo Flashing of Firmware succeed;"		\
-			"else echo Flashing of Firmware failed;"		\
+	"flash_firmware=nand erase.part firmware;"			\
+		"if nand write.trimffs ${fileaddr} ${firmware_addr} ${filesize};"\
+			"then echo Flashing of Firmware succeed;"	\
+			"else echo Flashing of Firmware failed;"	\
 		"fi\0"							\
-	"fpga_config=tftpboot ${fileaddr} $firmware_name;"\
-		"run flash_firmware;"\
-		"fpga load 0 ${fileaddr} ${firmware_len};\0"\
-	"flash_kernel=nand erase ${kernel_offset} ${kernel_len};"	\
-		"if nand write.trimffs ${fileaddr} ${kernel_offset} ${filesize} ;"\
+	"flash_kernel=nand erase.part kernel;"				\
+		"if nand write.trimffs ${fileaddr} ${kernel_addr} ${filesize};"\
 			"then echo Flashing of kernel succeed;"		\
 			"else echo Flashing of kernel failed;"		\
 		"fi\0"							\
 	"flash_rootfs=nand erase.part rootfs;"	\
-		"if nand write.trimffs ${fileaddr} ${rootfs_offset} ${filesize};"\
+		"if nand write.trimffs ${fileaddr} ${rootfs_addr} ${filesize};"\
 			"then echo Flashing of rootfs succeed;"		\
 			"else echo Flashing of rootfs failed;"		\
 		"fi\0"							\
 	"flash_reset_env=env default -f; saveenv;"			\
 		"echo Flash environment variables erased!\0"		\
-	"download_uboot=tftpboot ${loadaddr} "				\
-		" ${serverpath}${board_name}-u-boot-nand.bin\0"		\
-	"download_kernel=tftpboot ${loadaddr} "				\
-		" ${serverpath}${board_name}-linux.bin\0"		\
-	"download_rootfs=tftpboot ${loadaddr} "				\
-		" ${serverpath}${board_name}-rootfs.ubi\0"		\
+	"download_uboot=tftpboot ${loadaddr} ${board_name}-u-boot-nand.bin\0" \
+	"download_kernel=tftpboot ${loadaddr} ${board_name}-linux.bin\0" \
+	"download_rootfs=tftpboot ${loadaddr} ${board_name}-rootfs.ubi\0" \
 	"update_uboot=run download_uboot flash_uboot\0"			\
 	"update_kernel=run download_kernel flash_kernel\0"		\
 	"update_rootfs=run download_rootfs flash_rootfs\0"		\
@@ -292,10 +280,10 @@
  */
 #define CONFIG_MXC_UART
 #define CONFIG_SYS_MX27_UART1
-#define CONFIG_CONS_INDEX	1
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200, 230400 }
-#define CONFIG_BAUDRATE 	115200
-#define CONFIG_MXC_UART_BASE	UART1_BASE
+#define CONFIG_CONS_INDEX		1
+#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
+#define CONFIG_BAUDRATE 		115200
+#define CONFIG_MXC_UART_BASE		UART1_BASE
 
 /*
  * GPIO
@@ -323,11 +311,7 @@
 #define CONFIG_FLASH_SHOW_PROGRESS	45
 #define CONFIG_SYS_NAND_QUIET		1
 
-#define CONFIG_BOOT_TRACE_REG	0xAFFFFFF8 /* Addr to store traces of SPL boot */
-
-/* Environment is in NAND */
-#define CONFIG_ENV_IS_IN_NAND
-#define	CONFIG_ENV_OVERWRITE			/* env is writable now   */
+#define CONFIG_BOOT_TRACE_REG	0xAFFFFFF8 /* Addr to store traces of SPL boot*/
 
 /*
  * Partitions & Filsystems
@@ -344,10 +328,9 @@
 #define CONFIG_LZO
 
 /*
- * Ethernet (on SOC mx28 FEC)
+ * Ethernet (on SOC imx FEC)
  */
 #define CONFIG_FEC_MXC
-#undef CONFIG_FEC_IMX27_DEBUG
 
 #define CONFIG_NET_MULTI
 #define CONFIG_FEC_MXC_PHYADDR		0x1f
@@ -393,21 +376,23 @@
  * I2C
  */
 
-//#define	CONFIG_HARD_I2C		1	/* I2C with hardware support    */
+#ifdef CONFIG_CMD_I2C
+#define	CONFIG_HARD_I2C			1
 
-//#define CONFIG_SYS_I2C_SPEED		100000	/* 100 kHz */
-//#define CONFIG_SYS_I2C_SLAVE		0x7F
+#define CONFIG_SYS_I2C_SPEED		100000	/* 100 kHz */
+#define CONFIG_SYS_I2C_SLAVE		0x7F
 
-//#define CONFIG_I2C_CMD_TREE
-//#define CONFIG_I2C_MULTI_BUS	2
-//#define CONFIG_SYS_I2C_NOPROBES 	{ }
+#define CONFIG_I2C_CMD_TREE
+#define CONFIG_I2C_MULTI_BUS		2
+#define CONFIG_SYS_I2C_NOPROBES 	{ }
 
-# define CONFIG_SYS_I2C_EEPROM_ADDR	0x50	/* EEPROM 24LC02                */
-# define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1	/* bytes of address             */
-/* mask of address bits that overflow into the "EEPROM chip address"    */
-/*#define CONFIG_SYS_I2C_EEPROM_ADDR_OVERFLOW	0x00*/
+#ifdef CONFIG_CMD_EEPROM
+# define CONFIG_SYS_I2C_EEPROM_ADDR	0x50	/* EEPROM 24LC02 */
+# define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1	/* bytes of address */
 #define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS	3
-#define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS	10	/* takes up to 10 msec */
+#define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS	10	/* msec */
+#endif /* CONFIG_CMD_EEPROM */
+#endif /* CONFIG_CMD_I2C */
 
 /*
  * SPI
@@ -426,8 +411,10 @@
 /*
  * RTC
  */
+#ifdef CONFIG_CMD_DATE
 #define CONFIG_RTC_DS1374
 #define CONFIG_SYS_RTC_BUS_NUM		0
+#endif /* CONFIG_CMD_DATE */
 
 /*
  * Watchdog Config
@@ -440,7 +427,7 @@
 /*
  * Clocks
  */
-#define	CONFIG_SYS_HZ		1000	/* Ticks per second */
+#define	CONFIG_SYS_HZ			1000	/* Ticks per second */
 
 /*
  * PLL
@@ -448,8 +435,8 @@
  *  31 | x  |x| x x x x |x x x x x x x x x x |x x|x x x x|x x x x x x x x x x| 0
  *     |CPLM|X|----PD---|--------MFD---------|XXX|--MFI--|-----MFN-----------|
  */
-#define CONFIG_MX27_CLK32	32768	/* 32768 or 32000 Hz crystal */
-#undef  CONFIG_MX27_CLK26		/* there is no external 26MHz external clock */
+#define CONFIG_MX27_CLK32		32768	/* 32768 or 32000 Hz crystal */
+#undef  CONFIG_MX27_CLK26		/* No external 26MHz external clock */
 
 /* MPU CLOCK source before PLL  */
 /* CONFIG_SYS_CLK_FREQ (2/3 MPLL clock or ext 266 MHZ) */
@@ -471,7 +458,7 @@
 
 #define CONFIG_SYS_CLK_FREQ	(CONFIG_MPLL_FREQ*2/3) /* 266 MHz */
 
-/* Serial clock source before PLL (should be named CONFIG_SYS_SYSPLL_CLK_FREQ) */
+/* Serial clock source before PLL (should be named CONFIG_SYS_SYSPLL_CLK_FREQ)*/
 #ifndef CONFIG_MX27_CLK26
 /*#define CONFIG_SYSPLL_CLK_FREQ	(1024*CONFIG_MX27_CLK32)*/
 #if (CONFIG_MX27_CLK32 == 32000)
@@ -516,79 +503,10 @@
 /*
  * SDRAM
  */
-#if (CONFIG_SYS_SDRAM_MBYTE_SYZE == 8)
-/* micron 8MB */
-#define PHYS_SDRAM_1_SIZE	0x00800000 /* 8 MB                */
-#define PHYS_SDRAM_2_SIZE	0x00800000 /* 8 MB                   */
-#define CONFIG_SYS_SDRAM_NUM_COL		8  /* 8, 9, 10 or 11 column address bits */
-#define CONFIG_SYS_SDRAM_NUM_ROW		11 /* 11, 12 or 13 row address bits */
-#define CONFIG_SYS_SDRAM_REFRESH		3  /* 0=OFF 1=2048 2=4096 3=8192 refresh */
-#define CONFIG_SYS_SDRAM_EXIT_PWD		25 /* ns exit power down delay */
-#define CONFIG_SYS_SDRAM_W2R_DELAY		1  /* write to read cycle delay > 0 */
-#define CONFIG_SYS_SDRAM_ROW_PRECHARGE_DELAY	18 /* ns */
-#define CONFIG_SYS_SDRAM_TMRD_DELAY		2  /* Load mode register cycle delay 1..4 */
-#define CONFIG_SYS_SDRAM_TWR_DELAY		1  /* LPDDR: 0=2ck 1=3ck; SDRAM: 0=1ck 1=2ck*/
-#define CONFIG_SYS_SDRAM_RAS_DELAY		42 /* ns ACTIVE-to-PRECHARGE delay */
-#define CONFIG_SYS_SDRAM_RRD_DELAY		12 /* ns ACTIVE-to-ACTIVE delay */
-#define CONFIG_SYS_SDRAM_RCD_DELAY		18 /* ns Row to Column delay */
-#define CONFIG_SYS_SDRAM_RC_DELAY		70 /* ns Row cycle delay (tRFC refresh to command)*/
-#define CONFIG_SYS_SDRAM_CLOCK_CYCLE_CL_1	20 /* ns clock cycle time estimated fo CL=1 0=force 3 for lpddr*/
-#define CONFIG_SYS_SDRAM_PARTIAL_ARRAY_SR	0  /* 0=full 1=half 2=quater 3=Eighth 4=Sixteenth */
-#define CONFIG_SYS_SDRAM_DRIVE_STRENGH		0  /* 0=Full-strength 1=half 2=quater 3=Eighth */
-#define CONFIG_SYS_SDRAM_BURST_LENGTH		3  /* 2^N BYTES (N=0..3) */
-#define CONFIG_SYS_SDRAM_SINGLE_ACCESS		0  /* 1= single access; 0 = Burst mode */
-#endif
-
-#if (CONFIG_SYS_SDRAM_MBYTE_SYZE == 16)
-/* micron 16MB */
-#define PHYS_SDRAM_1_SIZE	0x01000000 /* 16 MB                   */
-#define PHYS_SDRAM_2_SIZE	0x01000000 /* 16 MB                   */
-#define CONFIG_SYS_SDRAM_NUM_COL		8  /* 8, 9, 10 or 11 column address bits */
-#define CONFIG_SYS_SDRAM_NUM_ROW		12 /* 11, 12 or 13 row address bits */
-#define CONFIG_SYS_SDRAM_REFRESH		3  /* 0=OFF 1=2048 2=4096 3=8192 refresh */
-#define CONFIG_SYS_SDRAM_EXIT_PWD		25 /* ns exit power down delay */
-#define CONFIG_SYS_SDRAM_W2R_DELAY		1  /* write to read cycle delay > 0 */
-#define CONFIG_SYS_SDRAM_ROW_PRECHARGE_DELAY	18 /* ns */
-#define CONFIG_SYS_SDRAM_TMRD_DELAY		2  /* Load mode register cycle delay 1..4 */
-#define CONFIG_SYS_SDRAM_TWR_DELAY		1  /* LPDDR: 0=2ck 1=3ck; SDRAM: 0=1ck 1=2ck*/
-#define CONFIG_SYS_SDRAM_RAS_DELAY		42 /* ns ACTIVE-to-PRECHARGE delay */
-#define CONFIG_SYS_SDRAM_RRD_DELAY		12 /* ns ACTIVE-to-ACTIVE delay */
-#define CONFIG_SYS_SDRAM_RCD_DELAY		18 /* ns Row to Column delay */
-#define CONFIG_SYS_SDRAM_RC_DELAY		70 /* ns Row cycle delay (tRFC refresh to command)*/
-#define CONFIG_SYS_SDRAM_CLOCK_CYCLE_CL_1	0 /* ns clock cycle time estimated fo CL=1 0=force 3 for lpddr*/
-#define CONFIG_SYS_SDRAM_PARTIAL_ARRAY_SR	0  /* 0=full 1=half 2=quater 3=Eighth 4=Sixteenth */
-#define CONFIG_SYS_SDRAM_DRIVE_STRENGH		0  /* 0=Full-strength 1=half 2=quater 3=Eighth */
-#define CONFIG_SYS_SDRAM_BURST_LENGTH		3  /* 2^N BYTES (N=0..3) */
-#define CONFIG_SYS_SDRAM_SINGLE_ACCESS		0  /* 1= single access; 0 = Burst mode */
-#endif
-
-#if (CONFIG_SYS_SDRAM_MBYTE_SYZE == 32)
-/* micron 32MB */
-#define PHYS_SDRAM_1_SIZE	0x02000000 /* 32 MB                   */
-#define PHYS_SDRAM_2_SIZE	0x02000000 /* 32 MB                   */
-#define CONFIG_SYS_SDRAM_NUM_COL		9  /* 8, 9, 10 or 11 column address bits */
-#define CONFIG_SYS_SDRAM_NUM_ROW		12 /* 11, 12 or 13 row address bits */
-#define CONFIG_SYS_SDRAM_REFRESH		3  /* 0=OFF 1=2048 2=4096 3=8192 refresh */
-#define CONFIG_SYS_SDRAM_EXIT_PWD		25 /* ns exit power down delay */
-#define CONFIG_SYS_SDRAM_W2R_DELAY		1  /* write to read cycle delay > 0 */
-#define CONFIG_SYS_SDRAM_ROW_PRECHARGE_DELAY	18 /* ns */
-#define CONFIG_SYS_SDRAM_TMRD_DELAY		2  /* Load mode register cycle delay 1..4 */
-#define CONFIG_SYS_SDRAM_TWR_DELAY		1  /* LPDDR: 0=2ck 1=3ck; SDRAM: 0=1ck 1=2ck*/
-#define CONFIG_SYS_SDRAM_RAS_DELAY		42 /* ns ACTIVE-to-PRECHARGE delay */
-#define CONFIG_SYS_SDRAM_RRD_DELAY		12 /* ns ACTIVE-to-ACTIVE delay */
-#define CONFIG_SYS_SDRAM_RCD_DELAY		18 /* ns Row to Column delay */
-#define CONFIG_SYS_SDRAM_RC_DELAY		70 /* ns Row cycle delay (tRFC refresh to command)*/
-#define CONFIG_SYS_SDRAM_CLOCK_CYCLE_CL_1	0 /* ns clock cycle time estimated fo CL=1 0=force 3 for lpddr*/
-#define CONFIG_SYS_SDRAM_PARTIAL_ARRAY_SR	0  /* 0=full 1=half 2=quater 3=Eighth 4=Sixteenth */
-#define CONFIG_SYS_SDRAM_DRIVE_STRENGH		0  /* 0=Full-strength 1=half 2=quater 3=Eighth */
-#define CONFIG_SYS_SDRAM_BURST_LENGTH		3  /* 2^N BYTES (N=0..3) */
-#define CONFIG_SYS_SDRAM_SINGLE_ACCESS		0  /* 1= single access; 0 = Burst mode */
-#endif
-
 #if (CONFIG_SYS_SDRAM_MBYTE_SYZE == 64) /* micron MT46H16M32LF -6 */
 /* micron 64MB */
-#define PHYS_SDRAM_1_SIZE	0x04000000 /* 64 MB                   */
-#define PHYS_SDRAM_2_SIZE	0x04000000 /* 64 MB                   */
+#define PHYS_SDRAM_1_SIZE			0x04000000 /* 64 MB */
+#define PHYS_SDRAM_2_SIZE			0x04000000 /* 64 MB */
 #define CONFIG_SYS_SDRAM_NUM_COL		9  /* 8, 9, 10 or 11 column address bits */
 #define CONFIG_SYS_SDRAM_NUM_ROW		13 /* 11, 12 or 13 row address bits */
 #define CONFIG_SYS_SDRAM_REFRESH		3  /* 0=OFF 1=2048 2=4096 3=8192 refresh */
@@ -610,8 +528,8 @@
 
 #if (CONFIG_SYS_SDRAM_MBYTE_SYZE == 128)
 /* micron 128MB */
-#define PHYS_SDRAM_1_SIZE	0x08000000 /* 128 MB                   */
-#define PHYS_SDRAM_2_SIZE	0x08000000 /* 128 MB                   */
+#define PHYS_SDRAM_1_SIZE			0x08000000 /* 128 MB */
+#define PHYS_SDRAM_2_SIZE			0x08000000 /* 128 MB */
 #define CONFIG_SYS_SDRAM_NUM_COL		9  /* 8, 9, 10 or 11 column address bits */
 #define CONFIG_SYS_SDRAM_NUM_ROW		14 /* 11, 12 or 13 row address bits */
 #define CONFIG_SYS_SDRAM_REFRESH		3  /* 0=OFF 1=2048 2=4096 3=8192 refresh */
@@ -633,8 +551,8 @@
 
 #if (CONFIG_SYS_SDRAM_MBYTE_SYZE == 256)
 /* micron 256MB */
-#define PHYS_SDRAM_1_SIZE	0x10000000 /* 256 MB                   */
-#define PHYS_SDRAM_2_SIZE	0x10000000 /* 256 MB                   */
+#define PHYS_SDRAM_1_SIZE			0x10000000 /* 256 MB */
+#define PHYS_SDRAM_2_SIZE			0x10000000 /* 256 MB */
 #define CONFIG_SYS_SDRAM_NUM_COL		10  /* 8, 9, 10 or 11 column address bits */
 #define CONFIG_SYS_SDRAM_NUM_ROW		14 /* 11, 12 or 13 row address bits */
 #define CONFIG_SYS_SDRAM_REFRESH		3  /* 0=OFF 1=2048 2=4096 3=8192 refresh */
@@ -815,12 +733,7 @@
 /* Enforce DDR signal strengh & enable USB/PP/DMA burst override bits */
 #define CONFIG_SYS_GPCR_VAL		0x0003000F
 
-/* LPDDR enable. latency hiding behavior enabled */
-//#define CONFIG_SYS_ESDMISC_VAL	ESDMISC_MA10_SHARE+ESDMISC_MDDREN
-/*
- * safe value in case of erratic crash during boot
- *	(seen with some prototype boards)*/
-#define CONFIG_SYS_ESDMISC_VAL	ESDMISC_LHD+ESDMISC_MDDREN
+#define CONFIG_SYS_ESDMISC_VAL		ESDMISC_LHD+ESDMISC_MDDREN
 
 /* FMCR select num LPDDR RAMs and nand 16bits, 2KB pages */
 #if (CONFIG_NR_DRAM_BANKS == 1)


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-271-gab8fcf6

From: jorasse <jo...@us...> - 2012-04-18 21:21:47

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".

The branch, master has been updated
       via  ab8fcf6f1d02b5e285f84aeba0ea350ac108998b (commit)
      from  b47ec8db9a6d8ec4ed2b1c3c61bc814c6a02f9d2 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit ab8fcf6f1d02b5e285f84aeba0ea350ac108998b
Author: Eric Jarrige <eri...@ar...>
Date:   Wed Apr 18 23:32:52 2012 +0200

    [UBOOT][APF27] Refactore config file + support redundant environment + cleanup

-----------------------------------------------------------------------

Summary of changes:
 .../device/armadeus/apf27/apf27-u-boot-2011.12.h   |  308 +++++++-------------
 1 files changed, 108 insertions(+), 200 deletions(-)

diff --git a/buildroot/target/device/armadeus/apf27/apf27-u-boot-2011.12.h b/buildroot/target/device/armadeus/apf27/apf27-u-boot-2011.12.h
index cb3f83d..e8b4071 100644
--- a/buildroot/target/device/armadeus/apf27/apf27-u-boot-2011.12.h
+++ b/buildroot/target/device/armadeus/apf27/apf27-u-boot-2011.12.h
@@ -24,8 +24,8 @@
 #define __CONFIG_H
 
 #define CONFIG_VERSION_VARIABLE
-#define CONFIG_ENV_VERSION 	"2.3"
-#define CONFIG_IDENT_STRING	" apf27 patch 2.10"
+#define CONFIG_ENV_VERSION 	"3.0"
+#define CONFIG_IDENT_STRING	" apf27 patch 3.0"
 #define CONFIG_BOARD_NAME	apf27
 
 /*
@@ -68,7 +68,6 @@
 #define CONFIG_BOOTP_DNS2
 
 #define CONFIG_HOSTNAME		CONFIG_BOARD_NAME
-#define CONFIG_SRV_PATH		""
 #define CONFIG_ROOTPATH		"/tftpboot/" MK_STR(CONFIG_BOARD_NAME) "-root"
 
 /*
@@ -93,9 +92,7 @@
 #define CONFIG_CMD_NAND_TRIMFFS
 #define CONFIG_CMD_NFS		/* NFS support			*/
 #define CONFIG_CMD_PING		/* ping support			*/
-/*#define CONFIG_CMD_SAVES*/	/* save S record dump		*/
 #define CONFIG_CMD_SETEXPR	/* setexpr support		*/
-/*#define CONFIG_CMD_SNTP */		/* SNTP support			*/
 #define CONFIG_CMD_UBI
 #define CONFIG_CMD_UBIFS
 
@@ -107,17 +104,13 @@
 
 #define CONFIG_SYS_SDRAM_MBYTE_SYZE 64
 
-#define PHYS_SDRAM_1 		0xA0000000
-#define PHYS_SDRAM_2 		0xB0000000
-#define CONFIG_SYS_SDRAM_BASE	PHYS_SDRAM_1
-
+#define PHYS_SDRAM_1 			0xA0000000
+#define PHYS_SDRAM_2 			0xB0000000
+#define CONFIG_SYS_SDRAM_BASE		PHYS_SDRAM_1
 #define CONFIG_SYS_MALLOC_LEN		(CONFIG_ENV_SIZE + (512<<10) )
+#define CONFIG_SYS_GBL_DATA_SIZE	256		/* Initial data */
 #define CONFIG_SYS_MEMTEST_START	0xA0000000	/* memtest test area  */
-#define CONFIG_SYS_MEMTEST_END		0xA0300000	/*64MiB -1MiB*/
-
-#define CONFIG_SYS_GBL_DATA_SIZE	256	/* size in bytes reserved for initial data */
-
-/*#define CONFIG_STACKSIZE	(256<<10)*//* stack size                 */
+#define CONFIG_SYS_MEMTEST_END		0xA0300000	/* 3 MiB RAM test */
 
 #define CONFIG_SYS_INIT_SP_ADDR	(CONFIG_SYS_SDRAM_BASE	\
 		+ PHYS_SDRAM_1_SIZE - 0x0100000)
@@ -127,25 +120,31 @@
 /*
  * FLASH organization
  */
-#define	CONFIG_SYS_MONITOR_BASE	0xAFF00000
+/*#define	CONFIG_SYS_MONITOR_BASE	0xAFF00000*/
 #define	CONFIG_SYS_MONITOR_OFFSET	0x00000000
-#define	CONFIG_SYS_MONITOR_LEN		0x000A0000	/* 640kB ( 5 flash blocks )  */
-#define	CONFIG_ENV_OFFSET		0x000A0000	/* NAND offset address for now*/
-#define	CONFIG_ENV_SIZE		0x00020000	/* 128kB  */
-#define CONFIG_ENV_RANGE       0X00060000  /* 384kB ( 3 flash blocks )  */
-#define	CONFIG_FIRMWARE_OFFSET	0x00100000
-#define	CONFIG_FIRMWARE_LEN	0x00080000	/* 512kB ( 4 flash blocks )  */
-#define	CONFIG_KERNEL_OFFSET	0x00180000
-#define	CONFIG_KERNEL_LEN	0x00500000	/* 5.0MB */
-#define	CONFIG_ROOTFS_OFFSET	0x00680000
-#define	CONFIG_ROOTFS_LEN			/* entire flash if not specified ~116MB*/
-
-#define CONFIG_MTDMAP   "mxc_nand.0"
-#define MTDIDS_DEFAULT	"nand0=" CONFIG_MTDMAP
-#define MTDPARTS_DEFAULT "mtdparts=" CONFIG_MTDMAP ":640k(U-boot)ro,"	\
-			"384k(U-boot_env),512k(firmware),"		\
-			"5M(kernel),"	\
-			"-(rootfs)"
+#define	CONFIG_SYS_MONITOR_LEN		0x00100000	/* 1MiB */
+#define CONFIG_ENV_IS_IN_NAND
+#define	CONFIG_ENV_OVERWRITE
+#define	CONFIG_ENV_OFFSET		0x00100000	/* NAND offset */
+#define	CONFIG_ENV_SIZE			0x00020000	/* 128kB  */
+#define CONFIG_ENV_RANGE		0X00080000	/* 512kB */
+#define	CONFIG_ENV_OFFSET_REDUND	\
+		(CONFIG_ENV_OFFSET + CONFIG_ENV_RANGE)	/* +512kB */
+#define	CONFIG_ENV_SIZE_REDUND		CONFIG_ENV_SIZE	/* 512kB */
+#define	CONFIG_FIRMWARE_OFFSET		0x00200000
+#define	CONFIG_KERNEL_OFFSET		0x00300000
+#define	CONFIG_ROOTFS_OFFSET		0x00800000
+
+#define CONFIG_MTDMAP			"mxc_nand.0"
+#define MTDIDS_DEFAULT			"nand0=" CONFIG_MTDMAP
+#define MTDPARTS_DEFAULT	"mtdparts=" CONFIG_MTDMAP \
+				":1M(u-boot)ro," \
+				"512K(env)," \
+				"512K(env2)," \
+				"512k(firmware)," \
+				"512K(dtb)," \
+				"5M(kernel)," \
+				"-(rootfs)"
 
 /*
  * U-Boot general configurations
@@ -177,16 +176,17 @@
 #define CONFIG_BOOTDELAY	5
 #define CONFIG_ZERO_BOOTDELAY_CHECK
 #define	CONFIG_BOOTFILE		MK_STR(CONFIG_BOARD_NAME) "-linux.bin"
-#define CONFIG_BOOTARGS \
-	CONFIG_CONSOLE " root=/dev/mtdblock4 rootfstype=ubifs " MTDPARTS_DEFAULT
+#define CONFIG_BOOTARGS 	"console=" MK_STR(ACFG_CONSOLE_DEV) "," \
+				MK_STR(CONFIG_BAUDRATE) " " MTDPARTS_DEFAULT \
+			" ubi.mtd=rootfs root=ubi0:rootfs rootfstype=ubifs "
 
-#define CONFIG_CONSOLE "console=ttySMX0,"MK_STR(CONFIG_BAUDRATE)
+#define ACFG_CONSOLE_DEV	ttySMX0
 #define CONFIG_BOOTCOMMAND	"run ubifsboot"
 #define CONFIG_SYS_AUTOLOAD	"no"
 /*
  * Default load address for user programs and kernel
  */
-#define CONFIG_LOADADDR		0xA0000000
+#define CONFIG_LOADADDR			0xA0000000
 #define	CONFIG_SYS_LOAD_ADDR		CONFIG_LOADADDR
 #define CONFIG_SYS_TFTP_LOADADDR	CONFIG_LOADADDR
 
@@ -194,50 +194,40 @@
  * Extra Environments
  */
 #define CONFIG_EXTRA_ENV_SETTINGS \
-	"env_version="		CONFIG_ENV_VERSION		"\0"	\
-	"fileaddr="		MK_STR(CONFIG_SYS_LOAD_ADDR)		"\0"	\
-	"filesize="		MK_STR(0x00080000)		"\0"	\
-	"console="		CONFIG_CONSOLE			"\0"	\
-	"mtdparts="		MTDPARTS_DEFAULT		"\0"	\
-	"partition=nand0,4\0"						\
-	"uboot_offset="		MK_STR(CONFIG_SYS_MONITOR_OFFSET)	"\0"	\
-	"uboot_len="		MK_STR(CONFIG_SYS_MONITOR_LEN)		"\0"	\
-	"env_offset="		MK_STR(CONFIG_ENV_OFFSET)		"\0"	\
-	"env_len="		MK_STR(CONFIG_ENV_SIZE)		"\0"	\
-	"firmware_offset="	MK_STR(CONFIG_FIRMWARE_OFFSET)	"\0"	\
-	"firmware_len="	MK_STR(CONFIG_FIRMWARE_LEN)	"\0"	\
-	"kernel_offset="	MK_STR(CONFIG_KERNEL_OFFSET)	"\0"	\
-	"kernel_len="		MK_STR(CONFIG_KERNEL_LEN)	"\0"	\
-	"rootfs_offset="	MK_STR(CONFIG_ROOTFS_OFFSET)	"\0"	\
-	"rootfs_len="		MK_STR(CONFIG_ROOTFS_LEN)	"\0"	\
-	"board_name="		MK_STR(CONFIG_BOARD_NAME)	"\0"	\
-	"serverpath="		MK_STR(CONFIG_SRV_PATH)		"\0"	\
-	"ntpserverip=217.147.208.1\0"					\
-	"mmcroot=/dev/mmcblk0p1\0"					\
-	"mmcrootfstype=ext2\0"						\
+	"env_version="		CONFIG_ENV_VERSION			"\0" \
+	"consoledev="		MK_STR(ACFG_CONSOLE_DEV)		"\0" \
+	"mtdparts="		MTDPARTS_DEFAULT			"\0" \
+	"partition=nand0,6\0"						\
+	"u-boot_addr="		MK_STR(CONFIG_SYS_MONITOR_OFFSET)	"\0" \
+	"env_addr="		MK_STR(CONFIG_ENV_OFFSET)		"\0" \
+	"firmware_addr="	MK_STR(CONFIG_FIRMWARE_OFFSET)		"\0" \
+	"kernel_addr="		MK_STR(CONFIG_KERNEL_OFFSET)		"\0" \
+	"rootfs_addr="		MK_STR(CONFIG_ROOTFS_OFFSET)		"\0" \
+	"board_name="		MK_STR(CONFIG_BOARD_NAME)		"\0" \
 	"addnfsargs=setenv bootargs ${bootargs} "			\
 		"root=/dev/nfs rw nfsroot=${serverip}:${rootpath}\0"    \
 	"addubifsargs=setenv bootargs ${bootargs} "			\
 		"ubi.mtd=rootfs root=ubi0:rootfs rootfstype=ubifs\0"    \
 	"addmmcargs=setenv bootargs ${bootargs} "			\
-		"root=${mmcroot} rootfstype=${mmcrootfstype}\0"   	\
+		"root=/dev/mmcblk0p1 rootfstype=ext2\0"   		\
 	"addipargs=setenv bootargs ${bootargs} "			\
-		"ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}::off \0"\
-	"nfsboot=setenv bootargs ${console} ${mtdparts};"		\
-		"run addnfsargs addipargs; setenv autostart yes;"	\
-		"nboot A0000000 0 ${kernel_offset}\0"		\
-	"nfsboot2=setenv bootargs ${console} ${mtdparts};"		\
-		"run addnfsargs addipargs; setenv autostart yes;"	\
+		"ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:"	\
+		"${hostname}:eth0:off \0"				\
+	"nfsboot=setenv bootargs console=${consoledev},${baudrate} "	\
+		"${mtdparts}; run addnfsargs addipargs; setenv autostart yes;" \
+		"nboot kernel\0"					\
+	"nfsboot2=setenv bootargs console=${consoledev},${baudrate} "	\
+		"${mtdparts}; run addnfsargs addipargs; setenv autostart yes;" \
 		"setenv kernel_image ${board_name}-linux.bin;"		\
 		"nfs ${loadaddr} "					\
 			"${serverip}:${rootpath}/${kernel_image};"	\
 		"bootm\0"						\
-	"ubifsboot=setenv bootargs ${console} ${mtdparts};"		\
-		"run addubifsargs addipargs; setenv autostart yes;"	\
-		"nboot A0000000 0 ${kernel_offset}\0"		\
-	"mmcboot=setenv bootargs ${console} ${mtdparts};"		\
-		"run addmmcargs addipargs; setenv autostart yes;"	\
-		"nboot A0000000 0 ${kernel_offset}\0"		\
+	"ubifsboot=setenv bootargs console=${consoledev},${baudrate} "	\
+		"${mtdparts};run addubifsargs addipargs; setenv autostart yes;"\
+		"nboot kernel\0"					\
+	"mmcboot=setenv bootargs console=${consoledev},${baudrate} "	\
+		"${mtdparts}; run addmmcargs addipargs; setenv autostart yes;" \
+		"nboot kernel\0"					\
 	"boot_nfs_fallback_flash=if ping ${serverip};"			\
 			"then echo Boot over NFS; run nfsboot;"		\
 			"else echo Boot from the board; run ubifsboot;"	\
@@ -246,40 +236,34 @@
 			"then echo Boot over NFS; run nfsboot2;"	\
 			"else echo Boot from the board; run ubifsboot;"	\
 		"fi\0"							\
-	"firmware_autoload=0\0"					\
-	"flash_uboot=nand unlock ${uboot_offset} ${uboot_len};"		\
-		"nand erase ${uboot_offset} ${uboot_len};"		\
-		"if nand write.trimffs ${fileaddr} ${uboot_offset} ${filesize};"	\
-			"then nand lock; nand unlock ${env_offset};"	\
-				"echo Flashing of uboot succeed;"		\
+	"firmware_autoload=0\0"						\
+	"flash_uboot=nand unlock ${u-boot_addr} ;"			\
+		"nand erase.part u-boot;"		\
+		"if nand write.trimffs ${fileaddr} ${u-boot_addr} ${filesize};"\
+			"then nand lock; nand unlock ${env_addr};"	\
+				"echo Flashing of uboot succeed;"	\
 			"else echo Flashing of uboot failed;"		\
 		"fi; \0"						\
-	"flash_firmware=nand erase ${firmware_offset} ${firmware_len};"\
-		"if nand write.trimffs ${fileaddr} ${firmware_offset} ${filesize} ;"\
-			"then echo Flashing of Firmware succeed;"		\
-			"else echo Flashing of Firmware failed;"		\
+	"flash_firmware=nand erase.part firmware;"			\
+		"if nand write.trimffs ${fileaddr} ${firmware_addr} ${filesize};"\
+			"then echo Flashing of Firmware succeed;"	\
+			"else echo Flashing of Firmware failed;"	\
 		"fi\0"							\
-	"fpga_config=tftpboot ${fileaddr} $firmware_name;"\
-		"run flash_firmware;"\
-		"fpga load 0 ${fileaddr} ${firmware_len};\0"\
-	"flash_kernel=nand erase ${kernel_offset} ${kernel_len};"	\
-		"if nand write.trimffs ${fileaddr} ${kernel_offset} ${filesize} ;"\
+	"flash_kernel=nand erase.part kernel;"				\
+		"if nand write.trimffs ${fileaddr} ${kernel_addr} ${filesize};"\
 			"then echo Flashing of kernel succeed;"		\
 			"else echo Flashing of kernel failed;"		\
 		"fi\0"							\
 	"flash_rootfs=nand erase.part rootfs;"	\
-		"if nand write.trimffs ${fileaddr} ${rootfs_offset} ${filesize};"\
+		"if nand write.trimffs ${fileaddr} ${rootfs_addr} ${filesize};"\
 			"then echo Flashing of rootfs succeed;"		\
 			"else echo Flashing of rootfs failed;"		\
 		"fi\0"							\
 	"flash_reset_env=env default -f; saveenv;"			\
 		"echo Flash environment variables erased!\0"		\
-	"download_uboot=tftpboot ${loadaddr} "				\
-		" ${serverpath}${board_name}-u-boot-nand.bin\0"		\
-	"download_kernel=tftpboot ${loadaddr} "				\
-		" ${serverpath}${board_name}-linux.bin\0"		\
-	"download_rootfs=tftpboot ${loadaddr} "				\
-		" ${serverpath}${board_name}-rootfs.ubi\0"		\
+	"download_uboot=tftpboot ${loadaddr} ${board_name}-u-boot-nand.bin\0" \
+	"download_kernel=tftpboot ${loadaddr} ${board_name}-linux.bin\0" \
+	"download_rootfs=tftpboot ${loadaddr} ${board_name}-rootfs.ubi\0" \
 	"update_uboot=run download_uboot flash_uboot\0"			\
 	"update_kernel=run download_kernel flash_kernel\0"		\
 	"update_rootfs=run download_rootfs flash_rootfs\0"		\
@@ -292,10 +276,10 @@
  */
 #define CONFIG_MXC_UART
 #define CONFIG_SYS_MX27_UART1
-#define CONFIG_CONS_INDEX	1
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200, 230400 }
-#define CONFIG_BAUDRATE 	115200
-#define CONFIG_MXC_UART_BASE	UART1_BASE
+#define CONFIG_CONS_INDEX		1
+#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
+#define CONFIG_BAUDRATE 		115200
+#define CONFIG_MXC_UART_BASE		UART1_BASE
 
 /*
  * GPIO
@@ -323,11 +307,7 @@
 #define CONFIG_FLASH_SHOW_PROGRESS	45
 #define CONFIG_SYS_NAND_QUIET		1
 
-#define CONFIG_BOOT_TRACE_REG	0xAFFFFFF8 /* Addr to store traces of SPL boot */
-
-/* Environment is in NAND */
-#define CONFIG_ENV_IS_IN_NAND
-#define	CONFIG_ENV_OVERWRITE			/* env is writable now   */
+#define CONFIG_BOOT_TRACE_REG	0xAFFFFFF8 /* Addr to store traces of SPL boot*/
 
 /*
  * Partitions & Filsystems
@@ -344,10 +324,9 @@
 #define CONFIG_LZO
 
 /*
- * Ethernet (on SOC mx28 FEC)
+ * Ethernet (on SOC imx FEC)
  */
 #define CONFIG_FEC_MXC
-#undef CONFIG_FEC_IMX27_DEBUG
 
 #define CONFIG_NET_MULTI
 #define CONFIG_FEC_MXC_PHYADDR		0x1f
@@ -393,21 +372,23 @@
  * I2C
  */
 
-//#define	CONFIG_HARD_I2C		1	/* I2C with hardware support    */
+#ifdef CONFIG_CMD_I2C
+#define	CONFIG_HARD_I2C			1
 
-//#define CONFIG_SYS_I2C_SPEED		100000	/* 100 kHz */
-//#define CONFIG_SYS_I2C_SLAVE		0x7F
+#define CONFIG_SYS_I2C_SPEED		100000	/* 100 kHz */
+#define CONFIG_SYS_I2C_SLAVE		0x7F
 
-//#define CONFIG_I2C_CMD_TREE
-//#define CONFIG_I2C_MULTI_BUS	2
-//#define CONFIG_SYS_I2C_NOPROBES 	{ }
+#define CONFIG_I2C_CMD_TREE
+#define CONFIG_I2C_MULTI_BUS		2
+#define CONFIG_SYS_I2C_NOPROBES 	{ }
 
-# define CONFIG_SYS_I2C_EEPROM_ADDR	0x50	/* EEPROM 24LC02                */
-# define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1	/* bytes of address             */
-/* mask of address bits that overflow into the "EEPROM chip address"    */
-/*#define CONFIG_SYS_I2C_EEPROM_ADDR_OVERFLOW	0x00*/
+#ifdef CONFIG_CMD_EEPROM
+# define CONFIG_SYS_I2C_EEPROM_ADDR	0x50	/* EEPROM 24LC02 */
+# define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1	/* bytes of address */
 #define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS	3
-#define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS	10	/* takes up to 10 msec */
+#define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS	10	/* msec */
+#endif /* CONFIG_CMD_EEPROM */
+#endif /* CONFIG_CMD_I2C */
 
 /*
  * SPI
@@ -426,9 +407,10 @@
 /*
  * RTC
  */
+#ifdef CONFIG_CMD_DATE
 #define CONFIG_RTC_DS1374
 #define CONFIG_SYS_RTC_BUS_NUM		0
-//#define DEBUG_RTC
+#endif /* CONFIG_CMD_DATE */
 
 /*
  * Watchdog Config
@@ -441,7 +423,7 @@
 /*
  * Clocks
  */
-#define	CONFIG_SYS_HZ		1000	/* Ticks per second */
+#define	CONFIG_SYS_HZ			1000	/* Ticks per second */
 
 /*
  * PLL
@@ -449,8 +431,8 @@
  *  31 | x  |x| x x x x |x x x x x x x x x x |x x|x x x x|x x x x x x x x x x| 0
  *     |CPLM|X|----PD---|--------MFD---------|XXX|--MFI--|-----MFN-----------|
  */
-#define CONFIG_MX27_CLK32	32768	/* 32768 or 32000 Hz crystal */
-#undef  CONFIG_MX27_CLK26		/* there is no external 26MHz external clock */
+#define CONFIG_MX27_CLK32		32768	/* 32768 or 32000 Hz crystal */
+#undef  CONFIG_MX27_CLK26		/* No external 26MHz external clock */
 
 /* MPU CLOCK source before PLL  */
 /* CONFIG_SYS_CLK_FREQ (2/3 MPLL clock or ext 266 MHZ) */
@@ -472,7 +454,7 @@
 
 #define CONFIG_SYS_CLK_FREQ	(CONFIG_MPLL_FREQ*2/3) /* 266 MHz */
 
-/* Serial clock source before PLL (should be named CONFIG_SYS_SYSPLL_CLK_FREQ) */
+/* Serial clock source before PLL (should be named CONFIG_SYS_SYSPLL_CLK_FREQ)*/
 #ifndef CONFIG_MX27_CLK26
 /*#define CONFIG_SYSPLL_CLK_FREQ	(1024*CONFIG_MX27_CLK32)*/
 #if (CONFIG_MX27_CLK32 == 32000)
@@ -517,79 +499,10 @@
 /*
  * SDRAM
  */
-#if (CONFIG_SYS_SDRAM_MBYTE_SYZE == 8)
-/* micron 8MB */
-#define PHYS_SDRAM_1_SIZE	0x00800000 /* 8 MB                */
-#define PHYS_SDRAM_2_SIZE	0x00800000 /* 8 MB                   */
-#define CONFIG_SYS_SDRAM_NUM_COL		8  /* 8, 9, 10 or 11 column address bits */
-#define CONFIG_SYS_SDRAM_NUM_ROW		11 /* 11, 12 or 13 row address bits */
-#define CONFIG_SYS_SDRAM_REFRESH		3  /* 0=OFF 1=2048 2=4096 3=8192 refresh */
-#define CONFIG_SYS_SDRAM_EXIT_PWD		25 /* ns exit power down delay */
-#define CONFIG_SYS_SDRAM_W2R_DELAY		1  /* write to read cycle delay > 0 */
-#define CONFIG_SYS_SDRAM_ROW_PRECHARGE_DELAY	18 /* ns */
-#define CONFIG_SYS_SDRAM_TMRD_DELAY		2  /* Load mode register cycle delay 1..4 */
-#define CONFIG_SYS_SDRAM_TWR_DELAY		1  /* LPDDR: 0=2ck 1=3ck; SDRAM: 0=1ck 1=2ck*/
-#define CONFIG_SYS_SDRAM_RAS_DELAY		42 /* ns ACTIVE-to-PRECHARGE delay */
-#define CONFIG_SYS_SDRAM_RRD_DELAY		12 /* ns ACTIVE-to-ACTIVE delay */
-#define CONFIG_SYS_SDRAM_RCD_DELAY		18 /* ns Row to Column delay */
-#define CONFIG_SYS_SDRAM_RC_DELAY		70 /* ns Row cycle delay (tRFC refresh to command)*/
-#define CONFIG_SYS_SDRAM_CLOCK_CYCLE_CL_1	20 /* ns clock cycle time estimated fo CL=1 0=force 3 for lpddr*/
-#define CONFIG_SYS_SDRAM_PARTIAL_ARRAY_SR	0  /* 0=full 1=half 2=quater 3=Eighth 4=Sixteenth */
-#define CONFIG_SYS_SDRAM_DRIVE_STRENGH		0  /* 0=Full-strength 1=half 2=quater 3=Eighth */
-#define CONFIG_SYS_SDRAM_BURST_LENGTH		3  /* 2^N BYTES (N=0..3) */
-#define CONFIG_SYS_SDRAM_SINGLE_ACCESS		0  /* 1= single access; 0 = Burst mode */
-#endif
-
-#if (CONFIG_SYS_SDRAM_MBYTE_SYZE == 16)
-/* micron 16MB */
-#define PHYS_SDRAM_1_SIZE	0x01000000 /* 16 MB                   */
-#define PHYS_SDRAM_2_SIZE	0x01000000 /* 16 MB                   */
-#define CONFIG_SYS_SDRAM_NUM_COL		8  /* 8, 9, 10 or 11 column address bits */
-#define CONFIG_SYS_SDRAM_NUM_ROW		12 /* 11, 12 or 13 row address bits */
-#define CONFIG_SYS_SDRAM_REFRESH		3  /* 0=OFF 1=2048 2=4096 3=8192 refresh */
-#define CONFIG_SYS_SDRAM_EXIT_PWD		25 /* ns exit power down delay */
-#define CONFIG_SYS_SDRAM_W2R_DELAY		1  /* write to read cycle delay > 0 */
-#define CONFIG_SYS_SDRAM_ROW_PRECHARGE_DELAY	18 /* ns */
-#define CONFIG_SYS_SDRAM_TMRD_DELAY		2  /* Load mode register cycle delay 1..4 */
-#define CONFIG_SYS_SDRAM_TWR_DELAY		1  /* LPDDR: 0=2ck 1=3ck; SDRAM: 0=1ck 1=2ck*/
-#define CONFIG_SYS_SDRAM_RAS_DELAY		42 /* ns ACTIVE-to-PRECHARGE delay */
-#define CONFIG_SYS_SDRAM_RRD_DELAY		12 /* ns ACTIVE-to-ACTIVE delay */
-#define CONFIG_SYS_SDRAM_RCD_DELAY		18 /* ns Row to Column delay */
-#define CONFIG_SYS_SDRAM_RC_DELAY		70 /* ns Row cycle delay (tRFC refresh to command)*/
-#define CONFIG_SYS_SDRAM_CLOCK_CYCLE_CL_1	0 /* ns clock cycle time estimated fo CL=1 0=force 3 for lpddr*/
-#define CONFIG_SYS_SDRAM_PARTIAL_ARRAY_SR	0  /* 0=full 1=half 2=quater 3=Eighth 4=Sixteenth */
-#define CONFIG_SYS_SDRAM_DRIVE_STRENGH		0  /* 0=Full-strength 1=half 2=quater 3=Eighth */
-#define CONFIG_SYS_SDRAM_BURST_LENGTH		3  /* 2^N BYTES (N=0..3) */
-#define CONFIG_SYS_SDRAM_SINGLE_ACCESS		0  /* 1= single access; 0 = Burst mode */
-#endif
-
-#if (CONFIG_SYS_SDRAM_MBYTE_SYZE == 32)
-/* micron 32MB */
-#define PHYS_SDRAM_1_SIZE	0x02000000 /* 32 MB                   */
-#define PHYS_SDRAM_2_SIZE	0x02000000 /* 32 MB                   */
-#define CONFIG_SYS_SDRAM_NUM_COL		9  /* 8, 9, 10 or 11 column address bits */
-#define CONFIG_SYS_SDRAM_NUM_ROW		12 /* 11, 12 or 13 row address bits */
-#define CONFIG_SYS_SDRAM_REFRESH		3  /* 0=OFF 1=2048 2=4096 3=8192 refresh */
-#define CONFIG_SYS_SDRAM_EXIT_PWD		25 /* ns exit power down delay */
-#define CONFIG_SYS_SDRAM_W2R_DELAY		1  /* write to read cycle delay > 0 */
-#define CONFIG_SYS_SDRAM_ROW_PRECHARGE_DELAY	18 /* ns */
-#define CONFIG_SYS_SDRAM_TMRD_DELAY		2  /* Load mode register cycle delay 1..4 */
-#define CONFIG_SYS_SDRAM_TWR_DELAY		1  /* LPDDR: 0=2ck 1=3ck; SDRAM: 0=1ck 1=2ck*/
-#define CONFIG_SYS_SDRAM_RAS_DELAY		42 /* ns ACTIVE-to-PRECHARGE delay */
-#define CONFIG_SYS_SDRAM_RRD_DELAY		12 /* ns ACTIVE-to-ACTIVE delay */
-#define CONFIG_SYS_SDRAM_RCD_DELAY		18 /* ns Row to Column delay */
-#define CONFIG_SYS_SDRAM_RC_DELAY		70 /* ns Row cycle delay (tRFC refresh to command)*/
-#define CONFIG_SYS_SDRAM_CLOCK_CYCLE_CL_1	0 /* ns clock cycle time estimated fo CL=1 0=force 3 for lpddr*/
-#define CONFIG_SYS_SDRAM_PARTIAL_ARRAY_SR	0  /* 0=full 1=half 2=quater 3=Eighth 4=Sixteenth */
-#define CONFIG_SYS_SDRAM_DRIVE_STRENGH		0  /* 0=Full-strength 1=half 2=quater 3=Eighth */
-#define CONFIG_SYS_SDRAM_BURST_LENGTH		3  /* 2^N BYTES (N=0..3) */
-#define CONFIG_SYS_SDRAM_SINGLE_ACCESS		0  /* 1= single access; 0 = Burst mode */
-#endif
-
 #if (CONFIG_SYS_SDRAM_MBYTE_SYZE == 64) /* micron MT46H16M32LF -6 */
 /* micron 64MB */
-#define PHYS_SDRAM_1_SIZE	0x04000000 /* 64 MB                   */
-#define PHYS_SDRAM_2_SIZE	0x04000000 /* 64 MB                   */
+#define PHYS_SDRAM_1_SIZE			0x04000000 /* 64 MB */
+#define PHYS_SDRAM_2_SIZE			0x04000000 /* 64 MB */
 #define CONFIG_SYS_SDRAM_NUM_COL		9  /* 8, 9, 10 or 11 column address bits */
 #define CONFIG_SYS_SDRAM_NUM_ROW		13 /* 11, 12 or 13 row address bits */
 #define CONFIG_SYS_SDRAM_REFRESH		3  /* 0=OFF 1=2048 2=4096 3=8192 refresh */
@@ -611,8 +524,8 @@
 
 #if (CONFIG_SYS_SDRAM_MBYTE_SYZE == 128)
 /* micron 128MB */
-#define PHYS_SDRAM_1_SIZE	0x08000000 /* 128 MB                   */
-#define PHYS_SDRAM_2_SIZE	0x08000000 /* 128 MB                   */
+#define PHYS_SDRAM_1_SIZE			0x08000000 /* 128 MB */
+#define PHYS_SDRAM_2_SIZE			0x08000000 /* 128 MB */
 #define CONFIG_SYS_SDRAM_NUM_COL		9  /* 8, 9, 10 or 11 column address bits */
 #define CONFIG_SYS_SDRAM_NUM_ROW		14 /* 11, 12 or 13 row address bits */
 #define CONFIG_SYS_SDRAM_REFRESH		3  /* 0=OFF 1=2048 2=4096 3=8192 refresh */
@@ -634,8 +547,8 @@
 
 #if (CONFIG_SYS_SDRAM_MBYTE_SYZE == 256)
 /* micron 256MB */
-#define PHYS_SDRAM_1_SIZE	0x10000000 /* 256 MB                   */
-#define PHYS_SDRAM_2_SIZE	0x10000000 /* 256 MB                   */
+#define PHYS_SDRAM_1_SIZE			0x10000000 /* 256 MB */
+#define PHYS_SDRAM_2_SIZE			0x10000000 /* 256 MB */
 #define CONFIG_SYS_SDRAM_NUM_COL		10  /* 8, 9, 10 or 11 column address bits */
 #define CONFIG_SYS_SDRAM_NUM_ROW		14 /* 11, 12 or 13 row address bits */
 #define CONFIG_SYS_SDRAM_REFRESH		3  /* 0=OFF 1=2048 2=4096 3=8192 refresh */
@@ -816,12 +729,7 @@
 /* Enforce DDR signal strengh & enable USB/PP/DMA burst override bits */
 #define CONFIG_SYS_GPCR_VAL		0x0003000F
 
-/* LPDDR enable. latency hiding behavior enabled */
-//#define CONFIG_SYS_ESDMISC_VAL	ESDMISC_MA10_SHARE+ESDMISC_MDDREN
-/*
- * safe value in case of erratic crash during boot
- *	(seen with some prototype boards)*/
-#define CONFIG_SYS_ESDMISC_VAL	ESDMISC_LHD+ESDMISC_MDDREN
+#define CONFIG_SYS_ESDMISC_VAL		ESDMISC_LHD+ESDMISC_MDDREN
 
 /* FMCR select num LPDDR RAMs and nand 16bits, 2KB pages */
 #if (CONFIG_NR_DRAM_BANKS == 1)


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-270-gb47ec8d

From: jorasse <jo...@us...> - 2012-04-18 19:26:04

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".

The branch, master has been updated
       via  b47ec8db9a6d8ec4ed2b1c3c61bc814c6a02f9d2 (commit)
       via  a7c6d9e6a8072b14435158ef548cf98bdb7df8b2 (commit)
      from  4bcb0dee4b1c30e214662ef234d653c75a0b0b4d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit b47ec8db9a6d8ec4ed2b1c3c61bc814c6a02f9d2
Merge: a7c6d9e 4bcb0de
Author: Eric Jarrige <eri...@ar...>
Date:   Wed Apr 18 21:37:18 2012 +0200

    Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus

commit a7c6d9e6a8072b14435158ef548cf98bdb7df8b2
Author: Eric Jarrige <eri...@ar...>
Date:   Wed Apr 18 21:37:05 2012 +0200

    [BUIDLROOT] apf9328: use the default version of binutils

-----------------------------------------------------------------------

Summary of changes:
 buildroot/configs/apf9328_defconfig     |    1 -
 buildroot/configs/apf9328test_defconfig |    1 -
 2 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/buildroot/configs/apf9328_defconfig b/buildroot/configs/apf9328_defconfig
index 2dd5d6d..a7c50e0 100644
--- a/buildroot/configs/apf9328_defconfig
+++ b/buildroot/configs/apf9328_defconfig
@@ -10,7 +10,6 @@ BR2_STRIP_sstrip=y
 BR2_KERNEL_HEADERS_VERSION=y
 BR2_DEFAULT_KERNEL_VERSION="2.6.29.6"
 BR2_UCLIBC_CONFIG="target/device/armadeus/uClibc-$(BR2_UCLIBC_VERSION_STRING).config"
-BR2_BINUTILS_VERSION_2_20=y
 BR2_GCC_VERSION_4_4_X=y
 BR2_PACKAGE_GDB_SERVER=y
 BR2_PACKAGE_GDB_HOST=y
diff --git a/buildroot/configs/apf9328test_defconfig b/buildroot/configs/apf9328test_defconfig
index 266990c..c7c44ce 100644
--- a/buildroot/configs/apf9328test_defconfig
+++ b/buildroot/configs/apf9328test_defconfig
@@ -10,7 +10,6 @@ BR2_STRIP_sstrip=y
 BR2_KERNEL_HEADERS_VERSION=y
 BR2_DEFAULT_KERNEL_VERSION="2.6.29.6"
 BR2_UCLIBC_CONFIG="target/device/armadeus/uClibc-$(BR2_UCLIBC_VERSION_STRING).config"
-BR2_BINUTILS_VERSION_2_20=y
 BR2_GCC_VERSION_4_4_X=y
 BR2_PACKAGE_GDB_SERVER=y
 BR2_PACKAGE_GDB_HOST=y


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-268-g4bcb0de

From: jorasse <jo...@us...> - 2012-04-18 19:20:45

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".

The branch, master has been updated
       via  4bcb0dee4b1c30e214662ef234d653c75a0b0b4d (commit)
       via  06ee8b6887a89bbe4afdd47215927ff1e48a509b (commit)
      from  b18aff5d371a89094adc3f94bf04e7f1dc2ccd92 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 4bcb0dee4b1c30e214662ef234d653c75a0b0b4d
Merge: 06ee8b6 b18aff5
Author: Eric Jarrige <eri...@ar...>
Date:   Wed Apr 18 21:32:09 2012 +0200

    Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus

commit 06ee8b6887a89bbe4afdd47215927ff1e48a509b
Author: Eric Jarrige <eri...@ar...>
Date:   Wed Apr 18 21:31:28 2012 +0200

    [BUIDLROOT] apf27, pps: use the default version of binutils

-----------------------------------------------------------------------

Summary of changes:
 buildroot/configs/apf27_defconfig          |    1 -
 buildroot/configs/apf27_webradio_defconfig |    1 -
 buildroot/configs/apf27test_defconfig      |    1 -
 buildroot/configs/pps_defconfig            |    1 -
 4 files changed, 0 insertions(+), 4 deletions(-)

diff --git a/buildroot/configs/apf27_defconfig b/buildroot/configs/apf27_defconfig
index bf4b714..01e7c0d 100644
--- a/buildroot/configs/apf27_defconfig
+++ b/buildroot/configs/apf27_defconfig
@@ -10,7 +10,6 @@ BR2_STRIP_sstrip=y
 BR2_KERNEL_HEADERS_VERSION=y
 BR2_DEFAULT_KERNEL_VERSION="2.6.29.6"
 BR2_UCLIBC_CONFIG="target/device/armadeus/uClibc-$(BR2_UCLIBC_VERSION_STRING).config"
-BR2_BINUTILS_VERSION_2_20=y
 BR2_GCC_VERSION_4_4_X=y
 BR2_PACKAGE_GDB_SERVER=y
 BR2_PACKAGE_GDB_HOST=y
diff --git a/buildroot/configs/apf27_webradio_defconfig b/buildroot/configs/apf27_webradio_defconfig
index 13a7ee9..f8d2630 100644
--- a/buildroot/configs/apf27_webradio_defconfig
+++ b/buildroot/configs/apf27_webradio_defconfig
@@ -10,7 +10,6 @@ BR2_STRIP_sstrip=y
 BR2_KERNEL_HEADERS_VERSION=y
 BR2_DEFAULT_KERNEL_VERSION="2.6.29.6"
 BR2_UCLIBC_CONFIG="target/device/armadeus/uClibc-$(BR2_UCLIBC_VERSION_STRING).config"
-BR2_BINUTILS_VERSION_2_20=y
 BR2_GCC_VERSION_4_4_X=y
 BR2_PACKAGE_GDB_SERVER=y
 BR2_PACKAGE_GDB_HOST=y
diff --git a/buildroot/configs/apf27test_defconfig b/buildroot/configs/apf27test_defconfig
index bed5351..e89448b 100644
--- a/buildroot/configs/apf27test_defconfig
+++ b/buildroot/configs/apf27test_defconfig
@@ -10,7 +10,6 @@ BR2_STRIP_sstrip=y
 BR2_KERNEL_HEADERS_VERSION=y
 BR2_DEFAULT_KERNEL_VERSION="2.6.29.6"
 BR2_UCLIBC_CONFIG="target/device/armadeus/uClibc-$(BR2_UCLIBC_VERSION_STRING).config"
-BR2_BINUTILS_VERSION_2_20=y
 BR2_GCC_VERSION_4_4_X=y
 BR2_PACKAGE_GDB_SERVER=y
 BR2_PACKAGE_GDB_HOST=y
diff --git a/buildroot/configs/pps_defconfig b/buildroot/configs/pps_defconfig
index d6fd426..5887cdf 100644
--- a/buildroot/configs/pps_defconfig
+++ b/buildroot/configs/pps_defconfig
@@ -10,7 +10,6 @@ BR2_STRIP_sstrip=y
 BR2_KERNEL_HEADERS_VERSION=y
 BR2_DEFAULT_KERNEL_VERSION="2.6.29.6"
 BR2_UCLIBC_CONFIG="target/device/armadeus/uClibc-$(BR2_UCLIBC_VERSION_STRING).config"
-BR2_BINUTILS_VERSION_2_20=y
 BR2_GCC_VERSION_4_4_X=y
 BR2_PACKAGE_GDB_SERVER=y
 BR2_PACKAGE_GDB_HOST=y


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-266-gb18aff5

From: jorasse <jo...@us...> - 2012-04-18 19:16:47

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".

The branch, master has been updated
       via  b18aff5d371a89094adc3f94bf04e7f1dc2ccd92 (commit)
      from  636e07e16edc49aa161c35c14888cdbd8f480e8f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit b18aff5d371a89094adc3f94bf04e7f1dc2ccd92
Author: Eric Jarrige <eri...@ar...>
Date:   Wed Apr 18 21:27:56 2012 +0200

    [BUIDLROOT] apf28: use default release of binutils

-----------------------------------------------------------------------

Summary of changes:
 buildroot/configs/apf28_defconfig |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/buildroot/configs/apf28_defconfig b/buildroot/configs/apf28_defconfig
index c941a8d..2e80169 100644
--- a/buildroot/configs/apf28_defconfig
+++ b/buildroot/configs/apf28_defconfig
@@ -10,7 +10,6 @@ BR2_STRIP_sstrip=y
 BR2_KERNEL_HEADERS_VERSION=y
 BR2_DEFAULT_KERNEL_VERSION="2.6.35.3"
 BR2_UCLIBC_CONFIG="target/device/armadeus/uClibc-$(BR2_UCLIBC_VERSION_STRING).config"
-BR2_BINUTILS_VERSION_2_22=y
 BR2_PACKAGE_GDB_SERVER=y
 BR2_PACKAGE_GDB_HOST=y
 BR2_ENABLE_LOCALE_PURGE=y


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-265-g636e07e

From: jorasse <jo...@us...> - 2012-04-18 15:12:50

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".

The branch, master has been updated
       via  636e07e16edc49aa161c35c14888cdbd8f480e8f (commit)
      from  cc22f39ce8e9de507d009f4466d8f62ffdf46f46 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 636e07e16edc49aa161c35c14888cdbd8f480e8f
Author: Eric Jarrige <eri...@ar...>
Date:   Wed Apr 18 17:24:13 2012 +0200

    [UBOOT][APF9328] config file refactoring + support redundant environment + cleanup

-----------------------------------------------------------------------

Summary of changes:
 .../armadeus/apf9328/apf9328-u-boot-2011.12.h      |  108 ++++++++------------
 1 files changed, 44 insertions(+), 64 deletions(-)

diff --git a/buildroot/target/device/armadeus/apf9328/apf9328-u-boot-2011.12.h b/buildroot/target/device/armadeus/apf9328/apf9328-u-boot-2011.12.h
index 18b1ef4..e6f7343 100644
--- a/buildroot/target/device/armadeus/apf9328/apf9328-u-boot-2011.12.h
+++ b/buildroot/target/device/armadeus/apf9328/apf9328-u-boot-2011.12.h
@@ -23,8 +23,8 @@
 #define __CONFIG_H
 
 #define CONFIG_VERSION_VARIABLE
-#define CONFIG_ENV_VERSION 	"4.1"
-#define CONFIG_IDENT_STRING	" apf9328 patch 4.2"
+#define CONFIG_ENV_VERSION 	"5.0"
+#define CONFIG_IDENT_STRING	" apf9328 patch 5.0"
 #define CONFIG_BOARD_NAME	apf9328
 
 /*
@@ -61,7 +61,6 @@
 #define CONFIG_BOOTP_DNS2
 
 #define CONFIG_HOSTNAME		CONFIG_BOARD_NAME
-#define CONFIG_SRV_PATH		""
 #define CONFIG_ROOTPATH		"/tftpboot/" MK_STR(CONFIG_BOARD_NAME) "-root"
 
 /*
@@ -117,20 +116,26 @@
 #define	CONFIG_ENV_ADDR		0x10040000	/* absolute address for now */
 #define	CONFIG_ENV_SIZE		0x00020000
 #define	CONFIG_ENV_SECT_SIZE	0x00020000
+#define	CONFIG_ENV_ADDR_REDUND	\
+		(CONFIG_ENV_ADDR + CONFIG_ENV_SIZE)	/* +128kB */
+#define	CONFIG_ENV_SIZE_REDUND	CONFIG_ENV_SIZE	/* 128kB */
 #define	CONFIG_ENV_OVERWRITE	1		/* env is writable now */
-#define	CONFIG_FIRMWARE_ADDR	0x10060000
+#define	CONFIG_FIRMWARE_ADDR	0x10080000
 #define	CONFIG_FIRMWARE_LEN	0x00040000	/* 256kB ( 2 flash sector ) */
-#define	CONFIG_KERNEL_ADDR	0x100A0000
-#define	CONFIG_KERNEL_LEN	0x00200000	/* 2MB */
-#define	CONFIG_ROOTFS_ADDR	0x102A0000
-#define	CONFIG_ROOTFS_LEN	/* entire flash if not specified */
+#define	CONFIG_KERNEL_ADDR	0x100C0000
+#define	CONFIG_ROOTFS_ADDR	0x102C0000
 
 #define CONFIG_MTD_DEVICE
 #define CONFIG_MTD_PARTITIONS
 #define CONFIG_MTDMAP	"physmap-flash.0"
 #define MTDIDS_DEFAULT	"nor0=" CONFIG_MTDMAP
-#define MTDPARTS_DEFAULT "mtdparts=" CONFIG_MTDMAP ":256k(U-boot)ro,"	\
-		"128k(U-boot_env),256k(firmware),2048k(kernel),-(rootfs)"
+#define MTDPARTS_DEFAULT "mtdparts=" CONFIG_MTDMAP \
+		":256k(u-boot)ro,"	\
+		"128k(env),"	\
+		"128k(env2),"	\
+		"256k(firmware),"	\
+		"2048k(kernel),"	\
+		"-(rootfs)"
 
 /*
  * U-Boot general configurations
@@ -162,10 +167,11 @@
 #define CONFIG_BOOTDELAY	5
 #define CONFIG_ZERO_BOOTDELAY_CHECK
 #define	CONFIG_BOOTFILE		MK_STR(CONFIG_BOARD_NAME) "-linux.bin"
-#define CONFIG_BOOTARGS \
-	CONFIG_CONSOLE " root=/dev/mtdblock4 rootfstype=jffs2 " MTDPARTS_DEFAULT
+#define CONFIG_BOOTARGS 	"console=" MK_STR(ACFG_CONSOLE_DEV) "," \
+				MK_STR(CONFIG_BAUDRATE) " " MTDPARTS_DEFAULT \
+				" root=/dev/mtdblock5 rootfstype=jffs2 "
 
-#define CONFIG_CONSOLE	"console=ttySMX0,"MK_STR(CONFIG_BAUDRATE)"n8"
+#define ACFG_CONSOLE_DEV	ttySMX0
 #define CONFIG_BOOTCOMMAND		"run jffsboot"
 #define CONFIG_SYS_AUTOLOAD		"no"
 /*
@@ -182,76 +188,64 @@
 	"env_version="		CONFIG_ENV_VERSION		"\0"	\
 	"fileaddr="		MK_STR(CONFIG_SYS_LOAD_ADDR)	"\0"	\
 	"filesize="		MK_STR(CONFIG_SYS_MONITOR_LEN)	"\0"	\
-	"console="		CONFIG_CONSOLE			"\0"	\
+	"consoledev="		MK_STR(ACFG_CONSOLE_DEV)	"\0"	\
 	"mtdparts="		MTDPARTS_DEFAULT		"\0"	\
-	"partition=nor0,4\0"				\
+	"partition=nor0,5\0"				\
 	"uboot_addr="		MK_STR(CONFIG_SYS_MONITOR_BASE)	"\0"	\
-	"uboot_len="		MK_STR(CONFIG_SYS_MONITOR_LEN)	"\0"	\
-	"env_addr="		MK_STR(CONFIG_ENV_ADDR)		"\0"	\
-	"env_len="		MK_STR(CONFIG_ENV_SIZE)		"\0"	\
 	"firmware_addr="	MK_STR(CONFIG_FIRMWARE_ADDR)	"\0"	\
-	"firmware_len="	MK_STR(CONFIG_FIRMWARE_LEN)	"\0"	\
 	"kernel_addr="		MK_STR(CONFIG_KERNEL_ADDR)	"\0"	\
-	"kernel_len="		MK_STR(CONFIG_KERNEL_LEN)	"\0"	\
 	"rootfs_addr="		MK_STR(CONFIG_ROOTFS_ADDR)	"\0"	\
 	"board_name="		MK_STR(CONFIG_BOARD_NAME)	"\0"	\
-	"serverpath="		MK_STR(CONFIG_SRV_PATH)		"\0"	\
-	"mmcroot=/dev/mmcblk0p1\0"					\
-	"mmcrootfstype=ext2\0"						\
+	"firmware_autoload=0\0"						\
 	"addnfsargs=setenv bootargs ${bootargs} "			\
 		"root=/dev/nfs rw nfsroot=${serverip}:${rootpath}\0"	\
 	"addjffsargs=setenv bootargs ${bootargs} "			\
-		"root=/dev/mtdblock4 rootfstype=jffs2\0"		\
-	"addubifsargs=setenv bootargs ${bootargs} "			\
-		"ubi.mtd=rootfs root=ubi0:rootfs rootfstype=ubifs\0"	\
+		"root=/dev/mtdblock5 rootfstype=jffs2\0"		\
 	"addmmcargs=setenv bootargs ${bootargs} "			\
-		"root=${mmcroot} rootfstype=${mmcrootfstype}\0"		\
+		"root=/dev/mmcblk0p1 rootfstype=ext2\0"			\
 	"addipargs=setenv bootargs ${bootargs} "			\
 		"ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:"	\
-		"${hostname}::off \0"					\
-	"nfsboot=setenv bootargs ${console} ${mtdparts};"		\
-		"run addnfsargs addipargs; bootm ${kernel_addr}\0"	\
-	"jffsboot=setenv bootargs ${console} ${mtdparts};"		\
-		"run addjffsargs addipargs; bootm ${kernel_addr}\0"	\
-	"ubifsboot=setenv bootargs ${console} ${mtdparts};"		\
-		"run addubifsargs addipargs; bootm ${kernel_addr}\0"	\
-	"mmcboot=setenv bootargs ${console} ${mtdparts};"		\
-		"run addmmcargs addipargs; bootm ${kernel_addr}\0"	\
-	"firmware_autoload=0\0"						\
-	"flash_uboot=protect off ${uboot_addr} +${uboot_len};"		\
+		"${hostname}:eth0:off \0"				\
+	"nfsboot=setenv bootargs console=${consoledev},${baudrate} "	\
+		"${mtdparts}; run addnfsargs addipargs; "		\
+		"bootm ${kernel_addr}\0"				\
+	"jffsboot=setenv bootargs console=${consoledev},${baudrate} "	\
+		"${mtdparts}; run addjffsargs addipargs; "		\
+		"bootm ${kernel_addr}\0"				\
+	"mmcboot=setenv bootargs console=${consoledev},${baudrate} "	\
+		"${mtdparts}; run addmmcargs addipargs; "		\
+		"bootm ${kernel_addr}\0"	\
+	"flash_uboot=protect off nor0,0;"		\
 		"echo Erasing FLASH;"					\
-		"era ${uboot_addr} +${uboot_len};"			\
+		"era nor0,0;"			\
 		"if cp.b ${fileaddr} ${uboot_addr} ${filesize};"	\
-			"then protect on ${uboot_addr} +${uboot_len};"	\
+			"then protect on nor0,0;"	\
 				"echo Flashing of uboot succeed;"	\
 			"else echo Flashing of uboot failed;"		\
 		"fi; \0"						\
 	"flash_firmware=echo Erasing FLASH;"				\
-		"era ${firmware_addr} +${firmware_len};"		\
+		"era nor0,3;"		\
 		"if cp.b ${fileaddr} ${firmware_addr} ${filesize} ;"	\
 			"then echo Flashing of Firmware succeed;"	\
 			"else echo Flashing of Firmware failed;"	\
 		"fi\0"							\
 	"flash_kernel=echo Erasing FLASH;"				\
-		"era ${kernel_addr} +${kernel_len};"			\
+		"era nor0,4;"			\
 		"if cp.b ${fileaddr} ${kernel_addr} ${filesize} ;"	\
 			"then echo Flashing of kernel succeed;"		\
 			"else echo Flashing of kernel failed;"		\
 		"fi\0"							\
 	"flash_rootfs=echo Erasing FLASH;"				\
-		"era nor0,4;"			\
+		"era nor0,5;"			\
 		"if cp.b ${fileaddr} ${rootfs_addr} ${filesize};"	\
 			"then echo Flashing of rootfs succeed;"		\
 			"else echo Flashing of rootfs failed;"		\
 		"fi\0"							\
 	"flash_reset_env=env default -f; saveenv;"			\
-		"echo Erasing of flash environment variables done!\0"	\
-	"download_uboot=tftpboot ${loadaddr} "				\
-		" ${serverpath}${board_name}-u-boot.bin\0"		\
-	"download_kernel=tftpboot ${loadaddr} "				\
-		" ${serverpath}${board_name}-linux.bin\0"		\
-	"download_rootfs=tftpboot ${loadaddr} "				\
-		" ${serverpath}${board_name}-rootfs.jffs2\0"		\
+		"echo Flash environment variables erased!\0"		\
+	"download_uboot=tftpboot ${loadaddr} ${board_name}-u-boot.bin\0" \
+	"download_kernel=tftpboot ${loadaddr} ${board_name}-linux.bin\0" \
+	"download_rootfs=tftpboot ${loadaddr} ${board_name}-rootfs.jffs2\0" \
 	"update_uboot=run download_uboot flash_uboot\0"			\
 	"update_kernel=run download_kernel flash_kernel\0"		\
 	"update_rootfs=run download_rootfs flash_rootfs\0"		\
@@ -420,20 +414,6 @@
  * CONFIG_SYS_SDRAM_SINGLE_ACCESS 1= single access; 0 = Burst mode
  */
 
-#if (CONFIG_SYS_SDRAM_MBYTE_SYZE == 8)
-/* micron 8MB */
-#define PHYS_SDRAM_1_SIZE	0x00800000	/* 8 MB	*/
-#define CONFIG_SYS_SDRAM_NUM_COL		8
-#define CONFIG_SYS_SDRAM_NUM_ROW		11
-#define CONFIG_SYS_SDRAM_REFRESH		2
-#define CONFIG_SYS_SDRAM_CLOCK_CYCLE_CL_1	20
-#define CONFIG_SYS_SDRAM_ROW_PRECHARGE_DELAY	20
-#define CONFIG_SYS_SDRAM_ROW_2_COL_DELAY	20
-#define CONFIG_SYS_SDRAM_ROW_CYCLE_DELAY	70
-#define CONFIG_SYS_SDRAM_BURST_LENGTH		3
-#define CONFIG_SYS_SDRAM_SINGLE_ACCESS		0
-#endif
-
 #if (CONFIG_SYS_SDRAM_MBYTE_SYZE == 16)
 /* micron 16MB */
 #define PHYS_SDRAM_1_SIZE	0x01000000	/* 16 MB */


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-264-gcc22f39

From: jorasse <jo...@us...> - 2012-04-18 15:10:04

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".

The branch, master has been updated
       via  cc22f39ce8e9de507d009f4466d8f62ffdf46f46 (commit)
      from  9caf476cd8b63d4648cdcc16a7dfc1bcd9670cf0 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit cc22f39ce8e9de507d009f4466d8f62ffdf46f46
Author: Eric Jarrige <eri...@ar...>
Date:   Wed Apr 18 17:21:12 2012 +0200

    [UBOOT][APF9328] rename patch set with a 3 digit prefix

-----------------------------------------------------------------------

Summary of changes:
 ...mx1-gpio-mode.patch => 101-mx1-gpio-mode.patch} |    0
 .../{02-mx1-i2c.patch => 102-mx1-i2c.patch}        |    0
 .../{03-apf9328.patch => 103-apf9328.patch}        |    0
 ...8-makefile.patch => 104-apf9328-makefile.patch} |    0
 .../{06-mx1-pllclk.patch => 106-mx1-pllclk.patch}  |    0
 ...lclk-debug.patch => 107-mx1-pllclk-debug.patch} |    0
 .../2011.12/{08-DM9000.patch => 108-DM9000.patch}  |    0
 ...1-relocation.patch => 109-mx1-relocation.patch} |    0
 .../{11-mx1-timer.patch => 111-mx1-timer.patch}    |    0
 9 files changed, 0 insertions(+), 0 deletions(-)
 rename patches/u-boot/2011.12/{01-mx1-gpio-mode.patch => 101-mx1-gpio-mode.patch} (100%)
 rename patches/u-boot/2011.12/{02-mx1-i2c.patch => 102-mx1-i2c.patch} (100%)
 rename patches/u-boot/2011.12/{03-apf9328.patch => 103-apf9328.patch} (100%)
 rename patches/u-boot/2011.12/{04-apf9328-makefile.patch => 104-apf9328-makefile.patch} (100%)
 rename patches/u-boot/2011.12/{06-mx1-pllclk.patch => 106-mx1-pllclk.patch} (100%)
 rename patches/u-boot/2011.12/{07-mx1-pllclk-debug.patch => 107-mx1-pllclk-debug.patch} (100%)
 rename patches/u-boot/2011.12/{08-DM9000.patch => 108-DM9000.patch} (100%)
 rename patches/u-boot/2011.12/{09-mx1-relocation.patch => 109-mx1-relocation.patch} (100%)
 rename patches/u-boot/2011.12/{11-mx1-timer.patch => 111-mx1-timer.patch} (100%)

diff --git a/patches/u-boot/2011.12/01-mx1-gpio-mode.patch b/patches/u-boot/2011.12/101-mx1-gpio-mode.patch
similarity index 100%
rename from patches/u-boot/2011.12/01-mx1-gpio-mode.patch
rename to patches/u-boot/2011.12/101-mx1-gpio-mode.patch
diff --git a/patches/u-boot/2011.12/02-mx1-i2c.patch b/patches/u-boot/2011.12/102-mx1-i2c.patch
similarity index 100%
rename from patches/u-boot/2011.12/02-mx1-i2c.patch
rename to patches/u-boot/2011.12/102-mx1-i2c.patch
diff --git a/patches/u-boot/2011.12/03-apf9328.patch b/patches/u-boot/2011.12/103-apf9328.patch
similarity index 100%
rename from patches/u-boot/2011.12/03-apf9328.patch
rename to patches/u-boot/2011.12/103-apf9328.patch
diff --git a/patches/u-boot/2011.12/04-apf9328-makefile.patch b/patches/u-boot/2011.12/104-apf9328-makefile.patch
similarity index 100%
rename from patches/u-boot/2011.12/04-apf9328-makefile.patch
rename to patches/u-boot/2011.12/104-apf9328-makefile.patch
diff --git a/patches/u-boot/2011.12/06-mx1-pllclk.patch b/patches/u-boot/2011.12/106-mx1-pllclk.patch
similarity index 100%
rename from patches/u-boot/2011.12/06-mx1-pllclk.patch
rename to patches/u-boot/2011.12/106-mx1-pllclk.patch
diff --git a/patches/u-boot/2011.12/07-mx1-pllclk-debug.patch b/patches/u-boot/2011.12/107-mx1-pllclk-debug.patch
similarity index 100%
rename from patches/u-boot/2011.12/07-mx1-pllclk-debug.patch
rename to patches/u-boot/2011.12/107-mx1-pllclk-debug.patch
diff --git a/patches/u-boot/2011.12/08-DM9000.patch b/patches/u-boot/2011.12/108-DM9000.patch
similarity index 100%
rename from patches/u-boot/2011.12/08-DM9000.patch
rename to patches/u-boot/2011.12/108-DM9000.patch
diff --git a/patches/u-boot/2011.12/09-mx1-relocation.patch b/patches/u-boot/2011.12/109-mx1-relocation.patch
similarity index 100%
rename from patches/u-boot/2011.12/09-mx1-relocation.patch
rename to patches/u-boot/2011.12/109-mx1-relocation.patch
diff --git a/patches/u-boot/2011.12/11-mx1-timer.patch b/patches/u-boot/2011.12/111-mx1-timer.patch
similarity index 100%
rename from patches/u-boot/2011.12/11-mx1-timer.patch
rename to patches/u-boot/2011.12/111-mx1-timer.patch


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-263-g9caf476

From: Nicolas <th...@us...> - 2012-04-16 09:07:38

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".

The branch, master has been updated
       via  9caf476cd8b63d4648cdcc16a7dfc1bcd9670cf0 (commit)
      from  6da2a097fe3e5452b4d04aabaaeb6c76c0a3d089 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 9caf476cd8b63d4648cdcc16a7dfc1bcd9670cf0
Author: nicolas <nicolas@nicolas-Studio-1558.(none)>
Date:   Mon Apr 16 11:06:31 2012 +0200

    [LINUX] fix sequencer of iMX28 touchscreen driver

-----------------------------------------------------------------------

Summary of changes:
 .../linux/2.6.35/453-armadeus-mxs-ts-fixes.patch   |  382 ++++++++++++++++++++
 1 files changed, 382 insertions(+), 0 deletions(-)
 create mode 100644 patches/linux/2.6.35/453-armadeus-mxs-ts-fixes.patch

diff --git a/patches/linux/2.6.35/453-armadeus-mxs-ts-fixes.patch b/patches/linux/2.6.35/453-armadeus-mxs-ts-fixes.patch
new file mode 100644
index 0000000..979ad1f
--- /dev/null
+++ b/patches/linux/2.6.35/453-armadeus-mxs-ts-fixes.patch
@@ -0,0 +1,382 @@
+Fix APF28 touchscreen driver
+
+Signed-off-by: Nicolas Colombain <nic...@ar...>
+
+Index: linux-2.6.35.3/drivers/input/touchscreen/mxs-ts.c
+===================================================================
+--- linux-2.6.35.3.orig/drivers/input/touchscreen/mxs-ts.c	2012-01-31 14:27:22.000000000 +0100
++++ linux-2.6.35.3/drivers/input/touchscreen/mxs-ts.c	2012-02-03 17:42:26.000000000 +0100
+@@ -1,8 +1,9 @@
+ /*
+- * Freesclae MXS Touchscreen driver
++ * Freescale MXS Touchscreen driver
+  *
+  * Author: Vitaly Wool <vi...@em...>
+  *
++ * Copyright (C) 2012 Armadeus systems
+  * Copyright 2008-2010 Freescale Semiconductor, Inc.
+  * Copyright 2008 Embedded Alley Solutions, Inc All Rights Reserved.
+  */
+@@ -30,7 +31,7 @@
+ #include <mach/device.h>
+ #include <mach/regs-lradc.h>
+ 
+-#define TOUCH_DEBOUNCE_TOLERANCE	100
++#define FILTER_SIZE 4 /* must be a power of 2 */
+ 
+ struct mxs_ts_info {
+ 	int touch_irq;
+@@ -50,6 +51,8 @@ struct mxs_ts_info {
+ 	unsigned int y_plus_mask;
+ 	unsigned int y_minus_mask;
+ 
++	struct delayed_work activate_touch_detect;
++
+ 	struct input_dev *idev;
+ 	enum {
+ 		TS_STATE_DISABLED,
+@@ -60,161 +63,142 @@ struct mxs_ts_info {
+ 	} state;
+ 	u16 x;
+ 	u16 y;
++	int pressure;
+ 	int sample_count;
+ };
+ 
+-static inline void enter_state_touch_detect(struct mxs_ts_info *info)
++static inline void enter_state_x_plane(struct mxs_ts_info *info)
+ {
+-	__raw_writel(0xFFFFFFFF,
+-		     info->base + HW_LRADC_CHn_CLR(info->x_plus_chan));
+-	__raw_writel(0xFFFFFFFF,
+-		     info->base + HW_LRADC_CHn_CLR(info->y_plus_chan));
+-	__raw_writel(0xFFFFFFFF,
+-		     info->base + HW_LRADC_CHn_CLR(info->x_minus_chan));
+-	__raw_writel(0xFFFFFFFF,
+-		     info->base + HW_LRADC_CHn_CLR(info->y_minus_chan));
+-
+-	__raw_writel(BM_LRADC_CTRL1_LRADC0_IRQ << info->y_minus_chan,
+-		     info->base + HW_LRADC_CTRL1_CLR);
+-	__raw_writel(BM_LRADC_CTRL1_TOUCH_DETECT_IRQ,
+-		     info->base + HW_LRADC_CTRL1_CLR);
+-	/*
+-	 * turn off the yplus and yminus pullup and pulldown, and turn off touch
+-	 * detect (enables yminus, and xplus through a resistor.On a press,
+-	 * xplus is pulled down)
+-	 */
+-	__raw_writel(info->y_plus_mask, info->base + HW_LRADC_CTRL0_CLR);
+-	__raw_writel(info->y_minus_mask, info->base + HW_LRADC_CTRL0_CLR);
++	__raw_writel(BM_LRADC_CTRL0_TOUCH_DETECT_ENABLE,
++		     info->base + HW_LRADC_CTRL0_CLR);
++	__raw_writel(info->y_plus_val, info->base + HW_LRADC_CTRL0_SET);
++	__raw_writel(info->y_minus_val, info->base + HW_LRADC_CTRL0_SET);
+ 	__raw_writel(info->x_plus_mask, info->base + HW_LRADC_CTRL0_CLR);
+ 	__raw_writel(info->x_minus_mask, info->base + HW_LRADC_CTRL0_CLR);
+-	__raw_writel(BM_LRADC_CTRL0_TOUCH_DETECT_ENABLE,
+-		     info->base + HW_LRADC_CTRL0_SET);
+-	hw_lradc_set_delay_trigger_kick(LRADC_DELAY_TRIGGER_TOUCHSCREEN, 0);
+-	info->state = TS_STATE_TOUCH_DETECT;
++
++	info->state = TS_STATE_X_PLANE;
+ 	info->sample_count = 0;
++	info->x = 0;
++	info->y = 0;
++	
++	hw_lradc_set_delay_trigger_kick(LRADC_DELAY_TRIGGER_TOUCHSCREEN, 1);
+ }
+ 
+-static inline void enter_state_disabled(struct mxs_ts_info *info)
++static inline void enter_state_y_plane(struct mxs_ts_info *info)
+ {
+-	__raw_writel(info->y_plus_mask, info->base + HW_LRADC_CTRL0_CLR);
+-	__raw_writel(info->y_minus_mask, info->base + HW_LRADC_CTRL0_CLR);
+-	__raw_writel(info->x_plus_mask, info->base + HW_LRADC_CTRL0_CLR);
+-	__raw_writel(info->x_minus_mask, info->base + HW_LRADC_CTRL0_CLR);
+ 	__raw_writel(BM_LRADC_CTRL0_TOUCH_DETECT_ENABLE,
+ 		     info->base + HW_LRADC_CTRL0_CLR);
+-	hw_lradc_set_delay_trigger_kick(LRADC_DELAY_TRIGGER_TOUCHSCREEN, 0);
+-	info->state = TS_STATE_DISABLED;
++	__raw_writel(info->y_plus_mask, info->base + HW_LRADC_CTRL0_CLR);
++	__raw_writel(info->y_minus_mask, info->base + HW_LRADC_CTRL0_CLR);
++	__raw_writel(info->x_plus_val, info->base + HW_LRADC_CTRL0_SET);
++	__raw_writel(info->x_minus_val, info->base + HW_LRADC_CTRL0_SET);
++	info->state = TS_STATE_Y_PLANE;
+ 	info->sample_count = 0;
++	hw_lradc_set_delay_trigger_kick(LRADC_DELAY_TRIGGER_TOUCHSCREEN, 1);
+ }
+ 
+-
+-static inline void enter_state_x_plane(struct mxs_ts_info *info)
++static void activate_touch_detect(struct work_struct *work)
+ {
+-	__raw_writel(info->y_plus_val, info->base + HW_LRADC_CTRL0_SET);
+-	__raw_writel(info->y_minus_val, info->base + HW_LRADC_CTRL0_SET);
+-	__raw_writel(info->x_plus_mask, info->base + HW_LRADC_CTRL0_CLR);
+-	__raw_writel(info->x_minus_mask, info->base + HW_LRADC_CTRL0_CLR);
+-	__raw_writel(BM_LRADC_CTRL0_TOUCH_DETECT_ENABLE,
+-		     info->base + HW_LRADC_CTRL0_CLR);
+-	hw_lradc_set_delay_trigger_kick(LRADC_DELAY_TRIGGER_TOUCHSCREEN, 1);
++	struct mxs_ts_info *info =
++		container_of(to_delayed_work(work), struct mxs_ts_info, activate_touch_detect);
+ 
+ 	info->state = TS_STATE_X_PLANE;
+-	info->sample_count = 0;
++
++	/* check if the pen is always down */
++	if( __raw_readl(info->base + HW_LRADC_STATUS) & BM_LRADC_STATUS_TOUCH_DETECT_RAW ){
++		info->pressure = 1;	
++		/* if yes, start a new scan */
++		enter_state_x_plane(info);
++	}
++	else{	
++		if (info->pressure){
++			info->pressure = 0;	
++			/* report touch pen up */
++			input_report_key(info->idev, BTN_TOUCH, 0);
++			input_report_abs(info->idev, ABS_PRESSURE, 0);
++			input_sync(info->idev);
++		}
++		/* enable touch detect IRQ */
++		__raw_writel(BM_LRADC_CTRL1_TOUCH_DETECT_IRQ,
++			     info->base + HW_LRADC_CTRL1_CLR);
++		__raw_writel(BM_LRADC_CTRL1_TOUCH_DETECT_IRQ_EN,
++			     info->base + HW_LRADC_CTRL1_SET);
++	}
+ }
+ 
+-static inline void enter_state_y_plane(struct mxs_ts_info *info)
++static inline void enter_state_touch_detect(struct mxs_ts_info *info)
+ {
++	__raw_writel(info->x_plus_mask, info->base + HW_LRADC_CTRL0_CLR);
+ 	__raw_writel(info->y_plus_mask, info->base + HW_LRADC_CTRL0_CLR);
+ 	__raw_writel(info->y_minus_mask, info->base + HW_LRADC_CTRL0_CLR);
+-	__raw_writel(info->x_plus_val, info->base + HW_LRADC_CTRL0_SET);
+-	__raw_writel(info->x_minus_val, info->base + HW_LRADC_CTRL0_SET);
++	__raw_writel(info->x_minus_mask, info->base + HW_LRADC_CTRL0_CLR);
++
++	__raw_writel(0xFFFFFFFF,
++		     info->base + HW_LRADC_CHn_CLR(info->x_plus_chan));
++	__raw_writel(0xFFFFFFFF,
++		     info->base + HW_LRADC_CHn_CLR(info->y_plus_chan));
++	__raw_writel(0xFFFFFFFF,
++		     info->base + HW_LRADC_CHn_CLR(info->x_minus_chan));
++	__raw_writel(0xFFFFFFFF,
++		     info->base + HW_LRADC_CHn_CLR(info->y_minus_chan));
++
++	__raw_writel(BM_LRADC_CTRL1_LRADC0_IRQ << info->y_minus_chan,
++		     info->base + HW_LRADC_CTRL1_CLR);
++
++	hw_lradc_set_delay_trigger_kick(LRADC_DELAY_TRIGGER_TOUCHSCREEN, 0);
++
+ 	__raw_writel(BM_LRADC_CTRL0_TOUCH_DETECT_ENABLE,
+-		     info->base + HW_LRADC_CTRL0_CLR);
+-	hw_lradc_set_delay_trigger_kick(LRADC_DELAY_TRIGGER_TOUCHSCREEN, 1);
+-	info->state = TS_STATE_Y_PLANE;
+-	info->sample_count = 0;
++		     info->base + HW_LRADC_CTRL0_SET);
++	/* delay touch detect interrupt enable due to touch capacitance and imx28 bug */
++	schedule_delayed_work(&info->activate_touch_detect, msecs_to_jiffies(5));
+ }
+ 
+-static inline void enter_state_touch_verify(struct mxs_ts_info *info)
++static inline void enter_state_disabled(struct mxs_ts_info *info)
+ {
+ 	__raw_writel(info->y_plus_mask, info->base + HW_LRADC_CTRL0_CLR);
+ 	__raw_writel(info->y_minus_mask, info->base + HW_LRADC_CTRL0_CLR);
+ 	__raw_writel(info->x_plus_mask, info->base + HW_LRADC_CTRL0_CLR);
+ 	__raw_writel(info->x_minus_mask, info->base + HW_LRADC_CTRL0_CLR);
+ 	__raw_writel(BM_LRADC_CTRL0_TOUCH_DETECT_ENABLE,
+-		     info->base + HW_LRADC_CTRL0_SET);
+-	info->state = TS_STATE_TOUCH_VERIFY;
+-	hw_lradc_set_delay_trigger_kick(LRADC_DELAY_TRIGGER_TOUCHSCREEN, 1);
++		     info->base + HW_LRADC_CTRL0_CLR);
++	hw_lradc_set_delay_trigger_kick(LRADC_DELAY_TRIGGER_TOUCHSCREEN, 0);
++	info->state = TS_STATE_DISABLED;
+ 	info->sample_count = 0;
+ }
+ 
+-static void process_lradc(struct mxs_ts_info *info, u16 x, u16 y,
+-			int pressure)
++static void process_lradc(struct mxs_ts_info *info, u16 x, u16 y)
+ {
+ 	switch (info->state) {
++
+ 	case TS_STATE_X_PLANE:
+-		pr_debug("%s: x plane state, sample_count %d\n", __func__,
+-				info->sample_count);
+-		if (info->sample_count < 2) {
+-			info->x = x;
+-			info->sample_count++;
+-		} else {
+-			if (abs(info->x - x) > TOUCH_DEBOUNCE_TOLERANCE)
+-				info->sample_count = 1;
+-			else {
+-				u16 x_c = info->x * (info->sample_count - 1);
+-				info->x = (x_c + x) / info->sample_count;
+-				info->sample_count++;
+-			}
+-		}
+-		if (info->sample_count > 4)
++		info->x += x;
++		info->sample_count++;
++		if (info->sample_count >= FILTER_SIZE){
++			info->x = info->x >> FILTER_SIZE;
+ 			enter_state_y_plane(info);
+-		else
++		}
++		else{			
+ 			hw_lradc_set_delay_trigger_kick(
+ 					LRADC_DELAY_TRIGGER_TOUCHSCREEN, 1);
++		}
+ 		break;
+ 
+ 	case TS_STATE_Y_PLANE:
+-		pr_debug("%s: y plane state, sample_count %d\n", __func__,
+-				info->sample_count);
+-		if (info->sample_count < 2) {
+-			info->y = y;
+-			info->sample_count++;
+-		} else {
+-			if (abs(info->y - y) > TOUCH_DEBOUNCE_TOLERANCE)
+-				info->sample_count = 1;
+-			else {
+-				u16 y_c = info->y * (info->sample_count - 1);
+-				info->y = (y_c + y) / info->sample_count;
+-				info->sample_count++;
+-			}
+-		}
+-		if (info->sample_count > 4)
+-			enter_state_touch_verify(info);
+-		else
+-			hw_lradc_set_delay_trigger_kick(
+-					LRADC_DELAY_TRIGGER_TOUCHSCREEN, 1);
+-		break;
++		info->y += y;
++		info->sample_count++;
++		if (info->sample_count >= FILTER_SIZE){
++			info->y = info->y >> FILTER_SIZE;
++			input_report_abs(info->idev, ABS_X, info->x);
++			input_report_abs(info->idev, ABS_Y, info->y);
++			input_report_abs(info->idev, ABS_PRESSURE, 100);
++			input_sync(info->idev);
+ 
+-	case TS_STATE_TOUCH_VERIFY:
+-		pr_debug("%s: touch verify state, sample_count %d\n", __func__,
+-				info->sample_count);
+-		pr_debug("%s: x %d, y %d\n", __func__, info->x, info->y);
+-		input_report_abs(info->idev, ABS_X, info->x);
+-		input_report_abs(info->idev, ABS_Y, info->y);
+-		input_report_abs(info->idev, ABS_PRESSURE, pressure);
+-		input_sync(info->idev);
+-		/* fall through */
+-	case TS_STATE_TOUCH_DETECT:
+-		pr_debug("%s: touch detect state, sample_count %d\n", __func__,
+-				info->sample_count);
+-		if (pressure) {
+-			input_report_abs(info->idev, ABS_PRESSURE, pressure);
+-			enter_state_x_plane(info);
++			enter_state_touch_detect(info);
++		}
++		else{
+ 			hw_lradc_set_delay_trigger_kick(
+ 					LRADC_DELAY_TRIGGER_TOUCHSCREEN, 1);
+-		} else
+-			enter_state_touch_detect(info);
++		}		
+ 		break;
+ 
+ 	default:
+@@ -227,30 +211,29 @@ static irqreturn_t ts_handler(int irq, v
+ {
+ 	struct mxs_ts_info *info = dev_id;
+ 	u16 x_plus, y_plus;
+-	int pressure = 0;
++	u32 status;
+ 
+-	if (irq == info->touch_irq)
++	if (irq == info->touch_irq){
+ 		__raw_writel(BM_LRADC_CTRL1_TOUCH_DETECT_IRQ,
+ 			     info->base + HW_LRADC_CTRL1_CLR);
+-	else if (irq == info->device_irq)
++		info->pressure = __raw_readl(info->base + HW_LRADC_STATUS) & BM_LRADC_STATUS_TOUCH_DETECT_RAW;
++		/* if pen down, disable touch IRQ and start touch scanning */
++		if (info->pressure){
++			__raw_writel(BM_LRADC_CTRL1_TOUCH_DETECT_IRQ_EN,
++			     info->base + HW_LRADC_CTRL1_CLR);
++			enter_state_x_plane(info);
++		}
++	}
++	else if (irq == info->device_irq){
+ 		__raw_writel(BM_LRADC_CTRL1_LRADC0_IRQ << info->y_minus_chan,
+ 			     info->base + HW_LRADC_CTRL1_CLR);
++		x_plus = __raw_readl(info->base + HW_LRADC_CHn(info->x_plus_chan)) &
++			BM_LRADC_CHn_VALUE;
++		y_plus = __raw_readl(info->base + HW_LRADC_CHn(info->y_plus_chan)) &
++			BM_LRADC_CHn_VALUE;
+ 
+-	/* get x, y values */
+-	x_plus = __raw_readl(info->base + HW_LRADC_CHn(info->x_plus_chan)) &
+-		BM_LRADC_CHn_VALUE;
+-	y_plus = __raw_readl(info->base + HW_LRADC_CHn(info->y_plus_chan)) &
+-		BM_LRADC_CHn_VALUE;
+-
+-	/* pressed? */
+-	if (__raw_readl(info->base + HW_LRADC_STATUS) &
+-	    BM_LRADC_STATUS_TOUCH_DETECT_RAW)
+-		pressure = 1;
+-
+-	pr_debug("%s: irq %d, x_plus %d, y_plus %d, pressure %d\n",
+-			__func__, irq, x_plus, y_plus, pressure);
+-
+-	process_lradc(info, x_plus, y_plus, pressure);
++		process_lradc(info, x_plus, y_plus);
++	}
+ 
+ 	return IRQ_HANDLED;
+ }
+@@ -278,7 +261,8 @@ static int __devinit mxs_ts_probe(struct
+ 	}
+ 
+ 	idev->name = "MXS touchscreen";
+-	idev->evbit[0] = BIT(EV_ABS);
++	idev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS);
++	idev->keybit[BIT_WORD(BTN_TOUCH)] |= BIT_MASK(BTN_TOUCH);
+ 	input_set_abs_params(idev, ABS_X, 0, 0xFFF, 0, 0);
+ 	input_set_abs_params(idev, ABS_Y, 0, 0xFFF, 0, 0);
+ 	input_set_abs_params(idev, ABS_PRESSURE, 0, 1, 0, 0);
+@@ -301,6 +285,8 @@ static int __devinit mxs_ts_probe(struct
+ 	info->y_plus_mask = plat_data->y_plus_mask;
+ 	info->y_minus_mask = plat_data->y_minus_mask;
+ 
++	INIT_DELAYED_WORK(&info->activate_touch_detect, activate_touch_detect);
++
+ 	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+ 	if (!res) {
+ 		printk(KERN_ERR "%s: couldn't get MEM resource\n", __func__);
+@@ -335,7 +321,6 @@ static int __devinit mxs_ts_probe(struct
+ 		free_irq(info->touch_irq, info);
+ 		goto out_nodev;
+ 	}
+-	enter_state_touch_detect(info);
+ 
+ 	hw_lradc_use_channel(info->x_plus_chan);
+ 	hw_lradc_use_channel(info->x_minus_chan);
+@@ -366,8 +351,8 @@ static int __devinit mxs_ts_probe(struct
+ 
+ 	__raw_writel(BM_LRADC_CTRL1_LRADC0_IRQ_EN << info->y_minus_chan,
+ 		     info->base + HW_LRADC_CTRL1_SET);
+-	__raw_writel(BM_LRADC_CTRL1_TOUCH_DETECT_IRQ_EN,
+-		     info->base + HW_LRADC_CTRL1_SET);
++
++	enter_state_touch_detect(info);
+ 
+ 	platform_set_drvdata(pdev, info);
+ 	device_init_wakeup(&pdev->dev, 1);
+@@ -401,6 +386,7 @@ static int __devexit mxs_ts_remove(struc
+ 
+ 	free_irq(info->device_irq, info);
+ 	free_irq(info->touch_irq, info);
++	cancel_delayed_work_sync(&info->activate_touch_detect);
+ 	input_free_device(info->idev);
+ 
+ 	enter_state_disabled(info);


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-262-g6da2a09

From: Fabien M <fa...@us...> - 2012-04-11 09:29:49

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".

The branch, master has been updated
       via  6da2a097fe3e5452b4d04aabaaeb6c76c0a3d089 (commit)
      from  4e28231f82e9e538f0119ccb03f313eb4c077b8f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 6da2a097fe3e5452b4d04aabaaeb6c76c0a3d089
Author: Fabien Marteau <fab...@ar...>
Date:   Wed Apr 11 11:29:17 2012 +0200

    [TOOLS] adding 320x240 image for testbench

-----------------------------------------------------------------------

Summary of changes:
 target/test/data/images/mire_320x240.png |  Bin 0 -> 1847 bytes
 1 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 target/test/data/images/mire_320x240.png

diff --git a/target/test/data/images/mire_320x240.png b/target/test/data/images/mire_320x240.png
new file mode 100644
index 0000000..a97da94
Binary files /dev/null and b/target/test/data/images/mire_320x240.png differ


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-261-g4e28231

From: Fabien M <fa...@us...> - 2012-04-10 14:13:48

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".

The branch, master has been updated
       via  4e28231f82e9e538f0119ccb03f313eb4c077b8f (commit)
      from  610dac7274027f1e2f61795531a9df01db937425 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 4e28231f82e9e538f0119ccb03f313eb4c077b8f
Author: Fabien Marteau <fab...@ar...>
Date:   Tue Apr 10 16:13:20 2012 +0200

    [TOOLS] Fix little bug in quiltify

-----------------------------------------------------------------------

Summary of changes:
 scripts/quiltify.sh |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/scripts/quiltify.sh b/scripts/quiltify.sh
index 5f7ebc1..42d0ed0 100755
--- a/scripts/quiltify.sh
+++ b/scripts/quiltify.sh
@@ -3,12 +3,6 @@
 # "quiltifies" Linux or Buildroot
 #
 
-if [ "$ARMADEUS_BOARD_NAME" != "apf28" ]; then
-	FREESCALE_PATCH=linux-2.6.35.3-imx_10.12.01.patch.tar.gz
-else
-	FREESCALE_PATCH=""
-fi
-
 answer=""
 
 ask_user_banner()
@@ -57,6 +51,12 @@ fi
 make shell_env
 . armadeus_env.sh
 
+if [ "$ARMADEUS_BOARD_NAME" == "apf28" ]; then
+	FREESCALE_PATCH=linux-2.6.35.3-imx_10.12.01.patch.tar.gz
+else
+	FREESCALE_PATCH=""
+fi
+
 if [ "$1" != "export" ]; then
 	ask_user_choice "What do you want to quiltify today ? ;-)" "Linux Buildroot U-Boot"
 fi


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-260-g610dac7

From: Fabien M <fa...@us...> - 2012-04-10 13:44:17

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".

The branch, master has been updated
       via  610dac7274027f1e2f61795531a9df01db937425 (commit)
      from  234fe9e80228b3b4b071f368da95fdf06f96149c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 610dac7274027f1e2f61795531a9df01db937425
Author: Fabien Marteau <fab...@ar...>
Date:   Tue Apr 10 15:43:26 2012 +0200

    [TOOLS] adding the freescale patch in quiltify, before importing regulars patch

-----------------------------------------------------------------------

Summary of changes:
 Makefile            |    1 +
 scripts/quiltify.sh |   12 ++++++++++++
 2 files changed, 13 insertions(+), 0 deletions(-)

diff --git a/Makefile b/Makefile
index e27b95b..bb7b6af 100644
--- a/Makefile
+++ b/Makefile
@@ -225,6 +225,7 @@ shell_env:
 	@echo ARMADEUS_BUSYBOX_VERSION=$(ARMADEUS_BUSYBOX_VERSION) >> $(ARMADEUS_ENV_FILE)
 	@echo ARMADEUS_BSP_VERSION=$(ARMADEUS_BSP_VERSION) >> $(ARMADEUS_ENV_FILE)
 	@echo ARMADEUS_BOARD_NAME=$(ARMADEUS_BOARD_NAME) >> $(ARMADEUS_ENV_FILE)
+	@echo ARMADEUS_DL_DIR=$(BR2_DL_DIR) >> $(ARMADEUS_ENV_FILE)
 
 
 PHONY_TARGETS+=dummy all linux26 linux26-clean buildroot-clean buildroot-dirclean
diff --git a/scripts/quiltify.sh b/scripts/quiltify.sh
index b593d93..5f7ebc1 100755
--- a/scripts/quiltify.sh
+++ b/scripts/quiltify.sh
@@ -3,6 +3,12 @@
 # "quiltifies" Linux or Buildroot
 #
 
+if [ "$ARMADEUS_BOARD_NAME" != "apf28" ]; then
+	FREESCALE_PATCH=linux-2.6.35.3-imx_10.12.01.patch.tar.gz
+else
+	FREESCALE_PATCH=""
+fi
+
 answer=""
 
 ask_user_banner()
@@ -160,9 +166,15 @@ if [ "$QUILT_PATCH_FILTER" != "" ]; then
 else
 	PATCHES=`ls -ar $QUILT_TARGET_PATCH_DIR/*.patch`
 fi
+
 for patch in $PATCHES; do
 	quilt import $patch
 done
+
+if [ "$FREESCALE_PATCH" != "" ]; then
+	quilt import $ARMADEUS_DL_DIR/$FREESCALE_PATCH
+fi
+
 quilt push -a
 if [ "$?" != 0 ]; then
 	echo "Please correct that"


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-259-g234fe9e

From: Julien B a. A. <ar...@us...> - 2012-04-10 08:55:33

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".

The branch, master has been updated
       via  234fe9e80228b3b4b071f368da95fdf06f96149c (commit)
      from  181a4437aa2ca776a64acb7b38e04d29a6e787e7 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 234fe9e80228b3b4b071f368da95fdf06f96149c
Author: Julien Boibessot <jul...@ar...>
Date:   Tue Apr 10 10:53:35 2012 +0200

    One TAB per indent, please...

-----------------------------------------------------------------------

Summary of changes:
 scripts/quiltify.sh |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/quiltify.sh b/scripts/quiltify.sh
index 5f09f94..b593d93 100755
--- a/scripts/quiltify.sh
+++ b/scripts/quiltify.sh
@@ -18,9 +18,9 @@ ask_user()
 	shift
 	n=1
 	while [ "$1" != "" ]; do
-			echo "  $n] "$1
-			shift
-			let n=n+1
+		echo "  $n] "$1
+		shift
+		let n=n+1
 	done
 	read -p "> " answer
 }


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-258-g181a443

From: Fabien M <fa...@us...> - 2012-04-05 11:48:26

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".

The branch, master has been updated
       via  181a4437aa2ca776a64acb7b38e04d29a6e787e7 (commit)
       via  69b429b79426faba0b25b9ce4f46c9214db4528e (commit)
      from  cb4af8dbd7c08a530c4b1421586d0ecffa22899b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 181a4437aa2ca776a64acb7b38e04d29a6e787e7
Merge: 69b429b cb4af8d
Author: Fabien Marteau <fab...@ar...>
Date:   Thu Apr 5 13:48:10 2012 +0200

    Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus

commit 69b429b79426faba0b25b9ce4f46c9214db4528e
Author: Fabien Marteau <fab...@ar...>
Date:   Thu Apr 5 13:47:44 2012 +0200

    [TOOLS][quiltify] use TAB not spaces

-----------------------------------------------------------------------

Summary of changes:
 scripts/quiltify.sh |   26 +++++++++++++-------------
 1 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/scripts/quiltify.sh b/scripts/quiltify.sh
index 272affd..5f09f94 100755
--- a/scripts/quiltify.sh
+++ b/scripts/quiltify.sh
@@ -7,28 +7,28 @@ answer=""
 
 ask_user_banner()
 {
-        echo
-        echo -e "--- "$1
+	echo
+	echo -e "--- "$1
 }
 
 # $1: thing to ask, $* possibilities. Will fill in "answer" variable.
 ask_user()
 {
-        ask_user_banner "$1"
-        shift
-        n=1
-        while [ "$1" != "" ]; do
-                echo "  $n] "$1
-                shift
-                let n=n+1
-        done
-        read -p "> " answer
+	ask_user_banner "$1"
+	shift
+	n=1
+	while [ "$1" != "" ]; do
+			echo "  $n] "$1
+			shift
+			let n=n+1
+	done
+	read -p "> " answer
 }
 
 ask_user_choice()
 {
-        ask_user_banner "$1"
-        shift
+	ask_user_banner "$1"
+	shift
 	export PS3="> "
 	select answer in $1; do
 #		echo "($answer) ($REPLY)"


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-256-gcb4af8d

From: Julien B a. A. <ar...@us...> - 2012-04-05 10:50:08

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".

The branch, master has been updated
       via  cb4af8dbd7c08a530c4b1421586d0ecffa22899b (commit)
       via  0f6455d49c35d0d6a318fcb69abf147b154a944b (commit)
      from  05034c28d496c85dd96d01874958bda96cbeccd0 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit cb4af8dbd7c08a530c4b1421586d0ecffa22899b
Merge: 0f6455d 05034c2
Author: Julien Boibessot <jul...@ar...>
Date:   Thu Apr 5 12:49:41 2012 +0200

    Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus

commit 0f6455d49c35d0d6a318fcb69abf147b154a944b
Author: Julien Boibessot <jul...@ar...>
Date:   Thu Apr 5 12:49:02 2012 +0200

    [BUILDROOT] Let gst-fsl-plugin compile vpu_enc plugin too, by adding ipu stuff (\!?) from latest imx-lib, which required some linux headers updates...

-----------------------------------------------------------------------

Summary of changes:
 .../2012.02/174-imx-lib-add_package.patch          |   47 +++-
 .../2012.02/185-gst-fsl-plugin-add_package.patch   |   12 +-
 ...26692-3-add_mx23_mx25_mx28_security_stuff.patch |   30 +-
 ...0-add_scc2_and_sahara_drivers_without_rng.patch |  343 +++++++++++---------
 4 files changed, 246 insertions(+), 186 deletions(-)

diff --git a/patches/buildroot/2012.02/174-imx-lib-add_package.patch b/patches/buildroot/2012.02/174-imx-lib-add_package.patch
index 802396a..9ea4304 100644
--- a/patches/buildroot/2012.02/174-imx-lib-add_package.patch
+++ b/patches/buildroot/2012.02/174-imx-lib-add_package.patch
@@ -3,7 +3,7 @@ Signed-off-by: Julien Boibessot <jul...@ar...>
 Index: buildroot/package/imx-lib/Config.in
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/imx-lib/Config.in	2012-04-03 10:31:23.000000000 +0200
++++ buildroot/package/imx-lib/Config.in	2012-04-05 12:05:39.000000000 +0200
 @@ -0,0 +1,4 @@
 +config BR2_PACKAGE_IMX_LIB
 +	bool "imx-lib"
@@ -12,14 +12,14 @@ Index: buildroot/package/imx-lib/Config.in
 Index: buildroot/package/imx-lib/imx-lib.mk
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/imx-lib/imx-lib.mk	2012-04-03 12:24:19.000000000 +0200
-@@ -0,0 +1,46 @@
++++ buildroot/package/imx-lib/imx-lib.mk	2012-04-05 12:41:02.000000000 +0200
+@@ -0,0 +1,56 @@
 +#############################################################
 +#
 +# imx-lib (helpers librairies from Freescale BSP)
 +#
 +#############################################################
-+IMX_LIB_VERSION = 10.11.01
++IMX_LIB_VERSION = 11.09.01
 +IMX_LIB_SOURCE = imx-lib-$(IMX_LIB_VERSION).tar.gz
 +IMX_LIB_SITE = ftp://ftp2.armadeus.com/armadeusw/download/
 +IMX_LIB_INSTALL_STAGING = YES
@@ -30,11 +30,16 @@ Index: buildroot/package/imx-lib/imx-lib.mk
 +BUILD_PLATFORM = IMX51
 +endif
 +
++IMX_LIB_SUBDIRS += sahara2
++IMX_LIB_SUBDIRS += vpu
++IMX_LIB_SUBDIRS += ipu
++
 +define IMX_LIB_BUILD_CMDS
 +	$(MAKE) CC="$(TARGET_CC)" \
 +		PLATFORM=$(BUILD_PLATFORM) \
-+		DIRS="sahara2 vpu" \
-+		CFLAGS="-fPIC -I$(LINUX_DIR)/drivers/mxc/security/sahara2/include" \
++		DIRS="$(IMX_LIB_SUBDIRS)" \
++		CFLAGS="-fPIC -I$(LINUX_DIR)/drivers/mxc/security/sahara2/include -I$(LINUX_DIR)/include" \
++		INCLUDE="-I$(LINUX_DIR)/include" \
 +		-C $(@D)
 +endef
 +
@@ -44,15 +49,20 @@ Index: buildroot/package/imx-lib/imx-lib.mk
 +	install -D -m 755 $(@D)/vpu/vpu_lib.h $(STAGING_DIR)/usr/include
 +	install -D -m 755 $(@D)/sahara2/libsahara.so $(STAGING_DIR)/usr/lib
 +	install -D -m 755 $(@D)/ipu/mxc_ipu_hl_lib.h $(STAGING_DIR)/usr/include
++	install -D -m 755 $(@D)/ipu/ipu.h $(STAGING_DIR)/usr/include
++	install -D -m 755 $(@D)/ipu/libipu.so $(STAGING_DIR)/usr/lib
 +endef
 +
 +define IMX_LIB_INSTALL_TARGET_CMDS
 +	install -D -m 755 $(@D)/vpu/libvpu.so $(TARGET_DIR)/usr/lib
 +	install -D -m 755 $(@D)/sahara2/libsahara.so $(TARGET_DIR)/usr/lib
++	install -D -m 755 $(@D)/ipu/libipu.so $(TARGET_DIR)/usr/lib
 +endef
 +
 +define IMX_LIB_UNINSTALL_TARGET_CMDS
 +	rm -f $(TARGET_DIR)/usr/lib/libvpu.so
++	rm -f $(TARGET_DIR)/usr/lib/libsahara.so
++	rm -f $(TARGET_DIR)/usr/lib/libipu.so
 +endef
 +
 +define IMX_LIB_CLEAN_CMDS
@@ -62,8 +72,8 @@ Index: buildroot/package/imx-lib/imx-lib.mk
 +$(eval $(call GENTARGETS))
 Index: buildroot/package/Config.in
 ===================================================================
---- buildroot.orig/package/Config.in	2012-04-03 10:31:23.000000000 +0200
-+++ buildroot/package/Config.in	2012-04-03 18:01:02.000000000 +0200
+--- buildroot.orig/package/Config.in	2012-04-05 12:05:39.000000000 +0200
++++ buildroot/package/Config.in	2012-04-05 12:42:07.000000000 +0200
 @@ -349,6 +349,7 @@
  endmenu
  
@@ -72,3 +82,24 @@ Index: buildroot/package/Config.in
  source "package/libaio/Config.in"
  source "package/libraw1394/Config.in"
  source "package/tslib/Config.in"
+Index: buildroot/package/imx-lib/imx-lib-mxc_ipu_hl_li_v4l2_fixes.patch
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/imx-lib/imx-lib-mxc_ipu_hl_li_v4l2_fixes.patch	2012-04-05 12:35:42.000000000 +0200
+@@ -0,0 +1,16 @@
++linux/videodev.h include doesn't exist anymore on V4L2 only (=recent kernels).
++
++Signed-off-by: Julien Boibessot <jul...@ar...>
++
++diff -urN -X linux-2.6.38.8/Documentation/dontdiff imx-lib-11.09.01/ipu/mxc_ipu_hl_lib.c imx-lib-11.09.01.mod/ipu/mxc_ipu_hl_lib.c
++--- imx-lib-11.09.01/ipu/mxc_ipu_hl_lib.c	2012-04-05 12:24:55.000000000 +0200
+++++ imx-lib-11.09.01.mod/ipu/mxc_ipu_hl_lib.c	2011-09-09 16:10:11.000000000 +0200
++@@ -41,7 +41,7 @@
++ #include <sys/mman.h>
++ #include <sys/types.h>
++ #include <sys/stat.h>
++-#include <linux/videodev.h>
+++#include <linux/videodev2.h>
++ #include "mxc_ipu_hl_lib.h"
++ 
++ #define DBG_DEBUG		3
diff --git a/patches/buildroot/2012.02/185-gst-fsl-plugin-add_package.patch b/patches/buildroot/2012.02/185-gst-fsl-plugin-add_package.patch
index 6d13023..ef6267c 100644
--- a/patches/buildroot/2012.02/185-gst-fsl-plugin-add_package.patch
+++ b/patches/buildroot/2012.02/185-gst-fsl-plugin-add_package.patch
@@ -3,7 +3,7 @@ Signed-off-by: Julien Boibessot <jul...@ar...>
 Index: buildroot/package/multimedia/gst-fsl-plugin/gst-fsl-plugin.mk
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/multimedia/gst-fsl-plugin/gst-fsl-plugin.mk	2012-04-03 17:42:39.000000000 +0200
++++ buildroot/package/multimedia/gst-fsl-plugin/gst-fsl-plugin.mk	2012-04-05 12:37:49.000000000 +0200
 @@ -0,0 +1,41 @@
 +#############################################################
 +#
@@ -43,13 +43,13 @@ Index: buildroot/package/multimedia/gst-fsl-plugin/gst-fsl-plugin.mk
 +define GST_FSL_PLUGIN_NO_IPU_HOOK
 +	$(SED) 's/$$(IPUDIRS)//' $(@D)/Makefile
 +endef
-+GST_FSL_PLUGIN_POST_CONFIGURE_HOOKS += GST_FSL_PLUGIN_NO_IPU_HOOK
++#GST_FSL_PLUGIN_POST_CONFIGURE_HOOKS += GST_FSL_PLUGIN_NO_IPU_HOOK
 +
 +$(eval $(call AUTOTARGETS))
 Index: buildroot/package/multimedia/gst-fsl-plugin/gst-fsl-plugin-gst_snapshot_stdio.patch
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/multimedia/gst-fsl-plugin/gst-fsl-plugin-gst_snapshot_stdio.patch	2012-04-03 17:34:37.000000000 +0200
++++ buildroot/package/multimedia/gst-fsl-plugin/gst-fsl-plugin-gst_snapshot_stdio.patch	2012-04-05 12:36:53.000000000 +0200
 @@ -0,0 +1,19 @@
 +Otherwise build fails with:
 +
@@ -73,7 +73,7 @@ Index: buildroot/package/multimedia/gst-fsl-plugin/gst-fsl-plugin-gst_snapshot_s
 Index: buildroot/package/multimedia/gst-fsl-plugin/Config.in
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/multimedia/gst-fsl-plugin/Config.in	2012-04-03 17:58:51.000000000 +0200
++++ buildroot/package/multimedia/gst-fsl-plugin/Config.in	2012-04-05 12:36:53.000000000 +0200
 @@ -0,0 +1,8 @@
 +config BR2_PACKAGE_GST_FSL_PLUGIN
 +	bool "gst-fsl-plugin"
@@ -85,8 +85,8 @@ Index: buildroot/package/multimedia/gst-fsl-plugin/Config.in
 +	  Freescale's i.MX specific gstreamer plugins.
 Index: buildroot/package/multimedia/Config.in
 ===================================================================
---- buildroot.orig/package/multimedia/Config.in	2012-04-03 17:54:48.000000000 +0200
-+++ buildroot/package/multimedia/Config.in	2012-04-03 17:55:22.000000000 +0200
+--- buildroot.orig/package/multimedia/Config.in	2012-04-05 12:36:28.000000000 +0200
++++ buildroot/package/multimedia/Config.in	2012-04-05 12:36:53.000000000 +0200
 @@ -8,6 +8,7 @@
  source "package/multimedia/ffmpeg/Config.in"
  source "package/multimedia/gstreamer/Config.in"
diff --git a/patches/linux/2.6.38/442-freescale-0034-ENGR00126692-3-add_mx23_mx25_mx28_security_stuff.patch b/patches/linux/2.6.38/442-freescale-0034-ENGR00126692-3-add_mx23_mx25_mx28_security_stuff.patch
index 6c9dd38..18773a8 100644
--- a/patches/linux/2.6.38/442-freescale-0034-ENGR00126692-3-add_mx23_mx25_mx28_security_stuff.patch
+++ b/patches/linux/2.6.38/442-freescale-0034-ENGR00126692-3-add_mx23_mx25_mx28_security_stuff.patch
@@ -14,8 +14,8 @@ Signed-off-by: Dinh Nguyen <Din...@fr...>
 
 Index: linux-2.6.38.8/drivers/crypto/Kconfig
 ===================================================================
---- linux-2.6.38.8.orig/drivers/crypto/Kconfig	2011-06-03 03:35:11.000000000 +0200
-+++ linux-2.6.38.8/drivers/crypto/Kconfig	2011-10-20 17:27:20.000000000 +0200
+--- linux-2.6.38.8.orig/drivers/crypto/Kconfig	2012-04-03 16:57:51.000000000 +0200
++++ linux-2.6.38.8/drivers/crypto/Kconfig	2012-04-03 16:58:28.000000000 +0200
 @@ -252,4 +252,16 @@
  	  OMAP processors have AES module accelerator. Select this if you
  	  want to use the OMAP module for AES algorithms.
@@ -35,8 +35,8 @@ Index: linux-2.6.38.8/drivers/crypto/Kconfig
  endif # CRYPTO_HW
 Index: linux-2.6.38.8/drivers/crypto/Makefile
 ===================================================================
---- linux-2.6.38.8.orig/drivers/crypto/Makefile	2011-06-03 03:35:11.000000000 +0200
-+++ linux-2.6.38.8/drivers/crypto/Makefile	2011-10-20 17:27:20.000000000 +0200
+--- linux-2.6.38.8.orig/drivers/crypto/Makefile	2012-04-03 16:57:51.000000000 +0200
++++ linux-2.6.38.8/drivers/crypto/Makefile	2012-04-03 16:58:28.000000000 +0200
 @@ -10,4 +10,5 @@
  obj-$(CONFIG_CRYPTO_DEV_PPC4XX) += amcc/
  obj-$(CONFIG_CRYPTO_DEV_OMAP_SHAM) += omap-sham.o
@@ -46,7 +46,7 @@ Index: linux-2.6.38.8/drivers/crypto/Makefile
 Index: linux-2.6.38.8/drivers/crypto/dcp.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/crypto/dcp.c	2011-10-20 17:27:20.000000000 +0200
++++ linux-2.6.38.8/drivers/crypto/dcp.c	2012-04-03 16:58:28.000000000 +0200
 @@ -0,0 +1,1697 @@
 +/*
 + * Copyright (C) 2008-2010 Freescale Semiconductor, Inc.
@@ -1748,7 +1748,7 @@ Index: linux-2.6.38.8/drivers/crypto/dcp.c
 Index: linux-2.6.38.8/drivers/crypto/dcp.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/crypto/dcp.h	2011-10-20 17:27:20.000000000 +0200
++++ linux-2.6.38.8/drivers/crypto/dcp.h	2012-04-03 16:58:28.000000000 +0200
 @@ -0,0 +1,717 @@
 +/*
 + * Copyright 2008-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -2470,7 +2470,7 @@ Index: linux-2.6.38.8/drivers/crypto/dcp.h
 Index: linux-2.6.38.8/drivers/crypto/dcp_bootstream_ioctl.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/crypto/dcp_bootstream_ioctl.h	2011-10-20 17:27:20.000000000 +0200
++++ linux-2.6.38.8/drivers/crypto/dcp_bootstream_ioctl.h	2012-04-03 16:58:28.000000000 +0200
 @@ -0,0 +1,32 @@
 +/*
 + * Freescale DCP driver for bootstream update. Only handles the OTP KEY
@@ -2507,7 +2507,7 @@ Index: linux-2.6.38.8/drivers/crypto/dcp_bootstream_ioctl.h
 Index: linux-2.6.38.8/drivers/mxc/security/Kconfig
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/Kconfig	2011-10-20 17:27:20.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/Kconfig	2012-04-05 11:44:18.000000000 +0200
 @@ -0,0 +1,11 @@
 +menu "MXC Security Drivers"
 +
@@ -2523,16 +2523,16 @@ Index: linux-2.6.38.8/drivers/mxc/security/Kconfig
 Index: linux-2.6.38.8/drivers/mxc/security/Makefile
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/Makefile	2011-10-20 17:27:20.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/Makefile	2012-04-05 11:44:18.000000000 +0200
 @@ -0,0 +1 @@
 +obj-$(CONFIG_MXC_DRYICE) += dryice.o
 Index: linux-2.6.38.8/drivers/mxc/security/dryice-regs.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/dryice-regs.h	2011-10-20 17:27:20.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/dryice-regs.h	2012-04-05 11:41:06.000000000 +0200
 @@ -0,0 +1,207 @@
 +/*
-+ * Copyright 2009-2010 Freescale Semiconductor, Inc. All Rights Reserved.
++ * Copyright (C) 2009-2010 Freescale Semiconductor, Inc. All Rights Reserved.
 + */
 +
 +/*
@@ -2741,10 +2741,10 @@ Index: linux-2.6.38.8/drivers/mxc/security/dryice-regs.h
 Index: linux-2.6.38.8/drivers/mxc/security/dryice.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/dryice.c	2011-10-20 17:27:20.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/dryice.c	2012-04-05 11:41:05.000000000 +0200
 @@ -0,0 +1,1123 @@
 +/*
-+ * Copyright 2009-2010 Freescale Semiconductor, Inc. All Rights Reserved.
++ * Copyright (C) 2009-2010 Freescale Semiconductor, Inc. All Rights Reserved.
 + */
 +
 +/*
@@ -3869,10 +3869,10 @@ Index: linux-2.6.38.8/drivers/mxc/security/dryice.c
 Index: linux-2.6.38.8/drivers/mxc/security/dryice.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/dryice.h	2011-10-20 17:27:20.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/dryice.h	2012-04-05 11:41:06.000000000 +0200
 @@ -0,0 +1,287 @@
 +/*
-+ * Copyright 2009-2010 Freescale Semiconductor, Inc. All Rights Reserved.
++ * Copyright (C) 2009-2010 Freescale Semiconductor, Inc. All Rights Reserved.
 + */
 +
 +/*
diff --git a/patches/linux/2.6.38/442-freescale-0197-ENGR00131650-add_scc2_and_sahara_drivers_without_rng.patch b/patches/linux/2.6.38/442-freescale-0197-ENGR00131650-add_scc2_and_sahara_drivers_without_rng.patch
index b741baf..be4d4f3 100644
--- a/patches/linux/2.6.38/442-freescale-0197-ENGR00131650-add_scc2_and_sahara_drivers_without_rng.patch
+++ b/patches/linux/2.6.38/442-freescale-0197-ENGR00131650-add_scc2_and_sahara_drivers_without_rng.patch
@@ -11,6 +11,7 @@ Signed-off-by: Anish Trivedi <an...@fr...>
 ---
  Modifications done by Armadeus systems:
  - removal of RNG stuff
+ - updated to L2.6.35.11.09.01 + 201112 patches
  - compatibility with 2.6.38
 
  drivers/mxc/security/Kconfig                       |   53 +
@@ -42,7 +43,6 @@ Signed-off-by: Anish Trivedi <an...@fr...>
  .../security/sahara2/include/sah_memory_mapper.h   |   79 +
  .../security/sahara2/include/sah_queue_manager.h   |   63 +
  .../security/sahara2/include/sah_status_manager.h  |  228 ++
- drivers/mxc/security/sahara2/include/sahara.h      | 2265 +++++++++++++++
  .../mxc/security/sahara2/include/sahara2_kernel.h  |   49 +
  drivers/mxc/security/sahara2/include/sf_util.h     |  466 +++
  drivers/mxc/security/sahara2/km_adaptor.c          |  849 ++++++
@@ -56,12 +56,13 @@ Signed-off-by: Anish Trivedi <an...@fr...>
  drivers/mxc/security/sahara2/sf_util.c             | 1390 +++++++++
  drivers/mxc/security/scc2_driver.c                 | 2393 ++++++++++++++++
  drivers/mxc/security/scc2_internals.h              |  519 ++++
+ linux/include/mxc_sahara.h      | 2265 +++++++++++++++
  67 files changed, 40654 insertions(+), 3 deletions(-)
 
 Index: linux-2.6.38.8/drivers/mxc/security/Kconfig
 ===================================================================
---- linux-2.6.38.8.orig/drivers/mxc/security/Kconfig	2012-03-28 10:01:28.000000000 +0200
-+++ linux-2.6.38.8/drivers/mxc/security/Kconfig	2012-03-28 10:01:36.000000000 +0200
+--- linux-2.6.38.8.orig/drivers/mxc/security/Kconfig	2012-04-03 16:58:28.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/Kconfig	2012-04-03 16:58:29.000000000 +0200
 @@ -8,4 +8,57 @@
            This module contains the core API's for accessing the DryIce module.
            If you are unsure about this, say N here.
@@ -122,8 +123,8 @@ Index: linux-2.6.38.8/drivers/mxc/security/Kconfig
  endmenu
 Index: linux-2.6.38.8/drivers/mxc/security/Makefile
 ===================================================================
---- linux-2.6.38.8.orig/drivers/mxc/security/Makefile	2012-03-28 10:01:28.000000000 +0200
-+++ linux-2.6.38.8/drivers/mxc/security/Makefile	2012-03-28 10:01:36.000000000 +0200
+--- linux-2.6.38.8.orig/drivers/mxc/security/Makefile	2012-04-03 16:58:29.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/Makefile	2012-04-03 16:58:29.000000000 +0200
 @@ -1 +1,11 @@
  obj-$(CONFIG_MXC_DRYICE) += dryice.o
 +# Makefile for the Linux MXC Security API
@@ -139,7 +140,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/Makefile
 Index: linux-2.6.38.8/drivers/mxc/security/mxc_scc.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/mxc_scc.c	2012-03-28 10:01:36.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/mxc_scc.c	2012-04-03 16:58:29.000000000 +0200
 @@ -0,0 +1,2386 @@
 +/*
 + * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -2530,7 +2531,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/mxc_scc.c
 Index: linux-2.6.38.8/drivers/mxc/security/mxc_scc_internals.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/mxc_scc_internals.h	2012-03-28 10:01:36.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/mxc_scc_internals.h	2012-04-03 16:58:29.000000000 +0200
 @@ -0,0 +1,498 @@
 +/*
 + * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -3033,7 +3034,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/mxc_scc_internals.h
 Index: linux-2.6.38.8/drivers/mxc/security/sahara2/Kconfig
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/sahara2/Kconfig	2012-03-28 10:01:36.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/Kconfig	2012-04-03 16:58:29.000000000 +0200
 @@ -0,0 +1,35 @@
 +menu "SAHARA2 Security Hardware Support"
 +
@@ -3073,7 +3074,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/Kconfig
 Index: linux-2.6.38.8/drivers/mxc/security/sahara2/Makefile
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/sahara2/Makefile	2012-03-28 10:01:36.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/Makefile	2012-04-03 16:58:29.000000000 +0200
 @@ -0,0 +1,47 @@
 +# Makefile for the Linux Sahara2 driver
 +#
@@ -3125,10 +3126,10 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/Makefile
 Index: linux-2.6.38.8/drivers/mxc/security/sahara2/fsl_shw_auth.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/sahara2/fsl_shw_auth.c	2012-03-28 10:01:36.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/fsl_shw_auth.c	2012-04-05 11:41:06.000000000 +0200
 @@ -0,0 +1,706 @@
 +/*
-+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
++ * Copyright (C) 2004-2011 Freescale Semiconductor, Inc. All Rights Reserved.
 + */
 +
 +/*
@@ -3146,7 +3147,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/fsl_shw_auth.c
 + * functions.  For now, only AES-CCM is supported.
 + */
 +
-+#include "sahara.h"
++#include <linux/mxc_sahara.h>
 +#include "adaptor.h"
 +#include "sf_util.h"
 +
@@ -3836,10 +3837,10 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/fsl_shw_auth.c
 Index: linux-2.6.38.8/drivers/mxc/security/sahara2/fsl_shw_hash.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/sahara2/fsl_shw_hash.c	2012-03-28 10:01:36.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/fsl_shw_hash.c	2012-04-05 11:41:06.000000000 +0200
 @@ -0,0 +1,186 @@
 +/*
-+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
++ * Copyright (C) 2004-2011 Freescale Semiconductor, Inc. All Rights Reserved.
 + */
 +
 +/*
@@ -3858,7 +3859,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/fsl_shw_hash.c
 + * for Sahara.  This does not include HMAC.
 + */
 +
-+#include "sahara.h"
++#include <linux/mxc_sahara.h>
 +#include "sf_util.h"
 +
 +#ifdef LINUX_KERNEL
@@ -4027,10 +4028,10 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/fsl_shw_hash.c
 Index: linux-2.6.38.8/drivers/mxc/security/sahara2/fsl_shw_hmac.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/sahara2/fsl_shw_hmac.c	2012-03-28 10:01:36.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/fsl_shw_hmac.c	2012-04-05 11:41:06.000000000 +0200
 @@ -0,0 +1,266 @@
 +/*
-+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
++ * Copyright (C) 2004-2011 Freescale Semiconductor, Inc. All Rights Reserved.
 + */
 +
 +/*
@@ -4049,7 +4050,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/fsl_shw_hmac.c
 + * SHW API for Sahara.
 + */
 +
-+#include "sahara.h"
++#include <linux/mxc_sahara.h>
 +#include "sf_util.h"
 +
 +#ifdef __KERNEL__
@@ -4298,7 +4299,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/fsl_shw_hmac.c
 Index: linux-2.6.38.8/drivers/mxc/security/sahara2/fsl_shw_keystore.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/sahara2/fsl_shw_keystore.c	2012-03-28 10:01:36.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/fsl_shw_keystore.c	2012-04-03 16:58:29.000000000 +0200
 @@ -0,0 +1,837 @@
 +/*
 + * Copyright (C) 2008-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -5140,10 +5141,10 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/fsl_shw_keystore.c
 Index: linux-2.6.38.8/drivers/mxc/security/sahara2/fsl_shw_rand.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/sahara2/fsl_shw_rand.c	2012-03-28 10:01:36.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/fsl_shw_rand.c	2012-04-05 11:41:06.000000000 +0200
 @@ -0,0 +1,96 @@
 +/*
-+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
++ * Copyright (C) 2004-2011 Freescale Semiconductor, Inc. All Rights Reserved.
 + */
 +
 +/*
@@ -5162,7 +5163,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/fsl_shw_rand.c
 + * for Sahara.
 + */
 +
-+#include "sahara.h"
++#include <linux/mxc_sahara.h>
 +#include "sf_util.h"
 +
 +#ifdef __KERNEL__
@@ -5241,10 +5242,10 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/fsl_shw_rand.c
 Index: linux-2.6.38.8/drivers/mxc/security/sahara2/fsl_shw_sym.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/sahara2/fsl_shw_sym.c	2012-03-28 10:01:36.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/fsl_shw_sym.c	2012-04-05 11:41:06.000000000 +0200
 @@ -0,0 +1,281 @@
 +/*
-+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
++ * Copyright (C) 2004-2011 Freescale Semiconductor, Inc. All Rights Reserved.
 + */
 +
 +/*
@@ -5263,7 +5264,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/fsl_shw_sym.c
 + * Sahara.  This does not include CCM.
 + */
 +
-+#include "sahara.h"
++#include <linux/mxc_sahara.h>
 +#include "fsl_platform.h"
 +
 +#include "sf_util.h"
@@ -5527,10 +5528,10 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/fsl_shw_sym.c
 Index: linux-2.6.38.8/drivers/mxc/security/sahara2/fsl_shw_user.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/sahara2/fsl_shw_user.c	2012-03-28 10:01:36.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/fsl_shw_user.c	2012-04-05 11:41:06.000000000 +0200
 @@ -0,0 +1,137 @@
 +/*
-+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
++ * Copyright (C) 2004-2011 Freescale Semiconductor, Inc. All Rights Reserved.
 + */
 +
 +/*
@@ -5548,7 +5549,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/fsl_shw_user.c
 + * This file implements user and platform capabilities functions of the FSL SHW
 + * API for Sahara
 + */
-+#include "sahara.h"
++#include <linux/mxc_sahara.h>
 +#include <adaptor.h>
 +#include <sf_util.h>
 +
@@ -5669,10 +5670,10 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/fsl_shw_user.c
 Index: linux-2.6.38.8/drivers/mxc/security/sahara2/fsl_shw_wrap.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/sahara2/fsl_shw_wrap.c	2012-03-28 10:01:36.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/fsl_shw_wrap.c	2012-04-05 11:41:06.000000000 +0200
 @@ -0,0 +1,967 @@
 +/*
-+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
++ * Copyright (C) 2004-2011 Freescale Semiconductor, Inc. All Rights Reserved.
 + */
 +
 +/*
@@ -5737,7 +5738,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/fsl_shw_wrap.c
 +
 + */
 +
-+#include "sahara.h"
++#include <linux/mxc_sahara.h>
 +#include "fsl_platform.h"
 +#include "fsl_shw_keystore.h"
 +
@@ -6641,10 +6642,10 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/fsl_shw_wrap.c
 Index: linux-2.6.38.8/drivers/mxc/security/sahara2/include/adaptor.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/adaptor.h	2012-03-28 10:01:36.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/adaptor.h	2012-04-05 11:41:06.000000000 +0200
 @@ -0,0 +1,113 @@
 +/*
-+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
++ * Copyright (C) 2004-2011 Freescale Semiconductor, Inc. All Rights Reserved.
 + */
 +
 +/*
@@ -6668,7 +6669,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/include/adaptor.h
 +#ifndef ADAPTOR_H
 +#define ADAPTOR_H
 +
-+#include <sahara.h>
++#include <linux/mxc_sahara.h>
 +
 +/*!
 + * Structure passed during user ioctl() call to submit request.
@@ -6759,7 +6760,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/include/adaptor.h
 Index: linux-2.6.38.8/drivers/mxc/security/sahara2/include/diagnostic.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/diagnostic.h	2012-03-28 10:01:36.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/diagnostic.h	2012-04-03 16:58:29.000000000 +0200
 @@ -0,0 +1,116 @@
 +/*
 + * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -6880,7 +6881,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/include/diagnostic.h
 Index: linux-2.6.38.8/drivers/mxc/security/sahara2/include/fsl_platform.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/fsl_platform.h	2012-03-28 10:01:36.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/fsl_platform.h	2012-04-03 16:58:29.000000000 +0200
 @@ -0,0 +1,161 @@
 +/*
 + * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -7046,10 +7047,10 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/include/fsl_platform.h
 Index: linux-2.6.38.8/drivers/mxc/security/sahara2/include/fsl_shw.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/fsl_shw.h	2012-03-28 10:01:36.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/fsl_shw.h	2012-04-05 11:41:06.000000000 +0200
 @@ -0,0 +1,2515 @@
 +/*
-+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
++ * Copyright (C) 2004-2011 Freescale Semiconductor, Inc. All Rights Reserved.
 + */
 +
 +/*
@@ -7334,7 +7335,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/include/fsl_shw.h
 +
 +#if defined(FSL_HAVE_SAHARA2) || defined(FSL_HAVE_SAHARA4)
 +
-+#include "sahara.h"
++#include <linux/mxc_sahara.h>
 +
 +#else
 +
@@ -9566,7 +9567,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/include/fsl_shw.h
 Index: linux-2.6.38.8/drivers/mxc/security/sahara2/include/fsl_shw_keystore.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/fsl_shw_keystore.h	2012-03-28 10:01:36.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/fsl_shw_keystore.h	2012-04-03 16:58:29.000000000 +0200
 @@ -0,0 +1,475 @@
 +/*
 + * Copyright (C) 2008-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -10046,7 +10047,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/include/fsl_shw_keystore.h
 Index: linux-2.6.38.8/drivers/mxc/security/sahara2/include/linux_port.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/linux_port.h	2012-03-28 10:01:36.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/linux_port.h	2012-04-05 11:41:06.000000000 +0200
 @@ -0,0 +1,1829 @@
 +/*
 + * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -11826,7 +11827,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/include/linux_port.h
 +{                                                                         \
 +    void *s = (void*)start;                                               \
 +    void *e = s + len;                                                    \
-+    clean_dcache_area(s, len);                                               \
++    dmac_map_area(s, len, DMA_TO_DEVICE);                   \
 +    outer_clean_range(__pa(s), __pa(e));                                  \
 +}
 +#endif
@@ -11847,7 +11848,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/include/linux_port.h
 +{                                                                         \
 +    void *s = (void*)start;                                               \
 +    void *e = s + len;                                                    \
-+    invalidate_kernel_vmap_range(s, len);                                                 \
++    dmac_unmap_area(s, len, DMA_FROM_DEVICE);            \
 +    outer_inv_range(__pa(s), __pa(e));                                    \
 +}
 +#endif
@@ -11880,7 +11881,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/include/linux_port.h
 Index: linux-2.6.38.8/drivers/mxc/security/sahara2/include/platform_abstractions.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/platform_abstractions.h	2012-03-28 10:01:36.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/platform_abstractions.h	2012-04-03 16:58:29.000000000 +0200
 @@ -0,0 +1,15 @@
 +/*
 + * Copyright (C) 2005-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -11900,7 +11901,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/include/platform_abstractions
 Index: linux-2.6.38.8/drivers/mxc/security/sahara2/include/portable_os.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/portable_os.h	2012-03-28 10:01:36.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/portable_os.h	2012-04-03 16:58:29.000000000 +0200
 @@ -0,0 +1,1453 @@
 +/*
 + * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -13358,10 +13359,10 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/include/portable_os.h
 Index: linux-2.6.38.8/drivers/mxc/security/sahara2/include/sah_driver_common.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/sah_driver_common.h	2012-03-28 10:01:36.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/sah_driver_common.h	2012-04-05 11:41:06.000000000 +0200
 @@ -0,0 +1,102 @@
 +/*
-+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
++ * Copyright (C) 2004-2011 Freescale Semiconductor, Inc. All Rights Reserved.
 + */
 +
 +/*
@@ -13384,7 +13385,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/include/sah_driver_common.h
 +#define SAH_DRIVER_COMMON_H
 +
 +#include "fsl_platform.h"
-+#include <sahara.h>
++#include <linux/mxc_sahara.h>
 +#include <adaptor.h>
 +
 +/** This specifies the permissions for the device file. It is equivalent to
@@ -13465,7 +13466,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/include/sah_driver_common.h
 Index: linux-2.6.38.8/drivers/mxc/security/sahara2/include/sah_hardware_interface.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/sah_hardware_interface.h	2012-03-28 10:01:36.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/sah_hardware_interface.h	2012-04-03 16:58:29.000000000 +0200
 @@ -0,0 +1,99 @@
 +/*
 + * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -13569,7 +13570,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/include/sah_hardware_interfac
 Index: linux-2.6.38.8/drivers/mxc/security/sahara2/include/sah_interrupt_handler.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/sah_interrupt_handler.h	2012-03-28 10:01:36.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/sah_interrupt_handler.h	2012-04-03 16:58:29.000000000 +0200
 @@ -0,0 +1,42 @@
 +/*
 + * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -13616,7 +13617,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/include/sah_interrupt_handler
 Index: linux-2.6.38.8/drivers/mxc/security/sahara2/include/sah_kernel.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/sah_kernel.h	2012-03-28 10:01:36.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/sah_kernel.h	2012-04-03 16:58:29.000000000 +0200
 @@ -0,0 +1,113 @@
 +/*
 + * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -13734,7 +13735,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/include/sah_kernel.h
 Index: linux-2.6.38.8/drivers/mxc/security/sahara2/include/sah_memory_mapper.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/sah_memory_mapper.h	2012-03-28 10:01:36.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/sah_memory_mapper.h	2012-04-03 16:58:29.000000000 +0200
 @@ -0,0 +1,79 @@
 +/*
 + * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -13818,7 +13819,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/include/sah_memory_mapper.h
 Index: linux-2.6.38.8/drivers/mxc/security/sahara2/include/sah_queue_manager.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/sah_queue_manager.h	2012-03-28 10:01:36.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/sah_queue_manager.h	2012-04-03 16:58:29.000000000 +0200
 @@ -0,0 +1,63 @@
 +/*
 + * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -13886,10 +13887,10 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/include/sah_queue_manager.h
 Index: linux-2.6.38.8/drivers/mxc/security/sahara2/include/sah_status_manager.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/sah_status_manager.h	2012-03-28 10:01:36.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/sah_status_manager.h	2012-04-05 11:41:06.000000000 +0200
 @@ -0,0 +1,228 @@
 +/*
-+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
++ * Copyright (C) 2004-2011 Freescale Semiconductor, Inc. All Rights Reserved.
 + */
 +
 +/*
@@ -13913,7 +13914,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/include/sah_status_manager.h
 +#ifndef STATUS_MANAGER_H
 +#define STATUS_MANAGER_H
 +#include "sah_driver_common.h"
-+#include "sahara.h"
++#include <linux/mxc_sahara.h>
 +
 +
 +/******************************************************************************
@@ -14116,10 +14117,10 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/include/sah_status_manager.h
 +
 +
 +#endif  /* STATUS_MANAGER_H */
-Index: linux-2.6.38.8/drivers/mxc/security/sahara2/include/sahara.h
+Index: linux-2.6.38.8/include/linux/mxc_sahara.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/sahara.h	2012-03-28 10:01:36.000000000 +0200
++++ linux-2.6.38.8/include/linux/mxc_sahara.h	2012-04-03 16:58:29.000000000 +0200
 @@ -0,0 +1,2265 @@
 +/*
 + * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -16389,7 +16390,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/include/sahara.h
 Index: linux-2.6.38.8/drivers/mxc/security/sahara2/include/sahara2_kernel.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/sahara2_kernel.h	2012-03-28 10:01:36.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/sahara2_kernel.h	2012-04-03 16:58:29.000000000 +0200
 @@ -0,0 +1,49 @@
 +/*
 + * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -16443,10 +16444,10 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/include/sahara2_kernel.h
 Index: linux-2.6.38.8/drivers/mxc/security/sahara2/include/sf_util.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/sf_util.h	2012-03-28 10:01:36.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/sf_util.h	2012-04-05 11:41:06.000000000 +0200
 @@ -0,0 +1,466 @@
 +/*
-+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
++ * Copyright (C) 2004-2011 Freescale Semiconductor, Inc. All Rights Reserved.
 + */
 +
 +/*
@@ -16467,7 +16468,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/include/sf_util.h
 +#define SF_UTIL_H
 +
 +#include <fsl_platform.h>
-+#include <sahara.h>
++#include <linux/mxc_sahara.h>
 +
 +/*! Header value for Sahara Descriptor  1 */
 +#define SAH_HDR_SKHA_SET_MODE_IV_KEY  0x10880000
@@ -16914,7 +16915,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/include/sf_util.h
 Index: linux-2.6.38.8/drivers/mxc/security/sahara2/km_adaptor.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/sahara2/km_adaptor.c	2012-03-28 10:01:36.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/km_adaptor.c	2012-04-03 16:58:29.000000000 +0200
 @@ -0,0 +1,849 @@
 +/*
 + * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -17768,10 +17769,10 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/km_adaptor.c
 Index: linux-2.6.38.8/drivers/mxc/security/sahara2/sah_driver_interface.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/sahara2/sah_driver_interface.c	2012-03-28 10:01:36.000000000 +0200
-@@ -0,0 +1,2185 @@
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/sah_driver_interface.c	2012-04-05 11:41:06.000000000 +0200
+@@ -0,0 +1,2191 @@
 +/*
-+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
++ * Copyright (C) 2004-2011 Freescale Semiconductor, Inc. All Rights Reserved.
 + */
 +
 +/*
@@ -17820,6 +17821,10 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/sah_driver_interface.c
 +#define interruptible_sleep_on(x) sah_Handle_Interrupt()
 +#endif
 +
++MODULE_LICENSE("GPL");
++MODULE_AUTHOR("Freescale Semiconductor");
++MODULE_DESCRIPTION("Device Driver for SAHARA2 crypto hw block");
++
 +#define TEST_MODE_OFF 1
 +#define TEST_MODE_ON 2
 +
@@ -17963,7 +17968,9 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/sah_driver_interface.c
 +#else
 +	{
 +		sah_clk = clk_get(NULL, "sahara_clk");
-+		if (sah_clk != ERR_PTR(ENOENT))
++		if (IS_ERR(sah_clk))
++			os_error_code = PTR_ERR(sah_clk);
++		else
 +			clk_enable(sah_clk);
 +	}
 +#endif
@@ -18153,7 +18160,9 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/sah_driver_interface.c
 +		mxc_clks_disable(SAHARA2_CLK);
 +#else
 +	{
-+		if (sah_clk != ERR_PTR(ENOENT))
++		if (IS_ERR(sah_clk))
++			os_error_code = PTR_ERR(sah_clk);
++		else
 +			clk_disable(sah_clk);
 +	}
 +#endif
@@ -18220,13 +18229,15 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/sah_driver_interface.c
 +	    mxc_clks_disable(SAHARA2_CLK);
 +#else
 +	{
-+		if (sah_clk != ERR_PTR(ENOENT))
++		if (IS_ERR(sah_clk))
++			ret_val = PTR_ERR(sah_clk);
++		else
 +			clk_disable(sah_clk);
 +		clk_put(sah_clk);
 +	}
 +#endif
 +
-+	os_dev_shutdown_return(OS_ERROR_OK_S);
++	os_dev_shutdown_return(ret_val);
 +}
 +
 +/*!
@@ -19950,15 +19961,11 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/sah_driver_interface.c
 +
 +#endif				/* ifndef SAHARA_POLL_MODE */
 +
-+MODULE_DESCRIPTION("i.MX27?/i.MX51 Security Engine (SAHARA) driver");
-+MODULE_AUTHOR("Freescale");
-+MODULE_LICENSE("GPL");
-+
 +/* End of sah_driver_interface.c */
 Index: linux-2.6.38.8/drivers/mxc/security/sahara2/sah_hardware_interface.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/sahara2/sah_hardware_interface.c	2012-03-28 10:01:36.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/sah_hardware_interface.c	2012-04-03 16:58:29.000000000 +0200
 @@ -0,0 +1,808 @@
 +/*
 + * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -20771,7 +20778,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/sah_hardware_interface.c
 Index: linux-2.6.38.8/drivers/mxc/security/sahara2/sah_interrupt_handler.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/sahara2/sah_interrupt_handler.c	2012-03-28 10:01:36.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/sah_interrupt_handler.c	2012-04-03 16:58:29.000000000 +0200
 @@ -0,0 +1,216 @@
 +/*
 + * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -20992,10 +20999,10 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/sah_interrupt_handler.c
 Index: linux-2.6.38.8/drivers/mxc/security/sahara2/sah_memory_mapper.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/sahara2/sah_memory_mapper.c	2012-03-28 10:01:36.000000000 +0200
-@@ -0,0 +1,2356 @@
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/sah_memory_mapper.c	2012-04-05 11:41:06.000000000 +0200
+@@ -0,0 +1,2367 @@
 +/*
-+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
++ * Copyright (C) 2004-2011 Freescale Semiconductor, Inc. All Rights Reserved.
 + */
 +
 +/*
@@ -21746,6 +21753,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/sah_memory_mapper.c
 +sah_Link *sah_Physicalise_Links(sah_Link * first_link)
 +{
 +	sah_Link *link = first_link;
++	struct page *pg;
 +
 +	while (link != NULL) {
 +#ifdef DO_DBG
@@ -21810,8 +21818,18 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/sah_memory_mapper.c
 +			if (!(link->flags & SAH_PREPHYS_DATA)) {
 +				link->original_data = link->data;
 +
-+				/* All pointers are virtual right now */
-+				link->data = (void *)os_pa(link->data);
++				/* if the data buffer is not in kernel direct-
++				  * mapped region, find the physical addr
++				  * via other means.
++				  */
++				if (!virt_addr_valid(link->data)) {
++					pg = vmalloc_to_page(link->data);
++					link->data = (uint8_t *) (
++						page_to_phys(pg) +
++						(((unsigned int) link->data) &
++							~PAGE_MASK));
++				} else
++					link->data = (void *)os_pa(link->data);
 +#ifdef DO_DBG
 +				os_printk("%sput: %p (%d)\n",
 +					  (link->
@@ -23353,7 +23371,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/sah_memory_mapper.c
 Index: linux-2.6.38.8/drivers/mxc/security/sahara2/sah_queue.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/sahara2/sah_queue.c	2012-03-28 10:01:36.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/sah_queue.c	2012-04-03 16:58:29.000000000 +0200
 @@ -0,0 +1,249 @@
 +/*
 + * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -23607,10 +23625,10 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/sah_queue.c
 Index: linux-2.6.38.8/drivers/mxc/security/sahara2/sah_queue_manager.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/sahara2/sah_queue_manager.c	2012-03-28 10:01:36.000000000 +0200
-@@ -0,0 +1,1050 @@
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/sah_queue_manager.c	2012-04-05 11:41:06.000000000 +0200
+@@ -0,0 +1,1076 @@
 +/*
-+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
++ * Copyright (C) 2004-2011 Freescale Semiconductor, Inc. All Rights Reserved.
 + */
 +
 +/*
@@ -23965,7 +23983,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/sah_queue_manager.c
 +#else
 +		{
 +			struct clk *clk = clk_get(NULL, "sahara_clk");
-+			if (clk != ERR_PTR(ENOENT))
++			if (!IS_ERR(clk))
 +				clk_enable(clk);
 +			clk_put(clk);
 +		}
@@ -24037,7 +24055,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/sah_queue_manager.c
 +		desc_head->result =
 +		    sah_convert_error_status(desc_head->error_status);
 +#ifdef DIAG_DRV_STATUS
-+		sah_Log_Error(desc_head->current_dar, desc_head->error_status,
++		sah_Log_Error(desc_head->desc.dma_addr, desc_head->error_status,
 +			      desc_head->fault_address);
 +#endif
 +	}
@@ -24070,6 +24088,34 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/sah_queue_manager.c
 +void sah_postprocess_queue(unsigned long reset_flag)
 +{
 +
++	sah_Head_Desc *first_entry;
++	os_lock_context_t lock_flags;
++
++    /* Disabling Sahara Clock only if the hardware is in idle state and
++	    the DAR queue is empty.*/
++	os_lock_save_context(desc_queue_lock, lock_flags);
++	first_entry = sah_Find_With_State(SAH_STATE_ON_SAHARA);
++	os_unlock_restore_context(desc_queue_lock, lock_flags);
++
++	if ((first_entry == NULL) && (sah_HW_Read_Status() == SAH_EXEC_IDLE)) {
++
++#ifdef DIAG_DRV_IF
++		LOG_KDIAG("SAHARA : Disabling the clocks\n")
++#endif				/* DIAG_DRV_IF */
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 18))
++		mxc_clks_disable(SAHARA2_CLK);
++#else
++		{
++			struct clk *clk = clk_get(NULL, "sahara_clk");
++			if (!IS_ERR(clk))
++				clk_disable(clk);
++			clk_put(clk);
++		}
++#endif
++
++	}
++
++
 +	/* if SAHARA needs to be reset, do it here. This starts a descriptor chain
 +	 * if one is ready also */
 +	if (reset_flag) {
@@ -24078,8 +24124,6 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/sah_queue_manager.c
 +
 +	/* now handle the descriptor chain(s) that has/have completed */
 +	do {
-+		sah_Head_Desc *first_entry;
-+		os_lock_context_t lock_flags;
 +
 +		os_lock_save_context(desc_queue_lock, lock_flags);
 +
@@ -24662,10 +24706,10 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/sah_queue_manager.c
 Index: linux-2.6.38.8/drivers/mxc/security/sahara2/sah_status_manager.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/sahara2/sah_status_manager.c	2012-03-28 10:01:36.000000000 +0200
-@@ -0,0 +1,734 @@
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/sah_status_manager.c	2012-04-05 11:41:06.000000000 +0200
+@@ -0,0 +1,714 @@
 +/*
-+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
++ * Copyright (C) 2004-2011 Freescale Semiconductor, Inc. All Rights Reserved.
 + */
 +
 +/*
@@ -24994,30 +25038,6 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/sah_status_manager.c
 +		/* Keep going while further status is available. */
 +	} while (state == SAH_EXEC_ERROR1);
 +
-+    /* Disabling Sahara Clock only if the hardware is in idle state and
-+	    the DAR queue is empty.*/
-+	os_lock_save_context(desc_queue_lock, lock_flags);
-+	current_entry = sah_Find_With_State(SAH_STATE_ON_SAHARA);
-+	os_unlock_restore_context(desc_queue_lock, lock_flags);
-+
-+	if ((current_entry == NULL) && (state == SAH_EXEC_IDLE)) {
-+
-+#ifdef DIAG_DRV_IF
-+		LOG_KDIAG("SAHARA : Disabling the clocks\n")
-+#endif				/* DIAG_DRV_IF */
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 18))
-+		mxc_clks_disable(SAHARA2_CLK);
-+#else
-+		{
-+			struct clk *clk = clk_get(NULL, "sahara_clk");
-+			if (clk != ERR_PTR(ENOENT))
-+				clk_disable(clk);
-+			clk_put(clk);
-+		}
-+#endif
-+
-+	}
-+
 +	return reset_flag;
 +}
 +
@@ -25271,6 +25291,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/sah_status_manager.c
 +{
 +	sah_Head_Desc *entry = NULL;
 +	os_lock_context_t lock_flags;
++	int error_code = 0;
 +
 +#if  LINUX_VERSION_CODE < KERNEL_VERSION(2,6,11)
 +	switch (level) {
@@ -25318,13 +25339,14 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/sah_status_manager.c
 +	 * any power */
 +	{
 +		struct clk *clk = clk_get(NULL, "sahara_clk");
-+		if (clk != ERR_PTR(ENOENT)) {
++		if (IS_ERR(clk))
++			error_code = PTR_ERR(clk);
++		else
 +			clk_disable(clk);
-+		}
 +	}
 +#endif
 +
-+	return 0;
++	return error_code;
 +}
 +
 +/*!
@@ -25350,6 +25372,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/sah_status_manager.c
 +{
 +	sah_Head_Desc *entry = NULL;
 +	os_lock_context_t lock_flags;
++	int error_code = 0;
 +
 +#if  LINUX_VERSION_CODE < KERNEL_VERSION(2,6,11)
 +	switch (level) {
@@ -25380,9 +25403,10 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/sah_status_manager.c
 +		/* enable Sahara's clock */
 +		struct clk *clk = clk_get(NULL, "sahara_clk");
 +
-+		if (clk != ERR_PTR(ENOENT)) {
-+			clk_enable(clk);
-+		}
++		if (IS_ERR(clk))
++			error_code = PTR_ERR(clk);
++		else
++			clk_disable(clk);
 +	}
 +	sah_dpm_flag = FALSE;
 +
@@ -25394,14 +25418,14 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/sah_status_manager.c
 +	}
 +	os_unlock_restore_context(desc_queue_lock, lock_flags);
 +#endif
-+	return 0;
++	return error_code;
 +}
 +
 +#endif				/* SAHARA_POWER_MANAGEMENT */
 Index: linux-2.6.38.8/drivers/mxc/security/sahara2/sf_util.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/sahara2/sf_util.c	2012-03-28 10:01:36.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/sf_util.c	2012-04-03 16:58:29.000000000 +0200
 @@ -0,0 +1,1390 @@
 +/*
 + * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -26796,10 +26820,10 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/sf_util.c
 Index: linux-2.6.38.8/drivers/mxc/security/scc2_driver.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/scc2_driver.c	2012-03-28 10:01:37.000000000 +0200
-@@ -0,0 +1,2395 @@
++++ linux-2.6.38.8/drivers/mxc/security/scc2_driver.c	2012-04-05 11:41:06.000000000 +0200
+@@ -0,0 +1,2398 @@
 +/*
-+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
++ * Copyright (C) 2004-2011 Freescale Semiconductor, Inc. All Rights Reserved.
 + */
 +
 +/*
@@ -27215,7 +27239,6 @@ Index: linux-2.6.38.8/drivers/mxc/security/scc2_driver.c
 +		break;
 +	}
 +}
-+EXPORT_SYMBOL(scc_partition_status);
 +
 +/**
 + * Calculate the physical address from the kernel virtual address.
@@ -27228,7 +27251,6 @@ Index: linux-2.6.38.8/drivers/mxc/security/scc2_driver.c
 +	return (uint32_t) address - (uint32_t) scm_ram_base
 +	    + (uint32_t) scm_ram_phys_base;
 +}
-+EXPORT_SYMBOL(scc_virt_to_phys);
 +
 +/**
 + * Engage partition of secure memory
@@ -27323,9 +27345,11 @@ Index: linux-2.6.38.8/drivers/mxc/security/scc2_driver.c
 +#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18))
 +		mxc_clks_enable(SCC_CLK);
 +#else
-+		if (scc_clk != ERR_PTR(ENOENT)) {
++		if (IS_ERR(scc_clk)) {
++			return_value = PTR_ERR(scc_clk);
++			goto out;
++		} else
 +			clk_enable(scc_clk);
-+		}
 +#endif
 +
 +		/* Set up the hardware access locks */
@@ -27371,9 +27395,6 @@ Index: linux-2.6.38.8/drivers/mxc/security/scc2_driver.c
 +			goto out;
 +		}
 +
-+		if (mx51_revision() != IMX_CHIP_REVISION_2_0)
-+			scm_ram_phys_base += 0x8000;
-+
 +		scm_ram_base = (void *)ioremap_nocache(scm_ram_phys_base,
 +						       scc_configuration.
 +						       partition_count *
@@ -27455,7 +27476,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/scc2_driver.c
 +#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 18))
 +			mxc_clks_disable(SCC_CLK);
 +#else
-+			if (scc_clk != ERR_PTR(ENOENT))
++			if (!IS_ERR(scc_clk))
 +				clk_disable(scc_clk);
 +#endif
 +
@@ -27534,7 +27555,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/scc2_driver.c
 +#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 18))
 +			mxc_clks_disable(SCC_CLK);
 +#else
-+			if (scc_clk != ERR_PTR(ENOENT))
++			if (!IS_ERR(scc_clk))
 +				clk_disable(scc_clk);
 +			clk_put(scc_clk);
 +#endif
@@ -28157,8 +28178,11 @@ Index: linux-2.6.38.8/drivers/mxc/security/scc2_driver.c
 +#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 18))
 +				mxc_clks_enable(SCC_CLK);
 +#else
-+				if (scc_clk != ERR_PTR(ENOENT))
-+					clk_enable(scc_clk);
++		if (IS_ERR(scc_clk)) {
++			status = SCC_RET_FAIL;
++			goto out;
++		} else
++			clk_enable(scc_clk);
 +#endif
 +
 +	scm_command = ((offset_blocks << SCM_CCMD_OFFSET_SHIFT) |
@@ -28217,7 +28241,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/scc2_driver.c
 +#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 18))
 +					mxc_clks_disable(SCC_CLK);
 +#else
-+					if (scc_clk != ERR_PTR(ENOENT))
++					if (!IS_ERR(scc_clk))
 +						clk_disable(scc_clk);
 +#endif
 +
@@ -28252,8 +28276,11 @@ Index: linux-2.6.38.8/drivers/mxc/security/scc2_driver.c
 +#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 18))
 +			mxc_clks_enable(SCC_CLK);
 +#else
-+			if (scc_clk != ERR_PTR(ENOENT))
-+				clk_enable(scc_clk);
++		if (IS_ERR(scc_clk)) {
++			status = SCC_RET_FAIL;
++			goto out;
++		} else
++			clk_enable(scc_clk);
 +#endif
 +	scm_command = ((offset_blocks << SCM_CCMD_OFFSET_SHIFT) |
 +		       (SCM_PART_NUMBER(part_base) << SCM_CCMD_PART_SHIFT));
@@ -28309,7 +28336,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/scc2_driver.c
 +#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 18))
 +			mxc_clks_disable(SCC_CLK);
 +#else
-+			if (scc_clk != ERR_PTR(ENOENT))
++			if (!IS_ERR(scc_clk))
 +				clk_disable(scc_clk);
 +#endif
 +	return status;
@@ -29196,10 +29223,10 @@ Index: linux-2.6.38.8/drivers/mxc/security/scc2_driver.c
 Index: linux-2.6.38.8/drivers/mxc/security/scc2_internals.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/scc2_internals.h	2012-03-28 10:01:37.000000000 +0200
-@@ -0,0 +1,519 @@
++++ linux-2.6.38.8/drivers/mxc/security/scc2_internals.h	2012-04-05 11:41:06.000000000 +0200
+@@ -0,0 +1,521 @@
 +/*
-+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
++ * Copyright (C) 2004-2011 Freescale Semiconductor, Inc. All Rights Reserved.
 + */
 +
 +/*
@@ -29707,6 +29734,8 @@ Index: linux-2.6.38.8/drivers/mxc/security/scc2_internals.h
 +EXPORT_SYMBOL(scc_diminish_permissions);
 +EXPORT_SYMBOL(scc_encrypt_region);
 +EXPORT_SYMBOL(scc_decrypt_region);
++EXPORT_SYMBOL(scc_partition_status);
++EXPORT_SYMBOL(scc_virt_to_phys);
 +/*EXPORT_SYMBOL(make_vpu_partition);*/
 +
 +
@@ -29719,8 +29748,8 @@ Index: linux-2.6.38.8/drivers/mxc/security/scc2_internals.h
 +#endif /* SCC_INTERNALS_H */
 Index: linux-2.6.38.8/drivers/mxc/Kconfig
 ===================================================================
---- linux-2.6.38.8.orig/drivers/mxc/Kconfig	2012-03-28 10:01:12.000000000 +0200
-+++ linux-2.6.38.8/drivers/mxc/Kconfig	2012-03-28 10:01:37.000000000 +0200
+--- linux-2.6.38.8.orig/drivers/mxc/Kconfig	2012-04-03 16:58:28.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/Kconfig	2012-04-05 11:33:36.000000000 +0200
 @@ -6,6 +6,7 @@
  
  source "drivers/mxc/hw_event/Kconfig"
@@ -29731,8 +29760,8 @@ Index: linux-2.6.38.8/drivers/mxc/Kconfig
  
 Index: linux-2.6.38.8/drivers/mxc/Makefile
 ===================================================================
---- linux-2.6.38.8.orig/drivers/mxc/Makefile	2012-03-28 10:01:12.000000000 +0200
-+++ linux-2.6.38.8/drivers/mxc/Makefile	2012-03-28 10:01:37.000000000 +0200
+--- linux-2.6.38.8.orig/drivers/mxc/Makefile	2012-04-03 16:58:28.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/Makefile	2012-04-05 11:33:36.000000000 +0200
 @@ -1,2 +1,3 @@
  obj-$(CONFIG_MXC_VPU)		+= vpu/
  obj-$(CONFIG_MXC_HWEVENT)	+= hw_event/
@@ -29740,7 +29769,7 @@ Index: linux-2.6.38.8/drivers/mxc/Makefile
 Index: linux-2.6.38.8/include/linux/mxc_scc2_driver.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/include/linux/mxc_scc2_driver.h	2012-03-28 10:01:37.000000000 +0200
++++ linux-2.6....
 
[truncated message content]

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-254-g05034c2

From: Fabien M <fa...@us...> - 2012-04-05 07:35:45

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".

The branch, master has been updated
       via  05034c28d496c85dd96d01874958bda96cbeccd0 (commit)
       via  68f19fe239bf57c7ef29f8f860077b6df25625c4 (commit)
      from  2e441b36386725d8a96d5f4418cd5c733f3bf9b1 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 05034c28d496c85dd96d01874958bda96cbeccd0
Merge: 68f19fe 2e441b3
Author: Fabien Marteau <fab...@ar...>
Date:   Thu Apr 5 09:35:31 2012 +0200

    Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus

commit 68f19fe239bf57c7ef29f8f860077b6df25625c4
Author: Fabien Marteau <fab...@ar...>
Date:   Thu Apr 5 09:34:44 2012 +0200

    [AsDevices] change documentation for setPinDirection

-----------------------------------------------------------------------

Summary of changes:
 .../packages/as_devices/python/AsDevices/AsGpio.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/target/packages/as_devices/python/AsDevices/AsGpio.py b/target/packages/as_devices/python/AsDevices/AsGpio.py
index 00c9aff..7160f61 100644
--- a/target/packages/as_devices/python/AsDevices/AsGpio.py
+++ b/target/packages/as_devices/python/AsDevices/AsGpio.py
@@ -54,7 +54,7 @@ class AsGpio:
 
     def setPinDirection(self, aDirection):
         """ Set period in us
-            \param aDirection pin direction 0:input 1:output
+            \param aDirection pin direction "in":input "out":output
         """
         try:
             wrapper.setPinDirection(self.__device, aDirection)


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-252-g2e441b3

From: Julien B a. A. <ar...@us...> - 2012-04-05 06:33:38

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".

The branch, master has been updated
       via  2e441b36386725d8a96d5f4418cd5c733f3bf9b1 (commit)
       via  8794db1c437e23d439addb368a168c8d01f4d9f7 (commit)
      from  ae7a076dba024b51182e16fc9926ff970dba3b26 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 2e441b36386725d8a96d5f4418cd5c733f3bf9b1
Merge: 8794db1 ae7a076
Author: Julien Boibessot <jul...@ar...>
Date:   Thu Apr 5 08:32:34 2012 +0200

    Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus

commit 8794db1c437e23d439addb368a168c8d01f4d9f7
Author: Julien Boibessot <jul...@ar...>
Date:   Thu Apr 5 08:31:35 2012 +0200

    [LINUX] Add mxc_v4l2.h include needed by gst-fsl-plugin

-----------------------------------------------------------------------

Summary of changes:
 .../446-armadeus-add_freescale_ipu3_driver.patch   |  106 +++++++++++++++-----
 1 files changed, 82 insertions(+), 24 deletions(-)

diff --git a/patches/linux/2.6.38/446-armadeus-add_freescale_ipu3_driver.patch b/patches/linux/2.6.38/446-armadeus-add_freescale_ipu3_driver.patch
index 2d30abd..04f45d9 100644
--- a/patches/linux/2.6.38/446-armadeus-add_freescale_ipu3_driver.patch
+++ b/patches/linux/2.6.38/446-armadeus-add_freescale_ipu3_driver.patch
@@ -4,8 +4,8 @@ Signed-off-by: Julien Boibessot <jul...@ar...>
 
 Index: linux-2.6.38.8/drivers/mxc/Kconfig
 ===================================================================
---- linux-2.6.38.8.orig/drivers/mxc/Kconfig	2012-03-13 18:15:38.000000000 +0100
-+++ linux-2.6.38.8/drivers/mxc/Kconfig	2012-03-13 19:00:15.000000000 +0100
+--- linux-2.6.38.8.orig/drivers/mxc/Kconfig	2012-04-03 16:58:29.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/Kconfig	2012-04-03 16:58:29.000000000 +0200
 @@ -4,6 +4,21 @@
  
  menu "MXC support drivers"
@@ -30,8 +30,8 @@ Index: linux-2.6.38.8/drivers/mxc/Kconfig
  source "drivers/mxc/security/Kconfig"
 Index: linux-2.6.38.8/drivers/mxc/Makefile
 ===================================================================
---- linux-2.6.38.8.orig/drivers/mxc/Makefile	2012-03-13 18:15:38.000000000 +0100
-+++ linux-2.6.38.8/drivers/mxc/Makefile	2012-03-13 18:23:02.000000000 +0100
+--- linux-2.6.38.8.orig/drivers/mxc/Makefile	2012-04-03 16:58:29.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/Makefile	2012-04-03 16:58:29.000000000 +0200
 @@ -1,3 +1,4 @@
 +obj-$(CONFIG_MXC_IPU_V3)	+= ipu3/
  obj-$(CONFIG_MXC_VPU)		+= vpu/
@@ -40,7 +40,7 @@ Index: linux-2.6.38.8/drivers/mxc/Makefile
 Index: linux-2.6.38.8/drivers/mxc/ipu3/Kconfig
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/ipu3/Kconfig	2012-03-13 18:23:02.000000000 +0100
++++ linux-2.6.38.8/drivers/mxc/ipu3/Kconfig	2012-04-03 16:58:29.000000000 +0200
 @@ -0,0 +1,5 @@
 +config MXC_IPU_V3
 +	bool
@@ -50,7 +50,7 @@ Index: linux-2.6.38.8/drivers/mxc/ipu3/Kconfig
 Index: linux-2.6.38.8/drivers/mxc/ipu3/Makefile
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/ipu3/Makefile	2012-03-13 18:23:02.000000000 +0100
++++ linux-2.6.38.8/drivers/mxc/ipu3/Makefile	2012-04-03 16:58:29.000000000 +0200
 @@ -0,0 +1,4 @@
 +obj-$(CONFIG_MXC_IPU_V3) = mxc_ipu.o
 +
@@ -59,7 +59,7 @@ Index: linux-2.6.38.8/drivers/mxc/ipu3/Makefile
 Index: linux-2.6.38.8/drivers/mxc/ipu3/ipu_calc_stripes_sizes.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/ipu3/ipu_calc_stripes_sizes.c	2012-03-13 18:23:02.000000000 +0100
++++ linux-2.6.38.8/drivers/mxc/ipu3/ipu_calc_stripes_sizes.c	2012-04-03 16:58:29.000000000 +0200
 @@ -0,0 +1,376 @@
 +/*
 + * Copyright 2009-2011 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -440,7 +440,7 @@ Index: linux-2.6.38.8/drivers/mxc/ipu3/ipu_calc_stripes_sizes.c
 Index: linux-2.6.38.8/drivers/mxc/ipu3/ipu_capture.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/ipu3/ipu_capture.c	2012-03-13 18:23:02.000000000 +0100
++++ linux-2.6.38.8/drivers/mxc/ipu3/ipu_capture.c	2012-04-03 16:58:29.000000000 +0200
 @@ -0,0 +1,805 @@
 +/*
 + * Copyright 2008-2011 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -1250,7 +1250,7 @@ Index: linux-2.6.38.8/drivers/mxc/ipu3/ipu_capture.c
 Index: linux-2.6.38.8/drivers/mxc/ipu3/ipu_common.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/ipu3/ipu_common.c	2012-03-13 18:23:02.000000000 +0100
++++ linux-2.6.38.8/drivers/mxc/ipu3/ipu_common.c	2012-04-03 16:58:29.000000000 +0200
 @@ -0,0 +1,2840 @@
 +/*
 + * Copyright 2005-2011 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -4095,7 +4095,7 @@ Index: linux-2.6.38.8/drivers/mxc/ipu3/ipu_common.c
 Index: linux-2.6.38.8/drivers/mxc/ipu3/ipu_device.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/ipu3/ipu_device.c	2012-03-13 18:52:59.000000000 +0100
++++ linux-2.6.38.8/drivers/mxc/ipu3/ipu_device.c	2012-04-03 16:58:29.000000000 +0200
 @@ -0,0 +1,514 @@
 +/*
 + * Copyright 2005-2011 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -4614,7 +4614,7 @@ Index: linux-2.6.38.8/drivers/mxc/ipu3/ipu_device.c
 Index: linux-2.6.38.8/drivers/mxc/ipu3/ipu_disp.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/ipu3/ipu_disp.c	2012-03-13 18:23:02.000000000 +0100
++++ linux-2.6.38.8/drivers/mxc/ipu3/ipu_disp.c	2012-04-03 16:58:29.000000000 +0200
 @@ -0,0 +1,1942 @@
 +/*
 + * Copyright 2005-2011 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -6561,7 +6561,7 @@ Index: linux-2.6.38.8/drivers/mxc/ipu3/ipu_disp.c
 Index: linux-2.6.38.8/drivers/mxc/ipu3/ipu_ic.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/ipu3/ipu_ic.c	2012-03-13 18:23:02.000000000 +0100
++++ linux-2.6.38.8/drivers/mxc/ipu3/ipu_ic.c	2012-04-03 16:58:29.000000000 +0200
 @@ -0,0 +1,839 @@
 +/*
 + * Copyright 2005-2011 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -7405,7 +7405,7 @@ Index: linux-2.6.38.8/drivers/mxc/ipu3/ipu_ic.c
 Index: linux-2.6.38.8/drivers/mxc/ipu3/ipu_param_mem.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/ipu3/ipu_param_mem.h	2012-03-13 18:23:02.000000000 +0100
++++ linux-2.6.38.8/drivers/mxc/ipu3/ipu_param_mem.h	2012-04-03 16:58:29.000000000 +0200
 @@ -0,0 +1,735 @@
 +/*
 + * Copyright 2005-2011 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -8145,7 +8145,7 @@ Index: linux-2.6.38.8/drivers/mxc/ipu3/ipu_param_mem.h
 Index: linux-2.6.38.8/drivers/mxc/ipu3/ipu_prv.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/ipu3/ipu_prv.h	2012-03-13 18:23:02.000000000 +0100
++++ linux-2.6.38.8/drivers/mxc/ipu3/ipu_prv.h	2012-04-03 16:58:29.000000000 +0200
 @@ -0,0 +1,107 @@
 +/*
 + * Copyright 2005-2011 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -8257,7 +8257,7 @@ Index: linux-2.6.38.8/drivers/mxc/ipu3/ipu_prv.h
 Index: linux-2.6.38.8/drivers/mxc/ipu3/ipu_regs.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/ipu3/ipu_regs.h	2012-03-13 18:23:02.000000000 +0100
++++ linux-2.6.38.8/drivers/mxc/ipu3/ipu_regs.h	2012-04-03 16:58:29.000000000 +0200
 @@ -0,0 +1,694 @@
 +/*
 + * Copyright (C) 2005-2011 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -8956,7 +8956,7 @@ Index: linux-2.6.38.8/drivers/mxc/ipu3/ipu_regs.h
 Index: linux-2.6.38.8/include/linux/ipu.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/include/linux/ipu.h	2012-03-13 18:23:02.000000000 +0100
++++ linux-2.6.38.8/include/linux/ipu.h	2012-04-03 16:58:29.000000000 +0200
 @@ -0,0 +1,1297 @@
 +/*
 + * Copyright 2005-2011 Freescale Semiconductor, Inc.
@@ -10257,8 +10257,8 @@ Index: linux-2.6.38.8/include/linux/ipu.h
 +#endif
 Index: linux-2.6.38.8/include/linux/fsl_devices.h
 ===================================================================
---- linux-2.6.38.8.orig/include/linux/fsl_devices.h	2012-03-13 18:15:39.000000000 +0100
-+++ linux-2.6.38.8/include/linux/fsl_devices.h	2012-03-13 18:23:02.000000000 +0100
+--- linux-2.6.38.8.orig/include/linux/fsl_devices.h	2012-04-03 16:58:28.000000000 +0200
++++ linux-2.6.38.8/include/linux/fsl_devices.h	2012-04-03 17:12:07.000000000 +0200
 @@ -104,6 +104,13 @@
  	u32	sysclk;
  };
@@ -10275,8 +10275,8 @@ Index: linux-2.6.38.8/include/linux/fsl_devices.h
  	int(*voltage_set)(int slot, int vcc, int vpp);
 Index: linux-2.6.38.8/arch/arm/mach-mx5/system.c
 ===================================================================
---- linux-2.6.38.8.orig/arch/arm/mach-mx5/system.c	2012-03-13 18:15:38.000000000 +0100
-+++ linux-2.6.38.8/arch/arm/mach-mx5/system.c	2012-03-13 18:23:02.000000000 +0100
+--- linux-2.6.38.8.orig/arch/arm/mach-mx5/system.c	2012-04-03 16:58:28.000000000 +0200
++++ linux-2.6.38.8/arch/arm/mach-mx5/system.c	2012-04-03 16:58:29.000000000 +0200
 @@ -88,7 +88,10 @@
  	if (pdev == NULL)
  		return;
@@ -10305,8 +10305,8 @@ Index: linux-2.6.38.8/arch/arm/mach-mx5/system.c
  			dev_dbg(&pdev->dev, "power gating successful\n");
 Index: linux-2.6.38.8/arch/arm/plat-mxc/clock.c
 ===================================================================
---- linux-2.6.38.8.orig/arch/arm/plat-mxc/clock.c	2012-03-13 18:15:39.000000000 +0100
-+++ linux-2.6.38.8/arch/arm/plat-mxc/clock.c	2012-03-13 18:23:02.000000000 +0100
+--- linux-2.6.38.8.orig/arch/arm/plat-mxc/clock.c	2012-04-03 16:58:26.000000000 +0200
++++ linux-2.6.38.8/arch/arm/plat-mxc/clock.c	2012-04-03 16:58:29.000000000 +0200
 @@ -110,6 +110,21 @@
  }
  EXPORT_SYMBOL(clk_disable);
@@ -10331,8 +10331,8 @@ Index: linux-2.6.38.8/arch/arm/plat-mxc/clock.c
   * its parent and so on, until one is able to return
 Index: linux-2.6.38.8/arch/arm/plat-mxc/include/mach/clock.h
 ===================================================================
---- linux-2.6.38.8.orig/arch/arm/plat-mxc/include/mach/clock.h	2012-03-13 18:15:38.000000000 +0100
-+++ linux-2.6.38.8/arch/arm/plat-mxc/include/mach/clock.h	2012-03-13 18:23:02.000000000 +0100
+--- linux-2.6.38.8.orig/arch/arm/plat-mxc/include/mach/clock.h	2012-04-03 16:57:48.000000000 +0200
++++ linux-2.6.38.8/arch/arm/plat-mxc/include/mach/clock.h	2012-04-03 16:58:29.000000000 +0200
 @@ -59,6 +59,7 @@
  
  int clk_register(struct clk *clk);
@@ -10341,3 +10341,61 @@ Index: linux-2.6.38.8/arch/arm/plat-mxc/include/mach/clock.h
  
  unsigned long mxc_decode_pll(unsigned int pll, u32 f_ref);
  
+Index: linux-2.6.38.8/include/linux/mxc_v4l2.h
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.6.38.8/include/linux/mxc_v4l2.h	2012-04-03 17:12:30.000000000 +0200
+@@ -0,0 +1,53 @@
++/*
++ * Copyright 2004-2011 Freescale Semiconductor, Inc. All Rights Reserved.
++ */
++
++/*
++ * The code contained herein is licensed under the GNU Lesser General
++ * Public License.  You may obtain a copy of the GNU Lesser General
++ * Public License Version 2.1 or later at the following locations:
++ *
++ * http://www.opensource.org/licenses/lgpl-license.html
++ * http://www.gnu.org/copyleft/lgpl.html
++ */
++
++/*!
++ * @file arch-mxc/mxc_v4l2.h
++ *
++ * @brief mxc V4L2 private structures
++ *
++ * @ingroup MXC_V4L2_CAPTURE
++ */
++
++#ifndef __ASM_ARCH_MXC_V4L2_H__
++#define __ASM_ARCH_MXC_V4L2_H__
++
++/*
++ * For IPUv1 and IPUv3, V4L2_CID_MXC_ROT means encoder ioctl ID.
++ * And V4L2_CID_MXC_VF_ROT is viewfinder ioctl ID only for IPUv1 and IPUv3.
++ */
++#define V4L2_CID_MXC_ROT		(V4L2_CID_PRIVATE_BASE + 0)
++#define V4L2_CID_MXC_FLASH		(V4L2_CID_PRIVATE_BASE + 1)
++#define V4L2_CID_MXC_VF_ROT		(V4L2_CID_PRIVATE_BASE + 2)
++#define V4L2_CID_MXC_MOTION     (V4L2_CID_PRIVATE_BASE + 3)
++
++#define V4L2_MXC_ROTATE_NONE			0
++#define V4L2_MXC_ROTATE_VERT_FLIP		1
++#define V4L2_MXC_ROTATE_HORIZ_FLIP		2
++#define V4L2_MXC_ROTATE_180			3
++#define V4L2_MXC_ROTATE_90_RIGHT		4
++#define V4L2_MXC_ROTATE_90_RIGHT_VFLIP		5
++#define V4L2_MXC_ROTATE_90_RIGHT_HFLIP		6
++#define V4L2_MXC_ROTATE_90_LEFT			7
++
++#define V4L2_MXC_CAM_ROTATE_NONE		8
++#define V4L2_MXC_CAM_ROTATE_VERT_FLIP		9
++#define V4L2_MXC_CAM_ROTATE_HORIZ_FLIP		10
++#define V4L2_MXC_CAM_ROTATE_180			11
++
++struct v4l2_mxc_offset {
++	uint32_t u_offset;
++	uint32_t v_offset;
++};
++
++#endif


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-250-gae7a076

From: jorasse <jo...@us...> - 2012-04-03 21:41:18

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".

The branch, master has been updated
       via  ae7a076dba024b51182e16fc9926ff970dba3b26 (commit)
      from  d970030610a9e404e86f75ad1a36d640ce3a7522 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit ae7a076dba024b51182e16fc9926ff970dba3b26
Author: Eric Jarrige <eri...@ar...>
Date:   Tue Apr 3 23:52:26 2012 +0200

    [BUILDROOT] force rebuild boot/uboot package according to the last patch update

-----------------------------------------------------------------------

Summary of changes:
 patches/buildroot/2012.02/cleanup_buildroot.sh |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/patches/buildroot/2012.02/cleanup_buildroot.sh b/patches/buildroot/2012.02/cleanup_buildroot.sh
index a0bcc16..c988b60 100755
--- a/patches/buildroot/2012.02/cleanup_buildroot.sh
+++ b/patches/buildroot/2012.02/cleanup_buildroot.sh
@@ -4,6 +4,7 @@
 #
 
 # Removes packages/files added through patches:
+rm -rf buildroot/boot/uboot/
 rm -rf buildroot/package/games/quake-pak/
 rm -rf buildroot/package/games/sdlquake/
 rm -rf buildroot/package/gpm/


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-249-gd970030

From: jorasse <jo...@us...> - 2012-04-03 17:13:27

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".

The branch, master has been updated
       via  d970030610a9e404e86f75ad1a36d640ce3a7522 (commit)
      from  96c7dde3124d6c778350816b6965347c837221a4 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit d970030610a9e404e86f75ad1a36d640ce3a7522
Author: Eric Jarrige <eri...@ar...>
Date:   Tue Apr 3 19:24:40 2012 +0200

    [BUILDROOT] Change BR specific patches for UBoot to be a hook command in the armadeus makefiles

-----------------------------------------------------------------------

Summary of changes:
 buildroot/target/device/armadeus/Makefile.in       |    9 ++++---
 .../156-u.boot-remove-u-boot-patch-prefix.patch    |   22 --------------------
 2 files changed, 5 insertions(+), 26 deletions(-)
 delete mode 100644 patches/buildroot/2012.02/156-u.boot-remove-u-boot-patch-prefix.patch

diff --git a/buildroot/target/device/armadeus/Makefile.in b/buildroot/target/device/armadeus/Makefile.in
index 6bd55ea..0232231 100644
--- a/buildroot/target/device/armadeus/Makefile.in
+++ b/buildroot/target/device/armadeus/Makefile.in
@@ -9,12 +9,13 @@ ARMADEUS_LINUX_IMAGE_NAME:=$(BOARD_NAME)-linux.bin
 # for old BR:
 LINUX26_KERNEL_NAME:=$(BOARD_NAME)-linux.bin
 
-ifneq ($(strip $(BR2_TARGET_UBOOT_CONFIG_HEADER_FILE)),)
-define UBOOT_COPY_CONFIG_HEADER_FILE
+define UBOOT_ARMADEUS_SPECIFIC_PATCH_HOOK
+	support/scripts/apply-patches.sh $(@D) $(BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR) \*.patch
+$(ifneq ($(strip $(BR2_TARGET_UBOOT_CONFIG_HEADER_FILE)),))
 	cp -pf $(BR2_TARGET_UBOOT_CONFIG_HEADER_FILE) $(@D)/include/configs/$(UBOOT_BOARD_NAME).h
+$(endif)
 endef
-UBOOT_POST_PATCH_HOOKS += UBOOT_COPY_CONFIG_HEADER_FILE
-endif
+UBOOT_POST_PATCH_HOOKS += UBOOT_ARMADEUS_SPECIFIC_PATCH_HOOK
 
 define UBOOT_UPDATE_CONFIG_HEADER
 	$(SED) "s,^#define CONFIG_BOARD_NAME.*,#define CONFIG_BOARD_NAME $(BOARD_NAME),g;"\
diff --git a/patches/buildroot/2012.02/156-u.boot-remove-u-boot-patch-prefix.patch b/patches/buildroot/2012.02/156-u.boot-remove-u-boot-patch-prefix.patch
deleted file mode 100644
index b8d4a9e..0000000
--- a/patches/buildroot/2012.02/156-u.boot-remove-u-boot-patch-prefix.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-U-Boot: Remove u-boot patch prefix from filename
-
-Remove expected u-boot prefix from U-Boot patches in order to manage patches
-with patch mangement tools such as quilt or stgit
-
-Signed-off-by: Eric Jarrige <eri...@ar...>
----
-
-Index: buildroot/boot/uboot/uboot.mk
-===================================================================
---- buildroot.orig/boot/uboot/uboot.mk	2012-02-21 16:44:29.000000000 +0100
-+++ buildroot/boot/uboot/uboot.mk	2012-02-21 16:46:04.000000000 +0100
-@@ -62,8 +62,7 @@
- 
- ifneq ($(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR)),)
- define UBOOT_APPLY_CUSTOM_PATCHES
--	support/scripts/apply-patches.sh $(@D) $(BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR) \
--		uboot-$(UBOOT_VERSION)-\*.patch
-+	support/scripts/apply-patches.sh $(@D) $(BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR) \*.patch
- endef
- 
- UBOOT_POST_PATCH_HOOKS += UBOOT_APPLY_CUSTOM_PATCHES


hooks/post-receive
-- 
armadeus

Flat | Threaded

<< < 1 .. 75 76 77 78 79 .. 153 > >> (Page 77 of 153)