From 2e091135be670b7b3a9a72312cff3ac30aed8d3c Mon Sep 17 00:00:00 2001
From: Fabio Estevam <fabio.estevam@nxp.com>
Date: Sun, 2 Oct 2016 16:30:57 -0300
Subject: [PATCH] configs/imx6ulpico: Use common script for image generation

Using the common board/freescale/common/post-image.sh can lead
to some good amount of simplification.

Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 board/technexion/imx6ulpico/genimage.cfg  | 41 -----------------------
 board/technexion/imx6ulpico/post-image.sh | 14 --------
 configs/imx6ulpico_defconfig              |  2 +-
 3 files changed, 1 insertion(+), 56 deletions(-)
 delete mode 100644 board/technexion/imx6ulpico/genimage.cfg
 delete mode 100755 board/technexion/imx6ulpico/post-image.sh

diff --git a/board/technexion/imx6ulpico/genimage.cfg b/board/technexion/imx6ulpico/genimage.cfg
deleted file mode 100644
index 9e67105fe4..0000000000
--- a/board/technexion/imx6ulpico/genimage.cfg
+++ /dev/null
@@ -1,41 +0,0 @@
-# Minimal eMMC card image for the Technexion's i.MX6UL Pico board
-#
-# We mimic the .sdcard Freescale's image format for i.MX6UL:
-# * the eMMC must have 1 kB free space at the beginning,
-# * U-Boot is dumped as is,
-# * a FAT partition at offset 8 MB is containing zImage and dtbs,
-# * a single root filesystem partition is required (Ext4 in this case).
-#
-
-image boot.vfat {
-  vfat {
-    files = {
-      "imx6ul-pico-hobbit.dtb",
-      "zImage"
-    }
-  }
-  size = 16M
-}
-
-image sdcard.img {
-  hdimage {
-  }
-
-  partition u-boot {
-    in-partition-table = "no"
-    image = "u-boot.imx"
-    offset = 1024
-  }
-
-  partition boot {
-    partition-type = 0xC
-    bootable = "true"
-    image = "boot.vfat"
-    offset = 8M
-  }
-
-  partition rootfs {
-    partition-type = 0x83
-    image = "rootfs.ext4"
-  }
-}
diff --git a/board/technexion/imx6ulpico/post-image.sh b/board/technexion/imx6ulpico/post-image.sh
deleted file mode 100755
index b4ac4608ff..0000000000
--- a/board/technexion/imx6ulpico/post-image.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/usr/bin/env bash
-
-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/imx6ulpico_defconfig b/configs/imx6ulpico_defconfig
index 67058f8982..d94478a6cb 100644
--- a/configs/imx6ulpico_defconfig
+++ b/configs/imx6ulpico_defconfig
@@ -45,6 +45,6 @@ BR2_PACKAGE_HOST_GENIMAGE=y
 BR2_PACKAGE_HOST_MTOOLS=y
 
 # filesystem / image
-BR2_ROOTFS_POST_IMAGE_SCRIPT="board/technexion/imx6ulpico/post-image.sh"
+BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/post-image.sh"
 BR2_TARGET_ROOTFS_EXT2=y
 BR2_TARGET_ROOTFS_EXT2_4=y
-- 
2.30.2