From b840c333ac05f15a17d3ab7c1f44216a179b51d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?=
 <emulatorman@parabola.nu>
Date: Fri, 16 Oct 2015 18:36:16 -0300
Subject: uboot4grub-udoo: add additional configuration options for GRUB in
 include/configs/udoo.h

---
 .../0001-parabola-arm-modifications+grub-support.patch       | 12 ++++++++----
 libre-testing/uboot4grub-udoo/PKGBUILD                       |  2 +-
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/libre-testing/uboot4grub-udoo/0001-parabola-arm-modifications+grub-support.patch b/libre-testing/uboot4grub-udoo/0001-parabola-arm-modifications+grub-support.patch
index a75c5c5ff..70903de64 100644
--- a/libre-testing/uboot4grub-udoo/0001-parabola-arm-modifications+grub-support.patch
+++ b/libre-testing/uboot4grub-udoo/0001-parabola-arm-modifications+grub-support.patch
@@ -190,7 +190,7 @@ diff -Nur u-boot-2015.01.orig/configs/udoo_dl_defconfig u-boot-2015.01/configs/u
 +CONFIG_TARGET_UDOO=y
 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	2015-10-16 15:06:43.329468013 -0300
++++ u-boot-2015.01/include/configs/udoo.h	2015-10-16 18:33:35.589059733 -0300
 @@ -78,7 +78,7 @@
  #define CONFIG_CMD_BMODE
  #define CONFIG_CMD_SETEXPR
@@ -200,7 +200,7 @@ diff -Nur u-boot-2015.01.orig/include/configs/udoo.h u-boot-2015.01/include/conf
  
  #define CONFIG_SYS_MEMTEST_START	0x10000000
  #define CONFIG_SYS_MEMTEST_END		(CONFIG_SYS_MEMTEST_START + 500 * SZ_1M)
-@@ -96,60 +96,79 @@
+@@ -96,60 +96,83 @@
  #define CONFIG_BOUNCE_BUFFER
  #define CONFIG_CMD_EXT2
  #define CONFIG_CMD_FAT
@@ -208,6 +208,10 @@ diff -Nur u-boot-2015.01.orig/include/configs/udoo.h u-boot-2015.01/include/conf
 +#define CONFIG_CMD_FS_GENERIC
  #define CONFIG_DOS_PARTITION
  
++/* GRUB support */
++#define CONFIG_API
++#define CONFIG_SYS_MMC_MAX_DEVICE	1
++
 +#define CONFIG_IDENT_STRING " Parabola GNU/Linux-libre"
 +
 +#if defined(CONFIG_MX6DL) || defined(CONFIG_MX6S)
@@ -321,7 +325,7 @@ diff -Nur u-boot-2015.01.orig/include/configs/udoo.h u-boot-2015.01/include/conf
  		"fi;\0" \
  	"netargs=setenv bootargs console=${console},${baudrate} " \
  		"root=/dev/nfs " \
-@@ -161,32 +180,10 @@
+@@ -161,32 +184,10 @@
  		"else " \
  			"setenv get_cmd tftp; " \
  		"fi; " \
@@ -356,7 +360,7 @@ diff -Nur u-boot-2015.01.orig/include/configs/udoo.h u-boot-2015.01/include/conf
  
  /* Miscellaneous configurable options */
  #define CONFIG_SYS_LONGHELP
-@@ -227,6 +224,7 @@
+@@ -227,6 +228,7 @@
  
  #define CONFIG_OF_LIBFDT
  #define CONFIG_CMD_BOOTZ
diff --git a/libre-testing/uboot4grub-udoo/PKGBUILD b/libre-testing/uboot4grub-udoo/PKGBUILD
index d6d112cf2..61c4f52b3 100644
--- a/libre-testing/uboot4grub-udoo/PKGBUILD
+++ b/libre-testing/uboot4grub-udoo/PKGBUILD
@@ -16,7 +16,7 @@ source=("ftp://ftp.denx.de/pub/u-boot/u-boot-${pkgver}.tar.bz2"
         '0001-parabola-arm-modifications+grub-support.patch'
         '0002-kernel-add-support-for-gcc-5.patch')
 md5sums=('7f08dc9e98a71652bd6968888ed6ec95'
-         '712292157e0819785662f1ae42630889'
+         'e2176de47d43fc4e75e4752a7622021d'
          '721a46867e189d8dedc6b6f86a536a34')
 
 prepare() {
-- 
cgit v1.2.3