[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-818-gcae29da
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-818-gcae29da
|
From: Julien B a. A. <ar...@us...> - 2015-08-05 14:49:50
|
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 cae29da30f2ffd8cbbfcc4c28efd85663137b7d5 (commit)
via a6606e39d5274c211fc38ef8b33aa2ffe607dfe7 (commit)
via 38f9986e97be025b78ce4f031f98e5e44c9db467 (commit)
via 66e47777de6b5269b2b6372825466658dba150f0 (commit)
via db27e352ea0361339d34380c0c4f572992644fbd (commit)
via 2eaaf7d5ad5810ad5a585a14f97c1de7fe23985c (commit)
via bec29621486890e9b95075809d286bbb8fcfd563 (commit)
from 61fc4cdd65d0dc0a82855b009c61516a002e4adf (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 cae29da30f2ffd8cbbfcc4c28efd85663137b7d5
Author: Julien Boibessot <jul...@ar...>
Date: Wed Aug 5 16:39:45 2015 +0200
[BUILDROOT] APF6: generate a new image for SD/MMC only usage (rootfs-for-sd.ext4) and cleanup /boot directory of eMMC's rootfs image
commit a6606e39d5274c211fc38ef8b33aa2ffe607dfe7
Author: Julien Boibessot <jul...@ar...>
Date: Wed Aug 5 16:35:36 2015 +0200
[BUILDROOT] APF6: all defconfig: add pv and host-e2tools packages
commit 38f9986e97be025b78ce4f031f98e5e44c9db467
Author: Julien Boibessot <jul...@ar...>
Date: Wed Aug 5 16:08:26 2015 +0200
[U-BOOT] 2014.07+: APF6: remove the usage of dtbs/ directory to store .dtb files, to be similar with other APF boards
commit 66e47777de6b5269b2b6372825466658dba150f0
Author: Julien Boibessot <jul...@ar...>
Date: Wed Aug 5 15:15:05 2015 +0200
[U-BOOT] 2014.07+: APF6: add a script to (partially) erase eMMC User Data partition (erase_userdata).
commit db27e352ea0361339d34380c0c4f572992644fbd
Author: Julien Boibessot <jul...@ar...>
Date: Wed Aug 5 14:56:17 2015 +0200
[U-BOOT] 2014.07+: APF6: add a script to update whole eMMC User Data partition (update_userdata)
commit 2eaaf7d5ad5810ad5a585a14f97c1de7fe23985c
Author: Julien Boibessot <jul...@ar...>
Date: Wed Aug 5 14:52:55 2015 +0200
[U-BOOT] 2014.07+: APF6: add a script to update whole Boot partition (update_boot). Adapt dtb/kernel updating messages.
commit bec29621486890e9b95075809d286bbb8fcfd563
Author: Julien Boibessot <jul...@ar...>
Date: Wed Aug 5 14:46:25 2015 +0200
[U-BOOT] 2014.07+: APF6: fixes rootfs partition offset in eMMC
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf6_defconfig | 2 +
buildroot/configs/apf6failsafe_defconfig | 2 +
buildroot/configs/apf6legacy-preempt-rt_defconfig | 2 +
buildroot/configs/apf6legacy_defconfig | 2 +
buildroot/configs/apf6mediacenter_defconfig | 2 +
buildroot/configs/apf6test_defconfig | 2 +
buildroot/configs/apf6xenomai_defconfig | 2 +
.../device/armadeus/apf6/apf6-u-boot-2014.07.h | 63 +++++++++++++++----
.../device/armadeus/apf6/apf6-u-boot-2015.01.h | 63 +++++++++++++++----
.../device/armadeus/rootfs/post_image_creation.sh | 7 ++-
10 files changed, 118 insertions(+), 29 deletions(-)
diff --git a/buildroot/configs/apf6_defconfig b/buildroot/configs/apf6_defconfig
index 979a788..1ebf3cf 100644
--- a/buildroot/configs/apf6_defconfig
+++ b/buildroot/configs/apf6_defconfig
@@ -69,6 +69,7 @@ BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_FAAD=y
BR2_PACKAGE_GZIP=y
BR2_PACKAGE_GDB=y
BR2_PACKAGE_LTRACE=y
+BR2_PACKAGE_PV=y
BR2_PACKAGE_RAMSMP=y
BR2_PACKAGE_STRACE=y
BR2_PACKAGE_DOSFSTOOLS=y
@@ -122,5 +123,6 @@ BR2_TARGET_UBOOT_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-
BR2_TARGET_UBOOT_FORMAT_IMG=y
BR2_TARGET_UBOOT_SPL=y
BR2_TARGET_UBOOT_SPL_NAME="SPL"
+BR2_PACKAGE_HOST_E2TOOLS=y
BR2_PACKAGE_HOST_GENIMAGE=y
BR2_PACKAGE_HOST_IMX_USB_LOADER=y
diff --git a/buildroot/configs/apf6failsafe_defconfig b/buildroot/configs/apf6failsafe_defconfig
index 64e355d..5d86c80 100644
--- a/buildroot/configs/apf6failsafe_defconfig
+++ b/buildroot/configs/apf6failsafe_defconfig
@@ -35,6 +35,7 @@ BR2_LINUX_KERNEL_ZIMAGE=y
BR2_LINUX_KERNEL_DTS_SUPPORT=y
BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-apf6dev imx6dl-apf6dev"
BR2_PACKAGE_BUSYBOX_CONFIG="$(ARMADEUS_PATH)/busybox.config"
+BR2_PACKAGE_PV=y
BR2_PACKAGE_E2FSPROGS=y
BR2_PACKAGE_E2FSPROGS_E4DEFRAG=y
BR2_PACKAGE_E2FSPROGS_RESIZE2FS=y
@@ -48,4 +49,5 @@ BR2_TARGET_ROOTFS_CPIO_UIMAGE=y
BR2_TARGET_ROOTFS_EXT2=y
BR2_TARGET_ROOTFS_EXT2_4=y
BR2_TARGET_ROOTFS_INITRAMFS=y
+BR2_PACKAGE_HOST_E2TOOLS=y
BR2_PACKAGE_HOST_GENIMAGE=y
diff --git a/buildroot/configs/apf6legacy-preempt-rt_defconfig b/buildroot/configs/apf6legacy-preempt-rt_defconfig
index 543ca78..215d457 100644
--- a/buildroot/configs/apf6legacy-preempt-rt_defconfig
+++ b/buildroot/configs/apf6legacy-preempt-rt_defconfig
@@ -69,6 +69,7 @@ BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_FAAD=y
BR2_PACKAGE_GST_FSL_PLUGINS=y
BR2_PACKAGE_GDB=y
BR2_PACKAGE_LTRACE=y
+BR2_PACKAGE_PV=y
BR2_PACKAGE_RAMSMP=y
BR2_PACKAGE_RT_TESTS=y
BR2_PACKAGE_STRACE=y
@@ -126,5 +127,6 @@ BR2_TARGET_UBOOT_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-
BR2_TARGET_UBOOT_FORMAT_IMG=y
BR2_TARGET_UBOOT_SPL=y
BR2_TARGET_UBOOT_SPL_NAME="SPL"
+BR2_PACKAGE_HOST_E2TOOLS=y
BR2_PACKAGE_HOST_GENIMAGE=y
BR2_PACKAGE_HOST_IMX_USB_LOADER=y
diff --git a/buildroot/configs/apf6legacy_defconfig b/buildroot/configs/apf6legacy_defconfig
index 1b70d73..3b881b1 100644
--- a/buildroot/configs/apf6legacy_defconfig
+++ b/buildroot/configs/apf6legacy_defconfig
@@ -69,6 +69,7 @@ BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_FAAD=y
BR2_PACKAGE_GST_FSL_PLUGINS=y
BR2_PACKAGE_GDB=y
BR2_PACKAGE_LTRACE=y
+BR2_PACKAGE_PV=y
BR2_PACKAGE_RAMSMP=y
BR2_PACKAGE_STRACE=y
BR2_PACKAGE_DOSFSTOOLS=y
@@ -125,5 +126,6 @@ BR2_TARGET_UBOOT_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-
BR2_TARGET_UBOOT_FORMAT_IMG=y
BR2_TARGET_UBOOT_SPL=y
BR2_TARGET_UBOOT_SPL_NAME="SPL"
+BR2_PACKAGE_HOST_E2TOOLS=y
BR2_PACKAGE_HOST_GENIMAGE=y
BR2_PACKAGE_HOST_IMX_USB_LOADER=y
diff --git a/buildroot/configs/apf6mediacenter_defconfig b/buildroot/configs/apf6mediacenter_defconfig
index bddc674..f42a22c 100644
--- a/buildroot/configs/apf6mediacenter_defconfig
+++ b/buildroot/configs/apf6mediacenter_defconfig
@@ -44,6 +44,7 @@ BR2_PACKAGE_ALSA_UTILS_SPEAKER_TEST=y
BR2_PACKAGE_KODI=y
BR2_PACKAGE_KODI_ALSA_LIB=y
BR2_PACKAGE_KODI_LIBNFS=y
+BR2_PACKAGE_PV=y
BR2_PACKAGE_DOSFSTOOLS=y
BR2_PACKAGE_DOSFSTOOLS_FATLABEL=y
BR2_PACKAGE_DOSFSTOOLS_FSCK_FAT=y
@@ -98,5 +99,6 @@ BR2_TARGET_UBOOT_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-
BR2_TARGET_UBOOT_FORMAT_IMG=y
BR2_TARGET_UBOOT_SPL=y
BR2_TARGET_UBOOT_SPL_NAME="SPL"
+BR2_PACKAGE_HOST_E2TOOLS=y
BR2_PACKAGE_HOST_GENIMAGE=y
BR2_PACKAGE_HOST_IMX_USB_LOADER=y
diff --git a/buildroot/configs/apf6test_defconfig b/buildroot/configs/apf6test_defconfig
index dc6c3f1..d65074f 100644
--- a/buildroot/configs/apf6test_defconfig
+++ b/buildroot/configs/apf6test_defconfig
@@ -79,6 +79,7 @@ BR2_PACKAGE_MPLAYER=y
BR2_PACKAGE_GZIP=y
BR2_PACKAGE_GDB=y
BR2_PACKAGE_LTRACE=y
+BR2_PACKAGE_PV=y
BR2_PACKAGE_RAMSMP=y
BR2_PACKAGE_STRACE=y
BR2_PACKAGE_DOSFSTOOLS=y
@@ -148,5 +149,6 @@ BR2_TARGET_UBOOT_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-
BR2_TARGET_UBOOT_FORMAT_IMG=y
BR2_TARGET_UBOOT_SPL=y
BR2_TARGET_UBOOT_SPL_NAME="SPL"
+BR2_PACKAGE_HOST_E2TOOLS=y
BR2_PACKAGE_HOST_GENIMAGE=y
BR2_PACKAGE_HOST_IMX_USB_LOADER=y
diff --git a/buildroot/configs/apf6xenomai_defconfig b/buildroot/configs/apf6xenomai_defconfig
index 17e3223..199b6ad 100644
--- a/buildroot/configs/apf6xenomai_defconfig
+++ b/buildroot/configs/apf6xenomai_defconfig
@@ -44,6 +44,7 @@ BR2_PACKAGE_ALSA_UTILS_APLAY=y
BR2_PACKAGE_ALSA_UTILS_SPEAKER_TEST=y
BR2_PACKAGE_GDB=y
BR2_PACKAGE_LTRACE=y
+BR2_PACKAGE_PV=y
BR2_PACKAGE_RAMSMP=y
BR2_PACKAGE_STRACE=y
BR2_PACKAGE_DOSFSTOOLS=y
@@ -98,5 +99,6 @@ BR2_TARGET_UBOOT_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-
BR2_TARGET_UBOOT_FORMAT_IMG=y
BR2_TARGET_UBOOT_SPL=y
BR2_TARGET_UBOOT_SPL_NAME="SPL"
+BR2_PACKAGE_HOST_E2TOOLS=y
BR2_PACKAGE_HOST_GENIMAGE=y
BR2_PACKAGE_HOST_IMX_USB_LOADER=y
diff --git a/buildroot/target/device/armadeus/apf6/apf6-u-boot-2014.07.h b/buildroot/target/device/armadeus/apf6/apf6-u-boot-2014.07.h
index 1e79c52..85543e3 100644
--- a/buildroot/target/device/armadeus/apf6/apf6-u-boot-2014.07.h
+++ b/buildroot/target/device/armadeus/apf6/apf6-u-boot-2014.07.h
@@ -16,7 +16,7 @@
#define CONFIG_SYS_GENERIC_BOARD
#define CONFIG_VERSION_VARIABLE
-#define CONFIG_ENV_VERSION 13
+#define CONFIG_ENV_VERSION 18
#define CONFIG_BOARD_NAME apf6
/* SPL */
@@ -232,35 +232,68 @@
"download_kernel=tftpboot ${loadaddr} ${kernelimg}\0" \
"flash_kernel=" \
"if ext4write mmc ${mmcdev}:${mmcpart} ${loadaddr} /${kernelimg} ${filesize}; then " \
- "echo Flashing of kernel succeed; " \
- "else echo Flashing of kernel failed; " \
+ "echo kernel update in Boot partition succeed; " \
+ "else echo kernel update in Boot partition failed; " \
"fi;\0" \
"update_kernel=run download_kernel flash_kernel\0" \
"download_dtb=tftpboot ${fdt_addr} ${cpu_type}-${fdt_name}.dtb\0" \
"flash_dtb=" \
- "if ext4write mmc ${mmcdev}:${mmcpart} ${fdt_addr} /dtbs/${cpu_type}-${fdt_name}.dtb ${filesize}; then " \
- "echo Flashing of dtb succeed; " \
- "else echo Flashing of dtb failed; " \
+ "if ext4write mmc ${mmcdev}:${mmcpart} ${fdt_addr} /${cpu_type}-${fdt_name}.dtb ${filesize}; then " \
+ "echo dtb update in Boot partition succeed; " \
+ "else echo dtb update in Boot partition failed; " \
"fi;\0" \
"update_dtb=run download_dtb flash_dtb\0" \
+ "download_boot=tftpboot ${loadaddr} ${board_name}-boot.ext4\0" \
+ "flash_boot=" \
+ "if mmc dev 0 0; then " \
+ "setexpr nbblocks ${filesize} / 0x200; " \
+ "setexpr nbblocks ${nbblocks} + 1; " \
+ "if mmc write ${loadaddr} 0x800 ${nbblocks}; then " \
+ "echo Flashing of boot image succeed; " \
+ "else echo Flashing of boot image failed; " \
+ "fi; " \
+ "fi;\0" \
+ "update_boot=run download_boot flash_boot\0" \
"download_rootfs=tftpboot ${loadaddr} ${board_name}-rootfs.ext4\0" \
"flash_rootfs=" \
"if mmc dev 0 0; then " \
"setexpr nbblocks ${filesize} / 0x200; " \
"setexpr nbblocks ${nbblocks} + 1; " \
- "if mmc write ${loadaddr} 0x18800 ${nbblocks}; then " \
+ "if mmc write ${loadaddr} 0xc800 ${nbblocks}; then " \
"echo Flashing of rootfs image succeed; " \
"else echo Flashing of rootfs image failed; " \
"fi; " \
"fi;\0" \
"update_rootfs=run download_rootfs flash_rootfs\0" \
+ "download_userdata=tftpboot ${loadaddr} ${board_name}-user_data.ext4\0" \
+ "flash_userdata=" \
+ "if mmc dev 0 0; then " \
+ "setexpr nbblocks ${filesize} / 0x200; " \
+ "setexpr nbblocks ${nbblocks} + 1; " \
+ "if mmc write ${loadaddr} 0 ${nbblocks}; then " \
+ "echo Flashing of user_data image succeed; " \
+ "else echo Flashing of user_data image failed; " \
+ "fi; " \
+ "fi;\0" \
+ "update_userdata=run download_userdata flash_userdata; mmc rescan\0" \
+ "erase_userdata=" \
+ "if mmc dev 0 0; then " \
+ "echo Erasing eMMC User Data partition, no way out...; " \
+ "mw ${loadaddr} 0 0x200000; " \
+ "mmc write ${loadaddr} 0 0x1000; " \
+ "mmc write ${loadaddr} 0x800 0x1000; " \
+ "mmc write ${loadaddr} 0xc800 0x1000; " \
+ "fi;" \
+ "mmc rescan\0" \
"update_all=run update_kernel update_rootfs update_dtb update_uboot\0" \
"load_firmware=ext2load mmc 0:2 ${loadaddr} ${firmware_path} && " \
"fpga load 0 ${loadaddr} ${filesize}\0" \
"checknload_firmware=if test ${firmware_autoload} = 1;" \
"then run load_firmware; else exit; fi;\0" \
- "mmcloadzimage=load mmc ${mmcdev}:${mmcpart} ${loadaddr} ${mmcdir}/${kernelimg}\0" \
- "mmcloadfdt=load mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${mmcdtbdir}/${cpu_type}-${fdt_name}.dtb\0" \
+ "mmcloadzimage=load mmc ${mmcdev}:${mmcpart} ${loadaddr} ${mmcbootdir}/${kernelimg}\0" \
+ "mmcloadfdt=load mmc ${mmcdev}:${mmcpart} ${fdt_addr} " \
+ "${mmcbootdir}/${mmcdtbdir}/${cpu_type}-${fdt_name}.dtb || " \
+ "echo Please update your eMMC Boot partition\0" \
"initargs=setenv bootargs console=${consoledev},${baudrate} ${extrabootargs}\0" \
"addipargs=setenv bootargs ${bootargs} ip=${ipaddr}:${serverip}:" \
"${gatewayip}:${netmask}:${hostname}:eth0:off\0" \
@@ -268,10 +301,12 @@
"rootfstype=${mmcrootfstype}\0" \
"genmmcboot=run initargs; run addmmcargs; " \
"run mmcloadzimage && run mmcloadfdt && bootz ${loadaddr} - ${fdt_addr};\0" \
- "mmcboot=setenv mmcdev 1; setenv mmcpart 1; setenv mmcdir /boot; setenv mmcdtbdir /boot;" \
- "setenv mmcroot /dev/mmcblk1p1 ro; run genmmcboot;\0" \
- "emmcboot=setenv mmcdev 0; setenv mmcpart 1; setenv mmcdir; setenv mmcdtbdir /dtbs;" \
- "setenv mmcroot /dev/mmcblk2p2 ro; run genmmcboot;\0" \
+ "mmcboot=setenv mmcdev 1; setenv mmcpart 1; setenv mmcbootdir /boot; " \
+ "setenv mmcroot /dev/mmcblk1p1 ro; " \
+ "run genmmcboot;\0" \
+ "emmcboot=setenv mmcdev 0; setenv mmcpart 1; setenv mmcbootdir; " \
+ "setenv mmcroot /dev/mmcblk2p2 ro; " \
+ "run genmmcboot;\0" \
"addramargs=setenv bootargs ${bootargs} root=/dev/ram rw\0" \
"ramboot=run initargs; run addramargs; " \
"run download_kernel && run download_dtb && " \
@@ -280,7 +315,7 @@
"nfsroot=${serverip}:${rootpath}\0" \
"nfsboot=run initargs; run addnfsargs addipargs; " \
"nfs ${loadaddr} ${serverip}:${rootpath}/boot/${kernelimg} && " \
- "nfs ${fdt_addr} ${serverip}:${rootpath}/boot/dtbs/${cpu_type}-${fdt_name}.dtb && " \
+ "nfs ${fdt_addr} ${serverip}:${rootpath}/boot/${cpu_type}-${fdt_name}.dtb && " \
"bootz ${loadaddr} - ${fdt_addr};\0"
/* Miscellaneous configurable options */
diff --git a/buildroot/target/device/armadeus/apf6/apf6-u-boot-2015.01.h b/buildroot/target/device/armadeus/apf6/apf6-u-boot-2015.01.h
index 1e79c52..85543e3 100644
--- a/buildroot/target/device/armadeus/apf6/apf6-u-boot-2015.01.h
+++ b/buildroot/target/device/armadeus/apf6/apf6-u-boot-2015.01.h
@@ -16,7 +16,7 @@
#define CONFIG_SYS_GENERIC_BOARD
#define CONFIG_VERSION_VARIABLE
-#define CONFIG_ENV_VERSION 13
+#define CONFIG_ENV_VERSION 18
#define CONFIG_BOARD_NAME apf6
/* SPL */
@@ -232,35 +232,68 @@
"download_kernel=tftpboot ${loadaddr} ${kernelimg}\0" \
"flash_kernel=" \
"if ext4write mmc ${mmcdev}:${mmcpart} ${loadaddr} /${kernelimg} ${filesize}; then " \
- "echo Flashing of kernel succeed; " \
- "else echo Flashing of kernel failed; " \
+ "echo kernel update in Boot partition succeed; " \
+ "else echo kernel update in Boot partition failed; " \
"fi;\0" \
"update_kernel=run download_kernel flash_kernel\0" \
"download_dtb=tftpboot ${fdt_addr} ${cpu_type}-${fdt_name}.dtb\0" \
"flash_dtb=" \
- "if ext4write mmc ${mmcdev}:${mmcpart} ${fdt_addr} /dtbs/${cpu_type}-${fdt_name}.dtb ${filesize}; then " \
- "echo Flashing of dtb succeed; " \
- "else echo Flashing of dtb failed; " \
+ "if ext4write mmc ${mmcdev}:${mmcpart} ${fdt_addr} /${cpu_type}-${fdt_name}.dtb ${filesize}; then " \
+ "echo dtb update in Boot partition succeed; " \
+ "else echo dtb update in Boot partition failed; " \
"fi;\0" \
"update_dtb=run download_dtb flash_dtb\0" \
+ "download_boot=tftpboot ${loadaddr} ${board_name}-boot.ext4\0" \
+ "flash_boot=" \
+ "if mmc dev 0 0; then " \
+ "setexpr nbblocks ${filesize} / 0x200; " \
+ "setexpr nbblocks ${nbblocks} + 1; " \
+ "if mmc write ${loadaddr} 0x800 ${nbblocks}; then " \
+ "echo Flashing of boot image succeed; " \
+ "else echo Flashing of boot image failed; " \
+ "fi; " \
+ "fi;\0" \
+ "update_boot=run download_boot flash_boot\0" \
"download_rootfs=tftpboot ${loadaddr} ${board_name}-rootfs.ext4\0" \
"flash_rootfs=" \
"if mmc dev 0 0; then " \
"setexpr nbblocks ${filesize} / 0x200; " \
"setexpr nbblocks ${nbblocks} + 1; " \
- "if mmc write ${loadaddr} 0x18800 ${nbblocks}; then " \
+ "if mmc write ${loadaddr} 0xc800 ${nbblocks}; then " \
"echo Flashing of rootfs image succeed; " \
"else echo Flashing of rootfs image failed; " \
"fi; " \
"fi;\0" \
"update_rootfs=run download_rootfs flash_rootfs\0" \
+ "download_userdata=tftpboot ${loadaddr} ${board_name}-user_data.ext4\0" \
+ "flash_userdata=" \
+ "if mmc dev 0 0; then " \
+ "setexpr nbblocks ${filesize} / 0x200; " \
+ "setexpr nbblocks ${nbblocks} + 1; " \
+ "if mmc write ${loadaddr} 0 ${nbblocks}; then " \
+ "echo Flashing of user_data image succeed; " \
+ "else echo Flashing of user_data image failed; " \
+ "fi; " \
+ "fi;\0" \
+ "update_userdata=run download_userdata flash_userdata; mmc rescan\0" \
+ "erase_userdata=" \
+ "if mmc dev 0 0; then " \
+ "echo Erasing eMMC User Data partition, no way out...; " \
+ "mw ${loadaddr} 0 0x200000; " \
+ "mmc write ${loadaddr} 0 0x1000; " \
+ "mmc write ${loadaddr} 0x800 0x1000; " \
+ "mmc write ${loadaddr} 0xc800 0x1000; " \
+ "fi;" \
+ "mmc rescan\0" \
"update_all=run update_kernel update_rootfs update_dtb update_uboot\0" \
"load_firmware=ext2load mmc 0:2 ${loadaddr} ${firmware_path} && " \
"fpga load 0 ${loadaddr} ${filesize}\0" \
"checknload_firmware=if test ${firmware_autoload} = 1;" \
"then run load_firmware; else exit; fi;\0" \
- "mmcloadzimage=load mmc ${mmcdev}:${mmcpart} ${loadaddr} ${mmcdir}/${kernelimg}\0" \
- "mmcloadfdt=load mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${mmcdtbdir}/${cpu_type}-${fdt_name}.dtb\0" \
+ "mmcloadzimage=load mmc ${mmcdev}:${mmcpart} ${loadaddr} ${mmcbootdir}/${kernelimg}\0" \
+ "mmcloadfdt=load mmc ${mmcdev}:${mmcpart} ${fdt_addr} " \
+ "${mmcbootdir}/${mmcdtbdir}/${cpu_type}-${fdt_name}.dtb || " \
+ "echo Please update your eMMC Boot partition\0" \
"initargs=setenv bootargs console=${consoledev},${baudrate} ${extrabootargs}\0" \
"addipargs=setenv bootargs ${bootargs} ip=${ipaddr}:${serverip}:" \
"${gatewayip}:${netmask}:${hostname}:eth0:off\0" \
@@ -268,10 +301,12 @@
"rootfstype=${mmcrootfstype}\0" \
"genmmcboot=run initargs; run addmmcargs; " \
"run mmcloadzimage && run mmcloadfdt && bootz ${loadaddr} - ${fdt_addr};\0" \
- "mmcboot=setenv mmcdev 1; setenv mmcpart 1; setenv mmcdir /boot; setenv mmcdtbdir /boot;" \
- "setenv mmcroot /dev/mmcblk1p1 ro; run genmmcboot;\0" \
- "emmcboot=setenv mmcdev 0; setenv mmcpart 1; setenv mmcdir; setenv mmcdtbdir /dtbs;" \
- "setenv mmcroot /dev/mmcblk2p2 ro; run genmmcboot;\0" \
+ "mmcboot=setenv mmcdev 1; setenv mmcpart 1; setenv mmcbootdir /boot; " \
+ "setenv mmcroot /dev/mmcblk1p1 ro; " \
+ "run genmmcboot;\0" \
+ "emmcboot=setenv mmcdev 0; setenv mmcpart 1; setenv mmcbootdir; " \
+ "setenv mmcroot /dev/mmcblk2p2 ro; " \
+ "run genmmcboot;\0" \
"addramargs=setenv bootargs ${bootargs} root=/dev/ram rw\0" \
"ramboot=run initargs; run addramargs; " \
"run download_kernel && run download_dtb && " \
@@ -280,7 +315,7 @@
"nfsroot=${serverip}:${rootpath}\0" \
"nfsboot=run initargs; run addnfsargs addipargs; " \
"nfs ${loadaddr} ${serverip}:${rootpath}/boot/${kernelimg} && " \
- "nfs ${fdt_addr} ${serverip}:${rootpath}/boot/dtbs/${cpu_type}-${fdt_name}.dtb && " \
+ "nfs ${fdt_addr} ${serverip}:${rootpath}/boot/${cpu_type}-${fdt_name}.dtb && " \
"bootz ${loadaddr} - ${fdt_addr};\0"
/* Miscellaneous configurable options */
diff --git a/buildroot/target/device/armadeus/rootfs/post_image_creation.sh b/buildroot/target/device/armadeus/rootfs/post_image_creation.sh
index 1c0bfcf..ba155fa 100755
--- a/buildroot/target/device/armadeus/rootfs/post_image_creation.sh
+++ b/buildroot/target/device/armadeus/rootfs/post_image_creation.sh
@@ -49,10 +49,15 @@ else
fi
fi
-# if target uses ext4 for rootfs, generate also boot.ext4
+# if target uses ext4 for rootfs,
if [ -f "$1/rootfs.ext4" ]; then
+ # generate also boot.ext4:
mke2img -d $1/../target/boot/ -G 4 -o $1/boot.ext4
symlink_image $1 boot.ext4 $2-boot.ext4
+ # make a copy of rootfs for MMC/SD usage:
+ cp $1/rootfs.ext4 $1/rootfs-for-sd.ext4
+ # cleanup /boot in eMMC rootfs:
+ e2rm $1/rootfs.ext4:/boot/*
fi
# generate full HD/MMC image if config file found
hooks/post-receive
--
armadeus
|