sq - ubootwip-uboot

5 files changed, 364 insertions, 93 deletions

diff --git a/libre-testing/uboot4extlinux-sunxi/PKGBUILD b/libre-testing/uboot4extlinux-sunxi/PKGBUILD
new file mode 100644
index 000000000..dfa971411
--- /dev/null
+++ b/libre-testing/uboot4extlinux-sunxi/PKGBUILD
@@ -0,0 +1,137 @@
+# Maintainer: Isaac David <isacdaavid@at@isacdaavid@dot@info>
+# Contributor: André Silva <emulatorman@hyperbola.info>
+# Contributor: Timothy Redaelli <timothy.redaelli@gmail.com>
+# Contributor: bill-auger <bill-auger@programmer.net>
+
+
+pkgbase=uboot4extlinux-sunxi
+pkgname=( uboot4extlinux-a10-olinuxino-lime
+          uboot4extlinux-a10s-olinuxino-m
+          uboot4extlinux-a13-olinuxino
+          uboot4extlinux-a13-olinuxinom
+          uboot4extlinux-a20-olinuxino-lime
+          uboot4extlinux-a20-olinuxino-lime2
+          uboot4extlinux-a20-olinuxino-lime2-emmc
+          uboot4extlinux-a20-olinuxino-lime2-micrel # FIXME: https://labs.parabola.nu/issues/2945
+          uboot4extlinux-a20-olinuxino_micro
+          uboot4extlinux-bananapi
+          uboot4extlinux-bananapro
+          uboot4extlinux-chip
+          uboot4extlinux-cubieboard
+          uboot4extlinux-cubieboard2
+          uboot4extlinux-cubietruck
+          uboot4extlinux-linksprite_pcduino
+          uboot4extlinux-linksprite_pcduino3
+          uboot4extlinux-linksprite_pcduino3_nano
+          uboot4extlinux-orangepi_2
+          uboot4extlinux-orangepi_one
+          uboot4extlinux-orangepi_pc
+          uboot4extlinux-orangepi_plus )
+pkgver=2021.01
+pkgrel=1
+arch=('armv7h')
+url=http://www.denx.de/wiki/U-Boot/WebHome
+license=('GPL')
+
+makedepends=('bc' 'dtc' 'python' 'python2' 'python-setuptools' 'swig')
+provides=('uboot4extlinux-sunxi')
+conflicts=('uboot-sunxi' 'uboot4extlinux-sunxi' 'uboot4grub-sunxi')
+backup=(boot/extlinux/extlinux.conf)
+install=${pkgbase}.install
+
+source=(https://ftp.denx.de/pub/u-boot/u-boot-${pkgver}.tar.bz2{,.sig}
+        extlinux.conf)
+validpgpkeys=(1A3C7F70E08FAB1707809BBF147C39FF9634B72C) # Thomas Rini
+sha256sums=('b407e1510a74e863b8b5cb42a24625344f0e0c2fc7582d8c866bd899367d0454'
+            'SKIP'
+            '3760b46b053e458e1f7c4f2f743674064f4804aa9760e4ccb1f525294f71708d')
+validpgpkeys=(1A3C7F70E08FAB1707809BBF147C39FF9634B72C) # Thomas Rini
+
+
+prepare() {
+  cd "${srcdir}"/u-boot-${pkgver}
+
+  # FIXME: https://labs.parabola.nu/issues/2945
+  local opts='CONFIG_PHY_MICREL=y\nCONFIG_PHY_MICREL_KSZ9031=y\nCONFIG_GMAC_TX_DELAY=4'
+  sed "s|CONFIG_PHY_REALTEK=y|${opts}|" configs/A20-OLinuXino-Lime2_defconfig > \
+                                        configs/A20-OLinuXino-Lime2-micrel_defconfig
+
+  local pkg_name defconfig
+  for pkg_name in ${pkgname[*]}; do
+    defconfig=${pkg_name/uboot4extlinux-/}_defconfig               # lower case
+    defconfig=$(find configs/ -iname ${defconfig} | sed 's|.*/||') # mixed case
+
+    if [[ -n "${defconfig}" ]] ; then
+      echo -e "\n#\n# configuring: ${pkg_name}\n#"
+      make distclean
+      make ${defconfig}
+      echo 'CONFIG_IDENT_STRING=" Parabola GNU/Linux-libre"' >> .config
+      mv {,${pkg_name}}.config
+    else
+      echo "ERROR: defconfig not found for pkg_name: '${pkg_name}'"
+      echo "       package names must correspond precisely (case-insensitive) to a *_defconfig"
+      echo "       eg:                              -->|                   |<--"
+      echo "           if defconfig is:        'configs/A20-OLinuXino_MICRO_defconfig'"
+      echo "           then pkgname is: 'uboot4extlinux-a20-olinuxino_micro'"
+      echo "                                        -->|                   |<--"
+      return 1
+    fi
+  done
+}
+
+build() {
+  cd "${srcdir}"/u-boot-${pkgver}
+
+  local pkg_name
+  unset CFLAGS CXXFLAGS LDFLAGS
+  for pkg_name in ${pkgname[*]}; do
+    echo -e "\n#\n# compiling: ${pkg_name}\n#"
+    mv {${pkg_name},}.config
+    make EXTRAVERSION=-${pkgrel}
+    mv -f u-boot-sunxi-with-spl.bin ${pkg_name}.bin
+  done
+}
+
+_package() # (friendly_name)
+{
+  cd "${srcdir}"/u-boot-${pkgver}
+
+  local board_name="$1"
+  local pkg_name=${FUNCNAME[1]/package_}
+
+  pkgdesc="U-Boot + Extlinux for the ${board_name}"
+
+  echo -e "\n#\n# packaging: ${pkg_name}\n#"
+  install -Dm644 ${pkg_name}.bin           "${pkgdir}"/boot/u-boot/images/u-boot-sunxi-with-spl.bin
+  install -Dm644 "${srcdir}"/extlinux.conf "${pkgdir}"/boot/extlinux/extlinux.conf
+}
+
+package_uboot4extlinux-a10-olinuxino-lime()         { _package 'A10 OLinuXino Lime' ; }
+package_uboot4extlinux-a10s-olinuxino-m()           {
+  replaces=('uboot4extlinux-a10s-olinuxino-micro')  ; _package 'A10s OLinuXino M' ; }
+package_uboot4extlinux-a13-olinuxino()              { _package 'A13 OLinuXino' ; }
+package_uboot4extlinux-a13-olinuxinom()             {
+  replaces=('uboot4extlinux-a13-olinuxino-micro')   ; _package 'A13 OLinuXino M' ; }
+package_uboot4extlinux-a20-olinuxino-lime()         { _package 'A20 OLinuXino Lime' ; }
+package_uboot4extlinux-a20-olinuxino-lime2()        { _package 'A20 OLinuXino Lime2' ; }
+package_uboot4extlinux-a20-olinuxino-lime2-emmc()   { _package 'A20 OLinuXino Lime2 (eMMC)' ; }
+# FIXME: uboot4extlinux-a20-olinuxino-lime2-micrel - https://labs.parabola.nu/issues/2945
+package_uboot4extlinux-a20-olinuxino-lime2-micrel() { _package 'A20 OLinuXino Lime2 (rev H-L)' ; }
+package_uboot4extlinux-a20-olinuxino_micro()        {
+  replaces=('uboot-a20-olinuxino-micro')            ; _package 'A20 OLinuXino MICRO' ; }
+package_uboot4extlinux-bananapi()                   { _package 'Banana Pi' ; }
+package_uboot4extlinux-bananapro()                  { _package 'Banana Pro' ; }
+package_uboot4extlinux-chip()                       { _package 'C.H.I.P.' ; }
+package_uboot4extlinux-cubieboard()                 { _package 'Cubieboard' ; }
+package_uboot4extlinux-cubieboard2()                { _package 'Cubieboard2' ; }
+package_uboot4extlinux-cubietruck()                 { _package 'Cubietruck' ; }
+package_uboot4extlinux-linksprite_pcduino()         {
+  replaces=('uboot4extlinux-pcduino')               ; _package 'Linksprite pcDuino' ; }
+package_uboot4extlinux-linksprite_pcduino3()        {
+  replaces=('uboot4extlinux-pcduino3')              ; _package 'Linksprite pcDuino3' ; }
+package_uboot4extlinux-linksprite_pcduino3_nano()   {
+  replaces=('uboot4extlinux-pcduino3-nano')         ; _package 'Linksprite pcDuino3 Nano' ; }
+package_uboot4extlinux-orangepi_2()                 { _package 'Orangepi2' ; }
+package_uboot4extlinux-orangepi_one()               { _package 'Orangepi One' ; }
+package_uboot4extlinux-orangepi_pc()                { _package 'Orangepi PC' ; }
+package_uboot4extlinux-orangepi_plus()              { _package 'Orangepi Plus' ; }
diff --git a/libre-testing/uboot4extlinux-sunxi/extlinux.conf b/libre-testing/uboot4extlinux-sunxi/extlinux.conf
new file mode 100644
index 000000000..bb1d89bb2
--- /dev/null
+++ b/libre-testing/uboot4extlinux-sunxi/extlinux.conf
@@ -0,0 +1,99 @@
+#=====================================================================#
+#  NOTE: most of these examples will not be needed                    #
+#        feel free to customize this file                             #
+#        * ensure that the root= option indicates your / file-system  #
+#        * boot a fallback initd first                                #
+#        * boot a 'default console' entry for HDMI/DVI/VGA            #
+#        * boot a 'serial console' entry for UART                     #
+#=====================================================================#
+
+MENU title Parabola GNU/Linux-libre ARM Boot Menu
+
+TIMEOUT 50
+
+
+default console ##
+
+## complete initrds - default console ##
+
+LABEL Parabola GNU/Linux-libre, linux-libre kernel
+	KERNEL ../vmlinuz-linux-libre
+	INITRD ../initramfs-linux-libre.img
+	APPEND root=/dev/mmcblk0p1 rw rootwait
+	FDTDIR ../dtbs/linux-libre
+
+LABEL Parabola GNU/Linux-libre, linux-libre-lts kernel
+	KERNEL ../vmlinuz-linux-libre-lts
+	INITRD ../initramfs-linux-libre-lts.img
+	APPEND root=/dev/mmcblk0p1 rw rootwait
+	FDTDIR ../dtbs/linux-libre-lts
+
+LABEL Parabola GNU/Linux-libre, linux-libre-pck kernel
+	KERNEL ../vmlinuz-linux-libre-pck
+	INITRD ../initramfs-linux-libre-pck.img
+	APPEND root=/dev/mmcblk0p1 rw rootwait
+	FDTDIR ../dtbs/linux-libre-pck
+
+
+
+## complete initrds - serial console ##
+
+LABEL Parabola GNU/Linux-libre, linux-libre kernel (serial console)
+	KERNEL ../vmlinuz-linux-libre
+	INITRD ../initramfs-linux-libre.img
+	APPEND console=ttyS0,115200 root=/dev/mmcblk0p1 rw rootwait
+	FDTDIR ../dtbs/linux-libre
+
+LABEL Parabola GNU/Linux-libre, linux-libre-lts kernel (serial console)
+	KERNEL ../vmlinuz-linux-libre-lts
+	INITRD ../initramfs-linux-libre-lts.img
+	APPEND console=ttyS0,115200 root=/dev/mmcblk0p1 rw rootwait
+	FDTDIR ../dtbs/linux-libre-lts
+
+LABEL Parabola GNU/Linux-libre, linux-libre-pck kernel (serial console)
+	KERNEL ../vmlinuz-linux-libre-pck
+	INITRD ../initramfs-linux-libre-pck.img
+	APPEND console=ttyS0,115200 root=/dev/mmcblk0p1 rw rootwait
+	FDTDIR ../dtbs/linux-libre-pck
+
+
+## fallback initrds - default console ##
+
+LABEL Parabola GNU/Linux-libre, linux-libre kernel, fallback initrd
+	KERNEL ../vmlinuz-linux-libre
+	INITRD ../initramfs-linux-libre-fallback.img
+	APPEND root=/dev/mmcblk0p1 rw rootwait
+	FDTDIR ../dtbs/linux-libre
+
+LABEL Parabola GNU/Linux-libre, linux-libre-lts kernel, fallback initrd
+	KERNEL ../vmlinuz-linux-libre-lts
+	INITRD ../initramfs-linux-libre-lts-fallback.img
+	APPEND root=/dev/mmcblk0p1 rw rootwait
+	FDTDIR ../dtbs/linux-libre-lts
+
+LABEL Parabola GNU/Linux-libre, linux-libre-pck kernel, fallback initrd
+	KERNEL ../vmlinuz-linux-libre-pck
+	INITRD ../initramfs-linux-libre-pck-fallback.img
+	APPEND root=/dev/mmcblk0p1 rw rootwait
+	FDTDIR ../dtbs/linux-libre-pck
+
+
+## fallback initrds - serial console ##
+
+LABEL Parabola GNU/Linux-libre, linux-libre kernel, fallback initrd (serial console)
+	KERNEL ../vmlinuz-linux-libre
+	INITRD ../initramfs-linux-libre-fallback.img
+	APPEND console=ttyS0,115200 root=/dev/mmcblk0p1 rw rootwait
+	FDTDIR ../dtbs/linux-libre
+
+LABEL Parabola GNU/Linux-libre, linux-libre-lts kernel, fallback initrd (serial console)
+	KERNEL ../vmlinuz-linux-libre-lts
+	INITRD ../initramfs-linux-libre-lts-fallback.img
+	APPEND console=ttyS0,115200 root=/dev/mmcblk0p1 rw rootwait
+	FDTDIR ../dtbs/linux-libre-lts
+
+LABEL Parabola GNU/Linux-libre, linux-libre-pck kernel, fallback initrd (serial console)
+	KERNEL ../vmlinuz-linux-libre-pck
+	INITRD ../initramfs-linux-libre-pck-fallback.img
+	APPEND console=ttyS0,115200 root=/dev/mmcblk0p1 rw rootwait
+	FDTDIR ../dtbs/linux-libre-pck
diff --git a/libre-testing/uboot4extlinux-sunxi/uboot4extlinux-sunxi.install b/libre-testing/uboot4extlinux-sunxi/uboot4extlinux-sunxi.install
new file mode 100644
index 000000000..46f8304cd
--- /dev/null
+++ b/libre-testing/uboot4extlinux-sunxi/uboot4extlinux-sunxi.install
@@ -0,0 +1,35 @@
+flash_instructions() {
+  echo "# dd if=/boot/u-boot/images/u-boot-sunxi-with-spl.bin of=/dev/mmcblk0 bs=1024 seek=8"
+}
+
+extlinux_warning() {
+  echo "==> WARNING: Remember to set up your kernels in /boot/extlinux/extlinux.conf"
+}
+
+flash_uboot() {
+  root=$(mount | awk '/ on \/ / { print $1; }')
+  if [[ $root =~ ^/dev/mmcblk.*$ ]]; then
+    root=${root:0:12}
+    echo "A new U-Boot version needs to be flashed onto $root."
+    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/images/u-boot-sunxi-with-spl.bin of=$root bs=1024 seek=8
+    else
+      echo "You can do this later by running:"
+      flash_instructions
+    fi
+  else
+    echo "Flash the new U-Boot version onto your boot device. For example:"
+    flash_instructions
+  fi
+  extlinux_warning
+}
+
+post_install() {
+  flash_uboot
+}
+
+post_upgrade() {
+  flash_uboot
+}
diff --git a/libre/uboot4extlinux-sunxi/PKGBUILD b/libre/uboot4extlinux-sunxi/PKGBUILD
index 47c749e5f..dfa971411 100644
--- a/libre/uboot4extlinux-sunxi/PKGBUILD
+++ b/libre/uboot4extlinux-sunxi/PKGBUILD
@@ -1,11 +1,32 @@
 # Maintainer: Isaac David <isacdaavid@at@isacdaavid@dot@info>
 # Contributor: André Silva <emulatorman@hyperbola.info>
 # Contributor: Timothy Redaelli <timothy.redaelli@gmail.com>
