[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-181-g8e7a8de

[jorasse <jo...@us...>]

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  8e7a8de3f5f0956a37b417024cad9fa7fce8a771 (commit)
      from  e389ee6aa60976a0c46f4cbeb03394ffa2c93a65 (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 8e7a8de3f5f0956a37b417024cad9fa7fce8a771
Author: Eric Jarrige <eri...@ar...>
Date:   Tue Mar 20 18:50:42 2012 +0100

    [UBOOT] apf27: cleanup ongoing

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

Summary of changes:
 .../device/armadeus/apf27/apf27-u-boot-2011.12.h   |   40 +++++++++++++++----
 1 files changed, 31 insertions(+), 9 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 a74d14a..a839f4c 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
@@ -38,6 +38,7 @@
 #define CONFIG_MX27		1	/* in a Freescale i.MX27 Chip */
 #define CONFIG_APF27		1	/* on a Armadeus project APF27 board */
 #undef	CONFIG_USE_IRQ			/* don't need use IRQ/FIQ */
+#define CONFIG_MACH_TYPE 	1698
 
 /*
  * Enable the call to misc_init_r() for miscellaneous platform
@@ -80,13 +81,14 @@
 #define CONFIG_CMD_BSP		/* Board Specific functions	*/
 #define CONFIG_CMD_CACHE	/* icache, dcache		*/
 #define CONFIG_CMD_CDP		/* Cisco Discovery Protocol	*/
-//#define CONFIG_CMD_DATE		/* support for RTC, date/time...*/
+/*#define CONFIG_CMD_DATE */		/* support for RTC, date/time...*/
 #define CONFIG_CMD_DHCP		/* DHCP Support			*/
 #define CONFIG_CMD_DIAG		/* Diagnostics			*/
-//#define CONFIG_CMD_EEPROM	/* EEPROM read/write support	*/
+/*#define CONFIG_CMD_EEPROM */	/* EEPROM read/write support	*/
 #define CONFIG_CMD_FAT		/* FAT support			*/
 #undef  CONFIG_CMD_FLASH	/* flinfo, erase, protect	*/
-//#define CONFIG_CMD_I2C		/* I2C serial bus support	*/
+/*#define CONFIG_CMD_I2C */		/* I2C serial bus support	*/
+/*#define CONFIG_CMD_IIM */		/* imx iim fuse                 */
 #undef  CONFIG_CMD_IMLS		/* List all found images	*/
 #define CONFIG_CMD_JFFS2	/* JFFS2 Support		*/
 #define CONFIG_CMD_MII		/* MII support			*/
@@ -98,12 +100,11 @@
 #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_SNTP */		/* SNTP support			*/
 #define CONFIG_CMD_NFS		/* NFS support			*/
 #define CONFIG_CMD_DNS
 #define CONFIG_CMD_UBI
 #define CONFIG_CMD_UBIFS
-#define CONFIG_CMD_IMX_FUSE	/* iMX fuse access commands	*/
 
 #define CONFIG_DISPLAY_BOARDINFO
 #define CONFIG_DISPLAY_CPUINFO
@@ -168,12 +169,26 @@
 	"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;"	\
+		"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"		\
+	"boot_nfs_fallback_flash=if ping ${serverip};"			\
+			"then echo Boot over NFS; run nfsboot;"		\
+			"else echo Boot from the board; run ubifsboot;"	\
+		"fi\0"							\
+	"boot_nfs2_fallback_flash=if ping ${serverip};"			\
+			"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};"		\
@@ -217,12 +232,9 @@
 	"unlock_regs=mw 10000008 0; mw 10020008 0\0"			\
 
 #define CONFIG_BOOTCOMMAND	"run ubifsboot"
-#define CFG_AUTOLOAD		"no"
+#define CONFIG_SYS_AUTOLOAD	"no"
 #define CFG_DIRECT_FLASH_TFTP
 
-#define CONFIG_MACH_TYPE 	1698
-#define CONFIG_BOOT_PARAMS_ADDR	0xa0000100
-
 #undef CONFIG_SHOW_BOOT_PROGRESS
 
 #define CONFIG_ETHADDR
@@ -684,6 +696,16 @@
 #define CONFIG_MXC_MMC
 #define CONFIG_MXC_MCI_REGS_BASE	0x10014000
 
+/**
+ * IIM fuse Config
+ */
+
+#ifdef CONFIG_CMD_IIM
+#define CONFIG_IMX_IIM
+#define CONFIG_IIM_MAC_BANK     0
+#define CONFIG_IIM_MAC_ROW      5
+#endif /* CONFIG_CMD_IIM */
+
 /*
  * External interfaces module
  *


hooks/post-receive
-- 
armadeus