From: "Franklin S. Cooper Jr" <[email protected]>

* This patch has been upstreamed and was accidently committed to the incorrect 
git
  tree for am57xx-evm.
* Locally apply this patch now until it is committed to the right branch.

Signed-off-by: Franklin S. Cooper Jr <[email protected]>
---
 ...0001-omap5-Add-netargs-and-netboot-option.patch |   54 ++++++++++++++++++++
 .../u-boot/u-boot-ti-staging_2014.07.bbappend      |    5 +-
 2 files changed, 58 insertions(+), 1 deletion(-)
 create mode 100644 
meta-arago-distro/recipes-bsp/u-boot/u-boot-ti-staging/0001-omap5-Add-netargs-and-netboot-option.patch

diff --git 
a/meta-arago-distro/recipes-bsp/u-boot/u-boot-ti-staging/0001-omap5-Add-netargs-and-netboot-option.patch
 
b/meta-arago-distro/recipes-bsp/u-boot/u-boot-ti-staging/0001-omap5-Add-netargs-and-netboot-option.patch
new file mode 100644
index 0000000..44cb9ee
--- /dev/null
+++ 
b/meta-arago-distro/recipes-bsp/u-boot/u-boot-ti-staging/0001-omap5-Add-netargs-and-netboot-option.patch
@@ -0,0 +1,54 @@
+From ae58ce41dcd9e6c213e57abf46ec2680eab9cd34 Mon Sep 17 00:00:00 2001
+From: Franklin S Cooper Jr <[email protected]>
+Date: Thu, 4 Dec 2014 11:27:05 -0600
+Subject: [PATCH] omap5: Add netargs and netboot option
+
+* Add netargs and netboot option.
+* This enables tftp and nfs booting
+* This puts omap5 devices inline with other devices such as am335x and am437x
+
+Signed-off-by: Franklin S Cooper Jr <[email protected]>
+Signed-off-by: Felipe Balbi <[email protected]>
+---
+ include/configs/ti_omap5_common.h |   15 ++++++++++++++-
+ 1 file changed, 14 insertions(+), 1 deletion(-)
+
+diff --git a/include/configs/ti_omap5_common.h 
b/include/configs/ti_omap5_common.h
+index c47651d..925cb42 100644
+--- a/include/configs/ti_omap5_common.h
++++ b/include/configs/ti_omap5_common.h
+@@ -85,10 +85,16 @@
+               "vram=${vram} " \
+               "root=${mmcroot} " \
+               "rootfstype=${mmcrootfstype}\0" \
++      "netargs=setenv bootargs console=${console} " \
++              "${optargs} " \
++              "root=/dev/nfs " \
++              "nfsroot=${serverip}:${rootpath},${nfsopts} rw " \
++              "ip=dhcp\0" \
+       "loadbootscript=fatload mmc ${mmcdev} ${loadaddr} boot.scr\0" \
+       "bootscript=echo Running bootscript from mmc${mmcdev} ...; " \
+               "source ${loadaddr}\0" \
+-      "loadbootenv=fatload mmc ${mmcdev} ${loadaddr} uEnv.txt\0" \
++      "bootenv=uEnv.txt\0" \
++      "loadbootenv=fatload mmc ${mmcdev} ${loadaddr} ${bootenv}\0" \
+       "importbootenv=echo Importing environment from mmc${mmcdev} ...; " \
+               "env import -t ${loadaddr} ${filesize}\0" \
+       "loadimage=load mmc ${bootpart} ${loadaddr} ${bootdir}/${bootfile}\0" \
+@@ -110,6 +116,13 @@
+                               "bootz ${loadaddr} - ${fdtaddr}; " \
+                       "fi;" \
+               "fi;\0" \
++      "netboot=echo Booting from network ...; " \
++              "set env autoload no; " \
++              "dhcp; " \
++              "tftp ${loadaddr} ${bootfile}; " \
++              "tftp ${fdtaddr} ${fdtfile}; " \
++              "run netargs; " \
++              "bootz ${loadaddr} - ${fdtaddr}\0" \
+       "findfdt="\
+               "if test $board_name = omap5_uevm; then " \
+                       "setenv fdtfile omap5-uevm.dtb; fi; " \
+-- 
+1.7.9.5
+
diff --git 
a/meta-arago-distro/recipes-bsp/u-boot/u-boot-ti-staging_2014.07.bbappend 
b/meta-arago-distro/recipes-bsp/u-boot/u-boot-ti-staging_2014.07.bbappend
index 872d0b2..35ad282 100644
--- a/meta-arago-distro/recipes-bsp/u-boot/u-boot-ti-staging_2014.07.bbappend
+++ b/meta-arago-distro/recipes-bsp/u-boot/u-boot-ti-staging_2014.07.bbappend
@@ -1,4 +1,6 @@
-PR_append = "-arago5"
+FILESEXTRAPATHS_append := "${THISDIR}/${PN}:"
+
+PR_append = "-arago6"
 
 UBOOT_LOCALVERSION = "-g${@d.getVar('SRCPV', True).partition('+')[2][0:7]}"
 
@@ -12,3 +14,4 @@ SRC_URI_am57xx-evm := 
"${@oe_filter_out('git://git.ti.com/ti-u-boot/ti-u-boot.gi
 BRANCH_am57xx-evm = "beaglex15"
 
 SRC_URI_am57xx-evm += 
"git://github.com/felipebalbi/u-boot.git;protocol=git;branch=${BRANCH}"
+SRC_URI_am57xx-evm += "file://0001-omap5-Add-netargs-and-netboot-option.patch"
-- 
1.7.9.5

_______________________________________________
meta-arago mailing list
[email protected]
http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago

Reply via email to