+# Contributor: bill-auger <bill-auger@programmer.net>
 
 
 pkgbase=uboot4extlinux-sunxi
-pkgname='uboot4extlinux-a20-olinuxino-lime2-micrel'
-
+pkgname=( uboot4extlinux-a10-olinuxino-lime
+          uboot4extlinux-a10s-olinuxino-m
+          uboot4extlinux-a13-olinuxino
+          uboot4extlinux-a13-olinuxinom
+          uboot4extlinux-a20-olinuxino-lime
+          uboot4extlinux-a20-olinuxino-lime2
+          uboot4extlinux-a20-olinuxino-lime2-emmc
+          uboot4extlinux-a20-olinuxino-lime2-micrel # FIXME: https://labs.parabola.nu/issues/2945
+          uboot4extlinux-a20-olinuxino_micro
+          uboot4extlinux-bananapi
+          uboot4extlinux-bananapro
+          uboot4extlinux-chip
+          uboot4extlinux-cubieboard
+          uboot4extlinux-cubieboard2
+          uboot4extlinux-cubietruck
+          uboot4extlinux-linksprite_pcduino
+          uboot4extlinux-linksprite_pcduino3
+          uboot4extlinux-linksprite_pcduino3_nano
+          uboot4extlinux-orangepi_2
+          uboot4extlinux-orangepi_one
+          uboot4extlinux-orangepi_pc
+          uboot4extlinux-orangepi_plus )
 pkgver=2021.01
 pkgrel=1
 arch=('armv7h')
