cleanup: xradio package and orangepi boards

PATCH New Sergey Matyukevich 3 participants 5 messages Jan 7, 2018 – Jan 9, 2018

lore

Share & tools

lore

Sergey Matyukevich

author

2018-01-07 20:11 UTC #0 lore raw

cover cleanup: xradio package and orangepi boards

Hi all,

Here is a couple of cleanup patches. The first patch adds license file hash for xr819-xradio package. The second patch drops custom Orange Pi post-image and post-build scripts replacing them by generic Buildroot tools.

Regards,
Sergey

Sergey Matyukevich (2):
xr819-xradio: add license file hash
orangepi: drop custom post-build and post-image scripts

 b/configs/orangepi_lite_defconfig             |    6 ++++--
 b/configs/orangepi_one_defconfig              |    6 ++++--
 b/configs/orangepi_pc_defconfig               |    6 ++++--
 b/configs/orangepi_pc_plus_defconfig          |    6 ++++--
 b/configs/orangepi_zero_defconfig             |    6 ++++--
 b/package/xr819-xradio/xr819-xradio.hash      |    2 ++
 board/orangepi/orangepi-lite/post-build.sh    |    1 -
 board/orangepi/orangepi-lite/post-image.sh    |    1 -
 board/orangepi/orangepi-one/post-build.sh     |    1 -
 board/orangepi/orangepi-one/post-image.sh     |    1 -
 board/orangepi/orangepi-pc-plus/post-build.sh |    1 -
 board/orangepi/orangepi-pc-plus/post-image.sh |    1 -
 board/orangepi/orangepi-pc/post-build.sh      |    1 -
 board/orangepi/orangepi-pc/post-image.sh      |    1 -
 board/orangepi/orangepi-zero/post-build.sh    |    1 -
 board/orangepi/orangepi-zero/post-image.sh    |    1 -
 board/orangepi/post-build.sh                  |   11 -----------
 board/orangepi/post-image.sh                  |   14 --------------
 18 files changed, 22 insertions(+), 45 deletions(-)

Sergey Matyukevich

author

2018-01-07 20:11 UTC #1 lore raw

PATCH 1/2 xr819-xradio: add license file hash

Signed-off-by Sergey Matyukevich <[email protected]>

---
 package/xr819-xradio/xr819-xradio.hash | 2 ++
 1 file changed, 2 insertions(+)

package/xr819-xradio/xr819-xradio.hash +2 -0

index 869801cad6..341747c5b5 100644
@@ -1,2 +1,4 @@
 # Locally computed
 sha256 7b78fc61d13a428a0d8a3d8dcffaa604d23b5a17c6e8e86d2e5e8372dcd17672 xr819-xradio-33f4b1c25eff0d9db7cbac19f36b130da9857f37.tar.gz
+# Locally computed
+sha256 db296f2f7f35bca3a174efb0eb392b3b17bd94b341851429a3dff411b1c2fc73 LICENSE

Signature · 1 line

2.11.0

Sergey Matyukevich

author

2018-01-07 20:11 UTC #2 lore raw

PATCH 2/2 orangepi: drop custom post-build and post-image scripts

In reply to Sergey Matyukevich

Currently in Orange Pi boards post-build script is used only to generate U-Boot boot script and post-image script is used only to generate sdcard image according to genimage configuration. However both those tasks can now be handled by generic Buildroot tools:
- BR2_TARGET_UBOOT_BOOT_SCRIPT config options
- support/scripts/genimage.sh script

This patch drops custom scripts replacing them
by generic Buildroot tools.

Signed-off-by Sergey Matyukevich <[email protected]>

