From 0b8c76ede9d769f50c4e4c040430ada504787cc0 Mon Sep 17 00:00:00 2001 From: "coadde [Márcio Alexandre Silva Delgado]" Date: Thu, 8 Oct 2015 06:30:55 -0300 Subject: libre-testing/uboot-grub-beaglebone: fix patch --- .../0001-parabola-arm-modifications+grub-support.patch | 4 ++-- libre-testing/uboot-grub-beaglebone/PKGBUILD | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libre-testing/uboot-grub-beaglebone/0001-parabola-arm-modifications+grub-support.patch b/libre-testing/uboot-grub-beaglebone/0001-parabola-arm-modifications+grub-support.patch index 72bd465be..351d31be8 100644 --- a/libre-testing/uboot-grub-beaglebone/0001-parabola-arm-modifications+grub-support.patch +++ b/libre-testing/uboot-grub-beaglebone/0001-parabola-arm-modifications+grub-support.patch @@ -151,7 +151,7 @@ diff -Nur u-boot-2015.04.orig/include/configs/am335x_evm.h u-boot-2015.04/includ - "setenv fdtfile am335x-evmsk.dtb; fi; " \ - "if test $fdtfile = undefined; then " \ - "echo WARNING: Could not determine device tree to use; fi; \0" \ -+ "for devtype in mmc usb; do " \ ++ "grubboot=for devtype in mmc usb; do " \ + "load ${devtype} ${bootpart} ${loadaddr} ${bootdir}/${grubfile}" \ + "done;\0" \ NANDARGS \ @@ -165,7 +165,7 @@ diff -Nur u-boot-2015.04.orig/include/configs/am335x_evm.h u-boot-2015.04/includ - "setenv bootpart 1:2; " \ - "run mmcboot;" \ - "run nandboot;" -+ "run mmcboot;" ++ "run grubboot;" /* NS16550 Configuration */ #define CONFIG_SYS_NS16550_COM1 0x44e09000 /* Base EVM has UART0 */ diff --git a/libre-testing/uboot-grub-beaglebone/PKGBUILD b/libre-testing/uboot-grub-beaglebone/PKGBUILD index 4a7fd8e2a..2c884258d 100644 --- a/libre-testing/uboot-grub-beaglebone/PKGBUILD +++ b/libre-testing/uboot-grub-beaglebone/PKGBUILD @@ -5,7 +5,7 @@ buildarch=4 pkgname=uboot-grub-beaglebone pkgver=2015.04 -pkgrel=1 +pkgrel=2 pkgdesc="U-Boot for BeagleBone and BeagleBone Black adapted for GRUB usage" arch=('armv7h') url="http://git.denx.de/u-boot.git/" @@ -16,7 +16,7 @@ install=${pkgname}.install source=("ftp://ftp.denx.de/pub/u-boot/u-boot-${pkgver}.tar.bz2" '0001-parabola-arm-modifications+grub-support.patch') md5sums=('570bdc2c47270c2a98ca60ff6c5c74cd' - 'a54848b63e4541013926586217ac32bd') + 'd8c8e9fea003cd06ef04fe1cd841d686') prepare() { cd u-boot-${pkgver} -- cgit v1.2.3