@@ -19,90 +40,98 @@ backup=(boot/extlinux/extlinux.conf)
 install=${pkgbase}.install
 
 source=(https://ftp.denx.de/pub/u-boot/u-boot-${pkgver}.tar.bz2{,.sig}
-        boards.sh.inc
         extlinux.conf)
 validpgpkeys=(1A3C7F70E08FAB1707809BBF147C39FF9634B72C) # Thomas Rini
 sha256sums=('b407e1510a74e863b8b5cb42a24625344f0e0c2fc7582d8c866bd899367d0454'
             'SKIP'
-            '52a3526391f28a24bff9832b3aa179de0e607dd649ae95f953efd458865a41e5'
             '3760b46b053e458e1f7c4f2f743674064f4804aa9760e4ccb1f525294f71708d')
 validpgpkeys=(1A3C7F70E08FAB1707809BBF147C39FF9634B72C) # Thomas Rini
 
 
 prepare() {
-  cd u-boot-${pkgver}/configs
+  cd "${srcdir}"/u-boot-${pkgver}
 
-  # https://labs.parabola.nu/issues/2945
+  # FIXME: https://labs.parabola.nu/issues/2945
   local opts='CONFIG_PHY_MICREL=y\nCONFIG_PHY_MICREL_KSZ9031=y\nCONFIG_GMAC_TX_DELAY=4'
-
-  cp A20-OLinuXino-Lime2{,-micrel}_defconfig
-  sed -i "s|CONFIG_PHY_REALTEK=y|${opts}|" A20-OLinuXino-Lime2-micrel_defconfig
+  sed "s|CONFIG_PHY_REALTEK=y|${opts}|" configs/A20-OLinuXino-Lime2_defconfig > \
+                                        configs/A20-OLinuXino-Lime2-micrel_defconfig
+
+  local pkg_name defconfig
+  for pkg_name in ${pkgname[*]}; do
+    defconfig=${pkg_name/uboot4extlinux-/}_defconfig               # lower case
+    defconfig=$(find configs/ -iname ${defconfig} | sed 's|.*/||') # mixed case
+
+    if [[ -n "${defconfig}" ]] ; then
+      echo -e "\n#\n# configuring: ${pkg_name}\n#"
+      make distclean
+      make ${defconfig}
+      echo 'CONFIG_IDENT_STRING=" Parabola GNU/Linux-libre"' >> .config
+      mv {,${pkg_name}}.config
+    else
+      echo "ERROR: defconfig not found for pkg_name: '${pkg_name}'"
+      echo "       package names must correspond precisely (case-insensitive) to a *_defconfig"
+      echo "       eg:                              -->|                   |<--"
+      echo "           if defconfig is:        'configs/A20-OLinuXino_MICRO_defconfig'"
+      echo "           then pkgname is: 'uboot4extlinux-a20-olinuxino_micro'"
+      echo "                                        -->|                   |<--"
+      return 1
+    fi
+  done
 }
 
 build() {
-  cd u-boot-${pkgver}
+  cd "${srcdir}"/u-boot-${pkgver}
 
+  local pkg_name
   unset CFLAGS CXXFLAGS LDFLAGS
-
-  source "${srcdir}"/boards.sh.inc # sets $_BOARDS
-  local board pkg_name out_dir
-#   for board in ${!_BOARDS[@]}; do
-board='A20-OLinuXino-Lime2-micrel'
-
-    pkg_name=uboot4extlinux-${board,,}
-    out_dir=../bin_${pkg_name} ; mkdir -p ${out_dir} ;
-    _BOARDS[${pkg_name}]=${_BOARDS[${board}]} # for _package()
-
-    make distclean
-    make ${board}_defconfig
-    echo 'CONFIG_IDENT_STRING=" Parabola GNU/Linux-libre"' >> .config
-
+  for pkg_name in ${pkgname[*]}; do
+    echo -e "\n#\n# compiling: ${pkg_name}\n#"
+    mv {${pkg_name},}.config
     make EXTRAVERSION=-${pkgrel}
-    mv -f u-boot-sunxi-with-spl.bin ${out_dir}
-#   done
+    mv -f u-boot-sunxi-with-spl.bin ${pkg_name}.bin
+  done
 }
 
