summaryrefslogtreecommitdiff
path: root/libre-testing/uboot4grub-am335x_bone/0001-parabola-arm-modifications+grub-support.patch
diff options
context:
space:
mode:
authorIsaac David <isacdaavid@isacdaavid.info>2015-11-09 23:01:38 -0600
committerIsaac David <isacdaavid@isacdaavid.info>2015-11-09 23:01:38 -0600
commit11c8429d4c4ef7552ffd4bfe6de2b8ec1560040d (patch)
treedc09d82b3eb19a7068e5ec8b173e27bace1417c3 /libre-testing/uboot4grub-am335x_bone/0001-parabola-arm-modifications+grub-support.patch
parent931ab19b3b8af19b4dd7f15cb8396da1e23bf184 (diff)
uboot4grub-am335x_bone: small fix to make uboot load grub automatically
Diffstat (limited to 'libre-testing/uboot4grub-am335x_bone/0001-parabola-arm-modifications+grub-support.patch')
-rw-r--r--libre-testing/uboot4grub-am335x_bone/0001-parabola-arm-modifications+grub-support.patch14
1 files changed, 8 insertions, 6 deletions
diff --git a/libre-testing/uboot4grub-am335x_bone/0001-parabola-arm-modifications+grub-support.patch b/libre-testing/uboot4grub-am335x_bone/0001-parabola-arm-modifications+grub-support.patch
index 335672fc0..57a22467f 100644
--- a/libre-testing/uboot4grub-am335x_bone/0001-parabola-arm-modifications+grub-support.patch
+++ b/libre-testing/uboot4grub-am335x_bone/0001-parabola-arm-modifications+grub-support.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 2015-10-07 01:51:34.454670270 -0300
+--- u-boot-2015.04.orig/configs/am335x_evm_defconfig 2015-04-13 14:53:03.000000000 +0000
++++ u-boot-2015.04/configs/am335x_evm_defconfig 2015-11-07 00:50:04.382344525 +0000
@@ -1,7 +1,6 @@
CONFIG_SPL=y
CONFIG_SPL_STACK_R=y
@@ -11,8 +11,8 @@ diff -Nur u-boot-2015.04.orig/configs/am335x_evm_defconfig u-boot-2015.04/config
CONFIG_ARM=y
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 2015-10-16 14:16:56.088111386 -0300
+--- u-boot-2015.04.orig/include/configs/am335x_evm.h 2015-04-13 14:53:03.000000000 +0000
++++ u-boot-2015.04/include/configs/am335x_evm.h 2015-11-07 00:53:11.785095746 +0000
@@ -17,6 +17,7 @@
#define __CONFIG_AM335X_EVM_H
@@ -35,7 +35,7 @@ diff -Nur u-boot-2015.04.orig/include/configs/am335x_evm.h u-boot-2015.04/includ
#ifdef CONFIG_NAND
#define NANDARGS \
-@@ -70,127 +78,64 @@
+@@ -70,127 +78,66 @@
#ifndef CONFIG_SPL_BUILD
#define CONFIG_EXTRA_ENV_SETTINGS \
DEFAULT_LINUX_BOOT_ENV \
@@ -146,6 +146,8 @@ diff -Nur u-boot-2015.04.orig/include/configs/am335x_evm.h u-boot-2015.04/includ
+ "gpio set 55;" \
+ "if run loadimage; then " \
+ "run mmcargs;" \
++ "gpio set 56;" \
++ "bootm;" \
+ "else " \
+ "echo No GRUB found;" \
+ "fi;" \
@@ -206,7 +208,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 +274,8 @@
+@@ -329,9 +276,8 @@
#endif
#ifdef CONFIG_MUSB_GADGET