u-boot 2011.10rc: update SRCREV and rediff patches
[glsdk/meta-ti-glsdk.git] / recipes-bsp / u-boot / u-boot / 2011.09git / 0001-am335x_evm-only-do-in-kernel-dhcp-when-using-NFS-use.patch
1 From 557a773eb245f3f2508e40d6d8a6c593738fd46f Mon Sep 17 00:00:00 2001
2 From: Koen Kooi <koen@dominion.thruhere.net>
3 Date: Tue, 1 Nov 2011 12:19:54 +0100
4 Subject: [PATCH 1/4] am335x_evm: only do in-kernel dhcp when using NFS, userspace will do dhcp otherwise
6 Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
7 ---
8  include/configs/am335x_evm.h |    4 ++--
9  1 files changed, 2 insertions(+), 2 deletions(-)
11 diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
12 index 41a3316..93b3161 100755
13 --- a/include/configs/am335x_evm.h
14 +++ b/include/configs/am335x_evm.h
15 @@ -69,7 +69,7 @@
16         "nfsopts=nolock\0" \
17         "static_ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}" \
18                         "::off\0" \
19 -       "ip_method=dhcp\0" \
20 +       "ip_method=none\0" \
21         "bootenv=uEnv.txt\0" \
22         "loadbootenv=fatload mmc ${mmc_dev} ${loadaddr} ${bootenv}\0" \
23         "importbootenv=echo Importing environment from mmc ...; " \
24 @@ -99,7 +99,7 @@
25                 "setenv bootargs ${bootargs} " \
26                 "root=/dev/nfs " \
27                 "nfsroot=${serverip}:${rootpath},${nfsopts} rw " \
28 -               "ip=${ip_method}\0" \
29 +               "ip=dhcp\0" \
30         "mmc_boot=run mmc_args; " \
31                 "run mmc_load_uimage; " \
32                 "bootm ${loadaddr}\0" \
33 -- 
34 1.7.2.5