From ab10b5b3ee6aa1e19aa6264153eeed9054d4c2e7 Mon Sep 17 00:00:00 2001 From: Biagio Montaruli Date: Sun, 11 Aug 2019 16:58:53 +0200 Subject: [PATCH] configs/acmesystems_aria_g25: bump Linux and AT91Bootstrap versions * Bump Linux version to 4.19 * Use default 'genimage' post-image script (support/scripts/genimage.sh) to build sdcard.img * Bump AT91bootstrap version to 3.8.13 Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/269139082 https://gitlab.com/buildroot.org/buildroot/-/jobs/269139081 Signed-off-by: Biagio Montaruli Signed-off-by: Thomas Petazzoni --- board/acmesystems/aria-g25/genimage.cfg | 2 +- board/acmesystems/aria-g25/post-image.sh | 14 -------------- configs/acmesystems_aria_g25_128mb_defconfig | 10 ++++++---- configs/acmesystems_aria_g25_256mb_defconfig | 10 ++++++---- 4 files changed, 13 insertions(+), 23 deletions(-) delete mode 100755 board/acmesystems/aria-g25/post-image.sh diff --git a/board/acmesystems/aria-g25/genimage.cfg b/board/acmesystems/aria-g25/genimage.cfg index 2e2eb129aa..b40ad9edf3 100644 --- a/board/acmesystems/aria-g25/genimage.cfg +++ b/board/acmesystems/aria-g25/genimage.cfg @@ -11,7 +11,7 @@ image boot.vfat { } file boot.bin { - image = "at91sam9x5_aria-sdcardboot-linux-zimage-dt-3.8.6.bin" + image = "at91sam9x5_aria-sdcardboot-linux-zimage-dt-3.8.13.bin" } } size = 16M diff --git a/board/acmesystems/aria-g25/post-image.sh b/board/acmesystems/aria-g25/post-image.sh deleted file mode 100755 index 2846f56d72..0000000000 --- a/board/acmesystems/aria-g25/post-image.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh - -BOARD_DIR="$(dirname $0)" -GENIMAGE_CFG="${BOARD_DIR}/genimage.cfg" -GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp" - -rm -rf "${GENIMAGE_TMP}" - -genimage \ - --rootpath "${TARGET_DIR}" \ - --tmppath "${GENIMAGE_TMP}" \ - --inputpath "${BINARIES_DIR}" \ - --outputpath "${BINARIES_DIR}" \ - --config "${GENIMAGE_CFG}" diff --git a/configs/acmesystems_aria_g25_128mb_defconfig b/configs/acmesystems_aria_g25_128mb_defconfig index 0ec210f33e..f2fe5cbefb 100644 --- a/configs/acmesystems_aria_g25_128mb_defconfig +++ b/configs/acmesystems_aria_g25_128mb_defconfig @@ -1,19 +1,21 @@ # Architecture BR2_arm=y +BR2_arm926t=y # Kernel headers -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_7=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y # System configuration BR2_TARGET_GENERIC_ISSUE="Welcome to Aria-G25 Buildroot" BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" BR2_TARGET_GENERIC_GETTY_BAUDRATE_115200=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/acmesystems/aria-g25/post-image.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/acmesystems/aria-g25/genimage.cfg" # Kernel configuration BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.7.4" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19" BR2_LINUX_KERNEL_DEFCONFIG="at91_dt" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91-ariag25" @@ -27,7 +29,7 @@ BR2_TARGET_ROOTFS_EXT2_LABEL="rootfs" BR2_TARGET_AT91BOOTSTRAP3=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git" -BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.6" +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.13" BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="aria-128m" # Tools to build sdcard.img diff --git a/configs/acmesystems_aria_g25_256mb_defconfig b/configs/acmesystems_aria_g25_256mb_defconfig index a480287cef..bb719603e9 100644 --- a/configs/acmesystems_aria_g25_256mb_defconfig +++ b/configs/acmesystems_aria_g25_256mb_defconfig @@ -1,19 +1,21 @@ # Architecture BR2_arm=y +BR2_arm926t=y # Kernel headers -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_7=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y # System configuration BR2_TARGET_GENERIC_ISSUE="Welcome to Aria-G25 Buildroot" BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" BR2_TARGET_GENERIC_GETTY_BAUDRATE_115200=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/acmesystems/aria-g25/post-image.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/acmesystems/aria-g25/genimage.cfg" # Kernel configuration BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.7.4" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19" BR2_LINUX_KERNEL_DEFCONFIG="at91_dt" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91-ariag25" @@ -27,7 +29,7 @@ BR2_TARGET_ROOTFS_EXT2_LABEL="rootfs" BR2_TARGET_AT91BOOTSTRAP3=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git" -BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.6" +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.13" BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="aria-256m" # Tools to build sdcard.img -- 2.30.2