From 4a379f82580a32fe460be428762ccc6a2c9f01cd Mon Sep 17 00:00:00 2001
From: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
Date: Wed, 6 Apr 2022 00:03:42 +0200
Subject: libre: remove uboot-sunxi

The uboot-sunxi PKGBUILD is completely unmaintained and it has long
been replaced by the uboo4extlinux-sunxi PKGBUILD.

All the devices that were supported by uboot-sunxi are now supported
by the uboo4extlinux-sunxi PKGBUILD.

Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
---
 .../0001-parabola-arm-modifications.patch          |  15 -
 libre/uboot-sunxi/PKGBUILD                         | 381 ---------------------
 libre/uboot-sunxi/boot.txt                         |  19 -
 libre/uboot-sunxi/mkscr                            |   9 -
 libre/uboot-sunxi/uboot-sunxi.install              |  22 --
 5 files changed, 446 deletions(-)
 delete mode 100644 libre/uboot-sunxi/0001-parabola-arm-modifications.patch
 delete mode 100644 libre/uboot-sunxi/PKGBUILD
 delete mode 100644 libre/uboot-sunxi/boot.txt
 delete mode 100755 libre/uboot-sunxi/mkscr
 delete mode 100644 libre/uboot-sunxi/uboot-sunxi.install

(limited to 'libre/uboot-sunxi')

