uboot-sunxi-2016.07-1.parabola1: updating version

2 files changed, 99 insertions, 35 deletions

diff --git a/libre/uboot-sunxi/0001-parabola-arm-modifications.patch b/libre/uboot-sunxi/0001-parabola-arm-modifications.patch
index fc504d587..c7ecda6fb 100644
--- a/libre/uboot-sunxi/0001-parabola-arm-modifications.patch
+++ b/libre/uboot-sunxi/0001-parabola-arm-modifications.patch
@@ -1,28 +1,28 @@
 diff --git a/include/config_distro_defaults.h b/include/config_distro_defaults.h
-index 9d1de55..b75c454 100644
+index 766a212..0df77cd 100644
 --- a/include/config_distro_defaults.h
 +++ b/include/config_distro_defaults.h
-@@ -67,4 +67,7 @@
+@@ -57,4 +57,7 @@
  #define CONFIG_SUPPORT_RAW_INITRD
- #define CONFIG_SYS_HUSH_PARSER
+ #define CONFIG_ENV_VARS_UBOOT_CONFIG
  
 +#define CONFIG_CMD_PART
 +#define CONFIG_PARTITION_UUIDS
 +
  #endif	/* _CONFIG_CMD_DISTRO_DEFAULTS_H */
 diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h
-index f5db4d3..1cdba92 100644
+index 2406115..8c64bbd 100644
 --- a/include/configs/sunxi-common.h
 +++ b/include/configs/sunxi-common.h
-@@ -176,7 +176,7 @@
+@@ -173,7 +173,7 @@
  #define CONFIG_SYS_NO_FLASH
  
  #define CONFIG_SYS_MONITOR_LEN		(768 << 10)	/* 768 KiB */
 -#define CONFIG_IDENT_STRING		" Allwinner Technology"
 +#define CONFIG_IDENT_STRING		" Parabola GNU/Linux-libre"
+ #define CONFIG_DISPLAY_BOARDINFO
  
  #define CONFIG_ENV_OFFSET		(544 << 10) /* (8 + 24 + 512) KiB */
- #define CONFIG_ENV_SIZE			(128 << 10)	/* 128 KiB */
 -- 
-2.6.1
+2.8.3
 
diff --git a/libre/uboot-sunxi/PKGBUILD b/libre/uboot-sunxi/PKGBUILD
index 7af67a648..7eed9751e 100644
--- a/libre/uboot-sunxi/PKGBUILD
+++ b/libre/uboot-sunxi/PKGBUILD
@@ -6,22 +6,26 @@ buildarch=4
 
 pkgbase=uboot-sunxi
 pkgname=('uboot-a10-olinuxino-lime'
-         'uboot-a10s-olinuxino-micro'
+         'uboot-a10s-olinuxino-m'
          'uboot-a13-olinuxino'
-         'uboot-a13-olinuxino-micro'
+         'uboot-a13-olinuxinom'
          'uboot-a20-olinuxino-lime'
          'uboot-a20-olinuxino-lime2'
-         'uboot-a20-olinuxino-micro'
+         'uboot-a20-olinuxino_micro'
          'uboot-bananapi'
          'uboot-bananapro'
          'uboot-chip'
          'uboot-cubieboard'
          'uboot-cubieboard2'
          'uboot-cubietruck'
-         'uboot-pcduino'
-         'uboot-pcduino3'
-         'uboot-pcduino3-nano')
-pkgver=2016.03
+         'uboot-linksprite_pcduino'
+         'uboot-linksprite_pcduino3'
+         'uboot-linksprite_pcduino3_nano'
+         'uboot-orangepi_2'
+         'uboot-orangepi_one'
+         'uboot-orangepi_pc'
+         'uboot-orangepi_plus')
+pkgver=2016.07
 pkgrel=1.parabola1
 arch=('armv7h')
 url="http://git.denx.de/u-boot.git/"
@@ -33,8 +37,8 @@ source=("ftp://ftp.denx.de/pub/u-boot/u-boot-${pkgver}.tar.bz2"
         '0001-parabola-arm-modifications.patch'
         'boot.txt'
         'mkscr')
