[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-376-g89ce23e
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-376-g89ce23e
|
From: jorasse <jo...@us...> - 2013-08-12 15:23: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 89ce23edf23b377362191bccdf49006b6e9158ae (commit)
from 63dc53ce0c43ae77804f36636f8ad8931aa4e99d (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 89ce23edf23b377362191bccdf49006b6e9158ae
Author: Eric Jarrige <eri...@ar...>
Date: Mon Aug 12 17:33:12 2013 +0200
[UBOOT] apf28: update to use external environment scripts.
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf28_defconfig | 3 +
buildroot/configs/apf28test_defconfig | 3 +
.../device/armadeus/apf28/apf28-u-boot-2013.04.h | 96 ++++++--------------
.../target/device/armadeus/u-boot-env-2013.04.txt | 2 +-
patches/u-boot/2013.04/502-add-apf28.patch | 22 +----
5 files changed, 39 insertions(+), 87 deletions(-)
diff --git a/buildroot/configs/apf28_defconfig b/buildroot/configs/apf28_defconfig
index 83dfdcf..e0ce2c3 100644
--- a/buildroot/configs/apf28_defconfig
+++ b/buildroot/configs/apf28_defconfig
@@ -84,6 +84,9 @@ BR2_TARGET_UBOOT_SERVERIP="192.168.0.2"
BR2_TARGET_UBOOT_IPADDR="192.168.0.10"
BR2_TARGET_UBOOT_GATEWAY="192.168.0.1"
BR2_TARGET_UBOOT_ETHADDR=""
+BR2_TARGET_UBOOT_ENVIMAGE=y
+BR2_TARGET_UBOOT_ENVIMAGE_SOURCE="$(ARMADEUS_PATH)/u-boot-env-2013.04.txt"
+BR2_TARGET_UBOOT_ENVIMAGE_SIZE="0x20000"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="2.6.35.3"
diff --git a/buildroot/configs/apf28test_defconfig b/buildroot/configs/apf28test_defconfig
index 8022526..7fc29c4 100644
--- a/buildroot/configs/apf28test_defconfig
+++ b/buildroot/configs/apf28test_defconfig
@@ -110,6 +110,9 @@ BR2_TARGET_UBOOT_SERVERIP="192.168.0.2"
BR2_TARGET_UBOOT_IPADDR="192.168.0.10"
BR2_TARGET_UBOOT_GATEWAY="192.168.0.1"
BR2_TARGET_UBOOT_ETHADDR=""
+BR2_TARGET_UBOOT_ENVIMAGE=y
+BR2_TARGET_UBOOT_ENVIMAGE_SOURCE="$(ARMADEUS_PATH)/u-boot-env-2013.04.txt"
+BR2_TARGET_UBOOT_ENVIMAGE_SIZE="0x20000"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="2.6.35.3"
diff --git a/buildroot/target/device/armadeus/apf28/apf28-u-boot-2013.04.h b/buildroot/target/device/armadeus/apf28/apf28-u-boot-2013.04.h
index 1cb9d61..77de7f1 100644
--- a/buildroot/target/device/armadeus/apf28/apf28-u-boot-2013.04.h
+++ b/buildroot/target/device/armadeus/apf28/apf28-u-boot-2013.04.h
@@ -8,8 +8,8 @@
#define __CONFIG_H
#define CONFIG_VERSION_VARIABLE
-#define CONFIG_ENV_VERSION "1.3"
-#define CONFIG_IDENT_STRING " apf28 patch 1.3"
+#define CONFIG_ENV_VERSION 10
+#define CONFIG_IDENT_STRING " apf28 patch 1.4"
#define CONFIG_BOARD_NAME apf28
/*
@@ -25,7 +25,6 @@
*/
#define CONFIG_SYS_NO_FLASH /* to be define before <config_cmd_default.h>*/
#define CONFIG_BOARD_EARLY_INIT_F
-#define CONFIG_BOARD_LATE_INIT
#define CONFIG_ARCH_MISC_INIT
#define CONFIG_APBH_DMA
@@ -140,6 +139,7 @@
/* last 2 MiB reservered for 2 copies of U-Boot */
#define CONFIG_SYS_MONITOR_OFFSET 0x00100000 /* offset in NAND */
#define CONFIG_SYS_MONITOR_LEN 0x00100000 /* 2 x 1MB */
+#define CONFIG_ENV_OVERWRITE
#define CONFIG_ENV_IS_IN_NAND
#define CONFIG_ENV_OFFSET 0x00300000 /* NAND offset */
#define CONFIG_ENV_SIZE 0x00020000 /* 128kB */
@@ -177,6 +177,8 @@
#define CONFIG_AUTO_COMPLETE /* Command auto complete */
#define CONFIG_CMDLINE_EDITING /* Command history etc */
#define CONFIG_SYS_HUSH_PARSER /* enable the "hush" shell */
+#define CONFIG_ENV_VARS_UBOOT_CONFIG
+#define CONFIG_PREBOOT "run check_flash check_env;"
/*
* Boot Linux
@@ -208,45 +210,31 @@
* Extra Environments
*/
#define CONFIG_EXTRA_ENV_SETTINGS \
- "env_version=" CONFIG_ENV_VERSION "\0" \
+ "env_version=" __stringify(CONFIG_ENV_VERSION) "\0"\
"consoledev=" __stringify(ACFG_CONSOLE_DEV) "\0"\
"mtdparts=" MTDPARTS_DEFAULT "\0"\
"partition=nand0,6\0" \
"u-boot_addr=" __stringify(CONFIG_SYS_MONITOR_OFFSET) "\0"\
- "u-boot_len=" __stringify(CONFIG_SYS_MONITOR_LEN) "\0"\
- "kernel_addr=" __stringify(CONFIG_KERNEL_OFFSET) "\0"\
- "rootfs_addr=" __stringify(CONFIG_ROOTFS_OFFSET) "\0"\
+ "u-boot_len=" __stringify(CONFIG_SYS_MONITOR_LEN) "\0"\
+ "env_addr=" __stringify(CONFIG_ENV_OFFSET) "\0"\
+ "kernel_addr=" __stringify(CONFIG_KERNEL_OFFSET) "\0"\
+ "rootfs_addr=" __stringify(CONFIG_ROOTFS_OFFSET) "\0"\
+ "cpu_name=imx28" "\0"\
"board_name=" __stringify(CONFIG_BOARD_NAME) "\0"\
"kernel_addr_r=40000000\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=/dev/mmcblk0p1 rootfstype=ext2\0" \
- "addipargs=setenv bootargs ${bootargs} " \
- "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:" \
- "${hostname}:eth0:off\0" \
- "nfsboot=setenv bootargs console=${consoledev},${baudrate} " \
- "${mtdparts} ${extrabootargs}; run addnfsargs addipargs;"\
- "nfs ${kernel_addr_r} " \
- "${serverip}:${rootpath}/boot/${board_name}-linux.bin;" \
- "if test -n ${fdt_addr_r} ; then " \
- "nand read ${fdt_addr_r} dtb; fi;" \
- "bootm ${kernel_addr_r} - ${fdt_addr_r}\0" \
- "ubifsboot=setenv bootargs console=${consoledev},${baudrate} " \
- "${mtdparts} ${extrabootargs};run addubifsargs addipargs;"\
- "if test -n ${fdt_addr_r} ; then " \
- "nand read ${fdt_addr_r} dtb; fi;" \
- "nboot ${kernel_addr_r} kernel;" \
- "bootm ${kernel_addr_r} - ${fdt_addr_r}\0" \
- "mmcboot=setenv bootargs console=${consoledev},${baudrate} " \
- "${mtdparts} ${extrabootargs}; run addmmcargs addipargs;"\
- "if test -n ${fdt_addr_r} ; then " \
- "nand read ${fdt_addr_r} dtb; fi;" \
- "mmc dev 0; ext2load mmc 0 ${kernel_addr_r}" \
- " /boot/${board_name}-linux.bin;" \
- "bootm ${kernel_addr_r} - ${fdt_addr_r}\0" \
+ "check_env=if test -n ${flash_env_version}; " \
+ "then env default env_version; " \
+ "else env set flash_env_version ${env_version}; env save; "\
+ "fi; " \
+ "if itest ${flash_env_version} < ${env_version}; then " \
+ "echo \"*** Warning - Environment version" \
+ " change suggests: run flash_reset_env; reset\"; "\
+ "env default flash_reset_env; "\
+ "fi; \0" \
+ "check_flash= exit\0" \
+ "flash_reset_env=env default -f -a; saveenv; run update_env;" \
+ "echo Flash environment variables erased!\0" \
+ "download_uboot=tftpboot ${loadaddr} ${board_name}-u-boot.sb\0" \
"flash_uboot=if bcb nand.write ; then " \
"nand erase ${u-boot_addr} ${u-boot_len} ; " \
"nand write.trimffs ${fileaddr} ${u-boot_addr} ${filesize};" \
@@ -256,34 +244,14 @@
"then echo Flashing of uboot succeed;" \
"else echo Flashing of uboot failed;" \
"fi; " \
+ "else echo bcb update failed;;" \
"fi; \0" \
- "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_addr} ${filesize};"\
- "then echo Flashing of rootfs succeed;" \
- "else echo Flashing of rootfs failed;" \
- "fi\0" \
- "flash_dtb=nand erase.part dtb;" \
- "if nand write.trimffs ${fileaddr} dtb ${filesize};" \
- "then echo Flashing of rootfs succeed;" \
- "else echo Flashing of rootfs failed;" \
- "fi\0" \
- "flash_reset_env=env default -f -a; saveenv;" \
- "echo Flash environment variables erased!\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"\
- "download_dtb=tftpboot ${loadaddr} imx28-${board_name}.dtb\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_dtb=run download_dtb flash_dtb\0" \
- "update_all=run download_kernel flash_kernel download_rootfs " \
- "flash_rootfs download_uboot flash_uboot\0" \
+ "download_env=tftpboot ${loadaddr} ${board_name}" \
+ "-u-boot-env.txt\0" \
+ "flash_env=env import -t ${loadaddr}; env save; \0" \
+ "update_env=run download_env flash_env\0" \
+ "update_all=run update_env update_uboot\0" \
"unlock_regs=echo unlock_reg not needed anymore\0"
/*
@@ -319,10 +287,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
-
/*
* Partitions & Filsystems
*/
diff --git a/buildroot/target/device/armadeus/u-boot-env-2013.04.txt b/buildroot/target/device/armadeus/u-boot-env-2013.04.txt
index d34227c..ce550d2 100644
--- a/buildroot/target/device/armadeus/u-boot-env-2013.04.txt
+++ b/buildroot/target/device/armadeus/u-boot-env-2013.04.txt
@@ -4,7 +4,7 @@ download_firmware=tftpboot ${loadaddr} ${board_name}-firmware.bin
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
update_firmware=run download_firmware flash_firmware
load_firmware=nand read ${loadaddr} firmware && fpga loadb 0 ${loadaddr} ${firmware_size} || fpga load 0 ${loadaddr} ${firmware_size}; if test $? -eq 0; then echo Firmware successfully loaded; else echo Loading firmware failed!; fi;
-checknload_firmware=if test -n ${firmware_autoload}; then run load_firmware; fi;
+checknload_firmware=if test -n ${firmware_autoload}; then run load_firmware; else exit; fi;
# DTB
download_dtb=tftpboot ${loadaddr} ${cpu_name}-${board_name}.dtb
diff --git a/patches/u-boot/2013.04/502-add-apf28.patch b/patches/u-boot/2013.04/502-add-apf28.patch
index 112adfd..3bac862 100644
--- a/patches/u-boot/2013.04/502-add-apf28.patch
+++ b/patches/u-boot/2013.04/502-add-apf28.patch
@@ -75,11 +75,11 @@ new file mode 100644
index 0000000..7f75494
--- /dev/null
+++ b/board/armadeus/apf28/apf28.c
-@@ -0,0 +1,194 @@
+@@ -0,0 +1,176 @@
+/*
+ * APF28 motherboard based on DENX M28 module
+ *
-+ * Copyright (C) 2012 Eric Jarrige <eri...@ar...>
++ * Copyright (C) 2012-2013 Eric Jarrige <eri...@ar...>
+ * Copyright (C) 2011 Marek Vasut <mar...@gm...>
+ * on behalf of DENX Software Engineering GmbH
+ *
@@ -235,24 +235,6 @@ index 0000000..7f75494
+ return ret;
+}
+
-+#ifdef CONFIG_BOARD_LATE_INIT
-+int board_late_init(void)
-+{
-+ char *s;
-+
-+ /* detect compatibility issue of environment version */
-+ s = getenv("env_version");
-+ if ((NULL == s) || (0 != strcmp(s, CONFIG_ENV_VERSION))) {
-+ char * const vars[] = {"flash_reset_env"};
-+ printf("*** Warning - Environment version change suggests: "
-+ "run flash_reset_env; reset\n");
-+ set_default_vars(1, vars);
-+ }
-+
-+ return 0;
-+}
-+#endif
-+
+#ifdef CONFIG_MX28_FEC_MAC_IN_OCOTP
+void mx28_adjust_mac(int dev_id, unsigned char *mac)
+{
hooks/post-receive
--
armadeus
|
