Skip to contentSkip to conversation

configs/acmesystems_aria_g25: update default configuration for both 128MB and 256MB version

PATCH New Biagio Montaruli 2 participants 5 messages Aug 11, 2019

lore
Share & tools
lore
#0 lore raw

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

* 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

---
 configs/acmesystems_aria_g25_128mb_defconfig | 10 ++++++----
 configs/acmesystems_aria_g25_256mb_defconfig | 10 ++++++----
 2 files changed, 12 insertions(+), 8 deletions(-)
configs/acmesystems_aria_g25_128mb_defconfig +6 -4
index 0ec210f33e..f2fe5cbefb 100644
@@ -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
configs/acmesystems_aria_g25_256mb_defconfig +6 -4
index a480287cef..bb719603e9 100644
@@ -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
Signature · 1 line
2.17.1
#1 lore raw

PATCH 2/4 board/acmesystems/aria-g25: update genimage.cfg and delete post-image.sh

* Update name of the AT91bootstrap output file since it has been updated to v3.8.13
* Remove post-image.sh since we now use the default one provided by Buildroot (support/scripts/genimage.sh)

---
 board/acmesystems/aria-g25/genimage.cfg  |  2 +-
 board/acmesystems/aria-g25/post-image.sh | 14 --------------
 2 files changed, 1 insertion(+), 15 deletions(-)
 delete mode 100755 board/acmesystems/aria-g25/post-image.sh
board/acmesystems/aria-g25/genimage.cfg +1 -1
index 2e2eb129aa..b40ad9edf3 100644
@@ -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
board/acmesystems/aria-g25/post-image.sh deleted +0 -14
deleted file mode 100755
index 2846f56d72..0000000000
@@ -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}"
Signature · 1 line
2.17.1
#2 lore raw

PATCH 3/4 configs/acmesystems_arietta_g25: update default configuration for both 128MB and 256MB version

In reply to Biagio Montaruli

* 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

---
 configs/acmesystems_arietta_g25_128mb_defconfig | 10 ++++++----
 configs/acmesystems_arietta_g25_256mb_defconfig | 10 ++++++----
 2 files changed, 12 insertions(+), 8 deletions(-)
configs/acmesystems_arietta_g25_128mb_defconfig +6 -4
index a68ac57ff7..d66d80d5ab 100644
@@ -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 Arietta-G25 Buildroot"
 BR2_TARGET_GENERIC_GETTY_PORT="ttyS0"
 BR2_TARGET_GENERIC_GETTY_BAUDRATE_115200=y
-BR2_ROOTFS_POST_IMAGE_SCRIPT="board/acmesystems/arietta-g25/post-image.sh"
+BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
+BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/acmesystems/arietta-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-ariettag25"
@@ -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="arietta-128m"
 
 # Tools to build sdcard.img
configs/acmesystems_arietta_g25_256mb_defconfig +6 -4
index ce9ebacb8d..5104291c48 100644
@@ -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 Arietta-G25 Buildroot"
 BR2_TARGET_GENERIC_GETTY_PORT="ttyS0"
 BR2_TARGET_GENERIC_GETTY_BAUDRATE_115200=y
-BR2_ROOTFS_POST_IMAGE_SCRIPT="board/acmesystems/arietta-g25/post-image.sh"
+BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
+BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/acmesystems/arietta-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-ariettag25"
@@ -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="arietta-256m"
 
 # Tools to build sdcard.img
Signature · 1 line
2.17.1
#3 lore raw

PATCH 4/4 board/acmesystems/arietta-g25: update genimage.cfg and delete post-image.sh

In reply to Biagio Montaruli

* Update name of the AT91bootstrap output file since it has been bumped to v3.8.13
* Remove post-image.sh since we now use the default one provided by Buildroot (support/scripts/genimage.sh)

---
 board/acmesystems/arietta-g25/genimage.cfg  |  2 +-
 board/acmesystems/arietta-g25/post-image.sh | 14 --------------
 2 files changed, 1 insertion(+), 15 deletions(-)
 delete mode 100755 board/acmesystems/arietta-g25/post-image.sh
board/acmesystems/arietta-g25/genimage.cfg +1 -1
index 420f1b6be5..7c3112dd56 100644
@@ -11,7 +11,7 @@ image boot.vfat {
 		}
 		
 		file boot.bin {
-			image = "at91sam9x5_arietta-sdcardboot-linux-zimage-dt-3.8.6.bin"
+			image = "at91sam9x5_arietta-sdcardboot-linux-zimage-dt-3.8.13.bin"
 		} 
 	}
 	size = 16M
board/acmesystems/arietta-g25/post-image.sh deleted +0 -14
deleted file mode 100755
index 2846f56d72..0000000000
@@ -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}"
Signature · 1 line
2.17.1
#4 lore raw

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

In reply to Biagio Montaruli

Hello Biagio!

Quoted 10 lines · On Sun, 11 Aug 2019 16:58:53 +0200 Biagio Montaruli <[email protected]>…

* 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

---
 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

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com