configs/atmel: refactor to use genimage.sh

PATCH New Joshua Henderson 3 participants 7 messages Nov 8, 2017 – Nov 11, 2017 Arm/Microchip (AT91) SoC support

lore

Share & tools

lore

Joshua Henderson

author

2017-11-08 18:15 UTC #0 lore raw

PATCH 1/1 configs/atmel: refactor to use genimage.sh

Prefer the commom genimage.sh instead of a custom post-image.sh script.

Cc Ludovic Desroches <[email protected]>

Cc Peter Korsgaard <[email protected]>

Signed-off-by Joshua Henderson <[email protected]>

---
 board/atmel/sama5d27_som1_ek_mmc/post-image.sh   | 14 --------------
 board/atmel/sama5d2_xplained_mmc/post-image.sh   | 14 --------------
 board/atmel/sama5d3_xplained_mmc/post-image.sh   | 14 --------------
 board/atmel/sama5d4_xplained_mmc/post-image.sh   | 14 --------------
 configs/atmel_sama5d27_som1_ek_mmc_dev_defconfig |  3 ++-
 configs/atmel_sama5d2_xplained_mmc_defconfig     |  3 ++-
 configs/atmel_sama5d2_xplained_mmc_dev_defconfig |  3 ++-
 configs/atmel_sama5d3_xplained_mmc_defconfig     |  3 ++-
 configs/atmel_sama5d3_xplained_mmc_dev_defconfig |  3 ++-
 configs/atmel_sama5d4_xplained_mmc_defconfig     |  3 ++-
 configs/atmel_sama5d4_xplained_mmc_dev_defconfig |  3 ++-
 11 files changed, 14 insertions(+), 63 deletions(-)
 delete mode 100755 board/atmel/sama5d27_som1_ek_mmc/post-image.sh
 delete mode 100755 board/atmel/sama5d2_xplained_mmc/post-image.sh
 delete mode 100755 board/atmel/sama5d3_xplained_mmc/post-image.sh
 delete mode 100755 board/atmel/sama5d4_xplained_mmc/post-image.sh

board/atmel/sama5d27_som1_ek_mmc/post-image.sh deleted +0 ~~-14~~

deleted file mode 100755
index 359b4c9..0000000
@@ -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}"

board/atmel/sama5d2_xplained_mmc/post-image.sh deleted +0 ~~-14~~

deleted file mode 100755
index 359b4c9..0000000
@@ -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}"

board/atmel/sama5d3_xplained_mmc/post-image.sh deleted +0 ~~-14~~

deleted file mode 100755
index 359b4c9..0000000
@@ -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}"

board/atmel/sama5d4_xplained_mmc/post-image.sh deleted +0 ~~-14~~

deleted file mode 100755
index 359b4c9..0000000
@@ -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}"

configs/atmel_sama5d27_som1_ek_mmc_dev_defconfig +2 -1

index 0dddaf5..3752129 100644
@@ -8,7 +8,8 @@ BR2_TOOLCHAIN_BUILDROOT_WCHAR=y
 BR2_PTHREAD_DEBUG=y
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
 BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y
-BR2_ROOTFS_POST_IMAGE_SCRIPT="board/atmel/sama5d27_som1_ek_mmc/post-image.sh"
+BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
+BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/atmel/sama5d27_som1_ek_mmc/genimage.cfg"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
 BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/linux4sam/linux-at91.git"

configs/atmel_sama5d2_xplained_mmc_defconfig +2 -1

index 9b65a56..8889978 100644
@@ -4,7 +4,8 @@ BR2_ARM_ENABLE_NEON=y
 BR2_ARM_ENABLE_VFP=y
 BR2_ARM_INSTRUCTIONS_THUMB2=y
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y
-BR2_ROOTFS_POST_IMAGE_SCRIPT="board/atmel/sama5d2_xplained_mmc/post-image.sh"
+BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
+BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/atmel/sama5d2_xplained_mmc/genimage.cfg"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
 BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/linux4sam/linux-at91.git"