diff --git a/libre/uboot-sunxi/0001-parabola-arm-modifications.patch b/libre/uboot-sunxi/0001-parabola-arm-modifications.patch
deleted file mode 100644
index 4717c7ea7..000000000
--- a/libre/uboot-sunxi/0001-parabola-arm-modifications.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/include/config_distro_defaults.h b/include/config_distro_defaults.h
-index 766a212..0df77cd 100644
---- a/include/config_distro_defaults.h
-+++ b/include/config_distro_defaults.h
-@@ -29,4 +29,7 @@
- #define CONFIG_SUPPORT_RAW_INITRD
- #define CONFIG_ENV_VARS_UBOOT_CONFIG
- 
-+#define CONFIG_CMD_PART
-+#define CONFIG_PARTITION_UUIDS
-+
- #endif	/* _CONFIG_CMD_DISTRO_DEFAULTS_H */
--- 
-2.8.3
-
diff --git a/libre/uboot-sunxi/PKGBUILD b/libre/uboot-sunxi/PKGBUILD
deleted file mode 100644
index d42140e0b..000000000
--- a/libre/uboot-sunxi/PKGBUILD
+++ /dev/null
@@ -1,381 +0,0 @@
-# Contributor: André Silva <emulatorman@hyperbola.info>
-# Contributor: Timothy Redaelli <timothy.redaelli@gmail.com>
-# Maintainers: Parabola hackers <dev@lists.parabola.nu>
-
-buildarch=4
-
-pkgbase=uboot-sunxi
-pkgname=(#'uboot-a10-olinuxino-lime'
-         'uboot-a10s-olinuxino-m'
-         #'uboot-a13-olinuxino'
-         'uboot-a13-olinuxinom'
-         #'uboot-a20-olinuxino-lime'
-         #'uboot-a20-olinuxino-lime2'
-         'uboot-a20-olinuxino_micro'
-         'uboot-bananapi'
-         'uboot-bananapro'
-         'uboot-chip'
-         #'uboot-cubieboard'
-         #'uboot-cubieboard2'
-         #'uboot-cubietruck'
-         'uboot-linksprite_pcduino'
-         'uboot-linksprite_pcduino3'
-         'uboot-linksprite_pcduino3_nano'
-         'uboot-orangepi_2'
-         'uboot-orangepi_one'
-         'uboot-orangepi_pc'
-         'uboot-orangepi_plus')
-pkgver=2017.01
-pkgrel=1.parabola1
-arch=('armv7h')
-url="http://git.denx.de/u-boot.git/"
-license=('GPL')
-makedepends=('bc' 'dtc')
-depends=('linux-libre')
-backup=(boot/boot.txt boot/boot.scr)
-source=("ftp://ftp.denx.de/pub/u-boot/u-boot-${pkgver}.tar.bz2"
-        '0001-parabola-arm-modifications.patch'
-        'boot.txt'
-        'mkscr')
-md5sums=('ad2d82d5b4fa548b2b95bbc26c9bad79'
-         '4c21a725e8aae2af7ae85a0196e0022d'
-         'a149665c52dc30817f98040b77999aeb'
-         '021623a04afd29ac3f368977140cfbfd')
-
-boards=('A10-OLinuXino-Lime'
-        'A10s-OLinuXino-M'
-        'A13-OLinuXino'
-        'A13-OLinuXinoM'
-        'A20-OLinuXino-Lime'
-        'A20-OLinuXino-Lime2'
-        'A20-OLinuXino_MICRO'
-        'Bananapi'
-        'Bananapro'
-        'CHIP'
-        'Cubieboard'
-        'Cubieboard2'
-        'Cubietruck'
-        'Linksprite_pcDuino'
-        'Linksprite_pcDuino3'
-        'Linksprite_pcDuino3_Nano'
-        'orangepi_2'
-        'orangepi_one'
-        'orangepi_pc'
-        'orangepi_plus')
-
-prepare() {
-  cd u-boot-${pkgver}
-
-  patch -Np1 -i ../0001-parabola-arm-modifications.patch
-}
-
-build() {
-  cd u-boot-${pkgver}
-
-  unset CFLAGS
-  unset CXXFLAGS
-  unset LDFLAGS
-
-  for i in ${boards[@]}; do
-    mkdir ../bin_${i}
-    make distclean
-    make ${i}_config
-    make EXTRAVERSION=-${pkgrel}
-    mv u-boot-sunxi-with-spl.bin ../bin_${i}
-  done
-
-  tools/mkimage -A arm -O linux -T script -C none -n "U-Boot boot script" -d ../boot.txt ../boot.scr
-}
-
-package_uboot-a10-olinuxino-lime() {
-  pkgdesc="U-Boot for A10 OLinuXino Lime"
-  install=${pkgbase}.install
-  provides=('uboot-sunxi')
-  conflicts=('uboot-sunxi' 'uboot4extlinux-sunxi' 'uboot4grub-sunxi')
-  replaces=('uboot-a10-olinuxino-lime-linux-libre')
-
-  install -d "${pkgdir}"/boot
-  install -Dm644 bin_A10-OLinuXino-Lime/u-boot-sunxi-with-spl.bin "${pkgdir}"/boot
-
-  install -Dm644 boot.txt "${pkgdir}"/boot/boot.txt
-  install -Dm644 boot.scr "${pkgdir}"/boot/boot.scr
-  install -Dm755 mkscr "${pkgdir}"/boot/mkscr
-}
-
-package_uboot-a10s-olinuxino-m() {
-  pkgdesc="U-Boot for A10s OLinuXino Micro"
-  install=${pkgbase}.install
-  provides=('uboot-sunxi')
-  conflicts=('uboot-sunxi' 'uboot4extlinux-sunxi' 'uboot4grub-sunxi')
-  replaces=('uboot-a10s-olinuxino-micro' 'uboot-a10s-olinuxino-micro-linux-libre')
-
-  install -d "${pkgdir}"/boot
-  install -Dm644 bin_A10s-OLinuXino-M/u-boot-sunxi-with-spl.bin "${pkgdir}"/boot
-
-  install -Dm644 boot.txt "${pkgdir}"/boot/boot.txt
-  install -Dm644 boot.scr "${pkgdir}"/boot/boot.scr
-  install -Dm755 mkscr "${pkgdir}"/boot/mkscr
-}
-
-package_uboot-a13-olinuxino() {
-  pkgdesc="U-Boot for A13 OLinuXino"
-  install=${pkgbase}.install
-  provides=('uboot-sunxi')
-  conflicts=('uboot-sunxi' 'uboot4extlinux-sunxi' 'uboot4grub-sunxi')
-  replaces=('uboot-a13-olinuxino-linux-libre')
-
-  install -d "${pkgdir}"/boot
-  install -Dm644 bin_A13-OLinuXino/u-boot-sunxi-with-spl.bin "${pkgdir}"/boot
-
-  install -Dm644 boot.txt "${pkgdir}"/boot/boot.txt
-  install -Dm644 boot.scr "${pkgdir}"/boot/boot.scr
-  install -Dm755 mkscr "${pkgdir}"/boot/mkscr
-}
-
-package_uboot-a13-olinuxinom() {
-  pkgdesc="U-Boot for A13 OLinuXino Micro"
-  install=${pkgbase}.install
-  provides=('uboot-sunxi')
-  conflicts=('uboot-sunxi' 'uboot4extlinux-sunxi' 'uboot4grub-sunxi')
-  replaces=('uboot-a13-olinuxino-micro' 'uboot-a13-olinuxino-micro-linux-libre')
-
-  install -d "${pkgdir}"/boot
-  install -Dm644 bin_A13-OLinuXinoM/u-boot-sunxi-with-spl.bin "${pkgdir}"/boot
-
-  install -Dm644 boot.txt "${pkgdir}"/boot/boot.txt
-  install -Dm644 boot.scr "${pkgdir}"/boot/boot.scr
-  install -Dm755 mkscr "${pkgdir}"/boot/mkscr
-}
-
-package_uboot-a20-olinuxino-lime() {
-  pkgdesc="U-Boot for A20 OLinuXino Lime"
-  install=${pkgbase}.install
-  provides=('uboot-sunxi')
-  conflicts=('uboot-sunxi' 'uboot4extlinux-sunxi' 'uboot4grub-sunxi')
-  replaces=('uboot-a20-olinuxino-lime-linux-libre')
-
-  install -d "${pkgdir}"/boot
-  install -Dm644 bin_A20-OLinuXino-Lime/u-boot-sunxi-with-spl.bin "${pkgdir}"/boot
-
-  install -Dm644 boot.txt "${pkgdir}"/boot/boot.txt
-  install -Dm644 boot.scr "${pkgdir}"/boot/boot.scr
-  install -Dm755 mkscr "${pkgdir}"/boot/mkscr
-}
-
-package_uboot-a20-olinuxino-lime2() {
-  pkgdesc="U-Boot for A20 OLinuXino Lime2"
-  install=${pkgbase}.install
-  provides=('uboot-sunxi')
-  conflicts=('uboot-sunxi' 'uboot4extlinux-sunxi' 'uboot4grub-sunxi')
-  replaces=('uboot-a20-olinuxino-lime2-linux-libre')
-
-  install -d "${pkgdir}"/boot
-  install -Dm644 bin_A20-OLinuXino-Lime2/u-boot-sunxi-with-spl.bin "${pkgdir}"/boot
-
-  install -Dm644 boot.txt "${pkgdir}"/boot/boot.txt
-  install -Dm644 boot.scr "${pkgdir}"/boot/boot.scr
-  install -Dm755 mkscr "${pkgdir}"/boot/mkscr
-}
-
-package_uboot-a20-olinuxino_micro() {
-  pkgdesc="U-Boot for A20 OLinuXino Micro"
-  install=${pkgbase}.install
-  provides=('uboot-sunxi')
-  conflicts=('uboot-sunxi' 'uboot4extlinux-sunxi' 'uboot4grub-sunxi')
-  replaces=('uboot-a20-olinuxino-micro' 'uboot-a20-olinuxino-micro-linux-libre')
-
-  install -d "${pkgdir}"/boot
-  install -Dm644 bin_A20-OLinuXino_MICRO/u-boot-sunxi-with-spl.bin "${pkgdir}"/boot
-
-  install -Dm644 boot.txt "${pkgdir}"/boot/boot.txt
-  install -Dm644 boot.scr "${pkgdir}"/boot/boot.scr
-  install -Dm755 mkscr "${pkgdir}"/boot/mkscr
-}
-
-package_uboot-bananapi() {
-  pkgdesc="U-Boot for Banana Pi"
-  install=${pkgbase}.install
-  provides=('uboot-sunxi')
-  conflicts=('uboot-sunxi' 'uboot4extlinux-sunxi' 'uboot4grub-sunxi')
-
-  install -d "${pkgdir}"/boot
-  install -Dm644 bin_Bananapi/u-boot-sunxi-with-spl.bin "${pkgdir}"/boot
-
-  install -Dm644 boot.txt "${pkgdir}"/boot/boot.txt
-  install -Dm644 boot.scr "${pkgdir}"/boot/boot.scr
-  install -Dm755 mkscr "${pkgdir}"/boot/mkscr
-}
-
-package_uboot-bananapro() {
-  pkgdesc="U-Boot for Banana Pro"
-  install=${pkgbase}.install
-  provides=('uboot-sunxi')
-  conflicts=('uboot-sunxi' 'uboot4extlinux-sunxi' 'uboot4grub-sunxi')
-
-  install -d "${pkgdir}"/boot
-  install -Dm644 bin_Bananapro/u-boot-sunxi-with-spl.bin "${pkgdir}"/boot
-
-  install -Dm644 boot.txt "${pkgdir}"/boot/boot.txt
-  install -Dm644 boot.scr "${pkgdir}"/boot/boot.scr
-  install -Dm755 mkscr "${pkgdir}"/boot/mkscr
-}
-
-package_uboot-chip() {
-  pkgdesc="U-Boot for C.H.I.P"
-  install=${pkgbase}.install
-  provides=('uboot-sunxi')
-  conflicts=('uboot-sunxi' 'uboot4extlinux-sunxi' 'uboot4grub-sunxi')
-
-  install -d "${pkgdir}"/boot
-  install -Dm644 bin_CHIP/u-boot-sunxi-with-spl.bin "${pkgdir}"/boot
-
-  install -Dm644 boot.txt "${pkgdir}"/boot/boot.txt
-  install -Dm644 boot.scr "${pkgdir}"/boot/boot.scr
-  install -Dm755 mkscr "${pkgdir}"/boot/mkscr
-}
-
-package_uboot-cubieboard() {
-  pkgdesc="U-Boot for Cubieboard"
-  install=${pkgbase}.install
-  provides=('uboot-sunxi')
-  conflicts=('uboot-sunxi' 'uboot4extlinux-sunxi' 'uboot4grub-sunxi')
-  replaces=('uboot-cubieboard-linux-libre')
-
-  install -d "${pkgdir}"/boot
-  install -Dm644 bin_Cubieboard/u-boot-sunxi-with-spl.bin "${pkgdir}"/boot
-
-  install -Dm644 boot.txt "${pkgdir}"/boot/boot.txt
-  install -Dm644 boot.scr "${pkgdir}"/boot/boot.scr
-  install -Dm755 mkscr "${pkgdir}"/boot/mkscr
-}
-
-package_uboot-cubieboard2() {
-  pkgdesc="U-Boot for Cubieboard 2"
-  install=${pkgbase}.install
-  provides=('uboot-sunxi')
-  conflicts=('uboot-sunxi' 'uboot4extlinux-sunxi' 'uboot4grub-sunxi')
-  replaces=('uboot-cubieboard2-linux-libre')
-
-  install -d "${pkgdir}"/boot
-  install -Dm644 bin_Cubieboard2/u-boot-sunxi-with-spl.bin "${pkgdir}"/boot
-
-  install -Dm644 boot.txt "${pkgdir}"/boot/boot.txt
-  install -Dm644 boot.scr "${pkgdir}"/boot/boot.scr
-  install -Dm755 mkscr "${pkgdir}"/boot/mkscr
-}
-
-package_uboot-cubietruck() {
-  pkgdesc="U-Boot for Cubietruck"
-  install=${pkgbase}.install
-  provides=('uboot-sunxi')
-  conflicts=('uboot-sunxi' 'uboot4extlinux-sunxi' 'uboot4grub-sunxi')
-  replaces=('uboot-cubietruck-linux-libre')
-
-  install -d "${pkgdir}"/boot
-  install -Dm644 bin_Cubietruck/u-boot-sunxi-with-spl.bin "${pkgdir}"/boot
-
-  install -Dm644 boot.txt "${pkgdir}"/boot/boot.txt
-  install -Dm644 boot.scr "${pkgdir}"/boot/boot.scr
-  install -Dm755 mkscr "${pkgdir}"/boot/mkscr
-}
-
-package_uboot-linksprite_pcduino() {
-  pkgdesc="U-Boot for pcDuino"
-  install=${pkgbase}.install
-  provides=('uboot-sunxi')
-  conflicts=('uboot-sunxi' 'uboot4extlinux-sunxi' 'uboot4grub-sunxi')
-  replaces=('uboot-pcduino' 'uboot-pcduino-linux-libre')
-
-  install -d "${pkgdir}"/boot
-  install -Dm644 bin_Linksprite_pcDuino/u-boot-sunxi-with-spl.bin "${pkgdir}"/boot
-
-  install -Dm644 boot.txt "${pkgdir}"/boot/boot.txt
-  install -Dm644 boot.scr "${pkgdir}"/boot/boot.scr
-  install -Dm755 mkscr "${pkgdir}"/boot/mkscr
-}
-
-package_uboot-linksprite_pcduino3() {
-  pkgdesc="U-Boot for pcDuino3"
-  install=${pkgbase}.install
-  provides=('uboot-sunxi')
-  conflicts=('uboot-sunxi' 'uboot4extlinux-sunxi' 'uboot4grub-sunxi')
-  replaces=('uboot-pcduino3' 'uboot-pcduino3-linux-libre')
-
-  install -d "${pkgdir}"/boot
-  install -Dm644 bin_Linksprite_pcDuino3/u-boot-sunxi-with-spl.bin "${pkgdir}"/boot
-
-  install -Dm644 boot.txt "${pkgdir}"/boot/boot.txt
-  install -Dm644 boot.scr "${pkgdir}"/boot/boot.scr
-  install -Dm755 mkscr "${pkgdir}"/boot/mkscr
-}
-
-package_uboot-linksprite_pcduino3_nano() {
-  pkgdesc="U-Boot for pcDuino3 Nano"
-  install=${pkgbase}.install
-  provides=('uboot-sunxi')
-  conflicts=('uboot-sunxi' 'uboot4extlinux-sunxi' 'uboot4grub-sunxi')
-  replaces=('uboot-pcduino3-nano' 'uboot-pcduino3-nano-linux-libre')
-
-  install -d "${pkgdir}"/boot
-  install -Dm644 bin_Linksprite_pcDuino3_Nano/u-boot-sunxi-with-spl.bin "${pkgdir}"/boot
-
-  install -Dm644 boot.txt "${pkgdir}"/boot/boot.txt
-  install -Dm644 boot.scr "${pkgdir}"/boot/boot.scr
-  install -Dm755 mkscr "${pkgdir}"/boot/mkscr
-}
-
-package_uboot-orangepi_2() {
-  pkgdesc="U-Boot for Orange Pi 2"
-  install=${pkgbase}.install
-  provides=('uboot-sunxi')
-  conflicts=('uboot-sunxi' 'uboot4extlinux-sunxi' 'uboot4grub-sunxi')
-
-  install -d "${pkgdir}"/boot
-  install -Dm644 bin_orangepi_2/u-boot-sunxi-with-spl.bin "${pkgdir}"/boot
-
-  install -Dm644 boot.txt "${pkgdir}"/boot/boot.txt
-  install -Dm644 boot.scr "${pkgdir}"/boot/boot.scr
-  install -Dm755 mkscr "${pkgdir}"/boot/mkscr
-}
-
-package_uboot-orangepi_one() {
-  pkgdesc="U-Boot for Orange Pi One"
-  install=${pkgbase}.install
-  provides=('uboot-sunxi')
-  conflicts=('uboot-sunxi' 'uboot4extlinux-sunxi' 'uboot4grub-sunxi')
-
-  install -d "${pkgdir}"/boot
-  install -Dm644 bin_orangepi_one/u-boot-sunxi-with-spl.bin "${pkgdir}"/boot
-
-  install -Dm644 boot.txt "${pkgdir}"/boot/boot.txt
-  install -Dm644 boot.scr "${pkgdir}"/boot/boot.scr
-  install -Dm755 mkscr "${pkgdir}"/boot/mkscr
-}
-
-package_uboot-orangepi_pc() {
-  pkgdesc="U-Boot for Orange Pi PC"
-  install=${pkgbase}.install
-  provides=('uboot-sunxi')
-  conflicts=('uboot-sunxi' 'uboot4extlinux-sunxi' 'uboot4grub-sunxi')
-
-  install -d "${pkgdir}"/boot
-  install -Dm644 bin_orangepi_pc/u-boot-sunxi-with-spl.bin "${pkgdir}"/boot
-
-  install -Dm644 boot.txt "${pkgdir}"/boot/boot.txt
-  install -Dm644 boot.scr "${pkgdir}"/boot/boot.scr
-  install -Dm755 mkscr "${pkgdir}"/boot/mkscr
-}
-
-package_uboot-orangepi_plus() {
-  pkgdesc="U-Boot for Orange Pi Plus"
-  install=${pkgbase}.install
-  provides=('uboot-sunxi')
-  conflicts=('uboot-sunxi' 'uboot4extlinux-sunxi' 'uboot4grub-sunxi')
-
-  install -d "${pkgdir}"/boot
-  install -Dm644 bin_orangepi_plus/u-boot-sunxi-with-spl.bin "${pkgdir}"/boot
-
-  install -Dm644 boot.txt "${pkgdir}"/boot/boot.txt
-  install -Dm644 boot.scr "${pkgdir}"/boot/boot.scr
-  install -Dm755 mkscr "${pkgdir}"/boot/mkscr
-}
diff --git a/libre/uboot-sunxi/boot.txt b/libre/uboot-sunxi/boot.txt
deleted file mode 100644
index 1eac14d9c..000000000
--- a/libre/uboot-sunxi/boot.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-part uuid ${devtype} ${devnum}:${bootpart} uuid
-setenv bootargs console=${console} root=PARTUUID=${uuid} rw rootwait
-
-if load ${devtype} ${devnum}:${bootpart} ${kernel_addr_r} /boot/vmlinuz-linux-libre; then
-  if load ${devtype} ${devnum}:${bootpart} ${fdt_addr_r} /boot/dtbs/linux-libre/${fdtfile}; then
-    if load ${devtype} ${devnum}:${bootpart} ${ramdisk_addr_r} /boot/initramfs-linux-libre.img; then
-      bootz ${kernel_addr_r} ${ramdisk_addr_r}:${filesize} ${fdt_addr_r};
-    else
-      bootz ${kernel_addr_r} - ${fdt_addr_r};
-    fi;
-  fi;
-fi
-
-if load ${devtype} ${devnum}:${bootpart} 0x48000000 /boot/uImage; then
-  if load ${devtype} ${devnum}:${bootpart} 0x43000000 /boot/script.bin; then
-    setenv bootm_boot_mode sec;
-    bootm 0x48000000;
-  fi;
-fi
diff --git a/libre/uboot-sunxi/mkscr b/libre/uboot-sunxi/mkscr
deleted file mode 100755
index 272b6a7a5..000000000
--- a/libre/uboot-sunxi/mkscr
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-
-if [[ ! -x /usr/bin/mkimage ]]; then
-  echo "mkimage not found. Please install uboot-tools:"
-  echo "  pacman -S uboot-tools"
-  exit 1
-fi
-
-mkimage -A arm -O linux -T script -C none -n "U-Boot boot script" -d boot.txt boot.scr
diff --git a/libre/uboot-sunxi/uboot-sunxi.install b/libre/uboot-sunxi/uboot-sunxi.install
deleted file mode 100644
index cd4afef4b..000000000
--- a/libre/uboot-sunxi/uboot-sunxi.install
+++ /dev/null
@@ -1,22 +0,0 @@
-flash_uboot() {
-  echo "A new U-Boot version needs to be flashed onto /dev/mmcblk0."
-  echo "Do you want to do this now? [y|N]"
-  read -r shouldwe
-  if [[ $shouldwe =~ ^([yY][eE][sS]|[yY])$ ]]; then
-    dd if=/boot/u-boot-sunxi-with-spl.bin of=/dev/mmcblk0 bs=1024 seek=8
-  else
-    echo "You can do this later by running:"
-    echo "# dd if=/boot/u-boot-sunxi-with-spl.bin of=/dev/mmcblk0 bs=1024 seek=8"
-  fi
-}
-
-## arg 1:  the new package version
-post_install() {
-  flash_uboot
-}
-
-## arg 1:  the new package version
-## arg 2:  the old package version
-post_upgrade() {
-  flash_uboot
-}
-- 
cgit v1.2.3