uboot-omap3_beagle: add new package to [libre]

6 files changed, 140 insertions, 72 deletions

diff --git a/libre/uboot-beagleboard-linux-libre/PKGBUILD b/libre/uboot-beagleboard-linux-libre/PKGBUILD
deleted file mode 100644
index 8cf7ecca5..000000000
--- a/libre/uboot-beagleboard-linux-libre/PKGBUILD
+++ /dev/null
@@ -1,44 +0,0 @@
-# U-Boot: BeagleBoard and BeagleBoard-xM
-# Maintainer (Arch): Kevin Mihelich <kevin@archlinuxarm.org>
-# Contributor: André Silva <emulatorman@parabola.nu>
-
-buildarch=4
-
-_pkgname=linux-libre
-pkgname=uboot-beagleboard-${_pkgname}
-pkgver=2015.04
-pkgrel=1
-pkgdesc="U-Boot for BeagleBoard and BeagleBoard-xM (built for the linux-libre kernel package)"
-arch=('armv7h')
-url="http://git.denx.de/u-boot.git/"
-license=('GPL')
-depends=('linux-libre')
-makedepends=('bc')
-replaces=('uboot-beagleboard')
-source=("ftp://ftp.denx.de/pub/u-boot/u-boot-${pkgver}.tar.bz2"
-        '0001-parabola-arm-modifications.patch'
-        'uEnv.txt')
-md5sums=('570bdc2c47270c2a98ca60ff6c5c74cd'
-         '98d94d7e1ac1302da57c89dc3b5b9f5b'
-         'd41d8cd98f00b204e9800998ecf8427e')
-
-prepare() {
-  cd u-boot-${pkgver}
-  patch -Np1 -i ../0001-parabola-arm-modifications.patch
-}
-
-build() {
-  cd u-boot-${pkgver}
-
-  unset LDFLAGS CFLAGS CXXFLAGS
-
-  make distclean 
-  make omap3_beagle_config
-  make
-}
-
-package() {
-  cd u-boot-${pkgver}
-  mkdir -p "${pkgdir}/boot/${pkgname}"
-  cp MLO u-boot.img "${srcdir}"/uEnv.txt "${pkgdir}/boot/${pkgname}"
-}
diff --git a/libre/uboot-beagleboard-linux-libre/0001-parabola-arm-modifications.patch b/libre/uboot-omap3_beagle/0001-parabola-arm-modifications.patch
index dbca32bb5..c99cd89b8 100644
--- a/libre/uboot-beagleboard-linux-libre/0001-parabola-arm-modifications.patch
+++ b/libre/uboot-omap3_beagle/0001-parabola-arm-modifications.patch
@@ -1,7 +1,6 @@
-diff --git a/board/ti/beagle/beagle.c b/board/ti/beagle/beagle.c
-index 7b37fbe..ff986ff 100644
---- a/board/ti/beagle/beagle.c
-+++ b/board/ti/beagle/beagle.c
+diff -Nur u-boot-2016.01.orig/board/ti/beagle/beagle.c u-boot-2016.01/board/ti/beagle/beagle.c
+--- u-boot-2016.01.orig/board/ti/beagle/beagle.c	2016-01-12 11:06:54.000000000 -0300
++++ u-boot-2016.01/board/ti/beagle/beagle.c	2016-02-24 19:45:05.779336247 -0300
 @@ -56,6 +56,7 @@
  #define BBTOYS_WIFI			0x01000B00
  #define BBTOYS_VGA			0x02000B00
@@ -10,7 +9,7 @@ index 7b37fbe..ff986ff 100644
  #define BCT_BRETTL3			0x01000F00
  #define BCT_BRETTL4			0x02000F00
  #define LSR_COM6L_ADPT			0x01001300
-@@ -211,25 +212,25 @@ void get_board_mem_timings(struct board_sdrc_timings *timings)
+@@ -211,25 +212,25 @@
   *		bus 1 for the availability of an AT24C01B serial EEPROM.
   *		returns the device_vendor field from the EEPROM
   */
@@ -40,7 +39,7 @@ index 7b37fbe..ff986ff 100644
  			 sizeof(expansion_config));
  	}
  
-@@ -341,15 +342,18 @@ int misc_init_r(void)
+@@ -341,15 +342,18 @@
  	case REVISION_AXBX:
  		printf("Beagle Rev Ax/Bx\n");
  		setenv("beaglerev", "AxBx");
