From bf2f84a53eb2bbea305eafbfd77b7bf5a859b24e Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado <emulatorman@parabola.nu>
Date: Sun, 21 Feb 2016 23:02:33 -0300
Subject: uboot-am335x_bone: minor fix

---
 .../uboot-am335x_bone/0001-parabola-arm-modifications.patch | 13 +++++++------
 libre-testing/uboot-am335x_bone/PKGBUILD                    |  2 +-
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/libre-testing/uboot-am335x_bone/0001-parabola-arm-modifications.patch b/libre-testing/uboot-am335x_bone/0001-parabola-arm-modifications.patch
index 062ec61c3..909924cbd 100644
--- a/libre-testing/uboot-am335x_bone/0001-parabola-arm-modifications.patch
+++ b/libre-testing/uboot-am335x_bone/0001-parabola-arm-modifications.patch
@@ -1,6 +1,6 @@
 diff -Nur u-boot-2015.04.orig/configs/am335x_evm_defconfig u-boot-2015.04/configs/am335x_evm_defconfig
 --- u-boot-2015.04.orig/configs/am335x_evm_defconfig	2015-04-13 11:53:03.000000000 -0300
-+++ u-boot-2015.04/configs/am335x_evm_defconfig	2016-02-21 22:12:00.228331339 -0300
++++ u-boot-2015.04/configs/am335x_evm_defconfig	2016-02-21 23:00:16.971065261 -0300
 @@ -1,7 +1,6 @@
  CONFIG_SPL=y
  CONFIG_SPL_STACK_R=y
@@ -12,7 +12,7 @@ diff -Nur u-boot-2015.04.orig/configs/am335x_evm_defconfig u-boot-2015.04/config
  CONFIG_TARGET_AM335X_EVM=y
 diff -Nur u-boot-2015.04.orig/include/configs/am335x_evm.h u-boot-2015.04/include/configs/am335x_evm.h
 --- u-boot-2015.04.orig/include/configs/am335x_evm.h	2015-04-13 11:53:03.000000000 -0300
-+++ u-boot-2015.04/include/configs/am335x_evm.h	2016-02-21 22:49:46.009920163 -0300
++++ u-boot-2015.04/include/configs/am335x_evm.h	2016-02-21 23:01:07.093612748 -0300
 @@ -17,6 +17,7 @@
  #define __CONFIG_AM335X_EVM_H
  
@@ -31,7 +31,7 @@ diff -Nur u-boot-2015.04.orig/include/configs/am335x_evm.h u-boot-2015.04/includ
  
  #ifdef CONFIG_NAND
  #define NANDARGS \
-@@ -67,130 +71,80 @@
+@@ -67,130 +71,81 @@
  
  #define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
  
@@ -50,12 +50,13 @@ diff -Nur u-boot-2015.04.orig/include/configs/am335x_evm.h u-boot-2015.04/includ
 +	"bootm_size=0x10000000\0" \
 +	"kernel_addr_r=0x82000000\0" \
 +	"fdt_addr_r=0x88000000\0" \
-+        "scriptaddr=0x43100000\0" \
-+        "pxefile_addr_r=0x43200000\0" \
++	"scriptaddr=0x43100000\0" \
++	"pxefile_addr_r=0x43200000\0" \
 +	"ramdisk_addr_r=0x88080000\0"
 +
  #ifndef CONFIG_SPL_BUILD
  #define CONFIG_EXTRA_ENV_SETTINGS \
++	BOOTENV \
  	DEFAULT_LINUX_BOOT_ENV \
 -	"boot_fdt=try\0" \
 -	"bootpart=0:2\0" \
@@ -218,7 +219,7 @@ diff -Nur u-boot-2015.04.orig/include/configs/am335x_evm.h u-boot-2015.04/includ
  
  /* NS16550 Configuration */
  #define CONFIG_SYS_NS16550_COM1		0x44e09000	/* Base EVM has UART0 */
-@@ -329,9 +283,8 @@
+@@ -329,9 +284,8 @@
  #endif
  
  #ifdef CONFIG_MUSB_GADGET
diff --git a/libre-testing/uboot-am335x_bone/PKGBUILD b/libre-testing/uboot-am335x_bone/PKGBUILD
index bfce9b132..fc01d2bb6 100644
--- a/libre-testing/uboot-am335x_bone/PKGBUILD
+++ b/libre-testing/uboot-am335x_bone/PKGBUILD
@@ -20,7 +20,7 @@ source=("ftp://ftp.denx.de/pub/u-boot/u-boot-${pkgver}.tar.bz2"
         'extlinux.conf'
         'uEnv.txt')
 md5sums=('570bdc2c47270c2a98ca60ff6c5c74cd'
-         '4f4078a4d5558a56a9144b7e8ed94fb5'
+         '9fbef94650acc064c8ca5ffdb097b8a5'
          '9bf446920d4344d17eb0673b7a49701a'
          'ccb79775b81654e16fca18825c7f2506')
 
-- 
cgit v1.2.3