uboot4extlinux-udoo: move package to [libre]

7 files changed, 158 insertions, 124 deletions

diff --git a/libre/uboot-udoo-linux-libre/PKGBUILD b/libre/uboot-udoo-linux-libre/PKGBUILD
deleted file mode 100644
index 001d5bf99..000000000
--- a/libre/uboot-udoo-linux-libre/PKGBUILD
+++ /dev/null
@@ -1,61 +0,0 @@
-# U-Boot: UDOO
-# Maintainer (Arch): Kevin Mihelich <kevin@archlinuxarm.org>
-# Contributor: André Silva <emulatorman@parabola.nu>
-
-buildarch=4
-
-_pkgbase=linux-libre
-pkgbase=uboot-udoo-${_pkgbase}
-pkgname=("uboot-udoo-dual-${_pkgbase}" "uboot-udoo-quad-${_pkgbase}")
-pkgver=2015.01
-pkgrel=1.1
-arch=('armv7h')
-url="http://git.denx.de/u-boot.git/"
-license=('GPL')
-makedepends=('bc')
-depends=('linux-libre')
-source=("ftp://ftp.denx.de/pub/u-boot/u-boot-${pkgver}.tar.bz2"
-        '0001-parabola-arm-modifications.patch'
-        '0002-kernel-add-support-for-gcc-5.patch')
-md5sums=('7f08dc9e98a71652bd6968888ed6ec95'
-         '818143fb9e57d4aef9684365b0623901'
-         '721a46867e189d8dedc6b6f86a536a34')
-
-prepare() {
-  cd u-boot-${pkgver}
-
-  patch -Np1 -i ../0001-parabola-arm-modifications.patch
-  patch -Np1 -i ../0002-kernel-add-support-for-gcc-5.patch
-}
-
-build() {
-  cd u-boot-${pkgver}
-  
-  unset CFLAGS CXXFLAGS LDFLAGS
-  
-  mkdir bins
-  for i in dl quad; do
-    make distclean
-    make udoo_${i}_config
-    make
-    mv u-boot.imx bins/u-boot-${i}.imx
-  done
-}
-
-package_uboot-udoo-dual-linux-libre() {
-  pkgdesc="U-Boot for UDOO Dual (built for the linux-libre kernel package)"
-  replaces=('uboot-udoo-dual')
-  install=${pkgname}.install
-
-  mkdir -p "${pkgdir}/boot/${pkgname}"
-  cp u-boot-${pkgver}/bins/u-boot-dl.imx "${pkgdir}/boot/${pkgname}"/u-boot.imx
-}
-
-package_uboot-udoo-quad-linux-libre() {
-  pkgdesc="U-Boot for UDOO Quad (built for the linux-libre kernel package)"
-  replaces=('uboot-udoo-quad')
-  install=${pkgname}.install
-
-  mkdir -p "${pkgdir}/boot/${pkgname}"
-  cp u-boot-${pkgver}/bins/u-boot-quad.imx "${pkgdir}/boot/${pkgname}"/u-boot.imx
-}
diff --git a/libre/uboot-udoo-linux-libre/uboot-udoo-quad-linux-libre.install b/libre/uboot-udoo-linux-libre/uboot-udoo-quad-linux-libre.install
deleted file mode 100644
index 60376bc46..000000000
--- a/libre/uboot-udoo-linux-libre/uboot-udoo-quad-linux-libre.install
+++ /dev/null
@@ -1,23 +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/uboot-udoo-quad-linux-libre/u-boot.imx of=/dev/mmcblk0 bs=512 seek=2
-    sync
-  else
-    echo "You can do this later by running:"
-    echo "# dd if=/boot/uboot-udoo-quad-linux-libre/u-boot.imx of=/dev/mmcblk0 bs=512 seek=2"
-  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
-}
diff --git a/libre/uboot-udoo-linux-libre/0001-parabola-arm-modifications.patch b/libre/uboot4extlinux-udoo/0001-parabola-arm-modifications.patch
index 88a2afa8c..7328d1ad7 100644
--- a/libre/uboot-udoo-linux-libre/0001-parabola-arm-modifications.patch
+++ b/libre/uboot4extlinux-udoo/0001-parabola-arm-modifications.patch
@@ -1,8 +1,6 @@
-diff --git a/board/udoo/1066mhz_4x256mx16_dl.cfg b/board/udoo/1066mhz_4x256mx16_dl.cfg
-new file mode 100644
-index 0000000..e37c9f9
---- /dev/null
-+++ b/board/udoo/1066mhz_4x256mx16_dl.cfg
+diff -Nur u-boot-2015.01.orig/board/udoo/1066mhz_4x256mx16_dl.cfg u-boot-2015.01/board/udoo/1066mhz_4x256mx16_dl.cfg
+--- u-boot-2015.01.orig/board/udoo/1066mhz_4x256mx16_dl.cfg	1969-12-31 21:00:00.000000000 -0300
++++ u-boot-2015.01/board/udoo/1066mhz_4x256mx16_dl.cfg	2016-02-23 18:15:32.854611743 -0300
 @@ -0,0 +1,58 @@
 +/*
 + * Copyright (C) 2013 Seco USA Inc
@@ -62,11 +60,9 @@ index 0000000..e37c9f9
 +DATA 4, MX6_MMDC_P0_MDPDC,	0x0002556D
 +DATA 4, MX6_MMDC_P0_MAPSR,	0x00011006
 +DATA 4, MX6_MMDC_P0_MDSCR,	0x00000000
-diff --git a/board/udoo/ddr-setup_dl.cfg b/board/udoo/ddr-setup_dl.cfg
-new file mode 100644
-index 0000000..487570e
---- /dev/null
-+++ b/board/udoo/ddr-setup_dl.cfg
+diff -Nur u-boot-2015.01.orig/board/udoo/ddr-setup_dl.cfg u-boot-2015.01/board/udoo/ddr-setup_dl.cfg
+--- u-boot-2015.01.orig/board/udoo/ddr-setup_dl.cfg	1969-12-31 21:00:00.000000000 -0300
++++ u-boot-2015.01/board/udoo/ddr-setup_dl.cfg	2016-02-23 18:15:32.854611743 -0300
 @@ -0,0 +1,84 @@
 +/*
 + * Copyright (C) 2013 Seco USA Inc
@@ -152,11 +148,9 @@ index 0000000..487570e
 +DATA 4, MX6_MMDC_P1_MPRDDQBY1DL,	0x33333333
 +DATA 4, MX6_MMDC_P1_MPRDDQBY2DL,	0x33333333
 +DATA 4, MX6_MMDC_P1_MPRDDQBY3DL,	0x33333333
-diff --git a/board/udoo/udoo-dl.cfg b/board/udoo/udoo-dl.cfg
-new file mode 100644
-index 0000000..46953c1
---- /dev/null
-+++ b/board/udoo/udoo-dl.cfg
+diff -Nur u-boot-2015.01.orig/board/udoo/udoo-dl.cfg u-boot-2015.01/board/udoo/udoo-dl.cfg
+--- u-boot-2015.01.orig/board/udoo/udoo-dl.cfg	1969-12-31 21:00:00.000000000 -0300
++++ u-boot-2015.01/board/udoo/udoo-dl.cfg	2016-02-23 18:15:32.854611743 -0300
 @@ -0,0 +1,29 @@
 +/*
 + * Copyright (C) 2013 Boundary Devices
@@ -187,19 +181,16 @@ index 0000000..46953c1
 +#include "ddr-setup_dl.cfg"
 +#include "1066mhz_4x256mx16_dl.cfg"
 +#include "clocks.cfg"
-diff --git a/configs/udoo_dl_defconfig b/configs/udoo_dl_defconfig
-new file mode 100644
-index 0000000..5dc9016
---- /dev/null
-+++ b/configs/udoo_dl_defconfig
+diff -Nur u-boot-2015.01.orig/configs/udoo_dl_defconfig u-boot-2015.01/configs/udoo_dl_defconfig
+--- u-boot-2015.01.orig/configs/udoo_dl_defconfig	1969-12-31 21:00:00.000000000 -0300
++++ u-boot-2015.01/configs/udoo_dl_defconfig	2016-02-23 18:15:32.854611743 -0300
 @@ -0,0 +1,3 @@
 +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/udoo/udoo-dl.cfg,MX6DL,DDR_MB=1024"
 +CONFIG_ARM=y
 +CONFIG_TARGET_UDOO=y
-diff --git a/include/configs/udoo.h b/include/configs/udoo.h
-index 700e9c1..7fdce0f 100644
---- a/include/configs/udoo.h
-+++ b/include/configs/udoo.h
+diff -Nur u-boot-2015.01.orig/include/configs/udoo.h u-boot-2015.01/include/configs/udoo.h
+--- u-boot-2015.01.orig/include/configs/udoo.h	2015-01-12 12:39:08.000000000 -0200
++++ u-boot-2015.01/include/configs/udoo.h	2016-02-23 18:24:17.779054304 -0300
 @@ -78,7 +78,7 @@
  #define CONFIG_CMD_BMODE
  #define CONFIG_CMD_SETEXPR
@@ -209,7 +200,7 @@ index 700e9c1..7fdce0f 100644
  
  #define CONFIG_SYS_MEMTEST_START	0x10000000
  #define CONFIG_SYS_MEMTEST_END		(CONFIG_SYS_MEMTEST_START + 500 * SZ_1M)
-@@ -96,60 +96,97 @@
+@@ -96,60 +96,107 @@
  #define CONFIG_BOUNCE_BUFFER
  #define CONFIG_CMD_EXT2
  #define CONFIG_CMD_FAT
@@ -224,28 +215,37 @@ index 700e9c1..7fdce0f 100644
 +#elif defined(CONFIG_MX6Q)
  #define CONFIG_DEFAULT_FDT_FILE		"imx6q-udoo.dtb"
 +#endif
++
++/* Enable Extlinux boot support */
++#define CONFIG_CMD_PXE
++#define CONFIG_MENU
++#define BOOT_TARGET_DEVICES(func)
++#include <config_distro_bootcmd.h>
  
  #define CONFIG_EXTRA_ENV_SETTINGS \
 -	"script=boot.scr\0" \
 -	"image=zImage\0" \
 -	"console=ttymxc1\0" \