@@ -59,7 +58,7 @@ index 7b37fbe..ff986ff 100644
  		MUX_BEAGLE_C();
  		/* Set VAUX2 to 1.8V for EHCI PHY */
  		twl4030_pmrecv_vsel_cfg(TWL4030_PM_RECEIVER_VAUX2_DEDICATED,
-@@ -390,7 +394,7 @@ int misc_init_r(void)
+@@ -390,7 +394,7 @@
  		generate_fake_mac = true;
  	}
  
@@ -68,10 +67,12 @@ index 7b37fbe..ff986ff 100644
  	case TINCANTOOLS_ZIPPY:
  		printf("Recognized Tincantools Zippy board (rev %d %s)\n",
  			expansion_config.revision,
-@@ -473,6 +477,30 @@ int misc_init_r(void)
- 	if (expansion_config.content == 1)
- 		setenv(expansion_config.env_var, expansion_config.env_setting);
+@@ -471,6 +475,30 @@
+ 	}
  
+ 	if (expansion_config.content == 1)
++		setenv(expansion_config.env_var, expansion_config.env_setting);
++
 +	/* Scan 0x51 as well for loop-thru boards */
 +	switch (get_expansion_id(EXPANSION_EEPROM_I2C_ADDRESS + 1)) {
 +	case BBTOYS_ULCD:
@@ -94,16 +95,13 @@ index 7b37fbe..ff986ff 100644
 +	}
 +
 +	if (expansion_config.content == 1)
-+		setenv(expansion_config.env_var, expansion_config.env_setting);
-+
+ 		setenv(expansion_config.env_var, expansion_config.env_setting);
+ 
  	twl4030_power_init();