-_package() # (pkg_fn_name)
+_package() # (friendly_name)
 {
-  source "${srcdir}"/boards.sh.inc # sets $_BOARDS
-  local pkg_name=${1/package_}
-  local board_name=${_BOARDS[${pkg_name}]}
-pkg_name=uboot4extlinux-a20-olinuxino-lime2-micrel
-board_name='A20 OLinuXino Lime2'
+  cd "${srcdir}"/u-boot-${pkgver}
 
-  pkgdesc="U-Boot + Extlinux for the ${board_name}"
+  local board_name="$1"
+  local pkg_name=${FUNCNAME[1]/package_}
 
-  install -d "${pkgdir}"/boot/extlinux
-  install -d "${pkgdir}"/boot/u-boot/images/
+  pkgdesc="U-Boot + Extlinux for the ${board_name}"
 
-  install -Dm644 bin_${pkg_name}/u-boot-sunxi-with-spl.bin "${pkgdir}"/boot/u-boot/images/
-  install -Dm644 extlinux.conf                             "${pkgdir}"/boot/extlinux
+  echo -e "\n#\n# packaging: ${pkg_name}\n#"
+  install -Dm644 ${pkg_name}.bin           "${pkgdir}"/boot/u-boot/images/u-boot-sunxi-with-spl.bin
+  install -Dm644 "${srcdir}"/extlinux.conf "${pkgdir}"/boot/extlinux/extlinux.conf
 }
 