-+	"bootfile=vmlinuz-linux-libre\0" \
++	BOOTENV \
++	"bootfile=zImage\0" \
 +	"bootdir=/boot\0" \
 +	"console=ttymxc1,115200\0" \
  	"splashpos=m,m\0" \
  	"fdt_high=0xffffffff\0" \
 +	"rdaddr=0x12A00000\0" \
-+	"rdfile=initramfs-linux-libre.img\0" \
++	"rdfile=initramfs-linux.img\0" \
  	"initrd_high=0xffffffff\0" \
 -	"fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0" \
 -	"fdt_addr=0x18000000\0" \
 -	"boot_fdt=try\0" \
 +	"fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \
-+	"fdtdir=/boot/dtbs/linux-libre\0" \
++	"fdtdir=/boot/dtbs\0" \
 +	"fdtaddr=0x18000000\0" \
  	"ip_dyn=yes\0" \
 +	"optargs=\0" \
 +	"video=\0" \
++	"devtype=mmc\0" \
++	"devnum=0\0" \
  	"mmcdev=0\0" \
 -	"mmcpart=1\0" \
 -	"mmcroot=/dev/mmcblk0p2 rootwait rw\0" \
@@ -318,17 +318,18 @@ index 700e9c1..7fdce0f 100644
 +		"if mmc rescan; then " \
 +			"echo SD/MMC found on device ${mmcdev};" \
 +			"setenv bootpart ${mmcdev}:1; " \