configs/atmel_sama5d2_xplained_mmc_dev_defconfig +2 -1

index 8745bf4..23a2582 100644
@@ -18,7 +18,8 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y
 # Needed for usb-utils
 BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y
 # Creation of the SD card image
-BR2_ROOTFS_POST_IMAGE_SCRIPT="board/atmel/sama5d2_xplained_mmc/post-image.sh"
+BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
+BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/atmel/sama5d2_xplained_mmc/genimage.cfg"
 
 # Kernel
 BR2_LINUX_KERNEL=y

configs/atmel_sama5d3_xplained_mmc_defconfig +2 -1

index 798c655..4ddb171 100644
@@ -3,7 +3,8 @@ BR2_cortex_a5=y
 BR2_ARM_ENABLE_VFP=y
 BR2_ARM_INSTRUCTIONS_THUMB2=y
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y
-BR2_ROOTFS_POST_IMAGE_SCRIPT="board/atmel/sama5d3_xplained_mmc/post-image.sh"
+BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
+BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/atmel/sama5d3_xplained_mmc/genimage.cfg"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
 BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/linux4sam/linux-at91.git"

configs/atmel_sama5d3_xplained_mmc_dev_defconfig +2 -1

index eca8664..a335148 100644
@@ -17,7 +17,8 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y
 # Needed for usb-utils
 BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y
 # Creation of the SD card image
-BR2_ROOTFS_POST_IMAGE_SCRIPT="board/atmel/sama5d3_xplained_mmc/post-image.sh"
+BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
+BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/atmel/sama5d3_xplained_mmc/genimage.cfg"
 
 # Kernel
 BR2_LINUX_KERNEL=y

configs/atmel_sama5d4_xplained_mmc_defconfig +2 -1

index 073489f..b8b21e7 100644
@@ -4,7 +4,8 @@ BR2_ARM_ENABLE_NEON=y
 BR2_ARM_ENABLE_VFP=y
 BR2_ARM_INSTRUCTIONS_THUMB2=y
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y
-BR2_ROOTFS_POST_IMAGE_SCRIPT="board/atmel/sama5d4_xplained_mmc/post-image.sh"
+BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
+BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/atmel/sama5d4_xplained_mmc/genimage.cfg"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
 BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/linux4sam/linux-at91.git"

configs/atmel_sama5d4_xplained_mmc_dev_defconfig +2 -1

index 69893c3..c31f15a 100644
@@ -18,7 +18,8 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y
 # Needed for usb-utils
 BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y
 # Creation of the SD card image
-BR2_ROOTFS_POST_IMAGE_SCRIPT="board/atmel/sama5d4_xplained_mmc/post-image.sh"
+BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
+BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/atmel/sama5d4_xplained_mmc/genimage.cfg"
 
 # Kernel
 BR2_LINUX_KERNEL=y

Signature · 1 line

2.7.4

Joshua Henderson

author

2017-11-08 18:15 UTC #1 lore raw

PATCH 1/1 configs/at91: refactor to use genimage.sh

Prefer the commom genimage.sh instead of a custom post-image.sh script.

Cc Ludovic Desroches <[email protected]>

Cc Peter Korsgaard <[email protected]>

Signed-off-by Joshua Henderson <[email protected]>

---
 board/atmel/at91sam9x5ek_mmc/post-image.sh | 20 --------------------
 configs/at91sam9x5ek_mmc_defconfig         |  3 ++-
 configs/at91sam9x5ek_mmc_dev_defconfig     |  3 ++-
 3 files changed, 4 insertions(+), 22 deletions(-)
 delete mode 100755 board/atmel/at91sam9x5ek_mmc/post-image.sh

board/atmel/at91sam9x5ek_mmc/post-image.sh deleted +0 ~~-20~~

