add patch needed to fix up building

10 files changed, 89 insertions, 8 deletions

diff --git a/0001-TI-Add-use-a-DEFAULT_LINUX_BOOT_ENV-environment-stri.patch b/0001-TI-Add-use-a-DEFAULT_LINUX_BOOT_ENV-environment-stri.patch
index 3afdc93..1fedff6 100644
--- a/0001-TI-Add-use-a-DEFAULT_LINUX_BOOT_ENV-environment-stri.patch
+++ b/0001-TI-Add-use-a-DEFAULT_LINUX_BOOT_ENV-environment-stri.patch
@@ -1,7 +1,7 @@
 From b2f0945f9542a53960d8e394725f9de199059974 Mon Sep 17 00:00:00 2001
 From: Tom Rini <trini@ti.com>
 Date: Tue, 11 Mar 2014 15:42:01 -0400
-Subject: [PATCH 1/8] TI: Add, use a DEFAULT_LINUX_BOOT_ENV environment string
+Subject: [PATCH 1/9] TI: Add, use a DEFAULT_LINUX_BOOT_ENV environment string
 
 To deal with a reoccurring problem properly we need to specify addresses
 for the Linux kernel, Flatted Device Tree and ramdisk that obey the
diff --git a/0002-am335x_evm-Update-the-ramdisk-args-we-pass-things-in.patch b/0002-am335x_evm-Update-the-ramdisk-args-we-pass-things-in.patch
index e10bfdd..0262e85 100644
--- a/0002-am335x_evm-Update-the-ramdisk-args-we-pass-things-in.patch
+++ b/0002-am335x_evm-Update-the-ramdisk-args-we-pass-things-in.patch
@@ -1,7 +1,7 @@
 From d501ece818fe10845bb0a005d986acf1e143a313 Mon Sep 17 00:00:00 2001
 From: Tom Rini <trini@ti.com>
 Date: Tue, 11 Mar 2014 15:42:02 -0400
-Subject: [PATCH 2/8] am335x_evm: Update the ramdisk args, we pass things in
+Subject: [PATCH 2/9] am335x_evm: Update the ramdisk args, we pass things in
  just fine via DT
 
 Signed-off-by: Tom Rini <trini@ti.com>
diff --git a/0003-am43xx_evm-Update-the-ramdisk-args-we-pass-things-in.patch b/0003-am43xx_evm-Update-the-ramdisk-args-we-pass-things-in.patch
index 2c91a8d..ecafec6 100644
--- a/0003-am43xx_evm-Update-the-ramdisk-args-we-pass-things-in.patch
+++ b/0003-am43xx_evm-Update-the-ramdisk-args-we-pass-things-in.patch
@@ -1,7 +1,7 @@
 From 59459e211168e3465c2bdb1b78bfc9c594c9b479 Mon Sep 17 00:00:00 2001
 From: Tom Rini <trini@ti.com>
 Date: Tue, 11 Mar 2014 15:42:03 -0400
-Subject: [PATCH 3/8] am43xx_evm: Update the ramdisk args, we pass things in
+Subject: [PATCH 3/9] am43xx_evm: Update the ramdisk args, we pass things in
  just fine via DT
 
 Signed-off-by: Tom Rini <trini@ti.com>
diff --git a/0004-add-README.distro.patch b/0004-add-README.distro.patch
index 7a73380..7635ef5 100644
--- a/0004-add-README.distro.patch
+++ b/0004-add-README.distro.patch
@@ -1,7 +1,7 @@
 From 2ef279ec9eb812e4d67e7ae5eb695eadc63d8570 Mon Sep 17 00:00:00 2001
 From: Dennis Gilmore <dennis@ausil.us>
 Date: Sat, 8 Mar 2014 10:42:34 -0600
-Subject: [PATCH 4/8] add README.distro
+Subject: [PATCH 4/9] add README.distro
 
 Add instructions on how to setup a system to boot using the generic boot
 framework.