-# package_uboot4extlinux-a10-olinuxino-lime()        { _package ${FUNCNAME} ; }
-# package_uboot4extlinux-a10s-olinuxino-m() {
-#   replaces=('uboot4extlinux-a10s-olinuxino-micro') ; _package ${FUNCNAME} ; }
-# package_uboot4extlinux-a13-olinuxino()             { _package ${FUNCNAME} ; }
-# package_uboot4extlinux-a13-olinuxinom() {
-#   replaces=('uboot4extlinux-a13-olinuxino-micro')  ; _package ${FUNCNAME} ; }
-# package_uboot4extlinux-a20-olinuxino-lime()        { _package ${FUNCNAME} ; }
-package()       { _package ${FUNCNAME} ; }
-# package_uboot4extlinux-a20-olinuxino-lime2-emmc()  { _package ${FUNCNAME} ; }
-# package_uboot4extlinux-a20-olinuxino_micro() {
-#   replaces=('uboot-a20-olinuxino-micro')           ; _package ${FUNCNAME} ; }
-# package_uboot4extlinux-bananapi()                  { _package ${FUNCNAME} ; }
-# package_uboot4extlinux-bananapro()                 { _package ${FUNCNAME} ; }
-# package_uboot4extlinux-chip()                      { _package ${FUNCNAME} ; }
-# package_uboot4extlinux-cubieboard()                { _package ${FUNCNAME} ; }
-# package_uboot4extlinux-cubieboard2()               { _package ${FUNCNAME} ; }
-# package_uboot4extlinux-cubietruck()                { _package ${FUNCNAME} ; }
-# package_uboot4extlinux-linksprite_pcduino() {
-#   replaces=('uboot4extlinux-pcduino')              ; _package ${FUNCNAME} ; }
-# package_uboot4extlinux-linksprite_pcduino3() {
-#   replaces=('uboot4extlinux-pcduino3')             ; _package ${FUNCNAME} ; }
-# package_uboot4extlinux-linksprite_pcduino3_nano() {
-#   replaces=('uboot4extlinux-pcduino3-nano')        ; _package ${FUNCNAME} ; }
-# package_uboot4extlinux-orangepi_2()                { _package ${FUNCNAME} ; }
-# package_uboot4extlinux-orangepi_one()              { _package ${FUNCNAME} ; }
-# package_uboot4extlinux-orangepi_pc()               { _package ${FUNCNAME} ; }
-# package_uboot4extlinux-orangepi_plus()             { _package ${FUNCNAME} ; }
+package_uboot4extlinux-a10-olinuxino-lime()         { _package 'A10 OLinuXino Lime' ; }
+package_uboot4extlinux-a10s-olinuxino-m()           {
+  replaces=('uboot4extlinux-a10s-olinuxino-micro')  ; _package 'A10s OLinuXino M' ; }
+package_uboot4extlinux-a13-olinuxino()              { _package 'A13 OLinuXino' ; }
+package_uboot4extlinux-a13-olinuxinom()             {
+  replaces=('uboot4extlinux-a13-olinuxino-micro')   ; _package 'A13 OLinuXino M' ; }
+package_uboot4extlinux-a20-olinuxino-lime()         { _package 'A20 OLinuXino Lime' ; }
+package_uboot4extlinux-a20-olinuxino-lime2()        { _package 'A20 OLinuXino Lime2' ; }
+package_uboot4extlinux-a20-olinuxino-lime2-emmc()   { _package 'A20 OLinuXino Lime2 (eMMC)' ; }
+# FIXME: uboot4extlinux-a20-olinuxino-lime2-micrel - https://labs.parabola.nu/issues/2945
+package_uboot4extlinux-a20-olinuxino-lime2-micrel() { _package 'A20 OLinuXino Lime2 (rev H-L)' ; }
+package_uboot4extlinux-a20-olinuxino_micro()        {
+  replaces=('uboot-a20-olinuxino-micro')            ; _package 'A20 OLinuXino MICRO' ; }
+package_uboot4extlinux-bananapi()                   { _package 'Banana Pi' ; }
+package_uboot4extlinux-bananapro()                  { _package 'Banana Pro' ; }
+package_uboot4extlinux-chip()                       { _package 'C.H.I.P.' ; }
+package_uboot4extlinux-cubieboard()                 { _package 'Cubieboard' ; }
+package_uboot4extlinux-cubieboard2()                { _package 'Cubieboard2' ; }
+package_uboot4extlinux-cubietruck()                 { _package 'Cubietruck' ; }
+package_uboot4extlinux-linksprite_pcduino()         {
+  replaces=('uboot4extlinux-pcduino')               ; _package 'Linksprite pcDuino' ; }
+package_uboot4extlinux-linksprite_pcduino3()        {
+  replaces=('uboot4extlinux-pcduino3')              ; _package 'Linksprite pcDuino3' ; }
+package_uboot4extlinux-linksprite_pcduino3_nano()   {
+  replaces=('uboot4extlinux-pcduino3-nano')         ; _package 'Linksprite pcDuino3 Nano' ; }
+package_uboot4extlinux-orangepi_2()                 { _package 'Orangepi2' ; }
+package_uboot4extlinux-orangepi_one()               { _package 'Orangepi One' ; }
+package_uboot4extlinux-orangepi_pc()                { _package 'Orangepi PC' ; }
+package_uboot4extlinux-orangepi_plus()              { _package 'Orangepi Plus' ; }
diff --git a/libre/uboot4extlinux-sunxi/boards.sh.inc b/libre/uboot4extlinux-sunxi/boards.sh.inc
deleted file mode 100644
index a68f7f2b5..000000000
--- a/libre/uboot4extlinux-sunxi/boards.sh.inc
+++ /dev/null
@@ -1,29 +0,0 @@
-# this is a separate file because makepkg does not recognize associative arrays
-# declared in the outter scope
-
-# _BOARDS keys are each '<KEY>_defconfig' prefix
-# _BOARDS values are friendly names for pkgdesc
-# ASSERT: all in pkgname must be precisely the lower-case of a _BOARDS key
-declare -A _BOARDS=( [A10-OLinuXino-Lime]='A10 OLinuXino Lime'
-                     [A10s-OLinuXino-M]='A10s OLinuXino M'
-                     [A13-OLinuXino]='A13 OLinuXino'
-                     [A13-OLinuXinoM]='A13 OLinuXino M'
-                     [A20-OLinuXino-Lime]='A20 OLinuXino Lime'
-                     [A20-OLinuXino-Lime2]='A20 OLinuXino Lime2'
-                     [A20-OLinuXino-Lime2-eMMC]='A20 OLinuXino Lime2 (eMMC)'
-                     [A20-OLinuXino-Lime2-eMMC]='A20 OLinuXino Lime2 (rev H-L)'
-                     [A20-OLinuXino_MICRO]='A20 OLinuXino MICRO'
-                     [Bananapi]='Banana Pi'
-                     [Bananapro]='Banana Pro'
-                     [CHIP]='C.H.I.P.'
-                     [Cubieboard]='Cubieboard'
-                     [Cubieboard2]='Cubieboard2'
-                     [Cubietruck]='Cubietruck'
-                     [Linksprite_pcDuino]='Linksprite pcDuino'
-                     [Linksprite_pcDuino3]='Linksprite pcDuino3'
-                     [Linksprite_pcDuino3_Nano]='Linksprite pcDuino3 Nano'
-                     [orangepi_2]='Orangepi2'
-                     [orangepi_one]='Orangepi One'
-                     [orangepi_pc]='Orangepi PC'
-                     [orangepi_plus]='Orangepi Plus'
-)