-+			"echo Checking for: ${bootdir}/uboot-udoo-linux-libre/uEnv.txt ...;" \
-+			"if test -e mmc ${bootpart} ${bootdir}/uboot-udoo-linux-libre/uEnv.txt; then " \
-+				"load mmc ${bootpart} ${loadaddr} ${bootdir}/uboot-udoo-linux-libre/uEnv.txt;" \
++			"echo Checking for: ${bootdir}/uEnv.txt ...;" \
++			"if test -e mmc ${bootpart} ${bootdir}/uEnv.txt; then " \
++				"load mmc ${bootpart} ${loadaddr} ${bootdir}/uEnv.txt;" \
 +				"env import -t ${loadaddr} ${filesize};" \
-+				"echo Loaded environment from ${bootdir}/uboot-udoo-linux-libre/uEnv.txt;" \
++				"echo Loaded environment from ${bootdir}/uEnv.txt;" \
 +				"echo Checking if uenvcmd is set ...;" \
 +				"if test -n ${uenvcmd}; then " \
 +					"echo Running uenvcmd ...;" \
 +					"run uenvcmd;" \
 +				"fi;" \
 +			"fi; " \
++			"run scan_dev_for_boot;" \
 +			"if run loadimage; then " \
 +				"if run loadfdt; then " \
 +					"run mmcargs;" \
