[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-840-g8c9d004
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-840-g8c9d004
|
From: Julien B a. A. <ar...@us...> - 2015-08-11 18:18:04
|
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 8c9d0044891e9e605dc0f1d87c30bffe654f3c52 (commit)
via bf4e537c30d749cd9021e54ef1791253e9f3c716 (commit)
from 23457127fb3cf10d1fa47d2cfcf255e66ccec7d4 (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 8c9d0044891e9e605dc0f1d87c30bffe654f3c52
Author: Julien Boibessot <jul...@ar...>
Date: Tue Aug 11 18:41:12 2015 +0200
[U-BOOT] APF6: 2014.07+: set APF6 eMMC boot partition size to 48Mbytes and not 24. Updates related tools accordingly.
commit bf4e537c30d749cd9021e54ef1791253e9f3c716
Author: Julien Boibessot <jul...@ar...>
Date: Tue Aug 11 16:39:33 2015 +0200
[BUILDROOT] APF6: all defconfigs: give a volume name (ROOTFS) to rootfs.ext4 image)
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf6_defconfig | 1 +
buildroot/configs/apf6failsafe_defconfig | 1 +
buildroot/configs/apf6legacy-preempt-rt_defconfig | 1 +
buildroot/configs/apf6legacy_defconfig | 1 +
buildroot/configs/apf6mediacenter_defconfig | 1 +
buildroot/configs/apf6test_defconfig | 1 +
buildroot/configs/apf6xenomai_defconfig | 1 +
.../device/armadeus/apf6/apf6-u-boot-2014.07.h | 8 ++++----
.../device/armadeus/apf6/apf6-u-boot-2015.01.h | 8 ++++----
buildroot/target/device/armadeus/apf6/genimage.cfg | 4 ++--
.../device/armadeus/rootfs/post_image_creation.sh | 4 +++-
.../025-armadeus-apf-config-add-package.patch | 2 +-
12 files changed, 21 insertions(+), 12 deletions(-)
diff --git a/buildroot/configs/apf6_defconfig b/buildroot/configs/apf6_defconfig
index eaa6322..7120069 100644
--- a/buildroot/configs/apf6_defconfig
+++ b/buildroot/configs/apf6_defconfig
@@ -114,6 +114,7 @@ BR2_PACKAGE_UTIL_LINUX_FSCK=y
BR2_PACKAGE_NANO=y
BR2_TARGET_ROOTFS_EXT2=y
BR2_TARGET_ROOTFS_EXT2_4=y
+BR2_TARGET_ROOTFS_EXT2_LABEL="ROOTFS"
BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BOARDNAME="$(BR2_BOARD_NAME)"
BR2_TARGET_UBOOT_CUSTOM_VERSION=y
diff --git a/buildroot/configs/apf6failsafe_defconfig b/buildroot/configs/apf6failsafe_defconfig
index 5d86c80..4bddc02 100644
--- a/buildroot/configs/apf6failsafe_defconfig
+++ b/buildroot/configs/apf6failsafe_defconfig
@@ -48,6 +48,7 @@ BR2_TARGET_ROOTFS_CPIO_GZIP=y
BR2_TARGET_ROOTFS_CPIO_UIMAGE=y
BR2_TARGET_ROOTFS_EXT2=y
BR2_TARGET_ROOTFS_EXT2_4=y
+BR2_TARGET_ROOTFS_EXT2_LABEL="ROOTFS"
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 d52fe97..cb0c0c3 100644
--- a/buildroot/configs/apf6legacy-preempt-rt_defconfig
+++ b/buildroot/configs/apf6legacy-preempt-rt_defconfig
@@ -118,6 +118,7 @@ BR2_PACKAGE_UTIL_LINUX_FSCK=y
BR2_PACKAGE_NANO=y
BR2_TARGET_ROOTFS_EXT2=y
BR2_TARGET_ROOTFS_EXT2_4=y
+BR2_TARGET_ROOTFS_EXT2_LABEL="ROOTFS"
BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BOARDNAME="$(BR2_BOARD_NAME)"
BR2_TARGET_UBOOT_CUSTOM_VERSION=y
diff --git a/buildroot/configs/apf6legacy_defconfig b/buildroot/configs/apf6legacy_defconfig
index a46b583..b028421 100644
--- a/buildroot/configs/apf6legacy_defconfig
+++ b/buildroot/configs/apf6legacy_defconfig
@@ -117,6 +117,7 @@ BR2_PACKAGE_UTIL_LINUX_FSCK=y
BR2_PACKAGE_NANO=y
BR2_TARGET_ROOTFS_EXT2=y
BR2_TARGET_ROOTFS_EXT2_4=y
+BR2_TARGET_ROOTFS_EXT2_LABEL="ROOTFS"
BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BOARDNAME="$(BR2_BOARD_NAME)"
BR2_TARGET_UBOOT_CUSTOM_VERSION=y
diff --git a/buildroot/configs/apf6mediacenter_defconfig b/buildroot/configs/apf6mediacenter_defconfig
index f42a22c..35dcebf 100644
--- a/buildroot/configs/apf6mediacenter_defconfig
+++ b/buildroot/configs/apf6mediacenter_defconfig
@@ -89,6 +89,7 @@ BR2_PACKAGE_UTIL_LINUX_FSCK=y
BR2_PACKAGE_NANO=y
BR2_TARGET_ROOTFS_EXT2=y
BR2_TARGET_ROOTFS_EXT2_4=y
+BR2_TARGET_ROOTFS_EXT2_LABEL="ROOTFS"
BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BOARDNAME="$(BR2_BOARD_NAME)"
BR2_TARGET_UBOOT_CUSTOM_VERSION=y
diff --git a/buildroot/configs/apf6test_defconfig b/buildroot/configs/apf6test_defconfig
index 1ae53ae..bd2a90f 100644
--- a/buildroot/configs/apf6test_defconfig
+++ b/buildroot/configs/apf6test_defconfig
@@ -140,6 +140,7 @@ BR2_PACKAGE_UTIL_LINUX_FSCK=y
BR2_PACKAGE_NANO=y
BR2_TARGET_ROOTFS_EXT2=y
BR2_TARGET_ROOTFS_EXT2_4=y
+BR2_TARGET_ROOTFS_EXT2_LABEL="ROOTFS"
BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BOARDNAME="$(BR2_BOARD_NAME)"
BR2_TARGET_UBOOT_CUSTOM_VERSION=y
diff --git a/buildroot/configs/apf6xenomai_defconfig b/buildroot/configs/apf6xenomai_defconfig
index 1b40a55..f4f877d 100644
--- a/buildroot/configs/apf6xenomai_defconfig
+++ b/buildroot/configs/apf6xenomai_defconfig
@@ -90,6 +90,7 @@ BR2_PACKAGE_UTIL_LINUX_FSCK=y
BR2_PACKAGE_NANO=y
BR2_TARGET_ROOTFS_EXT2=y
BR2_TARGET_ROOTFS_EXT2_4=y
+BR2_TARGET_ROOTFS_EXT2_LABEL="ROOTFS"
BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BOARDNAME="$(BR2_BOARD_NAME)"
BR2_TARGET_UBOOT_CUSTOM_VERSION=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 b7a7d0c..3c2a3a9 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 20
+#define CONFIG_ENV_VERSION 21
#define CONFIG_BOARD_NAME apf6
/* SPL */
@@ -256,13 +256,13 @@
"update_boot=run download_boot flash_boot\0" \
"erase_rootfs=echo Erasing 10 first MB of eMMC rootfs partition: ; " \
"mw ${loadaddr} 0 0xa00000 && mmc dev 0 0 && " \
- "mmc write ${loadaddr} 0xc800 0x5000\0" \
+ "mmc write ${loadaddr} 0x18800 0x5000\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} 0xc800 ${nbblocks}; then " \
+ "if mmc write ${loadaddr} 0x18800 ${nbblocks}; then " \
"echo Flashing of rootfs image succeed; " \
"else echo Flashing of rootfs image failed; " \
"fi; " \
@@ -285,7 +285,7 @@
"mw ${loadaddr} 0 0x200000; " \
"mmc write ${loadaddr} 0 0x1000; " \
"mmc write ${loadaddr} 0x800 0x1000; " \
- "mmc write ${loadaddr} 0xc800 0x1000; " \
+ "mmc write ${loadaddr} 0x18800 0x1000; " \
"fi;" \
"mmc rescan\0" \
"update_all=run update_kernel update_rootfs update_dtb update_uboot\0" \
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 b7a7d0c..3c2a3a9 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 20
+#define CONFIG_ENV_VERSION 21
#define CONFIG_BOARD_NAME apf6
/* SPL */
@@ -256,13 +256,13 @@
"update_boot=run download_boot flash_boot\0" \
"erase_rootfs=echo Erasing 10 first MB of eMMC rootfs partition: ; " \
"mw ${loadaddr} 0 0xa00000 && mmc dev 0 0 && " \
- "mmc write ${loadaddr} 0xc800 0x5000\0" \
+ "mmc write ${loadaddr} 0x18800 0x5000\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} 0xc800 ${nbblocks}; then " \
+ "if mmc write ${loadaddr} 0x18800 ${nbblocks}; then " \
"echo Flashing of rootfs image succeed; " \
"else echo Flashing of rootfs image failed; " \
"fi; " \
@@ -285,7 +285,7 @@
"mw ${loadaddr} 0 0x200000; " \
"mmc write ${loadaddr} 0 0x1000; " \
"mmc write ${loadaddr} 0x800 0x1000; " \
- "mmc write ${loadaddr} 0xc800 0x1000; " \
+ "mmc write ${loadaddr} 0x18800 0x1000; " \
"fi;" \
"mmc rescan\0" \
"update_all=run update_kernel update_rootfs update_dtb update_uboot\0" \
diff --git a/buildroot/target/device/armadeus/apf6/genimage.cfg b/buildroot/target/device/armadeus/apf6/genimage.cfg
index 1295335..76cf6b9 100644
--- a/buildroot/target/device/armadeus/apf6/genimage.cfg
+++ b/buildroot/target/device/armadeus/apf6/genimage.cfg
@@ -11,12 +11,12 @@ image apf6-user_data.ext4 {
partition-type = 0x83
image = "apf6-boot.ext4"
offset = 1M
- size = 24M
+ size = 48M
}
partition rootfs {
partition-type = 0x83
image = "apf6-rootfs.ext4"
- size = 3750M
+ size = 3725M
}
}
diff --git a/buildroot/target/device/armadeus/rootfs/post_image_creation.sh b/buildroot/target/device/armadeus/rootfs/post_image_creation.sh
index 1739369..a477a99 100755
--- a/buildroot/target/device/armadeus/rootfs/post_image_creation.sh
+++ b/buildroot/target/device/armadeus/rootfs/post_image_creation.sh
@@ -52,8 +52,10 @@ fi
# if target uses ext4 for rootfs,
if [ -f "$1/rootfs.ext4" ]; then
# generate also boot.ext4:
- mke2img -d $1/../target/boot/ -G 4 -R 1 -l BOOT -b 24576 -o $1/boot.ext4
+ mke2img -d $1/../target/boot/ -G 4 -R 1 -l BOOT -b 49152 -o $1/boot.ext4
symlink_image $1 boot.ext4 $2-boot.ext4
+ # overwrite kernel symlink in boot.ext4 as U-Boot doesn't like it:
+ e2cp $1/*-linux.bin -d $1/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:
diff --git a/patches/buildroot/2015.02/025-armadeus-apf-config-add-package.patch b/patches/buildroot/2015.02/025-armadeus-apf-config-add-package.patch
index f278ef7..deae89e 100644
--- a/patches/buildroot/2015.02/025-armadeus-apf-config-add-package.patch
+++ b/patches/buildroot/2015.02/025-armadeus-apf-config-add-package.patch
@@ -37,7 +37,7 @@ Index: buildroot/package/apf-config/apf-config.mk
+#
+################################################################################
+
-+APF_CONFIG_VERSION = d57e2cf7dc736a83c0b65df95abb7886f4ac73c8
++APF_CONFIG_VERSION = 044378fc0f7b66bb6c66910f75abd49a9a29dfbc
+APF_CONFIG_SITE = $(call github,artemysfr,raspi-config,$(APF_CONFIG_VERSION))
+APF_CONFIG_LICENSE = MIT
+APF_CONFIG_LICENSE_FILES = LICENSE
hooks/post-receive
--
armadeus
|