[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-236-g99d4976

[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  99d49763c8de93cb2c6b6445866ef5fd97b53272 (commit)
       via  d04dd6796fdbcecdae1b6c50c877f30d6bc05959 (commit)
      from  c4dcc7715a907a2906a36f13b563bc8ad5b92a44 (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 99d49763c8de93cb2c6b6445866ef5fd97b53272
Author: Eric Jarrige <eri...@ar...>
Date:   Fri Mar 30 16:19:33 2012 +0200

    [UBOOT][APF28] fix ocotp bug to read fuse at any address

commit d04dd6796fdbcecdae1b6c50c877f30d6bc05959
Author: Eric Jarrige <eri...@ar...>
Date:   Fri Mar 30 16:18:35 2012 +0200

    [UBOOT][APF28] still improving environment variables

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

Summary of changes:
 .../device/armadeus/apf28/apf28-u-boot-2011.12.h   |   27 ++++++++++---------
 patches/u-boot/2011.12/502-add-apf28.patch         |    2 +-
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/buildroot/target/device/armadeus/apf28/apf28-u-boot-2011.12.h b/buildroot/target/device/armadeus/apf28/apf28-u-boot-2011.12.h
index 81cfa2f..2f38828 100644
--- a/buildroot/target/device/armadeus/apf28/apf28-u-boot-2011.12.h
+++ b/buildroot/target/device/armadeus/apf28/apf28-u-boot-2011.12.h
@@ -25,7 +25,7 @@
 #include <asm/arch/regs-base.h>
 
 #define CONFIG_VERSION_VARIABLE
-#define CONFIG_ENV_VERSION 	"0.7"
+#define CONFIG_ENV_VERSION 	"0.8"
 #define CONFIG_IDENT_STRING	" apf28 patch 0.8"
 #define CONFIG_BOARD_NAME	apf28
 
@@ -181,10 +181,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/mtdblock6 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=ttyAM0,"MK_STR(CONFIG_BAUDRATE)
+#define ACFG_CONSOLE_DEV	ttyAM0
 #define	CONFIG_BOOTCOMMAND	"run ubifsboot"
 #define CONFIG_SYS_AUTOLOAD	"no"
 /*
@@ -199,7 +200,7 @@
  */
 #define	CONFIG_EXTRA_ENV_SETTINGS					\
 	"env_version=" 		CONFIG_ENV_VERSION "\0"			\
-	"console="		CONFIG_CONSOLE				"\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" \
@@ -216,14 +217,14 @@
 	"addipargs=setenv bootargs ${bootargs} "			\
 		"ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:"	\
 		"${hostname}:eth0:off\0"				\
-	"nfsboot=setenv bootargs ${console} ${mtdparts};"		\
-		"run addnfsargs addipargs; setenv autostart yes;"	\
+	"nfsboot=setenv bootargs console=${consoledev},${baudrate} " \
+		"${mtdparts}; run addnfsargs addipargs; setenv autostart yes;" \
 		"nboot kernel\0"		\
-	"ubifsboot=setenv bootargs ${console} ${mtdparts};"		\
-		"run addubifsargs addipargs; setenv autostart yes;"	\
-		"nboot 40800000 0 ${kernel_addr}\0"		\
-	"mmcboot=setenv bootargs ${console} ${mtdparts};"		\
-		"run addmmcargs addipargs; setenv autostart yes;"	\
+	"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"		\
 	"flash_uboot=if bcb nand.write ; then "				\
 		"nand erase ${u-boot_addr} ${u-boot_len} ; "		\
@@ -327,7 +328,7 @@
 /*
  * Fuses - OCOTP
  */
-#define CONFIG_IMX_OCOTP
+/* #define CONFIG_IMX_OCOTP */
 #define IMX_OCOTP_BASE	MXS_OCOTP_BASE
 
 /*
diff --git a/patches/u-boot/2011.12/502-add-apf28.patch b/patches/u-boot/2011.12/502-add-apf28.patch
index f56fd93..6bcec47 100644
--- a/patches/u-boot/2011.12/502-add-apf28.patch
+++ b/patches/u-boot/2011.12/502-add-apf28.patch
@@ -326,7 +326,7 @@
 +		return val;
 +	}
 +
-+	val = readl(&ocotp_regs->hw_ocotp_cust0 + (addr << 4));
++	val = readl(&ocotp_regs->hw_ocotp_cust0 + (addr * 4));
 +
 +	writel(OCOTP_CTRL_RD_BANK_OPEN, &ocotp_regs->hw_ocotp_ctrl_clr);
 +


hooks/post-receive
-- 
armadeus