@@ -346,7 +347,7 @@ index 700e9c1..7fdce0f 100644
  		"fi;\0" \
  	"netargs=setenv bootargs console=${console},${baudrate} " \
  		"root=/dev/nfs " \
-@@ -161,10 +198,10 @@
+@@ -161,10 +208,10 @@
  		"else " \
  			"setenv get_cmd tftp; " \
  		"fi; " \
@@ -360,7 +361,7 @@ index 700e9c1..7fdce0f 100644
  			"else " \
  				"if test ${boot_fdt} = try; then " \
  					"bootz; " \
-@@ -177,16 +214,7 @@
+@@ -177,16 +224,7 @@
  		"fi;\0"
  
  #define CONFIG_BOOTCOMMAND \
@@ -378,7 +379,7 @@ index 700e9c1..7fdce0f 100644
  
  /* Miscellaneous configurable options */
  #define CONFIG_SYS_LONGHELP
-@@ -228,6 +256,7 @@
+@@ -227,6 +265,7 @@
  
  #define CONFIG_OF_LIBFDT
  #define CONFIG_CMD_BOOTZ
@@ -386,6 +387,3 @@ index 700e9c1..7fdce0f 100644
  
  #ifndef CONFIG_SYS_DCACHE_OFF
  #define CONFIG_CMD_CACHE
