From 8497e2a3ce8632ef57d0af5c7a482ba6978e6e9a Mon Sep 17 00:00:00 2001 From: Sergey Matyukevich Date: Fri, 25 Feb 2022 10:26:18 +0300 Subject: [PATCH] board/orangepi/orangepi-pc-plus: switch to extlinux 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 Reviewed-by: Giulio Benetti Tested-by: Giulio Benetti Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- board/orangepi/orangepi-pc-plus/boot.cmd | 8 ---- board/orangepi/orangepi-pc-plus/genimage.cfg | 43 -------------------- configs/orangepi_pc_plus_defconfig | 9 ++-- 3 files changed, 3 insertions(+), 57 deletions(-) delete mode 100644 board/orangepi/orangepi-pc-plus/boot.cmd delete mode 100644 board/orangepi/orangepi-pc-plus/genimage.cfg diff --git a/board/orangepi/orangepi-pc-plus/boot.cmd b/board/orangepi/orangepi-pc-plus/boot.cmd deleted file mode 100644 index c91f77942f..0000000000 --- a/board/orangepi/orangepi-pc-plus/boot.cmd +++ /dev/null @@ -1,8 +0,0 @@ -setenv fdt_high ffffffff - -setenv bootargs console=ttyS0,115200 earlyprintk root=PARTLABEL=rootfs rootwait - -fatload mmc 0 $kernel_addr_r zImage -fatload mmc 0 $fdt_addr_r sun8i-h3-orangepi-pc-plus.dtb - -bootz $kernel_addr_r - $fdt_addr_r diff --git a/board/orangepi/orangepi-pc-plus/genimage.cfg b/board/orangepi/orangepi-pc-plus/genimage.cfg deleted file mode 100644 index 3812d785d5..0000000000 --- a/board/orangepi/orangepi-pc-plus/genimage.cfg +++ /dev/null @@ -1,43 +0,0 @@ -# Minimal SD card image for the OrangePi PC Plus -# -image boot.vfat { - vfat { - files = { - "zImage", - "sun8i-h3-orangepi-pc-plus.dtb", - "boot.scr" - } - } - - size = 10M -} - -image sdcard.img { - hdimage { - # for root=PARTLABEL support - partition-table-type = "gpt" - # default GPT location conflicts with bootloaders, move it after - gpt-location = 1M - } - - partition u-boot { - in-partition-table = "no" - image = "u-boot-sunxi-with-spl.bin" - offset = 8K - size = 1016K # 1MB - 8KB - } - - partition boot { - partition-type-uuid = "F" - bootable = "true" - image = "boot.vfat" - } - - # 'rootfs' will be used as the partition label, used - # with root=PARTLABEL=rootfs kernel command line - partition rootfs { - partition-type-uuid = "L" - image = "rootfs.ext4" - size = 512M - } -} diff --git a/configs/orangepi_pc_plus_defconfig b/configs/orangepi_pc_plus_defconfig index c3ff8bc417..ba946e5285 100644 --- a/configs/orangepi_pc_plus_defconfig +++ b/configs/orangepi_pc_plus_defconfig @@ -14,6 +14,7 @@ BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h3-orangepi-pc-plus" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/orangepi/orangepi-pc-plus/linux-extras.config" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set @@ -27,14 +28,10 @@ BR2_TARGET_UBOOT_NEEDS_PYTHON3=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_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_BUILD_SCRIPT="board/orangepi/common/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/orangepi/orangepi-pc-plus/genimage.cfg" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cfg" # wireless driver and firmware BR2_PACKAGE_RTL8189FS=y