---
 board/orangepi/orangepi-lite/post-build.sh    |  1 -
 board/orangepi/orangepi-lite/post-image.sh    |  1 -
 board/orangepi/orangepi-one/post-build.sh     |  1 -
 board/orangepi/orangepi-one/post-image.sh     |  1 -
 board/orangepi/orangepi-pc-plus/post-build.sh |  1 -
 board/orangepi/orangepi-pc-plus/post-image.sh |  1 -
 board/orangepi/orangepi-pc/post-build.sh      |  1 -
 board/orangepi/orangepi-pc/post-image.sh      |  1 -
 board/orangepi/orangepi-zero/post-build.sh    |  1 -
 board/orangepi/orangepi-zero/post-image.sh    |  1 -
 board/orangepi/post-build.sh                  | 11 -----------
 board/orangepi/post-image.sh                  | 14 --------------
 configs/orangepi_lite_defconfig               |  6 ++++--
 configs/orangepi_one_defconfig                |  6 ++++--
 configs/orangepi_pc_defconfig                 |  6 ++++--
 configs/orangepi_pc_plus_defconfig            |  6 ++++--
 configs/orangepi_zero_defconfig               |  6 ++++--
 17 files changed, 20 insertions(+), 45 deletions(-)
 delete mode 120000 board/orangepi/orangepi-lite/post-build.sh
 delete mode 120000 board/orangepi/orangepi-lite/post-image.sh
 delete mode 120000 board/orangepi/orangepi-one/post-build.sh
 delete mode 120000 board/orangepi/orangepi-one/post-image.sh
 delete mode 120000 board/orangepi/orangepi-pc-plus/post-build.sh
 delete mode 120000 board/orangepi/orangepi-pc-plus/post-image.sh
 delete mode 120000 board/orangepi/orangepi-pc/post-build.sh
 delete mode 120000 board/orangepi/orangepi-pc/post-image.sh
 delete mode 120000 board/orangepi/orangepi-zero/post-build.sh
 delete mode 120000 board/orangepi/orangepi-zero/post-image.sh
 delete mode 100755 board/orangepi/post-build.sh
 delete mode 100755 board/orangepi/post-image.sh

board/orangepi/orangepi-lite/post-build.sh deleted +0 -1

deleted file mode 120000
index cd7f11645b..0000000000
@@ -1 +0,0 @@
-../post-build.sh
\ No newline at end of file

board/orangepi/orangepi-lite/post-image.sh deleted +0 -1

deleted file mode 120000
index ae6294fa38..0000000000
@@ -1 +0,0 @@
-../post-image.sh
\ No newline at end of file

board/orangepi/orangepi-one/post-build.sh deleted +0 -1

deleted file mode 120000
index cd7f11645b..0000000000
@@ -1 +0,0 @@
-../post-build.sh
\ No newline at end of file

board/orangepi/orangepi-one/post-image.sh deleted +0 -1

deleted file mode 120000
index ae6294fa38..0000000000
@@ -1 +0,0 @@
-../post-image.sh
\ No newline at end of file

board/orangepi/orangepi-pc-plus/post-build.sh deleted +0 -1

deleted file mode 120000
index cd7f11645b..0000000000
@@ -1 +0,0 @@
-../post-build.sh
\ No newline at end of file

board/orangepi/orangepi-pc-plus/post-image.sh deleted +0 -1

deleted file mode 120000
index ae6294fa38..0000000000
@@ -1 +0,0 @@
-../post-image.sh
\ No newline at end of file

board/orangepi/orangepi-pc/post-build.sh deleted +0 -1

deleted file mode 120000
index cd7f11645b..0000000000
@@ -1 +0,0 @@
-../post-build.sh
\ No newline at end of file

board/orangepi/orangepi-pc/post-image.sh deleted +0 -1

deleted file mode 120000
index ae6294fa38..0000000000
@@ -1 +0,0 @@
-../post-image.sh
\ No newline at end of file

board/orangepi/orangepi-zero/post-build.sh deleted +0 -1

deleted file mode 120000
index cd7f11645b..0000000000
@@ -1 +0,0 @@
-../post-build.sh
\ No newline at end of file

board/orangepi/orangepi-zero/post-image.sh deleted +0 -1

deleted file mode 120000
index ae6294fa38..0000000000
@@ -1 +0,0 @@
-../post-image.sh
\ No newline at end of file

board/orangepi/post-build.sh deleted +0 ~~-11~~