--- 
-2.2.1
-
diff --git a/libre/uboot-udoo-linux-libre/0002-kernel-add-support-for-gcc-5.patch b/libre/uboot4extlinux-udoo/0002-kernel-add-support-for-gcc-5.patch
index 30718c561..30718c561 100644
--- a/libre/uboot-udoo-linux-libre/0002-kernel-add-support-for-gcc-5.patch
+++ b/libre/uboot4extlinux-udoo/0002-kernel-add-support-for-gcc-5.patch
diff --git a/libre/uboot4extlinux-udoo/PKGBUILD b/libre/uboot4extlinux-udoo/PKGBUILD
new file mode 100644
index 000000000..41f6960a4
--- /dev/null
+++ b/libre/uboot4extlinux-udoo/PKGBUILD
@@ -0,0 +1,69 @@
+# U-Boot: UDOO
+# Maintainer: André Silva <emulatorman@parabola.nu>
+
+buildarch=4
+
+pkgbase=uboot4extlinux-udoo
+pkgname=('uboot4extlinux-udoo_dl' 'uboot4extlinux-udoo_quad')
+pkgver=2015.01
+pkgrel=1
+arch=('armv7h')
+url="http://git.denx.de/u-boot.git/"
+license=('GPL')
+makedepends=('bc')
+backup=(boot/extlinux/extlinux.conf)
+source=("ftp://ftp.denx.de/pub/u-boot/u-boot-${pkgver}.tar.bz2"
+        '0001-parabola-arm-modifications.patch'
+        '0002-kernel-add-support-for-gcc-5.patch'
+        'extlinux.conf')
+md5sums=('7f08dc9e98a71652bd6968888ed6ec95'
+         'f90125a266a2cd80980464f949d03d88'
+         '721a46867e189d8dedc6b6f86a536a34'
+         'e05d2d41a1bdbbd5d6fec02534784dcd')
+
+prepare() {
+  cd u-boot-${pkgver}
+
+  patch -Np1 -i ../0001-parabola-arm-modifications.patch
+  patch -Np1 -i ../0002-kernel-add-support-for-gcc-5.patch
+}
+
+build() {
+  cd u-boot-${pkgver}
+  
+  unset CFLAGS CXXFLAGS LDFLAGS
+  
+  mkdir bins
+  for i in dl quad; do
+    make distclean
+    make udoo_${i}_config
+    make
+    mv u-boot.imx bins/u-boot-${i}.imx
+  done
+}
+
+package_uboot4extlinux-udoo_dl() {
+  pkgdesc="U-Boot with Extlinux support for UDOO Dual"
+  replaces=('uboot-udoo-dual-linux-libre' 'uboot-udoo-dual-linux-libre-grsec'
+            'uboot-udoo-dual' 'uboot-udoo_dl')
+  conflicts=('uboot-udoo-dual-linux-libre' 'uboot-udoo-dual-linux-libre-grsec'
+             'uboot-udoo-dual' 'uboot-udoo_dl' 'uboot4extlinux-udoo_quad' 'uboot4grub-udoo_dl' 'uboot4grub-udoo_quad')
+  install=${pkgbase}.install
+
+  mkdir -p "${pkgdir}"/boot/extlinux
+  cp u-boot-${pkgver}/bins/u-boot-dl.imx "${pkgdir}"/boot/u-boot.imx
+  cp "${srcdir}"/extlinux.conf "${pkgdir}"/boot/extlinux
+}
+
+package_uboot4extlinux-udoo_quad() {
+  pkgdesc="U-Boot with Extlinux support for UDOO Quad"
+  replaces=('uboot-udoo-quad-linux-libre' 'uboot-udoo-quad-linux-libre-grsec'
+            'uboot-udoo-quad' 'uboot-udoo_quad')
+  conflicts=('uboot-udoo-quad-linux-libre' 'uboot-udoo-quad-linux-libre-grsec'
+             'uboot-udoo-quad' 'uboot-udoo_quad' 'uboot4extlinux-udoo_dl'  'uboot4grub-udoo_dl' 'uboot4grub-udoo_quad')
+  install=${pkgbase}.install
+
+  mkdir -p "${pkgdir}"/boot/extlinux
+  cp u-boot-${pkgver}/bins/u-boot-quad.imx "${pkgdir}"/boot/u-boot.imx
+  cp "${srcdir}"/extlinux.conf "${pkgdir}"/boot/extlinux
+}
diff --git a/libre/uboot4extlinux-udoo/extlinux.conf b/libre/uboot4extlinux-udoo/extlinux.conf
new file mode 100644
index 000000000..45d603094
--- /dev/null
+++ b/libre/uboot4extlinux-udoo/extlinux.conf
@@ -0,0 +1,46 @@
+menu title Welcome to U-Boot with Extlinux support!
+
+label Parabola GNU/Linux-libre, linux-libre kernel
+	kernel /boot/vmlinuz-linux-libre
+	append root=/dev/mmcblk0p1 rw console=ttymxc1,115200
+	fdtdir /boot/dtbs/linux-libre
+
+#label Parabola GNU/Linux-libre, linux-libre-lts kernel
+#	kernel /boot/vmlinuz-linux-libre-lts
+#	append root=/dev/mmcblk0p1 rw console=ttymxc1,115200
+#	fdtdir /boot/dtbs/linux-libre-lts
+
+#label Parabola GNU/Linux-libre, linux-libre-knock kernel
+#	kernel /boot/vmlinuz-linux-libre-knock
+#	append root=/dev/mmcblk0p1 rw console=ttymxc1,115200
+#	fdtdir /boot/dtbs/linux-libre-knock
+
+#label Parabola GNU/Linux-libre, linux-libre-lts-knock kernel
+#	kernel /boot/vmlinuz-linux-libre-lts-knock
+#	append root=/dev/mmcblk0p1 rw console=ttymxc1,115200
+#	fdtdir /boot/dtbs/linux-libre-lts-knock
+
+#label Parabola GNU/Linux-libre, linux-libre-grsec kernel
+#	kernel /boot/vmlinuz-linux-libre-grsec
+#	append root=/dev/mmcblk0p1 rw console=ttymxc1,115200
+#	fdtdir /boot/dtbs/linux-libre-grsec
+
+#label Parabola GNU/Linux-libre, linux-libre-grsec-knock kernel
+#	kernel /boot/vmlinuz-linux-libre-grsec-knock
+#	append root=/dev/mmcblk0p1 rw console=ttymxc1,115200
+#	fdtdir /boot/dtbs/linux-libre-grsec-knock
+
+#label Parabola GNU/Linux-libre, linux-libre-audit kernel
+#	kernel /boot/vmlinuz-linux-libre-audit
+#	append root=/dev/mmcblk0p1 rw console=ttymxc1,115200
+#	fdtdir /boot/dtbs/linux-libre-audit
+
+#label Parabola GNU/Linux-libre, linux-libre-pck kernel
+#	kernel /boot/vmlinuz-linux-libre-pck
+#	append root=/dev/mmcblk0p1 rw console=ttymxc1,115200
+#	fdtdir /boot/dtbs/linux-libre-pck
+
+#label Parabola GNU/Linux-libre, linux-libre-rt kernel
+#	kernel /boot/vmlinuz-linux-libre-rt
+#	append root=/dev/mmcblk0p1 rw console=ttymxc1,115200
+#	fdtdir /boot/dtbs/linux-libre-rt
diff --git a/libre/uboot-udoo-linux-libre/uboot-udoo-dual-linux-libre.install b/libre/uboot4extlinux-udoo/uboot4extlinux-udoo.install
index 64a7695b0..8a45c3b16 100644
--- a/libre/uboot-udoo-linux-libre/uboot-udoo-dual-linux-libre.install
+++ b/libre/uboot4extlinux-udoo/uboot4extlinux-udoo.install
@@ -1,14 +1,19 @@
+extlinux_warning() {
+  echo "==> WARNING: U-Boot uses Extlinux support to boot up. For setting it up, edit /boot/extlinux/extlinux.conf"
+}
+
 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/uboot-udoo-dual-linux-libre/u-boot.imx of=/dev/mmcblk0 bs=512 seek=2
+    dd if=/boot/u-boot.imx of=/dev/mmcblk0 bs=512 seek=2
     sync
   else
     echo "You can do this later by running:"
-    echo "# dd if=/boot/uboot-udoo-dual-linux-libre/u-boot.imx of=/dev/mmcblk0 bs=512 seek=2"
+    echo "# dd if=/boot/u-boot.imx of=/dev/mmcblk0 bs=512 seek=2"
   fi
+  extlinux_warning
 }
 
 ## arg 1:  the new package version