diff mbox series

[v2,4/6] board/linksprite/pcduino: switch to extlinux

Message ID 20220225072622.3584480-5-geomatsi@gmail.com
State Accepted
Headers show
Series orangepi/linksprite: convert more allwinner boards to extlinux | expand

Commit Message

Sergey Matyukevich Feb. 25, 2022, 7:26 a.m. UTC 
Switch to extlinux instead of U-Boot boot script. Drop custom
boot script and genimage config. Instead use common orangepi
files from board/orangepi/common.

Signed-off-by: Sergey Matyukevich <geomatsi@gmail.com>
---
 board/linksprite/pcduino/boot.cmd      |  8 -----
 board/linksprite/pcduino/genimage.cfg  | 43 --------------------------
 board/linksprite/pcduino/post-build.sh | 11 -------
 board/linksprite/pcduino/post-image.sh | 16 ----------
 configs/linksprite_pcduino_defconfig   |  9 +++---
 5 files changed, 4 insertions(+), 83 deletions(-)
 delete mode 100644 board/linksprite/pcduino/boot.cmd
 delete mode 100644 board/linksprite/pcduino/genimage.cfg
 delete mode 100755 board/linksprite/pcduino/post-build.sh
 delete mode 100755 board/linksprite/pcduino/post-image.sh

Comments

Giulio Benetti Feb. 26, 2022, 10:53 a.m. UTC | #1 
Hi Sergey,

On 25/02/22 08:26, Sergey Matyukevich wrote:
> Switch to extlinux instead of U-Boot boot script. Drop custom
> boot script and genimage config. Instead use common orangepi
> files from board/orangepi/common.
> 
> Signed-off-by: Sergey Matyukevich <geomatsi@gmail.com>

Reviewed-by: Giulio Benetti <giulio.benetti@benettiengineering.com>
Tested-by: Giulio Benetti <giulio.benetti@benettiengineering.com>
[Giulio: build tested only]

Best regards
diff mbox series

Patch

diff --git a/board/linksprite/pcduino/boot.cmd b/board/linksprite/pcduino/boot.cmd
deleted file mode 100644
index 0db8363599..0000000000
--- a/board/linksprite/pcduino/boot.cmd
+++ /dev/null
@@ -1,8 +0,0 @@ 
-setenv fdt_high ffffffff
-
-setenv bootargs console=ttyS0,115200 console=tty1 earlyprintk root=/dev/mmcblk0p2 rootwait panic=10 ${extra}
-
-fatload mmc 0 $kernel_addr_r zImage
-fatload mmc 0 $fdt_addr_r sun4i-a10-pcduino.dtb
-
-bootz $kernel_addr_r - $fdt_addr_r
diff --git a/board/linksprite/pcduino/genimage.cfg b/board/linksprite/pcduino/genimage.cfg
deleted file mode 100644
index db33322118..0000000000
--- a/board/linksprite/pcduino/genimage.cfg
+++ /dev/null
@@ -1,43 +0,0 @@ 
-#
-# Minimal SD card image for the pcDuino
-#
-
-image boot.vfat {
-	vfat {
-		files = {
-			"zImage",
-			"sun4i-a10-pcduino.dtb",
-			"boot.scr"
-		}
-	}
-
-	size = 16M
-}
-
-#
-# Note: u-boot environment is stored between u-boot and boot partitions
-#
-
-image sdcard.img {
-	hdimage {
-	}
-
-	partition u-boot {
-		in-partition-table = "no"
-		image = "u-boot-sunxi-with-spl.bin"
-		offset = 8K
-		size = 1016K # 1MB - 8KB
-	}
-
-	partition boot {
-		partition-type = 0xC
-		bootable = "true"
-		image = "boot.vfat"
-		offset = 1M
-	}
-
-	partition rootfs {
-		partition-type = 0x83
-		image = "rootfs.ext4"
-	}
-}
diff --git a/board/linksprite/pcduino/post-build.sh b/board/linksprite/pcduino/post-build.sh
deleted file mode 100755
index e1e1877671..0000000000
--- a/board/linksprite/pcduino/post-build.sh
+++ /dev/null
@@ -1,11 +0,0 @@ 
-#!/bin/sh
-# post-build.sh for pcDuino taken from OrangePi post-build.sh
-# 2013, Carlo Caione <carlo.caione@gmail.com>
-
-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
diff --git a/board/linksprite/pcduino/post-image.sh b/board/linksprite/pcduino/post-image.sh
deleted file mode 100755
index c82b189f9c..0000000000
--- a/board/linksprite/pcduino/post-image.sh
+++ /dev/null
@@ -1,16 +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}"
-
-exit $?
diff --git a/configs/linksprite_pcduino_defconfig b/configs/linksprite_pcduino_defconfig
index b58f970493..05b25aede4 100644
--- a/configs/linksprite_pcduino_defconfig
+++ b/configs/linksprite_pcduino_defconfig
@@ -11,8 +11,9 @@  BR2_TARGET_GENERIC_GETTY=y
 BR2_TARGET_GENERIC_GETTY_PORT="ttyS0"
 
 # SD image scripts
-BR2_ROOTFS_POST_BUILD_SCRIPT="board/linksprite/pcduino/post-build.sh"
-BR2_ROOTFS_POST_IMAGE_SCRIPT="board/linksprite/pcduino/post-image.sh"
+BR2_ROOTFS_POST_BUILD_SCRIPT="board/orangepi/common/post-build.sh"
+BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
+BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cfg"
 
 # For kernel modules autoloading
 BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y
@@ -29,6 +30,7 @@  BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun4i-a10-pcduino"
 BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/linksprite/pcduino/linux-extras.config"
 BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
+BR2_LINUX_KERNEL_INSTALL_TARGET=y
 
 # Filesystem
 BR2_TARGET_ROOTFS_EXT2=y
@@ -49,10 +51,7 @@  BR2_TARGET_UBOOT_SPL=y
 BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin"
 
 # Host packages
-BR2_PACKAGE_HOST_DOSFSTOOLS=y
 BR2_PACKAGE_HOST_GENIMAGE=y
-BR2_PACKAGE_HOST_MTOOLS=y
-BR2_PACKAGE_HOST_UBOOT_TOOLS=y
 
 # Target packages: wireless support for pcduino-lite-wifi
 BR2_PACKAGE_IW=y