- 	switch (get_board_revision()) {
- 	case REVISION_XM_AB:
-diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h
-index f25a940..9f15cf1 100644
---- a/include/configs/omap3_beagle.h
-+++ b/include/configs/omap3_beagle.h
-@@ -90,6 +90,12 @@
+diff -Nur u-boot-2016.01.orig/include/configs/omap3_beagle.h u-boot-2016.01/include/configs/omap3_beagle.h
+--- u-boot-2016.01.orig/include/configs/omap3_beagle.h	2016-01-12 11:06:54.000000000 -0300
++++ u-boot-2016.01/include/configs/omap3_beagle.h	2016-02-24 19:50:25.959802093 -0300
+@@ -91,6 +91,12 @@
  #define CONFIG_USB_ETHER_MCS7830
  #define CONFIG_USB_ETHER_SMSC95XX
  
@@ -116,12 +114,20 @@ index f25a940..9f15cf1 100644
  /* GPIO banks */
  #define CONFIG_OMAP3_GPIO_5		/* GPIO128..159 is in GPIO bank 5 */
  #define CONFIG_OMAP3_GPIO_6		/* GPIO160..191 is in GPIO bank 6 */
-@@ -129,50 +135,62 @@
+@@ -124,51 +130,71 @@
+ #define CONFIG_SYS_MAX_NAND_DEVICE	1		/* Max number of NAND */
  							/* devices */
  
++/* 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 \
 -	"loadaddr=0x80200000\0" \
 -	"rdaddr=0x81000000\0" \
++	BOOTENV \
 +	"loadaddr=0x82000000\0" \
 +	"rdaddr=0x88080000\0" \
  	"fdt_high=0xffffffff\0" \
@@ -142,10 +148,10 @@ index f25a940..9f15cf1 100644
 -	"defaultdisplay=dvi\0" \
 +	"fdtfile=undefined\0" \
 +	"bootpart=0:1\0" \
-+	"bootdir=/\0" \
-+	"fdtdir=/dtbs/linux-libre\0" \
-+	"bootfile=vmlinuz-linux-libre\0" \
-+	"rdfile=initramfs-linux-libre.img\0" \
++	"bootdir=\0" \
++	"fdtdir=/dtbs\0" \
++	"bootfile=zImage\0" \
++	"rdfile=initramfs-linux.img\0" \
  	"mmcdev=0\0" \
 -	"mmcroot=/dev/mmcblk0p2 rw\0" \
 -	"mmcrootfstype=ext3 rootwait\0" \
@@ -200,6 +206,7 @@ index f25a940..9f15cf1 100644
 +						"run uenvcmd;" \
 +					"fi;" \
 +				"fi;" \
++				"run scan_dev_for_boot;" \
 +				"if run loadimage; then " \
 +					"run mmcargs;" \
 +					"if run loadfdt; then " \
@@ -218,7 +225,7 @@ index f25a940..9f15cf1 100644
  	"findfdt=" \
  		"if test $beaglerev = AxBx; then " \
  			"setenv fdtfile omap3-beagle.dtb; fi; " \
-@@ -185,81 +203,11 @@
+@@ -181,81 +207,11 @@
  		"if test $beaglerev = xMC; then " \
  			"setenv fdtfile omap3-beagle-xm.dtb; fi; " \
  		"if test $fdtfile = undefined; then " \
@@ -303,6 +310,3 @@ index f25a940..9f15cf1 100644
  
  /*
   * OMAP3 has 12 GP timers, they can be driven by the system clock
--- 
-2.4.2
-
diff --git a/libre/uboot-omap3_beagle/PKGBUILD b/libre/uboot-omap3_beagle/PKGBUILD
new file mode 100644
index 000000000..3fdd5a274
--- /dev/null
+++ b/libre/uboot-omap3_beagle/PKGBUILD
@@ -0,0 +1,51 @@
+# U-Boot: BeagleBoard and BeagleBoard-xM
+# Maintainer: André Silva <emulatorman@parabola.nu>
+
+buildarch=4
+
+pkgname=uboot-omap3_beagle
+pkgver=2016.01
+pkgrel=1
+pkgdesc="U-Boot for BeagleBoard and BeagleBoard-xM"
+arch=('armv7h')
+url="http://git.denx.de/u-boot.git/"
+license=('GPL')
+replaces=('uboot-beagleboard-linux-libre' 'uboot-beagleboard-linux-libre-lts'
+          'uboot-beagleboard-linux-libre-grsec' 'uboot-beagleboard-linux-libre-pck'
+          'uboot-beagleboard')
+conflicts=('uboot-beagleboard-linux-libre' 'uboot-beagleboard-linux-libre-lts'
+           'uboot-beagleboard-linux-libre-grsec' 'uboot-beagleboard-linux-libre-pck'
+           'uboot-beagleboard' 'uboot4grub-omap3_beagle')
+makedepends=('bc')
+backup=(boot/extlinux/extlinux.conf)
+install=${pkgname}.install
+source=("ftp://ftp.denx.de/pub/u-boot/u-boot-${pkgver}.tar.bz2"
+        '0001-parabola-arm-modifications.patch'
+        'extlinux.conf'
+        'uEnv.txt')
+md5sums=('7d4f65fd43d4d706f5c5650e020d899d'
+         'da3d52f785bce02602f88fb85f74de2f'
+         '12c61073bb860f4c8d8ec59145c267ed'
+         'd41d8cd98f00b204e9800998ecf8427e')
+
+prepare() {
+  cd u-boot-${pkgver}
+  patch -Np1 -i ../0001-parabola-arm-modifications.patch
+}
+
+build() {
+  cd u-boot-${pkgver}
+
+  unset LDFLAGS CFLAGS CXXFLAGS
+
+  make distclean
+  make omap3_beagle_config
+  make
+}
+
+package() {
+  cd u-boot-${pkgver}
+  mkdir -p "${pkgdir}"/boot/extlinux
+  cp MLO u-boot.img "${srcdir}"/uEnv.txt "${pkgdir}"/boot
+  cp "${srcdir}"/extlinux.conf "${pkgdir}"/boot/extlinux
+}
diff --git a/libre/uboot-omap3_beagle/extlinux.conf b/libre/uboot-omap3_beagle/extlinux.conf
new file mode 100644
index 000000000..725121811
--- /dev/null
+++ b/libre/uboot-omap3_beagle/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=ttyO2,115200n8
+	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=ttyO2,115200n8
+#	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=ttyO2,115200n8
+#	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=ttyO2,115200n8
+#	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=ttyO2,115200n8
+#	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=ttyO2,115200n8
+#	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=ttyO2,115200n8
+#	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=ttyO2,115200n8
+#	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=ttyO2,115200n8
+#	fdtdir /boot/dtbs/linux-libre-rt
diff --git a/libre/uboot-beagleboard-linux-libre/uEnv.txt b/libre/uboot-omap3_beagle/uEnv.txt
index e69de29bb..e69de29bb 100644
--- a/libre/uboot-beagleboard-linux-libre/uEnv.txt
+++ b/libre/uboot-omap3_beagle/uEnv.txt
diff --git a/libre/uboot-omap3_beagle/uboot-omap3_beagle.install b/libre/uboot-omap3_beagle/uboot-omap3_beagle.install
new file mode 100644
index 000000000..249f69df3
--- /dev/null
+++ b/libre/uboot-omap3_beagle/uboot-omap3_beagle.install
@@ -0,0 +1,11 @@
+extlinux_warning() {
+  echo ">>> WARNING: for entries, edit /boot/extlinux/extlinux.conf"
+}
+
+post_install() {
+  extlinux_warning
+}
+
+post_upgrade() {
+  extlinux_warning
+}