deleted file mode 100755
index b560fd3..0000000
@@ -1,20 +0,0 @@
-#!/bin/sh
-
-BOARD_DIR="$(dirname $0)"
-GENIMAGE_CFG="${BOARD_DIR}/genimage.cfg"
-GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp"
-
-rm -rf "${GENIMAGE_TMP}"
-
-echo --rootpath "${TARGET_DIR}"
-echo --tmppath "${GENIMAGE_TMP}"
-echo --inputpath "${BINARIES_DIR}"
-echo --outputpath "${BINARIES_DIR}"
-echo --config "${GENIMAGE_CFG}"
-
-genimage                               \
-	--rootpath "${TARGET_DIR}"     \
-	--tmppath "${GENIMAGE_TMP}"    \
-	--inputpath "${BINARIES_DIR}"  \
-	--outputpath "${BINARIES_DIR}" \
-	--config "${GENIMAGE_CFG}"

configs/at91sam9x5ek_mmc_defconfig +2 -1

index 5ccbdb9..6964d58 100644
@@ -6,7 +6,8 @@ BR2_arm926t=y
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y
 
 # Creation of the SD card image
-BR2_ROOTFS_POST_IMAGE_SCRIPT="board/atmel/at91sam9x5ek_mmc/post-image.sh"
+BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
+BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/atmel/at91sam9x5ek_mmc/genimage.cfg"
 
 # Kernel
 BR2_LINUX_KERNEL=y

configs/at91sam9x5ek_mmc_dev_defconfig +2 -1

index e84bae3..931cf7d 100644
@@ -15,7 +15,8 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y
 # Needed for usb-utils
 BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y
 # Creation of the SD card image
-BR2_ROOTFS_POST_IMAGE_SCRIPT="board/atmel/at91sam9x5ek_mmc/post-image.sh"
+BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
+BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/atmel/at91sam9x5ek_mmc/genimage.cfg"
 
 # Kernel
 BR2_LINUX_KERNEL=y

Signature · 1 line

2.7.4

Ludovic Desroches

2017-11-10 08:10 UTC #2 lore raw

PATCH 1/1 configs/at91: refactor to use genimage.sh

Quoted 5 lines · Joshua Henderson

Prefer the commom genimage.sh instead of a custom post-image.sh script.
Cc Ludovic Desroches <[email protected]>
Cc Peter Korsgaard <[email protected]>
Signed-off-by Joshua Henderson <[email protected]>

I am not sure it's useful to split this refactoring. I may squash both patches. Otherwise,

Acked-by Ludovic Desroches <[email protected]>

Quoted 64 lines

---
 board/atmel/at91sam9x5ek_mmc/post-image.sh | 20 --------------------
 configs/at91sam9x5ek_mmc_defconfig         |  3 ++-
 configs/at91sam9x5ek_mmc_dev_defconfig     |  3 ++-
 3 files changed, 4 insertions(+), 22 deletions(-)
 delete mode 100755 board/atmel/at91sam9x5ek_mmc/post-image.sh

board/atmel/at91sam9x5ek_mmc/post-image.sh deleted +0 ~~-20~~

deleted file mode 100755
index b560fd3..0000000
@@ -1,20 +0,0 @@
-#!/bin/sh
-
-BOARD_DIR="$(dirname $0)"
-GENIMAGE_CFG="${BOARD_DIR}/genimage.cfg"
-GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp"
-
-rm -rf "${GENIMAGE_TMP}"
-
-echo --rootpath "${TARGET_DIR}"
-echo --tmppath "${GENIMAGE_TMP}"
-echo --inputpath "${BINARIES_DIR}"
-echo --outputpath "${BINARIES_DIR}"
-echo --config "${GENIMAGE_CFG}"
-
-genimage                               \
-	--rootpath "${TARGET_DIR}"     \
-	--tmppath "${GENIMAGE_TMP}"    \
-	--inputpath "${BINARIES_DIR}"  \
-	--outputpath "${BINARIES_DIR}" \
-	--config "${GENIMAGE_CFG}"

