[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-234-gc4dcc77
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-234-gc4dcc77
|
From: jorasse <jo...@us...> - 2012-03-30 12:10:37
|
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 c4dcc7715a907a2906a36f13b563bc8ad5b92a44 (commit)
from 94f6562c8dda494177c2f51d787f9cd12c98763c (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 c4dcc7715a907a2906a36f13b563bc8ad5b92a44
Author: Eric Jarrige <eri...@ar...>
Date: Fri Mar 30 14:19:07 2012 +0200
[UBOOT][APF28] refactoring environment variables
-----------------------------------------------------------------------
Summary of changes:
.../device/armadeus/apf28/apf28-u-boot-2011.12.h | 82 ++++++++------------
patches/u-boot/2011.12/502-add-apf28.patch | 4 +-
2 files changed, 36 insertions(+), 50 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 4ae20c5..81cfa2f 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,8 +25,8 @@
#include <asm/arch/regs-base.h>
#define CONFIG_VERSION_VARIABLE
-#define CONFIG_ENV_VERSION "0.6"
-#define CONFIG_IDENT_STRING " apf28 patch 0.7"
+#define CONFIG_ENV_VERSION "0.7"
+#define CONFIG_IDENT_STRING " apf28 patch 0.8"
#define CONFIG_BOARD_NAME apf28
/*
@@ -72,7 +72,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,7 +92,6 @@
#define CONFIG_CMD_MMC
#define CONFIG_CMD_MTDPARTS
#define CONFIG_CMD_NAND
-#define CONFIG_CMD_NAND_LOCK_UNLOCK
#define CONFIG_CMD_NAND_TRIMFFS
#define CONFIG_CMD_NFS
#define CONFIG_CMD_PING
@@ -109,7 +107,6 @@
#define PHYS_SDRAM_1 0x40000000 /* Base address */
#define PHYS_SDRAM_1_SIZE 0x20000000 /* Max 512 MiB RAM */
#define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1
-/*#define CONFIG_STACKSIZE 0x00010000*//* 128 KB stack */
#define CONFIG_SYS_MALLOC_LEN 0x00400000 /* 4 MB for malloc */
#define CONFIG_SYS_GBL_DATA_SIZE 128 /* Initial data */
#define CONFIG_SYS_MEMTEST_START 0x40000000 /* Memtest start adr */
@@ -139,18 +136,18 @@
#define CONFIG_ENV_OFFSET_REDUND \
(CONFIG_ENV_OFFSET + CONFIG_ENV_RANGE) /* +512kB */
#define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE /* 512kB */
-#define CONFIG_KERNEL_OFFSET 0x00400000
-#define CONFIG_KERNEL_LEN 0x00800000 /* 8MB (BB ready) */
-#define CONFIG_ROOTFS_OFFSET 0x00C00000
-#define CONFIG_ROOTFS_LEN /* entire flash if not specified */
+#define CONFIG_KERNEL_OFFSET 0x00500000 /* 8MB */
+#define CONFIG_ROOTFS_OFFSET 0x00D00000
-#define CONFIG_MTDMAP "gpmi-nfc-main"
+#define CONFIG_MTDMAP "gpmi-nfc-main"
#define MTDIDS_DEFAULT "nand0=" CONFIG_MTDMAP
#define MTDPARTS_DEFAULT \
"mtdparts=" CONFIG_MTDMAP \
- ":3M(bootloader)ro," \
- "512K(environment)," \
- "512K(redundant-environment)," \
+ ":3M(u-boot)ro," \
+ "512K(env)," \
+ "512K(env2)," \
+ "512K(dtb)," \
+ "512K(splash)," \
"8M(kernel)," \
"-(rootfs)"
@@ -185,7 +182,7 @@
#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
+ CONFIG_CONSOLE " root=/dev/mtdblock6 rootfstype=ubifs " MTDPARTS_DEFAULT
#define CONFIG_CONSOLE "console=ttyAM0,"MK_STR(CONFIG_BAUDRATE)
#define CONFIG_BOOTCOMMAND "run ubifsboot"
@@ -204,71 +201,60 @@
"env_version=" CONFIG_ENV_VERSION "\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_RANGE) "\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,6\0" \
+ "u-boot_addr=" MK_STR(CONFIG_SYS_MONITOR_OFFSET) "\0" \
+ "u-boot_len=" MK_STR(CONFIG_SYS_MONITOR_LEN) "\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" \
- "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 40800000 0 ${kernel_offset}\0" \
+ "nboot kernel\0" \
"ubifsboot=setenv bootargs ${console} ${mtdparts};" \
"run addubifsargs addipargs; setenv autostart yes;" \
- "nboot 40800000 0 ${kernel_offset}\0" \
+ "nboot 40800000 0 ${kernel_addr}\0" \
"mmcboot=setenv bootargs ${console} ${mtdparts};" \
"run addmmcargs addipargs; setenv autostart yes;" \
- "nboot 40800000 0 ${kernel_offset}\0" \
- "flash_uboot=nand unlock;" \
- "if bcb nand.write ; then " \
- "nand erase ${uboot_offset} ${uboot_len} ; " \
- "nand write.trimffs ${fileaddr} ${uboot_offset} ${filesize};" \
- "nand erase ${uboot2_offset} ${uboot_len};" \
- "if nand write.trimffs ${fileaddr} ${uboot2_offset} ${filesize};"\
- "then nand lock; nand unlock ${env_offset};" \
- "echo Flashing of uboot succeed;" \
+ "nboot kernel\0" \
+ "flash_uboot=if bcb nand.write ; then " \
+ "nand erase ${u-boot_addr} ${u-boot_len} ; " \
+ "nand write.trimffs ${fileaddr} ${u-boot_addr} ${filesize};" \
+ "nand erase ${u-boot2_addr} ${u-boot_len};" \
+ "if nand write.trimffs ${fileaddr} ${u-boot2_addr} ${filesize};"\
+ "then echo Flashing of uboot succeed;" \
"else echo Flashing of uboot failed;" \
"fi; " \
"fi; \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.sb\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.sb\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" \
"update_all=run download_kernel flash_kernel download_rootfs " \
- "flash_rootfs download_uboot flash_uboot\0"
+ "flash_rootfs download_uboot flash_uboot\0" \
+ "unlock_regs=echo unlock_reg not needed anymore\0"
/*
* Serial Driver
diff --git a/patches/u-boot/2011.12/502-add-apf28.patch b/patches/u-boot/2011.12/502-add-apf28.patch
index a8ac987..f56fd93 100644
--- a/patches/u-boot/2011.12/502-add-apf28.patch
+++ b/patches/u-boot/2011.12/502-add-apf28.patch
@@ -1082,9 +1082,9 @@
+ }
+
+ sprintf(buf, "0x%08x", fcb->firmware1_starting_sector * nand->writesize);
-+ setenv("uboot_offset", buf);
++ setenv("u-boot_addr", buf);
+ sprintf(buf, "0x%08x", fcb->firmware2_starting_sector * nand->writesize);
-+ setenv("uboot2_offset", buf);
++ setenv("u-boot2_addr", buf);
+
+ printf("NAND BCB tables updated\n");
+ ret = 0;
hooks/post-receive
--
armadeus
|