diff --git a/0005-add-generic-bootcmd-header.patch b/0005-add-generic-bootcmd-header.patch
index 1134bab..e83b118 100644
--- a/0005-add-generic-bootcmd-header.patch
+++ b/0005-add-generic-bootcmd-header.patch
@@ -1,7 +1,7 @@
 From db270067bf3b35802fdd8ecc647a80f25bbd7851 Mon Sep 17 00:00:00 2001
 From: Dennis Gilmore <dennis@ausil.us>
 Date: Sat, 15 Mar 2014 10:13:39 -0500
-Subject: [PATCH 5/8] add generic bootcmd header
+Subject: [PATCH 5/9] add generic bootcmd header
 
 ---
  include/config_distro_bootcmd.h | 208 ++++++++++++++++++++++++++++++++++++++++
diff --git a/0006-convert-wandboard-to-use-generic-boot-commands.patch b/0006-convert-wandboard-to-use-generic-boot-commands.patch
index c60575c..1c0cfb8 100644
--- a/0006-convert-wandboard-to-use-generic-boot-commands.patch
+++ b/0006-convert-wandboard-to-use-generic-boot-commands.patch
@@ -1,7 +1,7 @@
 From 4a7a3fb87348895c605ec36e4ff1e8272d41ce7c Mon Sep 17 00:00:00 2001
 From: Dennis Gilmore <dennis@ausil.us>
 Date: Sat, 8 Mar 2014 10:59:00 -0600
-Subject: [PATCH 6/8] convert wandboard to use generic boot commands
+Subject: [PATCH 6/9] convert wandboard to use generic boot commands
 
 ---
  include/configs/wandboard.h | 91 +++++++--------------------------------------
diff --git a/0007-convert-beaglebone-to-use-generic-boot-commands.patch b/0007-convert-beaglebone-to-use-generic-boot-commands.patch
index 819ebda..3e79ad2 100644
--- a/0007-convert-beaglebone-to-use-generic-boot-commands.patch
+++ b/0007-convert-beaglebone-to-use-generic-boot-commands.patch
@@ -1,7 +1,7 @@
 From 4998ea8d57088973c5d4b0306c9c226b85e29bfa Mon Sep 17 00:00:00 2001
 From: Dennis Gilmore <dennis@ausil.us>
 Date: Sat, 15 Mar 2014 10:24:26 -0500
-Subject: [PATCH 7/8] convert beaglebone to use generic boot commands
+Subject: [PATCH 7/9] convert beaglebone to use generic boot commands
 
 ---
  include/configs/am335x_evm.h      | 62 +++++++++------------------------------
diff --git a/0008-convert-pandaboard-to-use-generic-boot-commands.patch b/0008-convert-pandaboard-to-use-generic-boot-commands.patch
index eede63d..54096ae 100644
--- a/0008-convert-pandaboard-to-use-generic-boot-commands.patch
+++ b/0008-convert-pandaboard-to-use-generic-boot-commands.patch
@@ -1,7 +1,7 @@
 From dfdd6312dc00d1b2dde14f00fe7bd7fb4e8bdd2c Mon Sep 17 00:00:00 2001
 From: Dennis Gilmore <dennis@ausil.us>
 Date: Sat, 15 Mar 2014 10:26:49 -0500
-Subject: [PATCH 8/8] convert pandaboard to use generic boot commands
+Subject: [PATCH 8/9] convert pandaboard to use generic boot commands
 
 ---
  include/configs/omap4_panda.h     |  3 ---