configs/at91sam9x5ek_mmc_defconfig +2 -1

index 5ccbdb9..6964d58 100644
@@ -6,7 +6,8 @@ BR2_arm926t=y
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y
 
 # Creation of the SD card image
-BR2_ROOTFS_POST_IMAGE_SCRIPT="board/atmel/at91sam9x5ek_mmc/post-image.sh"
+BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
+BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/atmel/at91sam9x5ek_mmc/genimage.cfg"
 
 # Kernel
 BR2_LINUX_KERNEL=y

configs/at91sam9x5ek_mmc_dev_defconfig +2 -1

index e84bae3..931cf7d 100644
@@ -15,7 +15,8 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y
 # Needed for usb-utils
 BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y
 # Creation of the SD card image
-BR2_ROOTFS_POST_IMAGE_SCRIPT="board/atmel/at91sam9x5ek_mmc/post-image.sh"
+BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
+BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/atmel/at91sam9x5ek_mmc/genimage.cfg"
 
 # Kernel
 BR2_LINUX_KERNEL=y

Signature · 1 line

2.7.4

Thomas Petazzoni

Applied

2017-11-11 22:30 UTC #3 lore raw

PATCH 1/1 configs/at91: refactor to use genimage.sh

In reply to Joshua Henderson

Hello,

Quoted 11 lines · Joshua Henderson

Prefer the commom genimage.sh instead of a custom post-image.sh script.
Cc Ludovic Desroches <[email protected]>
Cc Peter Korsgaard <[email protected]>
Signed-off-by Joshua Henderson <[email protected]>
---
 board/atmel/at91sam9x5ek_mmc/post-image.sh | 20 --------------------
 configs/at91sam9x5ek_mmc_defconfig         |  3 ++-
 configs/at91sam9x5ek_mmc_dev_defconfig     |  3 ++-
 3 files changed, 4 insertions(+), 22 deletions(-)
 delete mode 100755 board/atmel/at91sam9x5ek_mmc/post-image.sh

Applied to next, thanks.

Thomas

Signature · 3 lines

Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

Ludovic Desroches

2017-11-10 08:08 UTC #4 lore raw

PATCH 1/1 configs/atmel: refactor to use genimage.sh

In reply to Joshua Henderson

Quoted 5 lines · Joshua Henderson

Prefer the commom genimage.sh instead of a custom post-image.sh script.
Cc Ludovic Desroches <[email protected]>
Cc Peter Korsgaard <[email protected]>
Signed-off-by Joshua Henderson <[email protected]>

Acked-by Ludovic Desroches <[email protected]>

Thanks

Quoted 199 lines

---
 board/atmel/sama5d27_som1_ek_mmc/post-image.sh   | 14 --------------
 board/atmel/sama5d2_xplained_mmc/post-image.sh   | 14 --------------
 board/atmel/sama5d3_xplained_mmc/post-image.sh   | 14 --------------
 board/atmel/sama5d4_xplained_mmc/post-image.sh   | 14 --------------
 configs/atmel_sama5d27_som1_ek_mmc_dev_defconfig |  3 ++-
 configs/atmel_sama5d2_xplained_mmc_defconfig     |  3 ++-
 configs/atmel_sama5d2_xplained_mmc_dev_defconfig |  3 ++-
 configs/atmel_sama5d3_xplained_mmc_defconfig     |  3 ++-
 configs/atmel_sama5d3_xplained_mmc_dev_defconfig |  3 ++-
 configs/atmel_sama5d4_xplained_mmc_defconfig     |  3 ++-
 configs/atmel_sama5d4_xplained_mmc_dev_defconfig |  3 ++-
 11 files changed, 14 insertions(+), 63 deletions(-)
 delete mode 100755 board/atmel/sama5d27_som1_ek_mmc/post-image.sh
 delete mode 100755 board/atmel/sama5d2_xplained_mmc/post-image.sh
 delete mode 100755 board/atmel/sama5d3_xplained_mmc/post-image.sh
 delete mode 100755 board/atmel/sama5d4_xplained_mmc/post-image.sh

