diff mbox series

[1/4] configs/acmesystems_aria_g25: update default configuration for both 128MB and 256MB version

Message ID 20190811145856.27420-1-biagio.hkr@gmail.com
State Accepted
Headers show
Series [1/4] configs/acmesystems_aria_g25: update default configuration for both 128MB and 256MB version | expand

Commit Message

Biagio Montaruli Aug. 11, 2019, 2:58 p.m. UTC 
* 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

Signed-off-by: Biagio Montaruli <biagio.hkr@gmail.com>
---
 configs/acmesystems_aria_g25_128mb_defconfig | 10 ++++++----
 configs/acmesystems_aria_g25_256mb_defconfig | 10 ++++++----
 2 files changed, 12 insertions(+), 8 deletions(-)

Comments

Thomas Petazzoni Aug. 11, 2019, 8:05 p.m. UTC | #1 
Hello Biagio!

On Sun, 11 Aug 2019 16:58:53 +0200
Biagio Montaruli <biagio.hkr@gmail.com> wrote:

> * 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
> 
> Signed-off-by: Biagio Montaruli <biagio.hkr@gmail.com>
> ---
>  configs/acmesystems_aria_g25_128mb_defconfig | 10 ++++++----
>  configs/acmesystems_aria_g25_256mb_defconfig | 10 ++++++----
>  2 files changed, 12 insertions(+), 8 deletions(-)

Thanks a lot for providing these patches so quickly! I have applied
your series. However, I had to do two changes:

 - Squash patches 1 & 2 together, and patches 3 & 4 together. Indeed,
   your patch 1 updates to AT91bootstrap 3.8.13, but only your patch 2
   changes the genimage.cfg to take into account the change of the
   at91bootstrap image. So patch 1 is not independent of patch 2,
   breaking bisectability.

 - Your commit logs forgot the references to the build failures that
   the patches are fixing.

Thanks again!

Thomas
diff mbox series

Patch

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