diff --git a/0009-fix-up-some-sillies.patch b/0009-fix-up-some-sillies.patch
new file mode 100644
index 0000000..900ec0c
--- /dev/null
+++ b/0009-fix-up-some-sillies.patch
@@ -0,0 +1,79 @@
+From 2033dc1af5641e61a7c3053bec1c93cb61f3fca8 Mon Sep 17 00:00:00 2001
+From: Dennis Gilmore <dennis@ausil.us>
+Date: Sat, 15 Mar 2014 11:34:31 -0500
+Subject: [PATCH 9/9] fix up some sillies
+
+---
+ include/config_distro_bootcmd.h   | 8 ++++----
+ include/configs/omap4_panda.h     | 1 +
+ include/configs/ti_omap4_common.h | 2 +-
+ 3 files changed, 6 insertions(+), 5 deletions(-)
+
+diff --git a/include/config_distro_bootcmd.h b/include/config_distro_bootcmd.h
+index bf44734..0fe94be 100644
+--- a/include/config_distro_bootcmd.h
++++ b/include/config_distro_bootcmd.h
+@@ -42,7 +42,7 @@
+ 			"run scan_boot; " \
+ 		"fi\0" \
+ 	\
+-	"bootcmd_usb0=setenv devnum 0; run usb_boot;\0"
++	"bootcmd_usb0=setenv devnum 0; run usb_boot;\0" \
+ 	"bootcmd_usb1=setenv devnum 1; run usb_boot;\0"
+ #define BOOT_TARGETS_USB "usb0 usb1"
+ #else
+@@ -59,7 +59,7 @@
+ 			"run scan_boot; " \
+ 		"fi\0" \
+ 	\
+-	"bootcmd_sata0=setenv devnum 0; run sata_boot;\0"
++	"bootcmd_sata0=setenv devnum 0; run sata_boot;\0" \
+ 	"bootcmd_sata1=setenv devnum 1; run sata_boot;\0"
+ #define BOOT_TARGETS_SATA "sata0 sata1"
+ #else
+@@ -75,7 +75,7 @@
+                         "run scan_boot; " \
+                 "fi\0" \
+         \
+-        "bootcmd_scsi0=setenv devnum 0; run scsi_boot;\0"
++        "bootcmd_scsi0=setenv devnum 0; run scsi_boot;\0" \
+         "bootcmd_scsi1=setenv devnum 1; run scsi_boot;\0"
+ #define BOOT_TARGETS_SCSI "scsi0 scsi1"
+ #else
+@@ -91,7 +91,7 @@
+                         "run scan_boot; " \
+                 "fi\0" \
+         \
+-        "bootcmd_ide0=setenv devnum 0; run ide_boot;\0"
++        "bootcmd_ide0=setenv devnum 0; run ide_boot;\0" \
+         "bootcmd_ide1=setenv devnum 1; run ide_boot;\0"
+ #define BOOT_TARGETS_IDE "ide0 ide1"
+ #else
+diff --git a/include/configs/omap4_panda.h b/include/configs/omap4_panda.h
+index 26f7aee..1b81a24 100644
+--- a/include/configs/omap4_panda.h
++++ b/include/configs/omap4_panda.h
+@@ -35,6 +35,7 @@
+ 
+ 
+ #include <configs/ti_omap4_common.h>
++#define CONFIG_CMD_NET
+ 
+ /* GPIO */
+ #define CONFIG_CMD_GPIO
+diff --git a/include/configs/ti_omap4_common.h b/include/configs/ti_omap4_common.h
+index a92e681..eb3240a 100644
+--- a/include/configs/ti_omap4_common.h
++++ b/include/configs/ti_omap4_common.h
+@@ -127,7 +127,7 @@
+ 
+ #define CONFIG_BOOTCOMMAND \
+ 	"run findfdt; " \
+-	for target in ${boot_targets}; do run bootcmd_${target}; done
++	"for target in ${boot_targets}; do run bootcmd_${target}; done"
+ /*
+  * Defines for SPL
+  * It is known that this will break HS devices. Since the current size of
+-- 
+1.9.0
+
diff --git a/uboot-tools.spec b/uboot-tools.spec
index 10cbb13..6c6cf40 100644
--- a/uboot-tools.spec
+++ b/uboot-tools.spec
@@ -20,6 +20,7 @@ Patch14:        0005-add-generic-bootcmd-header.patch
 Patch15:        0006-convert-wandboard-to-use-generic-boot-commands.patch
 Patch16:        0007-convert-beaglebone-to-use-generic-boot-commands.patch
 Patch17:        0008-convert-pandaboard-to-use-generic-boot-commands.patch
+Patch18:        0009-fix-up-some-sillies.patch
 
 %ifnarch %{arm}
 BuildRequires:  gcc-arm-linux-gnu
@@ -162,6 +163,7 @@ u-boot bootloader binaries for Wandboard i.MX6 Solo
 %patch15 -p1
 %patch16 -p1
 %patch17 -p1
+%patch18 -p1
 
 mkdir builds
 # convert fedora logo to bmp for use in u-boot