[FE training-materials-updates] kernel: update bootloader for bone black

[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=7c18caa90b13fd486e2f0ac6c1e0968cb84f677f

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

commit 7c18caa90b13fd486e2f0ac6c1e0968cb84f677f
Author: Michael Opdenacker <michael.opdenacker at free-electrons.com>
Date:   Thu Oct 3 05:49:40 2013 +0200

    kernel: update bootloader for bone black
    
    Signed-off-by: Michael Opdenacker <michael.opdenacker at free-electrons.com>


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

7c18caa90b13fd486e2f0ac6c1e0968cb84f677f
 lab-data/linux/bootloader/beaglebone-black/MLO     |  Bin 102320 -> 96736 bytes
 .../linux/bootloader/beaglebone-black/README.txt   |    5 +--
 ...oot-configuration-for-Free-Electrons-labs.patch |   42 --------------------
 .../linux/bootloader/beaglebone-black/u-boot.img   |  Bin 367544 -> 304872 bytes
 4 files changed, 1 insertion(+), 46 deletions(-)

diff --git a/lab-data/linux/bootloader/beaglebone-black/MLO b/lab-data/linux/bootloader/beaglebone-black/MLO
index 6590439..5c71b80 100644
Binary files a/lab-data/linux/bootloader/beaglebone-black/MLO and b/lab-data/linux/bootloader/beaglebone-black/MLO differ
diff --git a/lab-data/linux/bootloader/beaglebone-black/README.txt b/lab-data/linux/bootloader/beaglebone-black/README.txt
index d5e4438..77cf475 100644
--- a/lab-data/linux/bootloader/beaglebone-black/README.txt
+++ b/lab-data/linux/bootloader/beaglebone-black/README.txt
@@ -12,13 +12,10 @@ 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
-make am335x_evm_config
+make am335x_boneblack_config
 make
 
 This produces the MLO and u-boot.img files that
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
deleted file mode 100644
index 0aaaf2b..0000000
--- a/lab-data/linux/bootloader/beaglebone-black/patches/0001-Tune-U-boot-configuration-for-Free-Electrons-labs.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-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 7886572..8013291 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