board/atmel/sama5d27_som1_ek_mmc/post-image.sh deleted +0 ~~-14~~

deleted file mode 100755
index 359b4c9..0000000
@@ -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}"

board/atmel/sama5d2_xplained_mmc/post-image.sh deleted +0 ~~-14~~

deleted file mode 100755
index 359b4c9..0000000
@@ -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}"

board/atmel/sama5d3_xplained_mmc/post-image.sh deleted +0 ~~-14~~

deleted file mode 100755
index 359b4c9..0000000
@@ -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}"

board/atmel/sama5d4_xplained_mmc/post-image.sh deleted +0 ~~-14~~

deleted file mode 100755
index 359b4c9..0000000
@@ -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}"

configs/atmel_sama5d27_som1_ek_mmc_dev_defconfig +2 -1

index 0dddaf5..3752129 100644
@@ -8,7 +8,8 @@ BR2_TOOLCHAIN_BUILDROOT_WCHAR=y
 BR2_PTHREAD_DEBUG=y
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
 BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y
-BR2_ROOTFS_POST_IMAGE_SCRIPT="board/atmel/sama5d27_som1_ek_mmc/post-image.sh"
+BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
+BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/atmel/sama5d27_som1_ek_mmc/genimage.cfg"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
 BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/linux4sam/linux-at91.git"

configs/atmel_sama5d2_xplained_mmc_defconfig +2 -1

index 9b65a56..8889978 100644
@@ -4,7 +4,8 @@ BR2_ARM_ENABLE_NEON=y
 BR2_ARM_ENABLE_VFP=y
 BR2_ARM_INSTRUCTIONS_THUMB2=y
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y
-BR2_ROOTFS_POST_IMAGE_SCRIPT="board/atmel/sama5d2_xplained_mmc/post-image.sh"
+BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
+BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/atmel/sama5d2_xplained_mmc/genimage.cfg"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
 BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/linux4sam/linux-at91.git"

configs/atmel_sama5d2_xplained_mmc_dev_defconfig +2 -1

index 8745bf4..23a2582 100644
@@ -18,7 +18,8 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y
 # Needed for usb-utils
 BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y
 # Creation of the SD card image
-BR2_ROOTFS_POST_IMAGE_SCRIPT="board/atmel/sama5d2_xplained_mmc/post-image.sh"
+BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
+BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/atmel/sama5d2_xplained_mmc/genimage.cfg"
 
 # Kernel
 BR2_LINUX_KERNEL=y

configs/atmel_sama5d3_xplained_mmc_defconfig +2 -1

index 798c655..4ddb171 100644
@@ -3,7 +3,8 @@ BR2_cortex_a5=y
 BR2_ARM_ENABLE_VFP=y
 BR2_ARM_INSTRUCTIONS_THUMB2=y
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y
-BR2_ROOTFS_POST_IMAGE_SCRIPT="board/atmel/sama5d3_xplained_mmc/post-image.sh"
+BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
+BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/atmel/sama5d3_xplained_mmc/genimage.cfg"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
 BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/linux4sam/linux-at91.git"

configs/atmel_sama5d3_xplained_mmc_dev_defconfig +2 -1

index eca8664..a335148 100644
@@ -17,7 +17,8 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y
 # Needed for usb-utils
 BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y
 # Creation of the SD card image
-BR2_ROOTFS_POST_IMAGE_SCRIPT="board/atmel/sama5d3_xplained_mmc/post-image.sh"
+BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
+BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/atmel/sama5d3_xplained_mmc/genimage.cfg"
 
 # Kernel
 BR2_LINUX_KERNEL=y

configs/atmel_sama5d4_xplained_mmc_defconfig +2 -1