deleted file mode 100755
index 07e04df4d5..0000000000
@@ -1,11 +0,0 @@
-#!/bin/sh
-# post-build.sh for OrangePi taken from CubieBoard's post-build.sh
-# 2013, Carlo Caione <[email protected]>
-
-BOARD_DIR="$(dirname $0)"
-MKIMAGE=$HOST_DIR/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

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

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

configs/orangepi_lite_defconfig +4 -2

index 30e4b1ebb1..0f9a8e098b 100644
@@ -4,8 +4,6 @@ BR2_ARM_FPU_VFPV4=y
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y
 BR2_TARGET_GENERIC_HOSTNAME="OrangePi_Lite"
 BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the Orange Pi Lite"
-BR2_ROOTFS_POST_BUILD_SCRIPT="board/orangepi/orangepi-lite/post-build.sh"
-BR2_ROOTFS_POST_IMAGE_SCRIPT="board/orangepi/orangepi-lite/post-image.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.14.4"

@@ -28,7 +26,11 @@ BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_lite"
 BR2_TARGET_UBOOT_NEEDS_DTC=y
 BR2_TARGET_UBOOT_FORMAT_CUSTOM=y
 BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-sunxi-with-spl.bin"
+BR2_TARGET_UBOOT_BOOT_SCRIPT=y
+BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-lite/boot.cmd"
 BR2_PACKAGE_HOST_DOSFSTOOLS=y
 BR2_PACKAGE_HOST_GENIMAGE=y
 BR2_PACKAGE_HOST_MTOOLS=y
 BR2_PACKAGE_HOST_UBOOT_TOOLS=y
+BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
+BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/orangepi/orangepi-lite/genimage.cfg"

configs/orangepi_one_defconfig +4 -2

index 507e4deda4..0cd3ece2d2 100644
@@ -4,8 +4,6 @@ BR2_ARM_FPU_VFPV4=y
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_13=y
 BR2_TARGET_GENERIC_HOSTNAME="OrangePi_One"
 BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the Orange Pi One"
-BR2_ROOTFS_POST_BUILD_SCRIPT="board/orangepi/orangepi-one/post-build.sh"
-BR2_ROOTFS_POST_IMAGE_SCRIPT="board/orangepi/orangepi-one/post-image.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.13.11"

@@ -23,7 +21,11 @@ BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_one"
 BR2_TARGET_UBOOT_NEEDS_DTC=y
 BR2_TARGET_UBOOT_FORMAT_CUSTOM=y
 BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-sunxi-with-spl.bin"
+BR2_TARGET_UBOOT_BOOT_SCRIPT=y
+BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-one/boot.cmd"
 BR2_PACKAGE_HOST_DOSFSTOOLS=y
 BR2_PACKAGE_HOST_GENIMAGE=y
 BR2_PACKAGE_HOST_MTOOLS=y
 BR2_PACKAGE_HOST_UBOOT_TOOLS=y
+BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
+BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/orangepi/orangepi-one/genimage.cfg"

configs/orangepi_pc_defconfig +4 -2

index 02bcfa2ece..2d895c9ba9 100644
@@ -4,8 +4,6 @@ BR2_ARM_FPU_VFPV4=y
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_13=y
 BR2_TARGET_GENERIC_HOSTNAME="OrangePi_PC"
 BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the Orange Pi PC"
-BR2_ROOTFS_POST_BUILD_SCRIPT="board/orangepi/orangepi-pc/post-build.sh"
-BR2_ROOTFS_POST_IMAGE_SCRIPT="board/orangepi/orangepi-pc/post-image.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.13.11"

@@ -23,7 +21,11 @@ BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_pc"
 BR2_TARGET_UBOOT_NEEDS_DTC=y
 BR2_TARGET_UBOOT_FORMAT_CUSTOM=y
 BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-sunxi-with-spl.bin"
+BR2_TARGET_UBOOT_BOOT_SCRIPT=y
+BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-pc/boot.cmd"
 BR2_PACKAGE_HOST_DOSFSTOOLS=y
 BR2_PACKAGE_HOST_GENIMAGE=y
 BR2_PACKAGE_HOST_MTOOLS=y
 BR2_PACKAGE_HOST_UBOOT_TOOLS=y
+BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
+BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/orangepi/orangepi-pc/genimage.cfg"

configs/orangepi_pc_plus_defconfig +4 -2

index b06b9b1005..70056d75ec 100644
@@ -5,8 +5,6 @@ BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_13=y
 BR2_TARGET_GENERIC_HOSTNAME="OrangePi_PC_Plus"
 BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the Orange Pi PC Plus"
-BR2_ROOTFS_POST_BUILD_SCRIPT="board/orangepi/orangepi-pc-plus/post-build.sh"
-BR2_ROOTFS_POST_IMAGE_SCRIPT="board/orangepi/orangepi-pc-plus/post-image.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.13.11"

@@ -25,10 +23,14 @@ BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_pc_plus"
 BR2_TARGET_UBOOT_NEEDS_DTC=y
 BR2_TARGET_UBOOT_FORMAT_CUSTOM=y
 BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-sunxi-with-spl.bin"
+BR2_TARGET_UBOOT_BOOT_SCRIPT=y
+BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-pc-plus/boot.cmd"
 BR2_PACKAGE_HOST_DOSFSTOOLS=y
 BR2_PACKAGE_HOST_GENIMAGE=y
 BR2_PACKAGE_HOST_MTOOLS=y
 BR2_PACKAGE_HOST_UBOOT_TOOLS=y
+BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
+BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/orangepi/orangepi-pc-plus/genimage.cfg"
 
 # wireless driver and firmware
 BR2_PACKAGE_RTL8189FS=y

configs/orangepi_zero_defconfig +4 -2

index 142b648fa8..5d4ec14e28 100644
@@ -6,8 +6,6 @@ BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_13=y
 BR2_TARGET_GENERIC_HOSTNAME="OrangePi_Zero"
 BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the Orange Pi Zero"
-BR2_ROOTFS_POST_BUILD_SCRIPT="board/orangepi/orangepi-zero/post-build.sh"
-BR2_ROOTFS_POST_IMAGE_SCRIPT="board/orangepi/orangepi-zero/post-image.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.13.11"

@@ -26,10 +24,14 @@ BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_zero"
 BR2_TARGET_UBOOT_NEEDS_DTC=y
 BR2_TARGET_UBOOT_FORMAT_CUSTOM=y
 BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-sunxi-with-spl.bin"
+BR2_TARGET_UBOOT_BOOT_SCRIPT=y
+BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-zero/boot.cmd"
 BR2_PACKAGE_HOST_DOSFSTOOLS=y
 BR2_PACKAGE_HOST_GENIMAGE=y
 BR2_PACKAGE_HOST_MTOOLS=y
 BR2_PACKAGE_HOST_UBOOT_TOOLS=y
+BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
+BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/orangepi/orangepi-zero/genimage.cfg"
 
 # wireless driver and firmware
 BR2_PACKAGE_XR819_XRADIO=y

Signature · 1 line

2.11.0

Jagan Teki

2018-01-09 12:52 UTC #3 lore raw

PATCH 2/2 orangepi: drop custom post-build and post-image scripts

Quoted 7 lines · Sergey Matyukevich

Currently in Orange Pi boards post-build script is used only to generate U-Boot boot script and post-image script is used only to generate sdcard image according to genimage configuration. However both those tasks can now be handled by generic Buildroot tools:
- BR2_TARGET_UBOOT_BOOT_SCRIPT config options
- support/scripts/genimage.sh script

Quoted 5 lines

This patch drops custom scripts replacing them
by generic Buildroot tools.
Signed-off-by Sergey Matyukevich <[email protected]>
---

Reviewed-by Jagan Teki <[email protected]>

Thomas Petazzoni

2018-01-07 20:38 UTC #4 lore raw

cover cleanup: xradio package and orangepi boards

In reply to Sergey Matyukevich

Hello,

Quoted 3 lines · Sergey Matyukevich

Sergey Matyukevich (2):
xr819-xradio: add license file hash
orangepi: drop custom post-build and post-image scripts

Both applied. Thanks for cleaning up the post-build and post-image script usage in the second patch, very nice.

Thanks,

Thomas

Signature · 3 lines

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