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

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

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