index 073489f..b8b21e7 100644
@@ -4,7 +4,8 @@ BR2_ARM_ENABLE_NEON=y
 BR2_ARM_ENABLE_VFP=y
 BR2_ARM_INSTRUCTIONS_THUMB2=y
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y
-BR2_ROOTFS_POST_IMAGE_SCRIPT="board/atmel/sama5d4_xplained_mmc/post-image.sh"
+BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
+BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/atmel/sama5d4_xplained_mmc/genimage.cfg"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
 BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/linux4sam/linux-at91.git"

configs/atmel_sama5d4_xplained_mmc_dev_defconfig +2 -1

index 69893c3..c31f15a 100644
@@ -18,7 +18,8 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y
 # Needed for usb-utils
 BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y
 # Creation of the SD card image
-BR2_ROOTFS_POST_IMAGE_SCRIPT="board/atmel/sama5d4_xplained_mmc/post-image.sh"
+BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
+BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/atmel/sama5d4_xplained_mmc/genimage.cfg"
 
 # Kernel
 BR2_LINUX_KERNEL=y

Signature · 1 line

2.7.4

Thomas Petazzoni

Applied

2017-11-11 22:30 UTC #5 lore raw

PATCH 1/1 configs/atmel: refactor to use genimage.sh

In reply to Joshua Henderson

Hello,

Quoted 14 lines · Joshua Henderson

Prefer the commom genimage.sh instead of a custom post-image.sh script.

Cc Ludovic Desroches <[email protected]>

Cc Peter Korsgaard <[email protected]>

Signed-off-by Joshua Henderson <[email protected]>

---
 board/atmel/sama5d27_som1_ek_mmc/post-image.sh   | 14 --------------
 board/atmel/sama5d2_xplained_mmc/post-image.sh   | 14 --------------
 board/atmel/sama5d3_xplained_mmc/post-image.sh   | 14 --------------
 board/atmel/sama5d4_xplained_mmc/post-image.sh   | 14 --------------
 configs/atmel_sama5d27_som1_ek_mmc_dev_defconfig |  3 ++-
 configs/atmel_sama5d2_xplained_mmc_defconfig     |  3 ++-
 configs/atmel_sama5d2_xplained_mmc_dev_defconfig |  3 ++-
 configs/atmel_sama5d3_xplained_mmc_defconfig     |  3 ++-

Quoted 8 lines

 configs/atmel_sama5d3_xplained_mmc_dev_defconfig |  3 ++-
 configs/atmel_sama5d4_xplained_mmc_defconfig     |  3 ++-
 configs/atmel_sama5d4_xplained_mmc_dev_defconfig |  3 ++-
 11 files changed, 14 insertions(+), 63 deletions(-)
 delete mode 100755 board/atmel/sama5d27_som1_ek_mmc/post-image.sh
 delete mode 100755 board/atmel/sama5d2_xplained_mmc/post-image.sh
 delete mode 100755 board/atmel/sama5d3_xplained_mmc/post-image.sh
 delete mode 100755 board/atmel/sama5d4_xplained_mmc/post-image.sh

Applied to master, thanks.

Thomas

Signature · 3 lines

Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

Thomas Petazzoni

2017-11-11 22:31 UTC #6 lore raw

PATCH 1/1 configs/atmel: refactor to use genimage.sh

Hello,

Quoted 6 lines · Thomas Petazzoni

Quoted 4 lines

 delete mode 100755 board/atmel/sama5d27_som1_ek_mmc/post-image.sh
 delete mode 100755 board/atmel/sama5d2_xplained_mmc/post-image.sh
 delete mode 100755 board/atmel/sama5d3_xplained_mmc/post-image.sh
 delete mode 100755 board/atmel/sama5d4_xplained_mmc/post-image.sh

Applied to master, thanks.

Sorry, I wanted to say: "Applied to next, thanks"

Best regards,

Thomas

Signature · 3 lines

Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com