karo: use variable 'nfs_server' instead of 'serverip'

The latter may not be set (correctly) until after the 'bootp' command
which is executed only after initializing the 'bootargs' variable.

diff --git a/include/configs/tx28.h b/include/configs/tx28.h
index 7f0addb98b40587f790d4a26624ede6789ab30d6..5b890e23125fc834fbe266f83e1f72943350450b 100644 (file)
--- a/include/configs/tx28.h
+++ b/include/configs/tx28.h
@@ -134,7 +134,7 @@
        "bootargs_nand=run default_bootargs;set bootargs ${bootargs}"   \
        " root=/dev/mtdblock3 rootfstype=jffs2\0"                       \
        "bootargs_nfs=run default_bootargs;set bootargs ${bootargs}"    \
-       " root=/dev/nfs ip=dhcp nfsroot=${serverip}:${nfsroot},nolock\0"\
+       " root=/dev/nfs ip=dhcp nfsroot=${nfs_server}:${nfsroot},nolock\0"\
        "bootcmd_mmc=set autostart no;run bootargs_mmc;"                \
        "fatload mmc 0 ${loadaddr} uImage;run bootm_cmd\0"              \
        "bootcmd_nand=set autostart no;run bootargs_nand;"              \

diff --git a/include/configs/tx48.h b/include/configs/tx48.h
index 6de634fa80972d38986983650357e189c5a97e0f..8ce9efcd3c3086d8aa9ef2583db8ab727dda8f55 100644 (file)
--- a/include/configs/tx48.h
+++ b/include/configs/tx48.h
@@ -149,7 +149,7 @@
        " root=/dev/mtdblock4 rootfstype=jffs2\0"                       \
        "nfsroot=/tftpboot/rootfs\0"                                    \
        "bootargs_nfs=run default_bootargs;set bootargs ${bootargs}"    \
-       " root=/dev/nfs ip=dhcp nfsroot=${serverip}:${nfsroot},nolock\0"\
+       " root=/dev/nfs ip=dhcp nfsroot=${nfs_server}:${nfsroot},nolock\0"\
        "bootcmd_mmc=set autostart no;run bootargs_mmc;"                \
        " fatload mmc 0 ${loadaddr} uImage;run bootm_cmd\0"             \
        "bootcmd_nand=set autostart no;run bootargs_nand;"              \

diff --git a/include/configs/tx51.h b/include/configs/tx51.h
index 6cc12cd369e3f7d3f00a441eb44e25632e41dab0..8ab6ebb3a1fabe0332164b0f3e8cb7b5f3129c82 100644 (file)
--- a/include/configs/tx51.h
+++ b/include/configs/tx51.h
@@ -141,7 +141,7 @@
        " root=/dev/mtdblock3 rootfstype=jffs2\0"                       \
        "nfsroot=/tftpboot/rootfs\0"                                    \
        "bootargs_nfs=run default_bootargs;set bootargs ${bootargs}"    \
-       " root=/dev/nfs ip=dhcp nfsroot=${serverip}:${nfsroot},nolock\0"\
+       " root=/dev/nfs ip=dhcp nfsroot=${nfs_server}:${nfsroot},nolock\0"\
        "bootcmd_mmc=set autostart no;run bootargs_mmc;"                \
        "mmc read ${loadaddr} 100 3000;run bootm_cmd\0"                 \
        "bootcmd_nand=set autostart no;run bootargs_nand;"              \

diff --git a/include/configs/tx53.h b/include/configs/tx53.h
index 7ea23e5b955b75c37928bb7818b8551e35500580..b7821a88b5c050420c4db5c9d1e28f75fbcc016e 100644 (file)
--- a/include/configs/tx53.h
+++ b/include/configs/tx53.h
@@ -124,7 +124,7 @@
        " root=/dev/mtdblock3 rootfstype=jffs2\0"                       \
        "nfsroot=/tftpboot/rootfs\0"                                    \
        "bootargs_nfs=run default_bootargs;set bootargs ${bootargs}"    \
-       " root=/dev/nfs ip=dhcp nfsroot=${serverip}:${nfsroot},nolock\0"\
+       " root=/dev/nfs ip=dhcp nfsroot=${nfs_server}:${nfsroot},nolock\0"\
        "bootcmd_mmc=set autostart no;run bootargs_mmc;"                \
        "mmc read ${loadaddr} 100 3000;run bootm_cmd\0"                 \
        "bootcmd_nand=set autostart no;run bootargs_nand;"              \

diff --git a/include/configs/tx6.h b/include/configs/tx6.h
index 90882d286196dd5acbe4a71773313e93eb6817e6..91159dc4c40990e03e9df2bf6dc0fbdbb5593696 100644 (file)
--- a/include/configs/tx6.h
+++ b/include/configs/tx6.h
@@ -160,7 +160,7 @@
        "bootargs_nand=run default_bootargs;set bootargs ${bootargs}"   \
        " root=/dev/mtdblock3 rootfstype=jffs2\0"                       \
        "bootargs_nfs=run default_bootargs;set bootargs ${bootargs}"    \
-       " root=/dev/nfs ip=dhcp nfsroot=${serverip}:${nfsroot},nolock\0"\
+       " root=/dev/nfs ip=dhcp nfsroot=${nfs_server}:${nfsroot},nolock\0"\
        "bootcmd_mmc=set autostart no;run bootargs_mmc;"                \
        "fatload mmc 0 ${loadaddr} uImage;run bootm_cmd\0"              \
        "bootcmd_nand=set autostart no;run bootargs_nand;"              \