[FE training-materials-updates] kernel: adapt default u-boot configuration for our labs

[Michael Opdenacker]

Repository : git://git.free-electrons.com/training-materials.git

On branch  : kernel-ng
Link       : http://git.free-electrons.com/training-materials/commit/?id=dc04b883846fc6c0a19b6bcf7e65abd116b2b811

>---------------------------------------------------------------

commit dc04b883846fc6c0a19b6bcf7e65abd116b2b811
Author: Michael Opdenacker <michael.opdenacker at free-electrons.com>
Date:   Sat Sep 21 10:17:26 2013 +0200

    kernel: adapt default u-boot configuration for our labs
    
    Signed-off-by: Michael Opdenacker <michael.opdenacker at free-electrons.com>


>---------------------------------------------------------------

dc04b883846fc6c0a19b6bcf7e65abd116b2b811
 .../linux/bootloader/beaglebone-black/README.txt   |    3 ++
 ...oot-configuration-for-Free-Electrons-labs.patch |   42 ++++++++++++++++++++
 .../linux/bootloader/beaglebone-black/u-boot.img   |  Bin 367636 -> 367544 bytes
 3 files changed, 45 insertions(+)

diff --git a/lab-data/linux/bootloader/beaglebone-black/README.txt b/lab-data/linux/bootloader/beaglebone-black/README.txt
index 2132527..d5e4438 100644
--- a/lab-data/linux/bootloader/beaglebone-black/README.txt
+++ b/lab-data/linux/bootloader/beaglebone-black/README.txt
@@ -12,6 +12,9 @@ git clone git://git.denx.de/u-boot.git
 git tag
 git checkout v2013.10-rc3
 
+Apply a configuration-only patch:
+git am patches/*.patch
+
 export ARCH=arm
 export CROSS_COMPILE=arm-linux-gnueabi-
 make distclean
diff --git a/lab-data/linux/bootloader/beaglebone-black/patches/0001-Tune-U-boot-configuration-for-Free-Electrons-labs.patch b/lab-data/linux/bootloader/beaglebone-black/patches/0001-Tune-U-boot-configuration-for-Free-Electrons-labs.patch
new file mode 100644
index 0000000..0aaaf2b
--- /dev/null
+++ b/lab-data/linux/bootloader/beaglebone-black/patches/0001-Tune-U-boot-configuration-for-Free-Electrons-labs.patch
@@ -0,0 +1,42 @@
+From 93b56ab191c8aeaa462b7d473ec7a1bec3e916fe Mon Sep 17 00:00:00 2001
+From: Michael Opdenacker <michael.opdenacker at free-electrons.com>
+Date: Sat, 21 Sep 2013 10:14:43 +0200
+Subject: [PATCH] Tune U-boot configuration for Free Electrons labs
+
+Signed-off-by: Michael Opdenacker <michael.opdenacker at free-electrons.com>
+---
+ include/configs/am335x_evm.h | 11 ++---------
+ 1 file changed, 2 insertions(+), 9 deletions(-)
+
+diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
+index 3de30fc..b6989f4 100644
+--- a/include/configs/am335x_evm.h
++++ b/include/configs/am335x_evm.h
+@@ -132,9 +132,6 @@
+ 				"echo Running uenvcmd ...;" \
+ 				"run uenvcmd;" \
+ 			"fi;" \
+-			"if run loaduimage; then " \
+-				"run mmcloados;" \
+-			"fi;" \
+ 		"fi;\0" \
+ 	"spiboot=echo Booting from spi ...; " \
+ 		"run spiargs; " \
+@@ -166,12 +163,8 @@
+ #endif
+ 
+ #define CONFIG_BOOTCOMMAND \
+-	"run findfdt; " \
+-	"run mmcboot;" \
+-	"setenv mmcdev 1; " \
+-	"setenv bootpart 1:2; " \
+-	"run mmcboot;" \
+-	"run nandboot;"
++	"setenv mmcdev 0; " \
++	"run mmcboot;"
+ 
+ /* NS16550 Configuration */
+ #define CONFIG_SYS_NS16550_COM1		0x44e09000	/* Base EVM has UART0 */
+-- 
+1.8.1.2
+
diff --git a/lab-data/linux/bootloader/beaglebone-black/u-boot.img b/lab-data/linux/bootloader/beaglebone-black/u-boot.img
index b2adedf..7886572 100644
Binary files a/lab-data/linux/bootloader/beaglebone-black/u-boot.img and b/lab-data/linux/bootloader/beaglebone-black/u-boot.img differ