-md5sums=('973c1d896be751321cc3aafa564f64b2'
-         'c66a4ef7a5be5622b674a69a9035558a'
+md5sums=('425a3fa610a7d972e5092a0e92276c70'
+         '7cc4438cd6b6c032c9068e3c6ee8d11b'
          'a149665c52dc30817f98040b77999aeb'
          '021623a04afd29ac3f368977140cfbfd')
 
@@ -53,7 +57,11 @@ boards=('A10-OLinuXino-Lime'
         'Cubietruck'
         'Linksprite_pcDuino'
         'Linksprite_pcDuino3'
-        'Linksprite_pcDuino3_Nano')
+        'Linksprite_pcDuino3_Nano'
+        'orangepi_2'
+        'orangepi_one'
+        'orangepi_pc'
+        'orangepi_plus')
 
 prepare() {
   cd u-boot-${pkgver}
@@ -94,12 +102,12 @@ package_uboot-a10-olinuxino-lime() {
   install -Dm755 mkscr "${pkgdir}"/boot/mkscr
 }
 
-package_uboot-a10s-olinuxino-micro() {
+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-linux-libre')
+  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
@@ -124,12 +132,12 @@ package_uboot-a13-olinuxino() {
   install -Dm755 mkscr "${pkgdir}"/boot/mkscr
 }
 
-package_uboot-a13-olinuxino-micro() {
+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-linux-libre')
+  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
@@ -169,12 +177,12 @@ package_uboot-a20-olinuxino-lime2() {
   install -Dm755 mkscr "${pkgdir}"/boot/mkscr
 }
 
-package_uboot-a20-olinuxino-micro() {
+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-linux-libre')
+  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
@@ -191,7 +199,7 @@ package_uboot-bananapi() {
   conflicts=('uboot-sunxi' 'uboot4extlinux-sunxi' 'uboot4grub-sunxi')
 
   install -d "${pkgdir}"/boot
-  install -Dm644 bin_Bananapi/u-boot-sunxi-with-spl.bin "${pkgdir}"/boot/u-boot-sunxi-with-spl.bin
+  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
@@ -205,7 +213,7 @@ package_uboot-bananapro() {
   conflicts=('uboot-sunxi' 'uboot4extlinux-sunxi' 'uboot4grub-sunxi')
 
   install -d "${pkgdir}"/boot
-  install -Dm644 bin_Bananapro/u-boot-sunxi-with-spl.bin "${pkgdir}"/boot/u-boot-sunxi-with-spl.bin
+  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
@@ -219,7 +227,7 @@ package_uboot-chip() {
   conflicts=('uboot-sunxi' 'uboot4extlinux-sunxi' 'uboot4grub-sunxi')
 
   install -d "${pkgdir}"/boot
-  install -Dm644 bin_CHIP/u-boot-sunxi-with-spl.bin "${pkgdir}"/boot/u-boot-sunxi-with-spl.bin
+  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
@@ -234,7 +242,7 @@ package_uboot-cubieboard() {
   replaces=('uboot-cubieboard-linux-libre')
 
   install -d "${pkgdir}"/boot
-  install -Dm644 bin_Cubieboard/u-boot-sunxi-with-spl.bin "${pkgdir}"/boot/u-boot-sunxi-with-spl.bin
+  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
@@ -249,7 +257,7 @@ package_uboot-cubieboard2() {
   replaces=('uboot-cubieboard2-linux-libre')
 
   install -d "${pkgdir}"/boot
-  install -Dm644 bin_Cubieboard2/u-boot-sunxi-with-spl.bin "${pkgdir}"/boot/u-boot-sunxi-with-spl.bin
+  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
@@ -264,19 +272,19 @@ package_uboot-cubietruck() {
   replaces=('uboot-cubietruck-linux-libre')
 
   install -d "${pkgdir}"/boot
-  install -Dm644 bin_Cubietruck/u-boot-sunxi-with-spl.bin "${pkgdir}"/boot/u-boot-sunxi-with-spl.bin
+  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-pcduino() {
+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-linux-libre')
+  replaces=('uboot-pcduino' 'uboot-pcduino-linux-libre')
 
   install -d "${pkgdir}"/boot
   install -Dm644 bin_Linksprite_pcDuino/u-boot-sunxi-with-spl.bin "${pkgdir}"/boot
@@ -286,12 +294,12 @@ package_uboot-pcduino() {
   install -Dm755 mkscr "${pkgdir}"/boot/mkscr
 }
 
-package_uboot-pcduino3() {
+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-linux-libre')
+  replaces=('uboot-pcduino3' 'uboot-pcduino3-linux-libre')
 
   install -d "${pkgdir}"/boot
   install -Dm644 bin_Linksprite_pcDuino3/u-boot-sunxi-with-spl.bin "${pkgdir}"/boot
@@ -301,12 +309,12 @@ package_uboot-pcduino3() {
   install -Dm755 mkscr "${pkgdir}"/boot/mkscr
 }
 
-package_uboot-pcduino3-nano() {
+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-linux-libre')
+  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
@@ -315,3 +323,59 @@ package_uboot-pcduino3-nano() {
   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
+}