From c1a9fb9ddbc4e6520b9eeee43d45817f9e4a62aa Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Thu, 15 Dec 2016 17:24:45 +0100 Subject: [PATCH] board/orangepi: drop redundant files The orangepi board variants use identical post-build and post-image scripts, so move them up to board/orangepi and add symlinks in the variant subdirectories, similary to how we handle it for the raspberry pi variants. Signed-off-by: Peter Korsgaard --- board/orangepi/orangepi-one/post-build.sh | 12 +----------- board/orangepi/orangepi-one/post-image.sh | 15 +-------------- board/orangepi/orangepi-pc/post-build.sh | 12 +----------- board/orangepi/orangepi-pc/post-image.sh | 15 +-------------- board/orangepi/post-build.sh | 11 +++++++++++ board/orangepi/post-image.sh | 14 ++++++++++++++ 6 files changed, 29 insertions(+), 50 deletions(-) mode change 100755 => 120000 board/orangepi/orangepi-one/post-build.sh mode change 100755 => 120000 board/orangepi/orangepi-one/post-image.sh mode change 100755 => 120000 board/orangepi/orangepi-pc/post-build.sh mode change 100755 => 120000 board/orangepi/orangepi-pc/post-image.sh create mode 100755 board/orangepi/post-build.sh create mode 100755 board/orangepi/post-image.sh diff --git a/board/orangepi/orangepi-one/post-build.sh b/board/orangepi/orangepi-one/post-build.sh deleted file mode 100755 index 46e8905273..0000000000 --- a/board/orangepi/orangepi-one/post-build.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -# post-build.sh for OrangePi One taken from CubieBoard's post-build.sh -# 2013, Carlo Caione - -BOARD_DIR="$(dirname $0)" -MKIMAGE=$HOST_DIR/usr/bin/mkimage -BOOT_CMD=$BOARD_DIR/boot.cmd -BOOT_CMD_H=$BINARIES_DIR/boot.scr - -# U-Boot script -$MKIMAGE -C none -A arm -T script -d $BOOT_CMD $BOOT_CMD_H diff --git a/board/orangepi/orangepi-one/post-build.sh b/board/orangepi/orangepi-one/post-build.sh new file mode 120000 index 0000000000..cd7f11645b --- /dev/null +++ b/board/orangepi/orangepi-one/post-build.sh @@ -0,0 +1 @@ +../post-build.sh \ No newline at end of file diff --git a/board/orangepi/orangepi-one/post-image.sh b/board/orangepi/orangepi-one/post-image.sh deleted file mode 100755 index 359b4c9e7c..0000000000 --- a/board/orangepi/orangepi-one/post-image.sh +++ /dev/null @@ -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}" diff --git a/board/orangepi/orangepi-one/post-image.sh b/board/orangepi/orangepi-one/post-image.sh new file mode 120000 index 0000000000..ae6294fa38 --- /dev/null +++ b/board/orangepi/orangepi-one/post-image.sh @@ -0,0 +1 @@ +../post-image.sh \ No newline at end of file diff --git a/board/orangepi/orangepi-pc/post-build.sh b/board/orangepi/orangepi-pc/post-build.sh deleted file mode 100755 index ca7a99f220..0000000000 --- a/board/orangepi/orangepi-pc/post-build.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -# post-build.sh for OrangePi PC taken from CubieBoard's post-build.sh -# 2013, Carlo Caione - -BOARD_DIR="$(dirname $0)" -MKIMAGE=$HOST_DIR/usr/bin/mkimage -BOOT_CMD=$BOARD_DIR/boot.cmd -BOOT_CMD_H=$BINARIES_DIR/boot.scr - -# U-Boot script -$MKIMAGE -C none -A arm -T script -d $BOOT_CMD $BOOT_CMD_H diff --git a/board/orangepi/orangepi-pc/post-build.sh b/board/orangepi/orangepi-pc/post-build.sh new file mode 120000 index 0000000000..cd7f11645b --- /dev/null +++ b/board/orangepi/orangepi-pc/post-build.sh @@ -0,0 +1 @@ +../post-build.sh \ No newline at end of file diff --git a/board/orangepi/orangepi-pc/post-image.sh b/board/orangepi/orangepi-pc/post-image.sh deleted file mode 100755 index 359b4c9e7c..0000000000 --- a/board/orangepi/orangepi-pc/post-image.sh +++ /dev/null @@ -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}" diff --git a/board/orangepi/orangepi-pc/post-image.sh b/board/orangepi/orangepi-pc/post-image.sh new file mode 120000 index 0000000000..ae6294fa38 --- /dev/null +++ b/board/orangepi/orangepi-pc/post-image.sh @@ -0,0 +1 @@ +../post-image.sh \ No newline at end of file diff --git a/board/orangepi/post-build.sh b/board/orangepi/post-build.sh new file mode 100755 index 0000000000..a544a19560 --- /dev/null +++ b/board/orangepi/post-build.sh @@ -0,0 +1,11 @@ +#!/bin/sh +# post-build.sh for OrangePi taken from CubieBoard's post-build.sh +# 2013, Carlo Caione + +BOARD_DIR="$(dirname $0)" +MKIMAGE=$HOST_DIR/usr/bin/mkimage +BOOT_CMD=$BOARD_DIR/boot.cmd +BOOT_CMD_H=$BINARIES_DIR/boot.scr + +# U-Boot script +$MKIMAGE -C none -A arm -T script -d $BOOT_CMD $BOOT_CMD_H diff --git a/board/orangepi/post-image.sh b/board/orangepi/post-image.sh new file mode 100755 index 0000000000..359b4c9e7c --- /dev/null +++ b/board/orangepi/post-image.sh @@ -0,0 +1,14 @@ +#!/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}" -- 2.30.2