diff mbox

[04/15] board/wandboard: Leverage the new genimage infra

Message ID 1460577820-32164-5-git-send-email-ezequiel@vanguardiasur.com.ar
State Changes Requested
Headers show

Commit Message

Ezequiel Garcia April 13, 2016, 8:03 p.m. UTC
Let's rework the board and config files to use the
recently added genimage infra, which generates the
SD card image directly.

Signed-off-by: Ezequiel Garcia <ezequiel@vanguardiasur.com.ar>
---
 board/wandboard/post-image.sh | 16 ----------------
 configs/wandboard_defconfig   |  5 +++--
 2 files changed, 3 insertions(+), 18 deletions(-)
 delete mode 100755 board/wandboard/post-image.sh

Comments

Thomas Petazzoni April 13, 2016, 8:25 p.m. UTC | #1
Hello,

On Wed, 13 Apr 2016 17:03:29 -0300, Ezequiel Garcia wrote:

> -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/wandboard/post-image.sh"
> +BR2_ROOTFS_POST_IMAGE_SCRIPT=

Not good :)

Thomas
Ezequiel Garcia April 13, 2016, 10:02 p.m. UTC | #2
On 13 April 2016 at 17:25, Thomas Petazzoni
<thomas.petazzoni@free-electrons.com> wrote:
> Hello,
>
> On Wed, 13 Apr 2016 17:03:29 -0300, Ezequiel Garcia wrote:
>
>> -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/wandboard/post-image.sh"
>> +BR2_ROOTFS_POST_IMAGE_SCRIPT=
>
> Not good :)
>

Ouch, bad commit fixup.
diff mbox

Patch

diff --git a/board/wandboard/post-image.sh b/board/wandboard/post-image.sh
deleted file mode 100755
index 95cbfa489705..000000000000
--- a/board/wandboard/post-image.sh
+++ /dev/null
@@ -1,16 +0,0 @@ 
-#!/usr/bin/env bash
-
-GENIMAGE_CFG="board/wandboard/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}"
-
-RET=${?}
-exit ${RET}
diff --git a/configs/wandboard_defconfig b/configs/wandboard_defconfig
index cf71eb2d689b..c76bef0d41a4 100644
--- a/configs/wandboard_defconfig
+++ b/configs/wandboard_defconfig
@@ -3,10 +3,11 @@  BR2_cortex_a9=y
 # Linux headers same as kernel, a 3.14 series
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_14=y
 BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0"
-BR2_PACKAGE_HOST_GENIMAGE=y
-BR2_ROOTFS_POST_IMAGE_SCRIPT="board/wandboard/post-image.sh"
+BR2_ROOTFS_POST_IMAGE_SCRIPT=
 BR2_TARGET_ROOTFS_EXT2=y
 BR2_TARGET_ROOTFS_EXT2_4=y
+BR2_TARGET_ROOTFS_GENIMAGE=y
+BR2_TARGET_ROOTFS_GENIMAGE_CFG="board/wandboard/genimage.cfg"
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_USE_DEFCONFIG=y