[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-372-g9d74432
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-372-g9d74432
|
From: jorasse <jo...@us...> - 2013-08-12 09:15:01
|
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 9d74432d5b909ac176b5a3e563400717535eb71a (commit)
from bcc0d5494e1cc6aca6b5da4b69e4bb1afb56619e (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 9d74432d5b909ac176b5a3e563400717535eb71a
Author: Eric Jarrige <eri...@ar...>
Date: Mon Aug 12 11:24:01 2013 +0200
[UBOOT] apf9328: update to use external environment scripts.
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf9328_defconfig | 3 +
buildroot/configs/apf9328test_defconfig | 3 +
.../armadeus/apf9328/apf9328-u-boot-2013.04.h | 97 +++++++-------------
.../apf9328/apf9328-u-boot-env-2013.04.txt | 34 +++++++
patches/u-boot/2013.04/103-apf9328.patch | 84 ++++++-----------
5 files changed, 104 insertions(+), 117 deletions(-)
create mode 100644 buildroot/target/device/armadeus/apf9328/apf9328-u-boot-env-2013.04.txt
diff --git a/buildroot/configs/apf9328_defconfig b/buildroot/configs/apf9328_defconfig
index 71e41dc..c9686e4 100644
--- a/buildroot/configs/apf9328_defconfig
+++ b/buildroot/configs/apf9328_defconfig
@@ -67,6 +67,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="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-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.29.6"
diff --git a/buildroot/configs/apf9328test_defconfig b/buildroot/configs/apf9328test_defconfig
index 1a99ed6..1e7341f 100644
--- a/buildroot/configs/apf9328test_defconfig
+++ b/buildroot/configs/apf9328test_defconfig
@@ -112,6 +112,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="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-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.29.6"
diff --git a/buildroot/target/device/armadeus/apf9328/apf9328-u-boot-2013.04.h b/buildroot/target/device/armadeus/apf9328/apf9328-u-boot-2013.04.h
index d75c8a4..bad6229 100644
--- a/buildroot/target/device/armadeus/apf9328/apf9328-u-boot-2013.04.h
+++ b/buildroot/target/device/armadeus/apf9328/apf9328-u-boot-2013.04.h
@@ -8,8 +8,8 @@
#define __CONFIG_H
#define CONFIG_VERSION_VARIABLE
-#define CONFIG_ENV_VERSION "5.4"
-#define CONFIG_IDENT_STRING " apf9328 patch 5.8"
+#define CONFIG_ENV_VERSION 10
+#define CONFIG_IDENT_STRING " apf9328 patch 5.9"
#define CONFIG_BOARD_NAME apf9328
/*
@@ -23,7 +23,6 @@
* Enable the call to miscellaneous platform dependent initialization.
*/
#define CONFIG_SYS_DCACHE_OFF
-#define CONFIG_MISC_INIT_R
/*
* Board display option
@@ -107,7 +106,7 @@
(CONFIG_ENV_ADDR + CONFIG_ENV_SIZE) /* +128kB */
#define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE /* 128kB */
#define CONFIG_FIRMWARE_ADDR 0x10080000
-#define CONFIG_FIRMWARE_LEN 0x00040000 /* 256kB ( 2 flash sector ) */
+#define CONFIG_FIRMWARE_SIZE 0x00040000 /* 256kB ( 2 flash sector ) */
#define CONFIG_KERNEL_ADDR 0x100C0000
#define CONFIG_ROOTFS_ADDR 0x102C0000
@@ -139,6 +138,8 @@
#define CONFIG_CMDLINE_EDITING
#define CONFIG_SYS_HUSH_PARSER /* enable the "hush" shell */
#define CONFIG_SYS_PROMPT_HUSH_PS2 "> " /* secondary prompt string */
+#define CONFIG_ENV_VARS_UBOOT_CONFIG
+#define CONFIG_PREBOOT "run check_flash check_env;"
/*
* Boot Linux
@@ -170,36 +171,31 @@
* Extra Environments
*/
#define CONFIG_EXTRA_ENV_SETTINGS \
- "env_version=" CONFIG_ENV_VERSION "\0" \
- "consoledev=" __stringify(ACFG_CONSOLE_DEV) "\0" \
- "mtdparts=" MTDPARTS_DEFAULT "\0" \
+ "env_version=" __stringify(CONFIG_ENV_VERSION) "\0" \
+ "consoledev=" __stringify(ACFG_CONSOLE_DEV) "\0" \
+ "mtdparts=" MTDPARTS_DEFAULT "\0" \
"partition=nor0,5\0" \
- "uboot_addr=" __stringify(CONFIG_SYS_MONITOR_BASE) "\0" \
- "firmware_addr=" __stringify(CONFIG_FIRMWARE_ADDR) "\0" \
- "kernel_addr=" __stringify(CONFIG_KERNEL_ADDR) "\0" \
- "rootfs_addr=" __stringify(CONFIG_ROOTFS_ADDR) "\0" \
+ "uboot_addr=" __stringify(CONFIG_SYS_MONITOR_BASE) "\0" \
+ "env_addr=" __stringify(CONFIG_ENV_ADDR) "\0" \
+ "firmware_addr=" __stringify(CONFIG_FIRMWARE_ADDR) "\0" \
+ "firmware_size=" __stringify(CONFIG_FIRMWARE_SIZE) "\0" \
+ "kernel_addr=" __stringify(CONFIG_KERNEL_ADDR) "\0" \
+ "rootfs_addr=" __stringify(CONFIG_ROOTFS_ADDR) "\0" \
+ "cpu_name=imx1" "\0" \
"board_name=" __stringify(CONFIG_BOARD_NAME) "\0" \
- "firmware_autoload=0\0" \
- "addnfsargs=setenv bootargs ${bootargs} " \
- "root=/dev/nfs rw nfsroot=${serverip}:${rootpath}\0" \
- "addjffsargs=setenv bootargs ${bootargs} " \
- "root=/dev/mtdblock5 rootfstype=jffs2\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 ${loadaddr} " \
- "${serverip}:${rootpath}/boot/${board_name}-linux.bin;" \
- "bootm ${loadaddr}\0" \
- "jffsboot=setenv bootargs console=${consoledev},${baudrate} " \
- "${mtdparts} ${extrabootargs}; run addjffsargs addipargs; "\
- "bootm ${kernel_addr}\0" \
- "mmcboot=setenv bootargs console=${consoledev},${baudrate} " \
- "${mtdparts} ${extrabootargs}; run addmmcargs addipargs; "\
- "bootm ${kernel_addr}\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=protect on nor0,0;\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.bin\0"\
"flash_uboot=protect off nor0,0;" \
"echo Erasing FLASH;" \
"era nor0,0;" \
@@ -208,34 +204,12 @@
"echo Flashing of uboot succeed;" \
"else echo Flashing of uboot failed;" \
"fi; \0" \
- "flash_firmware=echo Erasing FLASH;" \
- "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 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,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 -a; saveenv;" \
- "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" \
- "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=mw 00200008 0; mw 00210008 0\0" \
/*
@@ -284,12 +258,11 @@
/*
* FPGA
*/
+#define CONFIG_FPGA
#define CONFIG_FPGA_COUNT 1
-/* only digital value for CONFIG_FPGA is supported (investigation pending) */
-#define CONFIG_FPGA 0x801 /* CONFIG_SYS_XILINX_SPARTAN3 */
#define CONFIG_FPGA_XILINX
#define CONFIG_FPGA_SPARTAN3
-#define CONFIG_SYS_FPGA_WAIT 250
+#define CONFIG_SYS_FPGA_WAIT 250 /* 250 ms */
#define CONFIG_SYS_FPGA_PROG_FEEDBACK
#define CONFIG_SYS_FPGA_CHECK_CTRLC
#define CONFIG_SYS_FPGA_CHECK_ERROR
diff --git a/buildroot/target/device/armadeus/apf9328/apf9328-u-boot-env-2013.04.txt b/buildroot/target/device/armadeus/apf9328/apf9328-u-boot-env-2013.04.txt
new file mode 100644
index 0000000..913bf2b
--- /dev/null
+++ b/buildroot/target/device/armadeus/apf9328/apf9328-u-boot-env-2013.04.txt
@@ -0,0 +1,34 @@
+# U-Boot / environment variable management scripts
+# FPGA
+download_firmware=tftpboot ${loadaddr} ${board_name}-firmware.bin
+flash_firmware=echo Erasing FLASH;era nor0,3;if cp.b ${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=fpga loadb 0 ${firmware_addr} ${firmware_size} || fpga load 0 ${firmware_addr} ${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;
+
+# DTB
+
+# kernel
+download_kernel=tftpboot ${loadaddr} ${board_name}-linux.bin
+flash_kernel=echo Erasing FLASH;era nor0,4;if cp.b ${fileaddr} ${kernel_addr} ${filesize} ;then echo Flashing of kernel succeed;else echo Flashing of kernel failed;fi
+update_kernel=run download_kernel flash_kernel
+
+# rootfs
+download_rootfs=tftpboot ${loadaddr} ${board_name}-rootfs.jffs2
+flash_rootfs=echo Erasing FLASH;era nor0,5;if cp.b ${fileaddr} ${rootfs_addr} ${filesize};then echo Flashing of rootfs succeed;else echo Flashing of rootfs failed;fi
+update_rootfs=run download_rootfs flash_rootfs
+
+# update
+update_all=run update_kernel update_rootfs update_env update_uboot
+
+# boot
+addipargs=setenv bootargs ${bootargs} ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}:eth0:off
+addmmcargs=setenv bootargs ${bootargs} root=/dev/mmcblk0p1 rootfstype=ext2
+mmcboot=setenv bootargs console=${consoledev},${baudrate} ${mtdparts} ${extrabootargs}; run addmmcargs addipargs; bootm ${kernel_addr}
+addnfsargs=setenv bootargs ${bootargs} root=/dev/nfs rw nfsroot=${serverip}:${rootpath}
+nfsboot=setenv bootargs console=${consoledev},${baudrate} ${mtdparts} ${extrabootargs}; run addnfsargs addipargs; nfs ${loadaddr} ${serverip}:${rootpath}/boot/${board_name}-linux.bin;bootm ${loadaddr}
+addjffsargs=setenv bootargs ${bootargs} root=/dev/mtdblock5 rootfstype=jffs2
+jffsboot=setenv bootargs console=${consoledev},${baudrate} ${mtdparts} ${extrabootargs}; run addjffsargs addipargs; bootm ${kernel_addr}
+
+preboot=run check_flash checknload_firmware check_env ;
+
diff --git a/patches/u-boot/2013.04/103-apf9328.patch b/patches/u-boot/2013.04/103-apf9328.patch
index 36f302a..7f1b021 100644
--- a/patches/u-boot/2013.04/103-apf9328.patch
+++ b/patches/u-boot/2013.04/103-apf9328.patch
@@ -89,7 +89,7 @@ new file mode 100644
index 0000000..280f749
--- /dev/null
+++ b/board/armadeus/apf9328/apf9328.c
-@@ -0,0 +1,93 @@
+@@ -0,0 +1,74 @@
+/*
+ * (C) Copyright 2005-2011
+ * Nicolas Colombain <nic...@ar...>
@@ -126,6 +126,14 @@ index 0000000..280f749
+
+ gd->bd->bi_boot_params = PHYS_SDRAM_1 + 0x100;
+
++#ifdef CONFIG_DRIVER_DM9000
++ imx_gpio_mode(GPIO_PORTB | GPIO_DR | GPIO_IN | 14);
++#endif
++
++#ifdef CONFIG_FPGA
++ apf9328_init_fpga();
++#endif
++
+ return 0;
+}
+
@@ -145,33 +153,6 @@ index 0000000..280f749
+#endif
+}
+
-+/*
-+ * Miscellaneous intialization
-+ */
-+int misc_init_r(void)
-+{
-+ char *s;
-+
-+#ifdef CONFIG_FPGA
-+ apf9328_init_fpga();
-+#endif
-+
-+#ifdef CONFIG_DRIVER_DM9000
-+ imx_gpio_mode(GPIO_PORTB | GPIO_DR | GPIO_IN | 14);
-+#endif
-+
-+ /* 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;
-+}
-+
+void show_boot_progress(int status)
+{
+ return;
@@ -188,7 +169,7 @@ new file mode 100644
index 0000000..9782115
--- /dev/null
+++ b/board/armadeus/apf9328/apf9328fpga.c
-@@ -0,0 +1,100 @@
+@@ -0,0 +1,81 @@
+/*
+ * (C) Copyright 2005-2011
+ * Nicolas Colombain <nic...@ar...>
@@ -240,6 +221,9 @@ index 0000000..9782115
+ fpga_init_fn,
+ fpga_done_fn,
+ fpga_wr_fn,
++ fpga_post_fn,
++ NULL,
++ fpga_abort_fn,
+};
+
+Xilinx_desc fpga[CONFIG_FPGA_COUNT] = {
@@ -255,37 +239,15 @@ index 0000000..9782115
+ */
+int apf9328_init_fpga(void)
+{
-+ char *autoload = getenv("firmware_autoload");
-+ int i, lout = 1;
-+ u8 pnum;
-+ struct mtd_device *dev;
-+ struct part_info *part;
-+
-+ debug("%s:%d: Initialize FPGA interface (relocation offset= 0x%.8lx)\n",
-+ __func__, __LINE__, gd->reloc_off);
++ int i;
+
+ fpga_init();
+
+ for (i = 0; i < CONFIG_FPGA_COUNT; i++) {
-+ debug("%s:%d: Adding fpga %d\n", __func__, __LINE__, i);
+ fpga_add(fpga_xilinx, &fpga[i]);
+ }
+
-+ if ((autoload) && (0 == strcmp(autoload, "1"))) {
-+ if ((mtdparts_init() == 0) &&
-+ (find_dev_and_part("firmware", &dev, &pnum, &part) == 0)) {
-+ if (ctrlc()) {
-+ printf("Firmware download stopped!\n");
-+ lout = 0;
-+ } else if (FPGA_SUCCESS != fpga_load(0,
-+ (void *)part->offset,
-+ (size_t)part->size)) {
-+ lout = 0;
-+ printf("Firmware not loaded!\n");
-+ }
-+ }
-+ }
-+ return lout;
++ return 0;
+}
+
+#endif /* CONFIG_FPGA */
@@ -425,7 +387,7 @@ new file mode 100644
index 0000000..f3d4f03
--- /dev/null
+++ b/board/armadeus/apf9328/fpga.c
-@@ -0,0 +1,121 @@
+@@ -0,0 +1,131 @@
+/*
+ * (C) Copyright 2002
+ * Rich Ireland, Enterasys Networks, rir...@en....
@@ -546,13 +508,23 @@ index 0000000..f3d4f03
+ return assert_write;
+}
+
++int fpga_post_fn(int cookie)
++{
++ return cookie;
++}
++
++int fpga_abort_fn(int cookie)
++{
++ return fpga_post_fn(cookie);
++}
++
+#endif /* CONFIG_FPGA */
diff --git a/board/armadeus/apf9328/fpga.h b/board/armadeus/apf9328/fpga.h
new file mode 100644
index 0000000..3b226d7
--- /dev/null
+++ b/board/armadeus/apf9328/fpga.h
-@@ -0,0 +1,30 @@
+@@ -0,0 +1,32 @@
+/*
+ * (C) Copyright 2002
+ * Rich Ireland, Enterasys Networks, rir...@en....
@@ -583,6 +555,8 @@ index 0000000..3b226d7
+extern int fpga_done_fn(int cookie);
+extern int fpga_clk_fn(int assert_clk, int flush, int cookie);
+extern int fpga_wr_fn(int assert_write, int flush, int cookie);
++extern int fpga_post_fn(int cookie);
++extern int fpga_abort_fn(int cookie);
diff --git a/board/armadeus/apf9328/i2c.c b/board/armadeus/apf9328/i2c.c
new file mode 100644
index 0000000..0ba0a8d
hooks/post-receive
--
armadeus
|
