From 940f92e75003a6b0f30704fdc06b183382119cb0 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Feb 19 2024 11:35:02 +0000 Subject: [PATCH 1/6] Update copyright years Signed-off-by: Peter Robinson --- diff --git a/arm-image-installer b/arm-image-installer index 69d9583..ae08196 100755 --- a/arm-image-installer +++ b/arm-image-installer @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright (C) 2014-2015 Red Hat Inc. +# Copyright (C) 2014-2024 Red Hat Inc. # SPDX-License-Identifier: GPL-2.0+ # Automate Media Creation for Fedora ARM diff --git a/update-uboot b/update-uboot index 278da1b..898c724 100755 --- a/update-uboot +++ b/update-uboot @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright (C) 2013 Red Hat Inc. +# Copyright (C) 2013-2024 Red Hat Inc. # SPDX-License-Identifier: GPL-2.0+ # This script will download and install uboot From 21adda6f990d3d3fc41fd1936169d6096a03d769 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Feb 19 2024 11:58:29 +0000 Subject: [PATCH 2/6] Drop support for ARMv7 devices We've not supported ARMv7 since F-36 and we don't build U-Boot for ARMv7 so it doesn't make sense to keep it around. Signed-off-by: Peter Robinson --- diff --git a/arm-image-installer b/arm-image-installer index ae08196..ac76af4 100755 --- a/arm-image-installer +++ b/arm-image-installer @@ -150,9 +150,6 @@ while [ $# -gt 0 ]; do --relabel) RELABEL=1 ;; - --lpae) - LPAE=1 - ;; --showboot) SHOWBOOT=1 ;; @@ -221,11 +218,6 @@ if [ "$MEDIA" = "$ROOTDISK" ]; then fi fi -# change cubietruck target to uppercase -if [ "$TARGET" = "cubietruck" ]; then - TARGET="Cubietruck" -fi - # check for boards if [ "$TARGET" != "" ] && ! [ -e "${BOARDDIR}/${TARGET}" ]; then echo "Error: You must choose a supported board or none at all." @@ -302,10 +294,6 @@ fi if [ "$SSH_KEY" != "" ]; then echo "= SSH Public Key $SSH_KEY will be added." fi -# Use the lpae kernel -if [ "$LPAE" != "" ]; then - echo "= The LPAE kernel will be the default." -fi # show boot messages if [ "$SHOWBOOT" != "" ]; then echo "= Boot messages will be shown onscreen." @@ -550,7 +538,7 @@ fi # determine uboot and write to disk if [ "$TARGET" != "" ]; then - if echo "$TARGET" | grep -q 'rpi[234]' || [ "$TARGET" = "olpc_xo175" ] || [ "$TARGET" = "beagleplay" ]; then + if echo "$TARGET" | grep -q 'rpi[34]' || [ "$TARGET" = "beagleplay" ]; then . "${BOARDDIR}/${TARGET}" elif [ -d "${PREFIX}/usr/share/uboot/${TARGET}" ]; then . "${BOARDDIR}/${TARGET}" @@ -615,18 +603,11 @@ if [ "$CONSOLE" = "1" ]; then echo "= Adding console $SYSCON to kernel parameters ..." add_kernel_parameter "console=$SYSCON console=tty0" - if echo "$TARGET" | grep -q 'rpi[234]'; then + if echo "$TARGET" | grep -q 'rpi[34]'; then sed -i "s|# enable_uart=1|enable_uart=1|" /tmp/fw/config.txt fi fi -# fix up rpi2/3 -if [ "$FIX_RPI" != "" ]; then - echo "= Blacklisting the VC4 Driver for the Raspberry Pi 2/3" - echo blacklist vc4 > ${PREFIX}/etc/modprobe.d/blacklist-vc4.conf - add_kernel_parameter "rd.driver.blacklist=vc4" -fi - # check if host system has selinux disabled, if it does autorelabel is required if [ "$(getenforce)" = "Disabled" ]; then echo "= NOTE: System Relabel required on first boot." @@ -648,25 +629,6 @@ if [ "$OPT_ARGS" != "" ] ; then echo "= Parameter: $OPT_ARGS" add_kernel_parameter "$OPT_ARGS" fi -# if using rpi4 && armhfp limit ram to 1GB with warning -if [ $TARGET = "rpi4" ] && [ "$(echo $IMAGE | grep -i armhfp)" != "" ]; then - # edit config.txt to limit memory on boot - echo "#################################################################" - echo "# The Raspberry Pi 4 must be limited to 1 GB of RAM on first boot." - echo "# To enable the additional RAM, install the lpae kernel and edit the" - echo "# /boot/config.txt and remove or comment the line 'total_mem=1024'." - echo "#################################################################" - # issue warning for the change - echo "total_mem=1024" >> /tmp/fw/config.txt - -fi - -# prefer the lpae kernel -if [ "$LPAE" != "" ]; then - if [ -f /tmp/boot/grub2/grubenv ]; then - sed -i 's|^saved_entry.*|&+lpae|' /tmp/boot/grub2/grubenv - fi -fi # remove quiet from kargs if [ "$SHOWBOOT" != "" ]; then sed -i 's|rhgb quiet ||g' /tmp/boot/loader/entries/*.conf diff --git a/boards.d/A10-OLinuXino-Lime b/boards.d/A10-OLinuXino-Lime deleted file mode 120000 index 44bea25..0000000 --- a/boards.d/A10-OLinuXino-Lime +++ /dev/null @@ -1 +0,0 @@ -../socs.d/AllWinner \ No newline at end of file diff --git a/boards.d/A10s-OLinuXino-M b/boards.d/A10s-OLinuXino-M deleted file mode 120000 index 44bea25..0000000 --- a/boards.d/A10s-OLinuXino-M +++ /dev/null @@ -1 +0,0 @@ -../socs.d/AllWinner \ No newline at end of file diff --git a/boards.d/A13-OLinuXino b/boards.d/A13-OLinuXino deleted file mode 120000 index 44bea25..0000000 --- a/boards.d/A13-OLinuXino +++ /dev/null @@ -1 +0,0 @@ -../socs.d/AllWinner \ No newline at end of file diff --git a/boards.d/A13-OLinuXinoM b/boards.d/A13-OLinuXinoM deleted file mode 120000 index 44bea25..0000000 --- a/boards.d/A13-OLinuXinoM +++ /dev/null @@ -1 +0,0 @@ -../socs.d/AllWinner \ No newline at end of file diff --git a/boards.d/A20-OLinuXino-Lime b/boards.d/A20-OLinuXino-Lime deleted file mode 120000 index 44bea25..0000000 --- a/boards.d/A20-OLinuXino-Lime +++ /dev/null @@ -1 +0,0 @@ -../socs.d/AllWinner \ No newline at end of file diff --git a/boards.d/A20-OLinuXino-Lime2 b/boards.d/A20-OLinuXino-Lime2 deleted file mode 120000 index 44bea25..0000000 --- a/boards.d/A20-OLinuXino-Lime2 +++ /dev/null @@ -1 +0,0 @@ -../socs.d/AllWinner \ No newline at end of file diff --git a/boards.d/A20-OLinuXino-Lime2-eMMC b/boards.d/A20-OLinuXino-Lime2-eMMC deleted file mode 120000 index 44bea25..0000000 --- a/boards.d/A20-OLinuXino-Lime2-eMMC +++ /dev/null @@ -1 +0,0 @@ -../socs.d/AllWinner \ No newline at end of file diff --git a/boards.d/A20-OLinuXino_MICRO b/boards.d/A20-OLinuXino_MICRO deleted file mode 120000 index 44bea25..0000000 --- a/boards.d/A20-OLinuXino_MICRO +++ /dev/null @@ -1 +0,0 @@ -../socs.d/AllWinner \ No newline at end of file diff --git a/boards.d/A20-Olimex-SOM-EVB b/boards.d/A20-Olimex-SOM-EVB deleted file mode 120000 index 44bea25..0000000 --- a/boards.d/A20-Olimex-SOM-EVB +++ /dev/null @@ -1 +0,0 @@ -../socs.d/AllWinner \ No newline at end of file diff --git a/boards.d/Ampe_A76 b/boards.d/Ampe_A76 deleted file mode 120000 index 44bea25..0000000 --- a/boards.d/Ampe_A76 +++ /dev/null @@ -1 +0,0 @@ -../socs.d/AllWinner \ No newline at end of file diff --git a/boards.d/Auxtek-T003 b/boards.d/Auxtek-T003 deleted file mode 120000 index 44bea25..0000000 --- a/boards.d/Auxtek-T003 +++ /dev/null @@ -1 +0,0 @@ -../socs.d/AllWinner \ No newline at end of file diff --git a/boards.d/Auxtek-T004 b/boards.d/Auxtek-T004 deleted file mode 120000 index 44bea25..0000000 --- a/boards.d/Auxtek-T004 +++ /dev/null @@ -1 +0,0 @@ -../socs.d/AllWinner \ No newline at end of file diff --git a/boards.d/Bananapi b/boards.d/Bananapi deleted file mode 120000 index 44bea25..0000000 --- a/boards.d/Bananapi +++ /dev/null @@ -1 +0,0 @@ -../socs.d/AllWinner \ No newline at end of file diff --git a/boards.d/Bananapi_M2_Ultra b/boards.d/Bananapi_M2_Ultra deleted file mode 120000 index 44bea25..0000000 --- a/boards.d/Bananapi_M2_Ultra +++ /dev/null @@ -1 +0,0 @@ -../socs.d/AllWinner \ No newline at end of file diff --git a/boards.d/Bananapi_m2m b/boards.d/Bananapi_m2m deleted file mode 120000 index 44bea25..0000000 --- a/boards.d/Bananapi_m2m +++ /dev/null @@ -1 +0,0 @@ -../socs.d/AllWinner \ No newline at end of file diff --git a/boards.d/Bananapro b/boards.d/Bananapro deleted file mode 120000 index 44bea25..0000000 --- a/boards.d/Bananapro +++ /dev/null @@ -1 +0,0 @@ -../socs.d/AllWinner \ No newline at end of file diff --git a/boards.d/CHIP b/boards.d/CHIP deleted file mode 120000 index 44bea25..0000000 --- a/boards.d/CHIP +++ /dev/null @@ -1 +0,0 @@ -../socs.d/AllWinner \ No newline at end of file diff --git a/boards.d/CSQ_CS908 b/boards.d/CSQ_CS908 deleted file mode 120000 index 44bea25..0000000 --- a/boards.d/CSQ_CS908 +++ /dev/null @@ -1 +0,0 @@ -../socs.d/AllWinner \ No newline at end of file diff --git a/boards.d/Chuwi_V7_CW0825 b/boards.d/Chuwi_V7_CW0825 deleted file mode 120000 index 44bea25..0000000 --- a/boards.d/Chuwi_V7_CW0825 +++ /dev/null @@ -1 +0,0 @@ -../socs.d/AllWinner \ No newline at end of file diff --git a/boards.d/Colombus b/boards.d/Colombus deleted file mode 120000 index 44bea25..0000000 --- a/boards.d/Colombus +++ /dev/null @@ -1 +0,0 @@ -../socs.d/AllWinner \ No newline at end of file diff --git a/boards.d/Cubieboard b/boards.d/Cubieboard deleted file mode 120000 index 44bea25..0000000 --- a/boards.d/Cubieboard +++ /dev/null @@ -1 +0,0 @@ -../socs.d/AllWinner \ No newline at end of file diff --git a/boards.d/Cubieboard2 b/boards.d/Cubieboard2 deleted file mode 120000 index 44bea25..0000000 --- a/boards.d/Cubieboard2 +++ /dev/null @@ -1 +0,0 @@ -../socs.d/AllWinner \ No newline at end of file diff --git a/boards.d/Cubieboard4 b/boards.d/Cubieboard4 deleted file mode 120000 index 44bea25..0000000 --- a/boards.d/Cubieboard4 +++ /dev/null @@ -1 +0,0 @@ -../socs.d/AllWinner \ No newline at end of file diff --git a/boards.d/Cubietruck b/boards.d/Cubietruck deleted file mode 120000 index 44bea25..0000000 --- a/boards.d/Cubietruck +++ /dev/null @@ -1 +0,0 @@ -../socs.d/AllWinner \ No newline at end of file diff --git a/boards.d/Cubietruck_plus b/boards.d/Cubietruck_plus deleted file mode 120000 index 44bea25..0000000 --- a/boards.d/Cubietruck_plus +++ /dev/null @@ -1 +0,0 @@ -../socs.d/AllWinner \ No newline at end of file diff --git a/boards.d/Hummingbird_A31 b/boards.d/Hummingbird_A31 deleted file mode 120000 index 44bea25..0000000 --- a/boards.d/Hummingbird_A31 +++ /dev/null @@ -1 +0,0 @@ -../socs.d/AllWinner \ No newline at end of file diff --git a/boards.d/Hyundai_A7HD b/boards.d/Hyundai_A7HD deleted file mode 120000 index 44bea25..0000000 --- a/boards.d/Hyundai_A7HD +++ /dev/null @@ -1 +0,0 @@ -../socs.d/AllWinner \ No newline at end of file diff --git a/boards.d/Itead_Ibox_A20 b/boards.d/Itead_Ibox_A20 deleted file mode 120000 index 44bea25..0000000 --- a/boards.d/Itead_Ibox_A20 +++ /dev/null @@ -1 +0,0 @@ -../socs.d/AllWinner \ No newline at end of file diff --git a/boards.d/Lamobo_R1 b/boards.d/Lamobo_R1 deleted file mode 120000 index 44bea25..0000000 --- a/boards.d/Lamobo_R1 +++ /dev/null @@ -1 +0,0 @@ -../socs.d/AllWinner \ No newline at end of file diff --git a/boards.d/Linksprite_pcDuino b/boards.d/Linksprite_pcDuino deleted file mode 120000 index 44bea25..0000000 --- a/boards.d/Linksprite_pcDuino +++ /dev/null @@ -1 +0,0 @@ -../socs.d/AllWinner \ No newline at end of file diff --git a/boards.d/Linksprite_pcDuino3 b/boards.d/Linksprite_pcDuino3 deleted file mode 120000 index 44bea25..0000000 --- a/boards.d/Linksprite_pcDuino3 +++ /dev/null @@ -1 +0,0 @@ -../socs.d/AllWinner \ No newline at end of file diff --git a/boards.d/Linksprite_pcDuino3_Nano b/boards.d/Linksprite_pcDuino3_Nano deleted file mode 120000 index 44bea25..0000000 --- a/boards.d/Linksprite_pcDuino3_Nano +++ /dev/null @@ -1 +0,0 @@ -../socs.d/AllWinner \ No newline at end of file diff --git a/boards.d/MK808C b/boards.d/MK808C deleted file mode 120000 index 44bea25..0000000 --- a/boards.d/MK808C +++ /dev/null @@ -1 +0,0 @@ -../socs.d/AllWinner \ No newline at end of file diff --git a/boards.d/MSI_Primo73 b/boards.d/MSI_Primo73 deleted file mode 120000 index 44bea25..0000000 --- a/boards.d/MSI_Primo73 +++ /dev/null @@ -1 +0,0 @@ -../socs.d/AllWinner \ No newline at end of file diff --git a/boards.d/MSI_Primo81 b/boards.d/MSI_Primo81 deleted file mode 120000 index 44bea25..0000000 --- a/boards.d/MSI_Primo81 +++ /dev/null @@ -1 +0,0 @@ -../socs.d/AllWinner \ No newline at end of file diff --git a/boards.d/Marsboard_A10 b/boards.d/Marsboard_A10 deleted file mode 120000 index 44bea25..0000000 --- a/boards.d/Marsboard_A10 +++ /dev/null @@ -1 +0,0 @@ -../socs.d/AllWinner \ No newline at end of file diff --git a/boards.d/Mele_A1000 b/boards.d/Mele_A1000 deleted file mode 120000 index 44bea25..0000000 --- a/boards.d/Mele_A1000 +++ /dev/null @@ -1 +0,0 @@ -../socs.d/AllWinner \ No newline at end of file diff --git a/boards.d/Mele_A1000G_quad b/boards.d/Mele_A1000G_quad deleted file mode 120000 index 44bea25..0000000 --- a/boards.d/Mele_A1000G_quad +++ /dev/null @@ -1 +0,0 @@ -../socs.d/AllWinner \ No newline at end of file diff --git a/boards.d/Mele_I7 b/boards.d/Mele_I7 deleted file mode 120000 index 44bea25..0000000 --- a/boards.d/Mele_I7 +++ /dev/null @@ -1 +0,0 @@ -../socs.d/AllWinner \ No newline at end of file diff --git a/boards.d/Mele_M3 b/boards.d/Mele_M3 deleted file mode 120000 index 44bea25..0000000 --- a/boards.d/Mele_M3 +++ /dev/null @@ -1 +0,0 @@ -../socs.d/AllWinner \ No newline at end of file diff --git a/boards.d/Mele_M5 b/boards.d/Mele_M5 deleted file mode 120000 index 44bea25..0000000 --- a/boards.d/Mele_M5 +++ /dev/null @@ -1 +0,0 @@ -../socs.d/AllWinner \ No newline at end of file diff --git a/boards.d/Mele_M9 b/boards.d/Mele_M9 deleted file mode 120000 index 44bea25..0000000 --- a/boards.d/Mele_M9 +++ /dev/null @@ -1 +0,0 @@ -../socs.d/AllWinner \ No newline at end of file diff --git a/boards.d/Mini-X b/boards.d/Mini-X deleted file mode 120000 index 44bea25..0000000 --- a/boards.d/Mini-X +++ /dev/null @@ -1 +0,0 @@ -../socs.d/AllWinner \ No newline at end of file diff --git a/boards.d/Orangepi b/boards.d/Orangepi deleted file mode 120000 index 44bea25..0000000 --- a/boards.d/Orangepi +++ /dev/null @@ -1 +0,0 @@ -../socs.d/AllWinner \ No newline at end of file diff --git a/boards.d/Orangepi_mini b/boards.d/Orangepi_mini deleted file mode 120000 index 44bea25..0000000 --- a/boards.d/Orangepi_mini +++ /dev/null @@ -1 +0,0 @@ -../socs.d/AllWinner \ No newline at end of file diff --git a/boards.d/Sinlinx_SinA31s b/boards.d/Sinlinx_SinA31s deleted file mode 120000 index 44bea25..0000000 --- a/boards.d/Sinlinx_SinA31s +++ /dev/null @@ -1 +0,0 @@ -../socs.d/AllWinner \ No newline at end of file diff --git a/boards.d/Sinovoip_BPI_M2_Plus b/boards.d/Sinovoip_BPI_M2_Plus deleted file mode 120000 index 44bea25..0000000 --- a/boards.d/Sinovoip_BPI_M2_Plus +++ /dev/null @@ -1 +0,0 @@ -../socs.d/AllWinner \ No newline at end of file diff --git a/boards.d/Sinovoip_BPI_M3 b/boards.d/Sinovoip_BPI_M3 deleted file mode 120000 index 44bea25..0000000 --- a/boards.d/Sinovoip_BPI_M3 +++ /dev/null @@ -1 +0,0 @@ -../socs.d/AllWinner \ No newline at end of file diff --git a/boards.d/UTOO_P66 b/boards.d/UTOO_P66 deleted file mode 120000 index 44bea25..0000000 --- a/boards.d/UTOO_P66 +++ /dev/null @@ -1 +0,0 @@ -../socs.d/AllWinner \ No newline at end of file diff --git a/boards.d/Wexler_TAB7200 b/boards.d/Wexler_TAB7200 deleted file mode 120000 index 44bea25..0000000 --- a/boards.d/Wexler_TAB7200 +++ /dev/null @@ -1 +0,0 @@ -../socs.d/AllWinner \ No newline at end of file diff --git a/boards.d/Wits_Pro_A20_DKT b/boards.d/Wits_Pro_A20_DKT deleted file mode 120000 index 44bea25..0000000 --- a/boards.d/Wits_Pro_A20_DKT +++ /dev/null @@ -1 +0,0 @@ -../socs.d/AllWinner \ No newline at end of file diff --git a/boards.d/Yones_Toptech_BS1078_V2 b/boards.d/Yones_Toptech_BS1078_V2 deleted file mode 120000 index 44bea25..0000000 --- a/boards.d/Yones_Toptech_BS1078_V2 +++ /dev/null @@ -1 +0,0 @@ -../socs.d/AllWinner \ No newline at end of file diff --git a/boards.d/am335x_evm b/boards.d/am335x_evm deleted file mode 120000 index 1cc9e23..0000000 --- a/boards.d/am335x_evm +++ /dev/null @@ -1 +0,0 @@ -../socs.d/omap \ No newline at end of file diff --git a/boards.d/am57xx_evm b/boards.d/am57xx_evm deleted file mode 120000 index 1cc9e23..0000000 --- a/boards.d/am57xx_evm +++ /dev/null @@ -1 +0,0 @@ -../socs.d/omap \ No newline at end of file diff --git a/boards.d/arndale b/boards.d/arndale deleted file mode 120000 index fd8ef4d..0000000 --- a/boards.d/arndale +++ /dev/null @@ -1 +0,0 @@ -../socs.d/exynos5 \ No newline at end of file diff --git a/boards.d/ba10_tv_box b/boards.d/ba10_tv_box deleted file mode 120000 index 44bea25..0000000 --- a/boards.d/ba10_tv_box +++ /dev/null @@ -1 +0,0 @@ -../socs.d/AllWinner \ No newline at end of file diff --git a/boards.d/bananapi_m1_plus b/boards.d/bananapi_m1_plus deleted file mode 120000 index 44bea25..0000000 --- a/boards.d/bananapi_m1_plus +++ /dev/null @@ -1 +0,0 @@ -../socs.d/AllWinner \ No newline at end of file diff --git a/boards.d/bananapi_m2_berry b/boards.d/bananapi_m2_berry deleted file mode 120000 index 44bea25..0000000 --- a/boards.d/bananapi_m2_berry +++ /dev/null @@ -1 +0,0 @@ -../socs.d/AllWinner \ No newline at end of file diff --git a/boards.d/bananapi_m2_plus_h3 b/boards.d/bananapi_m2_plus_h3 deleted file mode 120000 index 44bea25..0000000 --- a/boards.d/bananapi_m2_plus_h3 +++ /dev/null @@ -1 +0,0 @@ -../socs.d/AllWinner \ No newline at end of file diff --git a/boards.d/bananapi_m2_zero b/boards.d/bananapi_m2_zero deleted file mode 120000 index 44bea25..0000000 --- a/boards.d/bananapi_m2_zero +++ /dev/null @@ -1 +0,0 @@ -../socs.d/AllWinner \ No newline at end of file diff --git a/boards.d/chiliboard b/boards.d/chiliboard deleted file mode 120000 index 7ea1955..0000000 --- a/boards.d/chiliboard +++ /dev/null @@ -1 +0,0 @@ -../socs.d/omap4 \ No newline at end of file diff --git a/boards.d/cl-som-am57x b/boards.d/cl-som-am57x deleted file mode 120000 index 7ea1955..0000000 --- a/boards.d/cl-som-am57x +++ /dev/null @@ -1 +0,0 @@ -../socs.d/omap4 \ No newline at end of file diff --git a/boards.d/clearfog b/boards.d/clearfog deleted file mode 120000 index 59364f8..0000000 --- a/boards.d/clearfog +++ /dev/null @@ -1 +0,0 @@ -../socs.d/mvebu \ No newline at end of file diff --git a/boards.d/cm_fx6 b/boards.d/cm_fx6 deleted file mode 120000 index ff1e5b3..0000000 --- a/boards.d/cm_fx6 +++ /dev/null @@ -1 +0,0 @@ -../socs.d/imx6 \ No newline at end of file diff --git a/boards.d/colorfly_e708_q1 b/boards.d/colorfly_e708_q1 deleted file mode 120000 index 44bea25..0000000 --- a/boards.d/colorfly_e708_q1 +++ /dev/null @@ -1 +0,0 @@ -../socs.d/AllWinner \ No newline at end of file diff --git a/boards.d/difrnce_dit4350 b/boards.d/difrnce_dit4350 deleted file mode 120000 index 44bea25..0000000 --- a/boards.d/difrnce_dit4350 +++ /dev/null @@ -1 +0,0 @@ -../socs.d/AllWinner \ No newline at end of file diff --git a/boards.d/dserve_dsrv9703c b/boards.d/dserve_dsrv9703c deleted file mode 120000 index 44bea25..0000000 --- a/boards.d/dserve_dsrv9703c +++ /dev/null @@ -1 +0,0 @@ -../socs.d/AllWinner \ No newline at end of file diff --git a/boards.d/evb-rk3229 b/boards.d/evb-rk3229 deleted file mode 120000 index 57db056..0000000 --- a/boards.d/evb-rk3229 +++ /dev/null @@ -1 +0,0 @@ -../socs.d/Rockchips-ARMv7 \ No newline at end of file diff --git a/boards.d/helios4 b/boards.d/helios4 deleted file mode 120000 index 59364f8..0000000 --- a/boards.d/helios4 +++ /dev/null @@ -1 +0,0 @@ -../socs.d/mvebu \ No newline at end of file diff --git a/boards.d/i12-tvbox b/boards.d/i12-tvbox deleted file mode 120000 index 44bea25..0000000 --- a/boards.d/i12-tvbox +++ /dev/null @@ -1 +0,0 @@ -../socs.d/AllWinner \ No newline at end of file diff --git a/boards.d/icnova-a20-swac b/boards.d/icnova-a20-swac deleted file mode 120000 index 44bea25..0000000 --- a/boards.d/icnova-a20-swac +++ /dev/null @@ -1 +0,0 @@ -../socs.d/AllWinner \ No newline at end of file diff --git a/boards.d/inet86dz b/boards.d/inet86dz deleted file mode 120000 index 44bea25..0000000 --- a/boards.d/inet86dz +++ /dev/null @@ -1 +0,0 @@ -../socs.d/AllWinner \ No newline at end of file diff --git a/boards.d/jesurun_q5 b/boards.d/jesurun_q5 deleted file mode 120000 index 44bea25..0000000 --- a/boards.d/jesurun_q5 +++ /dev/null @@ -1 +0,0 @@ -../socs.d/AllWinner \ No newline at end of file diff --git a/boards.d/jetson-tk1 b/boards.d/jetson-tk1 deleted file mode 120000 index 8fe5ae1..0000000 --- a/boards.d/jetson-tk1 +++ /dev/null @@ -1 +0,0 @@ -../socs.d/none \ No newline at end of file diff --git a/boards.d/kc1 b/boards.d/kc1 deleted file mode 120000 index 1cc9e23..0000000 --- a/boards.d/kc1 +++ /dev/null @@ -1 +0,0 @@ -../socs.d/omap \ No newline at end of file diff --git a/boards.d/libretech_all_h3_cc_h2_plus b/boards.d/libretech_all_h3_cc_h2_plus deleted file mode 120000 index 44bea25..0000000 --- a/boards.d/libretech_all_h3_cc_h2_plus +++ /dev/null @@ -1 +0,0 @@ -../socs.d/AllWinner \ No newline at end of file diff --git a/boards.d/liteboard b/boards.d/liteboard deleted file mode 120000 index ff1e5b3..0000000 --- a/boards.d/liteboard +++ /dev/null @@ -1 +0,0 @@ -../socs.d/imx6 \ No newline at end of file diff --git a/boards.d/marsboard b/boards.d/marsboard deleted file mode 120000 index ff1e5b3..0000000 --- a/boards.d/marsboard +++ /dev/null @@ -1 +0,0 @@ -../socs.d/imx6 \ No newline at end of file diff --git a/boards.d/mk802 b/boards.d/mk802 deleted file mode 120000 index 44bea25..0000000 --- a/boards.d/mk802 +++ /dev/null @@ -1 +0,0 @@ -../socs.d/AllWinner \ No newline at end of file diff --git a/boards.d/mk802_a10s b/boards.d/mk802_a10s deleted file mode 120000 index 44bea25..0000000 --- a/boards.d/mk802_a10s +++ /dev/null @@ -1 +0,0 @@ -../socs.d/AllWinner \ No newline at end of file diff --git a/boards.d/mk802ii b/boards.d/mk802ii deleted file mode 120000 index 44bea25..0000000 --- a/boards.d/mk802ii +++ /dev/null @@ -1 +0,0 @@ -../socs.d/AllWinner \ No newline at end of file diff --git a/boards.d/mx6cuboxi b/boards.d/mx6cuboxi deleted file mode 120000 index ff1e5b3..0000000 --- a/boards.d/mx6cuboxi +++ /dev/null @@ -1 +0,0 @@ -../socs.d/imx6 \ No newline at end of file diff --git a/boards.d/nanopi_m1 b/boards.d/nanopi_m1 deleted file mode 120000 index 44bea25..0000000 --- a/boards.d/nanopi_m1 +++ /dev/null @@ -1 +0,0 @@ -../socs.d/AllWinner \ No newline at end of file diff --git a/boards.d/nanopi_m1_plus b/boards.d/nanopi_m1_plus deleted file mode 120000 index 44bea25..0000000 --- a/boards.d/nanopi_m1_plus +++ /dev/null @@ -1 +0,0 @@ -../socs.d/AllWinner \ No newline at end of file diff --git a/boards.d/nanopi_neo b/boards.d/nanopi_neo deleted file mode 120000 index 44bea25..0000000 --- a/boards.d/nanopi_neo +++ /dev/null @@ -1 +0,0 @@ -../socs.d/AllWinner \ No newline at end of file diff --git a/boards.d/novena b/boards.d/novena deleted file mode 120000 index ff1e5b3..0000000 --- a/boards.d/novena +++ /dev/null @@ -1 +0,0 @@ -../socs.d/imx6 \ No newline at end of file diff --git a/boards.d/olpc_xo175 b/boards.d/olpc_xo175 deleted file mode 100644 index e2485ce..0000000 --- a/boards.d/olpc_xo175 +++ /dev/null @@ -1,88 +0,0 @@ -#!/bin/bash - -SYSCON=ttyS2,115200 - -echo "= Copying loader scripts to boot partition" - -mkdir -p /tmp/boot/boot -cat > /tmp/boot/boot/olpc.fth <<'EOF' -\ OLPC XO boot script - -: enable-output ( -- ) - " /" find-device " model" get-property if - false else " olpc,XO" 2swap sindex -1 <> - then if " visible unfreeze" eval then -; - -: check-ofw-version ( -- ) - " /" find-device " compatible" get-property - abort" No compatible property on /" ( -- compatible$ ) - - \ Good compatible strings - " mrvl,mmp2" 2over sindex -1 <> if 2drop exit then - " marvell,mmp3" 2over sindex -1 <> if 2drop exit then - - \ Try to be helpful - cr - " olpc,xo-1.75" 2swap sindex -1 <> if - ." Firmware Q4E00 or newer is needed to boot a Devicetree enabled kernel." cr - cr - ." One way to update is to copy http://dev.laptop.org/~quozl/q4e00ja.rom" cr - ." to a FAT partition on a USB flash stick and run ""flash u:\q4e00ja.rom""" cr - " show-sad" eval - else - ." This hardware or firmware revision is not supported. Sorry." cr - then - cr - ." Aborting boot." cr - abort -; - -: unix-to-ofw-path ( $ -- $ ) - " last:" 2swap $cat2 - 2dup - begin dup 0<> while - 1 - - 2dup + dup c@ - ascii / = if ascii \ swap c! else drop then - repeat - 2drop -; - -: load-extlinux-conf ( $ -- ) - $read-file if exit then - 2dup - - 0 0 to boot-device - 0 0 to ramdisk - 0 0 to boot-file - - begin - linefeed left-parse-string - - -leading bl left-parse-string - 2dup " label" $= if - 4drop - \ If we see a label, but already have boot-device set, then - \ we drop the rest instead of proceeding to read another entry - boot-device swap drop 0<> if drop 0 then - else - 2dup " kernel" $= if 2over unix-to-ofw-path to boot-device else - 2dup " linux" $= if 2over unix-to-ofw-path to boot-device else - 2dup " initrd" $= if 2over unix-to-ofw-path to ramdisk else - 2dup " append" $= if 2over to boot-file - then then then then - 4drop - then - - dup 0 = - until - 2drop - free-mem -; - -enable-output -check-ofw-version -" last:\extlinux\extlinux.conf" load-extlinux-conf -boot -EOF diff --git a/boards.d/omap3_beagle b/boards.d/omap3_beagle deleted file mode 120000 index 1cc9e23..0000000 --- a/boards.d/omap3_beagle +++ /dev/null @@ -1 +0,0 @@ -../socs.d/omap \ No newline at end of file diff --git a/boards.d/omap4_panda b/boards.d/omap4_panda deleted file mode 120000 index 7ea1955..0000000 --- a/boards.d/omap4_panda +++ /dev/null @@ -1 +0,0 @@ -../socs.d/omap4 \ No newline at end of file diff --git a/boards.d/omap5_uevm b/boards.d/omap5_uevm deleted file mode 120000 index 1cc9e23..0000000 --- a/boards.d/omap5_uevm +++ /dev/null @@ -1 +0,0 @@ -../socs.d/omap \ No newline at end of file diff --git a/boards.d/orangepi_2 b/boards.d/orangepi_2 deleted file mode 120000 index 44bea25..0000000 --- a/boards.d/orangepi_2 +++ /dev/null @@ -1 +0,0 @@ -../socs.d/AllWinner \ No newline at end of file diff --git a/boards.d/orangepi_lite b/boards.d/orangepi_lite deleted file mode 120000 index 44bea25..0000000 --- a/boards.d/orangepi_lite +++ /dev/null @@ -1 +0,0 @@ -../socs.d/AllWinner \ No newline at end of file diff --git a/boards.d/orangepi_one b/boards.d/orangepi_one deleted file mode 120000 index 44bea25..0000000 --- a/boards.d/orangepi_one +++ /dev/null @@ -1 +0,0 @@ -../socs.d/AllWinner \ No newline at end of file diff --git a/boards.d/orangepi_pc b/boards.d/orangepi_pc deleted file mode 120000 index 44bea25..0000000 --- a/boards.d/orangepi_pc +++ /dev/null @@ -1 +0,0 @@ -../socs.d/AllWinner \ No newline at end of file diff --git a/boards.d/orangepi_pc_plus b/boards.d/orangepi_pc_plus deleted file mode 120000 index 44bea25..0000000 --- a/boards.d/orangepi_pc_plus +++ /dev/null @@ -1 +0,0 @@ -../socs.d/AllWinner \ No newline at end of file diff --git a/boards.d/orangepi_plus b/boards.d/orangepi_plus deleted file mode 120000 index 44bea25..0000000 --- a/boards.d/orangepi_plus +++ /dev/null @@ -1 +0,0 @@ -../socs.d/AllWinner \ No newline at end of file diff --git a/boards.d/orangepi_plus2e b/boards.d/orangepi_plus2e deleted file mode 120000 index 44bea25..0000000 --- a/boards.d/orangepi_plus2e +++ /dev/null @@ -1 +0,0 @@ -../socs.d/AllWinner \ No newline at end of file diff --git a/boards.d/orangepi_r1 b/boards.d/orangepi_r1 deleted file mode 120000 index 44bea25..0000000 --- a/boards.d/orangepi_r1 +++ /dev/null @@ -1 +0,0 @@ -../socs.d/AllWinner \ No newline at end of file diff --git a/boards.d/orangepi_zero b/boards.d/orangepi_zero deleted file mode 120000 index 44bea25..0000000 --- a/boards.d/orangepi_zero +++ /dev/null @@ -1 +0,0 @@ -../socs.d/AllWinner \ No newline at end of file diff --git a/boards.d/polaroid_mid2809pxe04 b/boards.d/polaroid_mid2809pxe04 deleted file mode 120000 index 44bea25..0000000 --- a/boards.d/polaroid_mid2809pxe04 +++ /dev/null @@ -1 +0,0 @@ -../socs.d/AllWinner \ No newline at end of file diff --git a/boards.d/pov_protab2_ips9 b/boards.d/pov_protab2_ips9 deleted file mode 120000 index 44bea25..0000000 --- a/boards.d/pov_protab2_ips9 +++ /dev/null @@ -1 +0,0 @@ -../socs.d/AllWinner \ No newline at end of file diff --git a/boards.d/q8_a13_tablet b/boards.d/q8_a13_tablet deleted file mode 120000 index 44bea25..0000000 --- a/boards.d/q8_a13_tablet +++ /dev/null @@ -1 +0,0 @@ -../socs.d/AllWinner \ No newline at end of file diff --git a/boards.d/q8_a23_tablet_800x480 b/boards.d/q8_a23_tablet_800x480 deleted file mode 120000 index 44bea25..0000000 --- a/boards.d/q8_a23_tablet_800x480 +++ /dev/null @@ -1 +0,0 @@ -../socs.d/AllWinner \ No newline at end of file diff --git a/boards.d/q8_a33_tablet_1024x600 b/boards.d/q8_a33_tablet_1024x600 deleted file mode 120000 index 44bea25..0000000 --- a/boards.d/q8_a33_tablet_1024x600 +++ /dev/null @@ -1 +0,0 @@ -../socs.d/AllWinner \ No newline at end of file diff --git a/boards.d/q8_a33_tablet_800x480 b/boards.d/q8_a33_tablet_800x480 deleted file mode 120000 index 44bea25..0000000 --- a/boards.d/q8_a33_tablet_800x480 +++ /dev/null @@ -1 +0,0 @@ -../socs.d/AllWinner \ No newline at end of file diff --git a/boards.d/r7-tv-dongle b/boards.d/r7-tv-dongle deleted file mode 120000 index 44bea25..0000000 --- a/boards.d/r7-tv-dongle +++ /dev/null @@ -1 +0,0 @@ -../socs.d/AllWinner \ No newline at end of file diff --git a/boards.d/riotboard b/boards.d/riotboard deleted file mode 120000 index ff1e5b3..0000000 --- a/boards.d/riotboard +++ /dev/null @@ -1 +0,0 @@ -../socs.d/imx6 \ No newline at end of file diff --git a/boards.d/rpi2 b/boards.d/rpi2 deleted file mode 120000 index 68e489a..0000000 --- a/boards.d/rpi2 +++ /dev/null @@ -1 +0,0 @@ -../socs.d/BCM2836 \ No newline at end of file diff --git a/boards.d/stih410-b2260 b/boards.d/stih410-b2260 deleted file mode 120000 index a972481..0000000 --- a/boards.d/stih410-b2260 +++ /dev/null @@ -1 +0,0 @@ -../socs.d/st \ No newline at end of file diff --git a/boards.d/sunxi_Gemei_G9 b/boards.d/sunxi_Gemei_G9 deleted file mode 120000 index 44bea25..0000000 --- a/boards.d/sunxi_Gemei_G9 +++ /dev/null @@ -1 +0,0 @@ -../socs.d/AllWinner \ No newline at end of file diff --git a/boards.d/trimslice b/boards.d/trimslice deleted file mode 120000 index 8fe5ae1..0000000 --- a/boards.d/trimslice +++ /dev/null @@ -1 +0,0 @@ -../socs.d/none \ No newline at end of file diff --git a/boards.d/turris_omnia b/boards.d/turris_omnia deleted file mode 120000 index 59364f8..0000000 --- a/boards.d/turris_omnia +++ /dev/null @@ -1 +0,0 @@ -../socs.d/mvebu \ No newline at end of file diff --git a/boards.d/udoo b/boards.d/udoo deleted file mode 120000 index ff1e5b3..0000000 --- a/boards.d/udoo +++ /dev/null @@ -1 +0,0 @@ -../socs.d/imx6 \ No newline at end of file diff --git a/boards.d/udoo_neo b/boards.d/udoo_neo deleted file mode 120000 index ff1e5b3..0000000 --- a/boards.d/udoo_neo +++ /dev/null @@ -1 +0,0 @@ -../socs.d/imx6 \ No newline at end of file diff --git a/boards.d/usbarmory b/boards.d/usbarmory deleted file mode 120000 index ff1e5b3..0000000 --- a/boards.d/usbarmory +++ /dev/null @@ -1 +0,0 @@ -../socs.d/imx6 \ No newline at end of file diff --git a/boards.d/wandboard b/boards.d/wandboard deleted file mode 120000 index ff1e5b3..0000000 --- a/boards.d/wandboard +++ /dev/null @@ -1 +0,0 @@ -../socs.d/imx6 \ No newline at end of file diff --git a/boards.d/warp b/boards.d/warp deleted file mode 120000 index ff1e5b3..0000000 --- a/boards.d/warp +++ /dev/null @@ -1 +0,0 @@ -../socs.d/imx6 \ No newline at end of file diff --git a/boards.d/warp7 b/boards.d/warp7 deleted file mode 120000 index ff1e5b3..0000000 --- a/boards.d/warp7 +++ /dev/null @@ -1 +0,0 @@ -../socs.d/imx6 \ No newline at end of file diff --git a/socs.d/BCM2836 b/socs.d/BCM2836 deleted file mode 100644 index 12472c9..0000000 --- a/socs.d/BCM2836 +++ /dev/null @@ -1,2 +0,0 @@ -echo "= Raspberry Pi 2 Uboot is already in place, no changes needed." -SYSCON="ttyAMA0,115200" diff --git a/socs.d/Rockchips-ARMv7 b/socs.d/Rockchips-ARMv7 deleted file mode 100644 index 6028837..0000000 --- a/socs.d/Rockchips-ARMv7 +++ /dev/null @@ -1,5 +0,0 @@ -# write uboot -echo "= Writing u-boot ...." -dd if=$PREFIX/usr/share/uboot/$TARGET/rk3288_idb.img of=$MEDIA seek=64; sync; sleep 5 -# set console for Rockchips -SYSCON=ttyS2,115200 diff --git a/socs.d/exynos5 b/socs.d/exynos5 deleted file mode 100644 index 586a01c..0000000 --- a/socs.d/exynos5 +++ /dev/null @@ -1,13 +0,0 @@ -# get arndale pre-bootloader -curl -o /tmp/arndale-bl1.bin https://pwhalen.fedorapeople.org/arndale/arndale-bl1.bin - -cat $PREFIX/usr/share/uboot/$TARGET/u-boot.bin $PREFIX/usr/share/uboot/$TARGET/u-boot.dtb > /tmp/u-boot-dtb.bin - -dd if=/tmp/arndale-bl1.bin of=$MEDIA seek=1 -dd if=$PREFIX/usr/share/uboot/$TARGET/arndale-spl.bin of=$MEDIA seek=17 -dd if=/tmp/u-boot-dtb.bin of=$MEDIA seek=49 - -# set console -SYSCON=ttySAC2,115200n8 - - diff --git a/socs.d/imx6 b/socs.d/imx6 deleted file mode 100644 index e03862d..0000000 --- a/socs.d/imx6 +++ /dev/null @@ -1,13 +0,0 @@ -if [ -f "$PREFIX/usr/share/uboot/$TARGET/SPL" ]; then -# write a SPL uboot if it's present -echo "= Writing SPL ...." -dd if=$PREFIX/usr/share/uboot/$TARGET/SPL of=$MEDIA seek=1 bs=1k -echo "= Writing u-boot.img ...." -dd if=$PREFIX/usr/share/uboot/$TARGET/u-boot.img of=$MEDIA bs=1k seek=69 conv=fsync; sync -else -# else fail back to traditional uboot -echo "= Writing u-boot.imx ...." -dd if=$PREFIX/usr/share/uboot/$TARGET/u-boot.imx of=$MEDIA bs=1k seek=1 conv=fsync; sync -fi -# set console for imx6 -SYSCON=ttymxc0,115200 diff --git a/socs.d/mvebu b/socs.d/mvebu deleted file mode 100644 index 101f8dd..0000000 --- a/socs.d/mvebu +++ /dev/null @@ -1,3 +0,0 @@ -# write uboot -echo "= Writing u-boot-spl.kwb ...." -dd if=$PREFIX/usr/share/uboot/$TARGET/u-boot-spl.kwb of=$MEDIA bs=512 seek=1; sync; sleep 5 diff --git a/socs.d/omap b/socs.d/omap deleted file mode 100644 index 486835c..0000000 --- a/socs.d/omap +++ /dev/null @@ -1,7 +0,0 @@ -# write MLO & U-Boot -echo "= Writing MLO for $TARGET...." -dd if=$PREFIX/usr/share/uboot/$TARGET/MLO of=$MEDIA seek=1 conv=notrunc bs=128k; sync -echo "= Writing u-boot.img for $TARGET...." -dd if=$PREFIX/usr/share/uboot/$TARGET/u-boot.img of=$MEDIA seek=1 conv=notrunc bs=384k; sync -# set console -SYSCON=ttyS0,115200 diff --git a/socs.d/omap4 b/socs.d/omap4 deleted file mode 100644 index 4c3ce19..0000000 --- a/socs.d/omap4 +++ /dev/null @@ -1,7 +0,0 @@ -# write MLO & U-Boot -echo "= Writing MLO for $TARGET...." -dd if=$PREFIX/usr/share/uboot/$TARGET/MLO of=$MEDIA seek=1 conv=notrunc bs=128k; sync -echo "= Writing u-boot.img for $TARGET...." -dd if=$PREFIX/usr/share/uboot/$TARGET/u-boot.img of=$MEDIA seek=1 conv=notrunc bs=384k; sync -# set console -SYSCON=ttyS2,115200 diff --git a/socs.d/st b/socs.d/st deleted file mode 100644 index d6be296..0000000 --- a/socs.d/st +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/bash - -cleanup() -{ - rmdir /tmp/firmware &> /dev/null - return -} - -echo "= Copying Primary BootLoader (PBL) scripts to firmware partition" -if [ "$FIRMPART" == "" ] ; then - echo "ERROR: Firmware partition not available - wrong image?" - return -fi - -mkdir /tmp/firmware - -mount "$FIRMPART" /tmp/firmware -if [ $? != 0 ] ; then - cleanup -fi - -mkdir /tmp/firmware/b2260 - -cat > /tmp/firmware/b2260/u-bootrom.script < /dev/null -SYSCON=ttyAS1,115200 -cleanup diff --git a/spi-flashing-disk b/spi-flashing-disk index e507804..f1f07ae 100755 --- a/spi-flashing-disk +++ b/spi-flashing-disk @@ -17,7 +17,7 @@ Usage: $(basename ${0}) optional --tag=KOJI TAG - koji tag to download build -Example: $(basename ${0}) --target=panda --media=/dev/mmcblk0 +Example: $(basename ${0}) --target=pine64-lts --media=/dev/mmcblk0 For list of supported boards please check SUPPORTED-BOARDS file. The devices must have on board SPI flash and support enabled for it. diff --git a/update-uboot b/update-uboot index 898c724..a931343 100755 --- a/update-uboot +++ b/update-uboot @@ -17,7 +17,7 @@ optional --tag=KOJI TAG - koji tag to download build --reboot - reboot after update -Example: $(basename ${0}) --target=panda --media=/dev/mmcblk0 +Example: $(basename ${0}) --target=pine64_plus --media=/dev/mmcblk0 For list of supported boards please check SUPPORTED-BOARDS file. " @@ -118,7 +118,7 @@ if [[ $KOJI_TAG != '' ]]; then fi # determine uboot and write to disk if [ "$TARGET" != "" ]; then - if [ "$TARGET" = "rpi2" ] || [ "$TARGET" = "rpi3" ] || [ "$TARGET" = "olpc_xo175" ]; then + if [ "$TARGET" = "rpi[34]" ]; then . "${BOARDDIR}/${TARGET}" elif [ -d "${PREFIX}/usr/share/uboot/${TARGET}" ]; then . "${BOARDDIR}/${TARGET}" From aa05832a44570cb286aa16b408ac7c951e790003 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Feb 19 2024 12:37:09 +0000 Subject: [PATCH 3/6] rockchip: Update the Rockchip rk33xx series devices There's a bunch of different Rockchip ARMv8 platforms so let's make some adjustments to make things a little easier. Signed-off-by: Peter Robinson --- diff --git a/boards.d/evb-rk3328 b/boards.d/evb-rk3328 index 6640528..288b8cb 120000 --- a/boards.d/evb-rk3328 +++ b/boards.d/evb-rk3328 @@ -1 +1 @@ -../socs.d/Rockchips-ARMv8 \ No newline at end of file +../socs.d/rk33xx \ No newline at end of file diff --git a/boards.d/evb-rk3399 b/boards.d/evb-rk3399 index 6640528..288b8cb 120000 --- a/boards.d/evb-rk3399 +++ b/boards.d/evb-rk3399 @@ -1 +1 @@ -../socs.d/Rockchips-ARMv8 \ No newline at end of file +../socs.d/rk33xx \ No newline at end of file diff --git a/boards.d/ficus-rk3399 b/boards.d/ficus-rk3399 index 6640528..288b8cb 120000 --- a/boards.d/ficus-rk3399 +++ b/boards.d/ficus-rk3399 @@ -1 +1 @@ -../socs.d/Rockchips-ARMv8 \ No newline at end of file +../socs.d/rk33xx \ No newline at end of file diff --git a/boards.d/firefly-rk3399 b/boards.d/firefly-rk3399 index 6640528..288b8cb 120000 --- a/boards.d/firefly-rk3399 +++ b/boards.d/firefly-rk3399 @@ -1 +1 @@ -../socs.d/Rockchips-ARMv8 \ No newline at end of file +../socs.d/rk33xx \ No newline at end of file diff --git a/boards.d/khadas-edge-captain-rk3399 b/boards.d/khadas-edge-captain-rk3399 index 6640528..288b8cb 120000 --- a/boards.d/khadas-edge-captain-rk3399 +++ b/boards.d/khadas-edge-captain-rk3399 @@ -1 +1 @@ -../socs.d/Rockchips-ARMv8 \ No newline at end of file +../socs.d/rk33xx \ No newline at end of file diff --git a/boards.d/khadas-edge-rk3399 b/boards.d/khadas-edge-rk3399 index 6640528..288b8cb 120000 --- a/boards.d/khadas-edge-rk3399 +++ b/boards.d/khadas-edge-rk3399 @@ -1 +1 @@ -../socs.d/Rockchips-ARMv8 \ No newline at end of file +../socs.d/rk33xx \ No newline at end of file diff --git a/boards.d/khadas-edge-v-rk3399 b/boards.d/khadas-edge-v-rk3399 index 6640528..288b8cb 120000 --- a/boards.d/khadas-edge-v-rk3399 +++ b/boards.d/khadas-edge-v-rk3399 @@ -1 +1 @@ -../socs.d/Rockchips-ARMv8 \ No newline at end of file +../socs.d/rk33xx \ No newline at end of file diff --git a/boards.d/nanopc-t4-rk3399 b/boards.d/nanopc-t4-rk3399 index 6640528..288b8cb 120000 --- a/boards.d/nanopc-t4-rk3399 +++ b/boards.d/nanopc-t4-rk3399 @@ -1 +1 @@ -../socs.d/Rockchips-ARMv8 \ No newline at end of file +../socs.d/rk33xx \ No newline at end of file diff --git a/boards.d/nanopi-m4-2gb-rk3399 b/boards.d/nanopi-m4-2gb-rk3399 index 6640528..288b8cb 120000 --- a/boards.d/nanopi-m4-2gb-rk3399 +++ b/boards.d/nanopi-m4-2gb-rk3399 @@ -1 +1 @@ -../socs.d/Rockchips-ARMv8 \ No newline at end of file +../socs.d/rk33xx \ No newline at end of file diff --git a/boards.d/nanopi-m4-rk3399 b/boards.d/nanopi-m4-rk3399 index 6640528..288b8cb 120000 --- a/boards.d/nanopi-m4-rk3399 +++ b/boards.d/nanopi-m4-rk3399 @@ -1 +1 @@ -../socs.d/Rockchips-ARMv8 \ No newline at end of file +../socs.d/rk33xx \ No newline at end of file diff --git a/boards.d/nanopi-neo4-rk3399 b/boards.d/nanopi-neo4-rk3399 index 6640528..288b8cb 120000 --- a/boards.d/nanopi-neo4-rk3399 +++ b/boards.d/nanopi-neo4-rk3399 @@ -1 +1 @@ -../socs.d/Rockchips-ARMv8 \ No newline at end of file +../socs.d/rk33xx \ No newline at end of file diff --git a/boards.d/orangepi-rk3399 b/boards.d/orangepi-rk3399 index 6640528..288b8cb 120000 --- a/boards.d/orangepi-rk3399 +++ b/boards.d/orangepi-rk3399 @@ -1 +1 @@ -../socs.d/Rockchips-ARMv8 \ No newline at end of file +../socs.d/rk33xx \ No newline at end of file diff --git a/boards.d/pinebook-pro-rk3399 b/boards.d/pinebook-pro-rk3399 index 6640528..288b8cb 120000 --- a/boards.d/pinebook-pro-rk3399 +++ b/boards.d/pinebook-pro-rk3399 @@ -1 +1 @@ -../socs.d/Rockchips-ARMv8 \ No newline at end of file +../socs.d/rk33xx \ No newline at end of file diff --git a/boards.d/pinephone-pro-rk3399 b/boards.d/pinephone-pro-rk3399 index 6640528..288b8cb 120000 --- a/boards.d/pinephone-pro-rk3399 +++ b/boards.d/pinephone-pro-rk3399 @@ -1 +1 @@ -../socs.d/Rockchips-ARMv8 \ No newline at end of file +../socs.d/rk33xx \ No newline at end of file diff --git a/boards.d/puma-rk3399 b/boards.d/puma-rk3399 index 6640528..288b8cb 120000 --- a/boards.d/puma-rk3399 +++ b/boards.d/puma-rk3399 @@ -1 +1 @@ -../socs.d/Rockchips-ARMv8 \ No newline at end of file +../socs.d/rk33xx \ No newline at end of file diff --git a/boards.d/roc-cc-rk3328 b/boards.d/roc-cc-rk3328 index 6640528..288b8cb 120000 --- a/boards.d/roc-cc-rk3328 +++ b/boards.d/roc-cc-rk3328 @@ -1 +1 @@ -../socs.d/Rockchips-ARMv8 \ No newline at end of file +../socs.d/rk33xx \ No newline at end of file diff --git a/boards.d/roc-pc-mezzanine-rk3399 b/boards.d/roc-pc-mezzanine-rk3399 index 6640528..288b8cb 120000 --- a/boards.d/roc-pc-mezzanine-rk3399 +++ b/boards.d/roc-pc-mezzanine-rk3399 @@ -1 +1 @@ -../socs.d/Rockchips-ARMv8 \ No newline at end of file +../socs.d/rk33xx \ No newline at end of file diff --git a/boards.d/roc-pc-rk3399 b/boards.d/roc-pc-rk3399 index 6640528..288b8cb 120000 --- a/boards.d/roc-pc-rk3399 +++ b/boards.d/roc-pc-rk3399 @@ -1 +1 @@ -../socs.d/Rockchips-ARMv8 \ No newline at end of file +../socs.d/rk33xx \ No newline at end of file diff --git a/boards.d/rock-pi-4-rk3399 b/boards.d/rock-pi-4-rk3399 index 6640528..288b8cb 120000 --- a/boards.d/rock-pi-4-rk3399 +++ b/boards.d/rock-pi-4-rk3399 @@ -1 +1 @@ -../socs.d/Rockchips-ARMv8 \ No newline at end of file +../socs.d/rk33xx \ No newline at end of file diff --git a/boards.d/rock-pi-4c-rk3399 b/boards.d/rock-pi-4c-rk3399 index 6640528..288b8cb 120000 --- a/boards.d/rock-pi-4c-rk3399 +++ b/boards.d/rock-pi-4c-rk3399 @@ -1 +1 @@ -../socs.d/Rockchips-ARMv8 \ No newline at end of file +../socs.d/rk33xx \ No newline at end of file diff --git a/boards.d/rock-pi-e-rk3328 b/boards.d/rock-pi-e-rk3328 index 6640528..288b8cb 120000 --- a/boards.d/rock-pi-e-rk3328 +++ b/boards.d/rock-pi-e-rk3328 @@ -1 +1 @@ -../socs.d/Rockchips-ARMv8 \ No newline at end of file +../socs.d/rk33xx \ No newline at end of file diff --git a/boards.d/rock-pi-n10-rk3399pro b/boards.d/rock-pi-n10-rk3399pro index 6640528..288b8cb 120000 --- a/boards.d/rock-pi-n10-rk3399pro +++ b/boards.d/rock-pi-n10-rk3399pro @@ -1 +1 @@ -../socs.d/Rockchips-ARMv8 \ No newline at end of file +../socs.d/rk33xx \ No newline at end of file diff --git a/boards.d/rock64-rk3328 b/boards.d/rock64-rk3328 index 6640528..288b8cb 120000 --- a/boards.d/rock64-rk3328 +++ b/boards.d/rock64-rk3328 @@ -1 +1 @@ -../socs.d/Rockchips-ARMv8 \ No newline at end of file +../socs.d/rk33xx \ No newline at end of file diff --git a/boards.d/rock960-rk3399 b/boards.d/rock960-rk3399 index 6640528..288b8cb 120000 --- a/boards.d/rock960-rk3399 +++ b/boards.d/rock960-rk3399 @@ -1 +1 @@ -../socs.d/Rockchips-ARMv8 \ No newline at end of file +../socs.d/rk33xx \ No newline at end of file diff --git a/boards.d/rockpro64-rk3399 b/boards.d/rockpro64-rk3399 index 6640528..288b8cb 120000 --- a/boards.d/rockpro64-rk3399 +++ b/boards.d/rockpro64-rk3399 @@ -1 +1 @@ -../socs.d/Rockchips-ARMv8 \ No newline at end of file +../socs.d/rk33xx \ No newline at end of file diff --git a/socs.d/Rockchips-ARMv8 b/socs.d/Rockchips-ARMv8 deleted file mode 100644 index b925671..0000000 --- a/socs.d/Rockchips-ARMv8 +++ /dev/null @@ -1,7 +0,0 @@ -# write uboot -echo "= Writing idbloader.img for $TARGET .... on media $MEDIA" -dd if=$PREFIX/usr/share/uboot/$TARGET/idbloader.img of=$MEDIA seek=64; sync; sleep 5 -echo "= Writing u-boot FIT image for $TARGET .... on media $MEDIA" -dd if=$PREFIX/usr/share/uboot/$TARGET/u-boot.itb of=$MEDIA seek=16384; sync; sleep 5 -# set console for Rockchips -SYSCON=ttyS2,1500000n8 diff --git a/socs.d/rk33xx b/socs.d/rk33xx new file mode 100644 index 0000000..b925671 --- /dev/null +++ b/socs.d/rk33xx @@ -0,0 +1,7 @@ +# write uboot +echo "= Writing idbloader.img for $TARGET .... on media $MEDIA" +dd if=$PREFIX/usr/share/uboot/$TARGET/idbloader.img of=$MEDIA seek=64; sync; sleep 5 +echo "= Writing u-boot FIT image for $TARGET .... on media $MEDIA" +dd if=$PREFIX/usr/share/uboot/$TARGET/u-boot.itb of=$MEDIA seek=16384; sync; sleep 5 +# set console for Rockchips +SYSCON=ttyS2,1500000n8 From 233055ffae7139dc25a020b860778fd4bed70087 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Feb 19 2024 13:45:52 +0000 Subject: [PATCH 4/6] Update the supported boards script and list Update the supported boards list and script to be more up to date and better reflect the aarch64 platforms we actively support. Also clarify in the help what supported in this context actually means as we at times get equiries assuming it means the device is fully supported in Fedora so clarify that the support in this context is purely about writing out the early boot firmware. Signed-off-by: Peter Robinson --- diff --git a/README b/README index b511849..c1013e8 100644 --- a/README +++ b/README @@ -11,8 +11,13 @@ ARM disk image for use with various hardware targets. - customize media with platform specific U-Boot file(s) - Turn SE Linux on and off - Remove the root password - - Update U-Boot for another Target + - Update U-Boot for a Target +Note that the list of supported devices is a list of devices that arm-image-installer +supports setting up the early boot firmware, it does not indicate the level of +support for the device in Fedora for things like kernel drivers, functionality like +display, audio, USB or any other specific hardware feature. + To add additional support, create a code snippet file (bash script) in the "boards.d" subdirectory with the commands needed to write U-Boot for the target board. @@ -25,18 +30,18 @@ Optional --addconsole - Add system console kernel parameter for the target --addkey - /path/to/ssh-public-key --args - Optional kernel parameters listed in quotes - --norootpass - Remove the root password + --norootpass - Remove the root password --relabel - SELinux relabel root filesystem on first boot --resizefs - Resize root filesystem to fill media device - --sysrq - Enable System Request debugging of the kernel - --target=TARGET - target board for uboot - -y - Assumes yes, will not wait for confirmation + --showboot - Show boot messages, removes 'rhgb quiet' from kargs + --sysrq - Enable System Request debugging of the kernel + --target=TARGET - target board for uboot + -y - Assumes yes, will not wait for confirmation Help - --supported - List of supported hardware + --supported - List of hardware we support writing out boot firmware --version - Display version and exit - -Example: arm-image-installer --image=Fedora-Rawhide.xz --target=panda --media=/dev/mmcblk0 --selinux=OFF +Example: arm-image-installer --image=Fedora-Rawhide.xz --target=pine64_plus --media=/dev/mmcblk0 update-uboot ------------ @@ -47,7 +52,10 @@ newer u-boot from koji by specifying a koji tag. Usage: update-uboot --media=DEVICE - media device file (/dev/[sdX|mmcblkX]) - --tag=KOJI TAG - koji tag to download build --target=TARGET - target board -Example: update-uboot --target=panda --media=/dev/mmcblk0 +optional + --tag=KOJI TAG - koji tag to download build + --reboot - reboot after update + +Example: update-uboot --target=pine64_plus --media=/dev/mmcblk0 diff --git a/SUPPORTED-BOARDS b/SUPPORTED-BOARDS index 719b766..560caa3 100644 --- a/SUPPORTED-BOARDS +++ b/SUPPORTED-BOARDS @@ -1,35 +1,26 @@ AllWinner Devices: -A10-OLinuXino-Lime A10s-OLinuXino-M A13-OLinuXino A13-OLinuXinoM A20-OLinuXino-Lime A20-OLinuXino-Lime2 -A20-OLinuXino-Lime2-eMMC A20-OLinuXino_MICRO A20-Olimex-SOM-EVB Ampe_A76 Auxtek-T003 Auxtek-T004 Bananapi -Bananapi_M2_Ultra Bananapi_m2m Bananapro CHIP CSQ_CS908 Chuwi_V7_CW0825 Colombus Cubieboard Cubieboard2 -Cubieboard4 Cubietruck Cubietruck_plus Hummingbird_A31 Hyundai_A7HD Itead_Ibox_A20 Lamobo_R1 -Linksprite_pcDuino Linksprite_pcDuino3 Linksprite_pcDuino3_Nano MK808C MSI_Primo73 MSI_Primo81 -Marsboard_A10 Mele_A1000 Mele_A1000G_quad Mele_I7 Mele_M3 Mele_M5 Mele_M9 Mini-X Orangepi Orangepi_mini -Sinlinx_SinA31s Sinovoip_BPI_M2_Plus UTOO_P66 Wexler_TAB7200 Wits_Pro_A20_DKT Yones_Toptech_BS1078_V2 -ba10_tv_box bananapi_m1_plus bananapi_m2_berry bananapi_m2_plus_h3 bananapi_m2_zero colorfly_e708_q1 -difrnce_dit4350 dserve_dsrv9703c i12-tvbox icnova-a20-swac inet86dz jesurun_q5 libretech_all_h3_cc_h2_plus -mk802 mk802_a10s mk802ii nanopi_m1 nanopi_m1_plus nanopi_neo nanopi_neo_air orangepi_2 orangepi_lite -orangepi_one orangepi_pc orangepi_pc_plus orangepi_plus orangepi_plus2e orangepi_r1 orangepi_zero -polaroid_mid2809pxe04 pov_protab2_ips9 q8_a13_tablet q8_a23_tablet_800x480 q8_a33_tablet_1024x600 -q8_a33_tablet_800x480 r7-tv-dongle sunxi_Gemei_G9 +a64-olinuxino amarula_a64_relic bananapi_m2_plus_h5 bananapi_m64 + libretech_all_h3_cc_h5 nanopi_a64 nanopi_neo2 nanopi_neo_air + nanopi_neo_plus2 nanopi_r1 orangepi_lite2 orangepi_one_plus orangepi_pc2 + orangepi_prime orangepi_win orangepi_zero_plus orangepi_zero_plus2 + pine64-lts pine64_plus pine_h64 pinebook pinephone pinetab sopine_baseboard + teres_i -AllWinner-A64 Devices: -a64-olinuxino amarula_a64_relic bananapi_m2_plus_h5 bananapi_m64 libretech_all_h3_cc_h5 nanopi_a64 -nanopi_neo2 nanopi_neo_plus2 orangepi_lite2 orangepi_one_plus orangepi_pc2 orangepi_prime orangepi_win -orangepi_zero_plus orangepi_zero_plus2 pine64-lts pine64_plus pine_h64 pinebook sopine_baseboard +TI am625 Devices: +beagleplay -MX6 Devices: -cm_fx6 liteboard marsboard mx6cuboxi novena riotboard udoo udoo_neo usbarmory wandboard warp warp7 +QCom Devices: +dragonboard410c dragonboard820c -TI Devices: -am335x_evm am57xx_evm kc1 omap3_beagle omap5_uevm omap4_panda -Note: For the am33xx BeagleBone devices use 'am335x_evm', BeagleBone AI use 'am57xx_evm' - -MVEBU Devices: -clearfog helios4 - -ST Devices: -stih410-b2260 +Rockchips rk33xx series Devices: +evb-rk3328 evb-rk3399 ficus-rk3399 firefly-rk3399 khadas-edge-captain-rk3399 + khadas-edge-rk3399 khadas-edge-v-rk3399 nanopc-t4-rk3399 + nanopi-m4-2gb-rk3399 nanopi-m4-rk3399 nanopi-neo4-rk3399 orangepi-rk3399 + pinebook-pro-rk3399 pinephone-pro-rk3399 puma-rk3399 roc-cc-rk3328 + roc-pc-mezzanine-rk3399 roc-pc-rk3399 rock-pi-4-rk3399 rock-pi-4c-rk3399 + rock-pi-e-rk3328 rock-pi-n10-rk3399pro rock64-rk3328 rock960-rk3399 + rockpro64-rk3399 Other Devices: -arndale chiliboard cl-som-am57x rpi2 rpi3 rpi4 olpc_xo175 +rpi02w rpi3 rpi4 + diff --git a/arm-image-installer b/arm-image-installer index ac76af4..bbbe098 100755 --- a/arm-image-installer +++ b/arm-image-installer @@ -26,10 +26,10 @@ Optional --target=TARGET - target board for uboot -y - Assumes yes, will not wait for confirmation Help - --supported - List of supported hardware + --supported - List of hardware we support writing out boot firmware --version - Display version and exit -Example: $(basename ${0}) --image=Fedora-Rawhide.xz --target=Bananapi --media=/dev/mmcblk0 +Example: $(basename ${0}) --image=Fedora-Rawhide.xz --target=pine64_plus --media=/dev/mmcblk0 " } diff --git a/list-targets.py b/list-targets.py index d794304..1691d28 100644 --- a/list-targets.py +++ b/list-targets.py @@ -10,11 +10,9 @@ def printboards(boards): os.chdir("boards.d") allwinner = "" -allwinner64 = "" -mx6 = "" -omap = "" -mvebu = "" -st = "" +am625 = "" +qcom = "" +rk33xx = "" other = "" for entry in sorted(os.listdir('.')): @@ -22,39 +20,28 @@ for entry in sorted(os.listdir('.')): if os.path.islink(entry): if 'AllWinner' == os.path.basename(os.path.realpath(entry)): allwinner += "%s " % entry - elif 'AllWinner-A64' == os.path.basename(os.path.realpath(entry)): - allwinner64 += "%s " % entry - elif 'omap' == os.path.basename(os.path.realpath(entry)): - omap += "%s " % entry - elif 'imx6' == os.path.basename(os.path.realpath(entry)): - mx6 += "%s " % entry - elif 'mvebu' == os.path.basename(os.path.realpath(entry)): - mvebu += "%s " % entry - elif 'st' == os.path.basename(os.path.realpath(entry)): - st += "%s " % entry + elif 'am625' == os.path.basename(os.path.realpath(entry)): + am625 += "%s " % entry + elif 'qcom' == os.path.basename(os.path.realpath(entry)): + qcom += "%s " % entry + elif 'rk33xx' == os.path.basename(os.path.realpath(entry)): + rk33xx += "%s " % entry else: if entry != 'none': other += "%s " % entry - print("AllWinner Devices:") printboards(allwinner) -print("AllWinner-A64 Devices:") -printboards(allwinner64) - -print("MX6 Devices:") -printboards(mx6) - -print("OMAP Devices:") -printboards(omap) +print("TI am625 Devices:") +printboards(am625) -print("MVEBU Devices:") -printboards(mvebu) +print("QCom Devices:") +printboards(qcom) -print("ST Devices:") -printboards(st) +print("Rockchips rk33xx series Devices:") +printboards(rk33xx) print("Other Devices:") printboards(other) diff --git a/spi-flashing-disk b/spi-flashing-disk index f1f07ae..8746d27 100755 --- a/spi-flashing-disk +++ b/spi-flashing-disk @@ -17,9 +17,8 @@ Usage: $(basename ${0}) optional --tag=KOJI TAG - koji tag to download build -Example: $(basename ${0}) --target=pine64-lts --media=/dev/mmcblk0 +Example: $(basename ${0}) --target=pinebook-pro-rk3399 --media=/dev/mmcblk0 -For list of supported boards please check SUPPORTED-BOARDS file. The devices must have on board SPI flash and support enabled for it. " } From 4fbc73da6e0dc404923b3a6f9ec0a3f0475970b3 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Feb 19 2024 13:46:08 +0000 Subject: [PATCH 5/6] Display help if run with no options If we're run with no options display the help and exit as it's more user friendly than displaying a message about sudo and the exiting. Signed-off-by: Peter Robinson --- diff --git a/arm-image-installer b/arm-image-installer index bbbe098..91fddde 100755 --- a/arm-image-installer +++ b/arm-image-installer @@ -46,6 +46,12 @@ else DOC_DIR="${DIR}/" fi +# Return help for no args +if [ $# -eq 0 ]; then + usage + exit 0 +fi + # check the args while [ $# -gt 0 ]; do case $1 in diff --git a/rpi-uboot-update b/rpi-uboot-update index a5af387..a77f8b9 100755 --- a/rpi-uboot-update +++ b/rpi-uboot-update @@ -6,6 +6,12 @@ Usage: $(basename ${0}) " } +# Return help for no args +if [ $# -eq 0 ]; then + usage + exit 0 +fi + # check the args while [ $# -gt 0 ]; do case $1 in diff --git a/spi-flashing-disk b/spi-flashing-disk index 8746d27..3ad9474 100755 --- a/spi-flashing-disk +++ b/spi-flashing-disk @@ -23,6 +23,12 @@ The devices must have on board SPI flash and support enabled for it. " } +# Return help for no args +if [ $# -eq 0 ]; then + usage + exit 0 +fi + # check the args while [ $# -gt 0 ]; do case $1 in diff --git a/update-uboot b/update-uboot index a931343..bc592f9 100755 --- a/update-uboot +++ b/update-uboot @@ -23,6 +23,12 @@ For list of supported boards please check SUPPORTED-BOARDS file. " } +# Return help for no args +if [ $# -eq 0 ]; then + usage + exit 0 +fi + # check the args while [ $# -gt 0 ]; do case $1 in From 963aeb9764a833726c80b1d8923409899c839cf1 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Feb 19 2024 13:46:45 +0000 Subject: [PATCH 6/6] Bump release to 4.0 Signed-off-by: Peter Robinson --- diff --git a/arm-image-installer b/arm-image-installer index 91fddde..cda3847 100755 --- a/arm-image-installer +++ b/arm-image-installer @@ -5,7 +5,7 @@ # Automate Media Creation for Fedora ARM # Current version -VERSION=3.9 +VERSION=4.0 # usage message usage() {