From 9eac282024c55fc13970189d6ace61f884917538 Mon Sep 17 00:00:00 2001 From: Jean-Christophe PLAGNIOL-VILLARD Date: Fri, 11 Mar 2011 02:10:39 +0100 Subject: defaultenv: add kernel_loc nfs and tftp support before we can only support tftp so keep it as default Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD Cc: Nicolas Ferre Cc: Patrice Vilchez Signed-off-by: Sascha Hauer --- arch/arm/boards/at91sam9261ek/env/config | 4 ++-- arch/arm/boards/at91sam9263ek/env/config | 4 ++-- arch/arm/boards/at91sam9m10g45ek/env/config | 4 ++-- arch/arm/boards/eukrea_cpuimx25/env/config | 2 +- arch/arm/boards/eukrea_cpuimx35/env/config | 2 +- arch/arm/boards/eukrea_cpuimx51/env/config | 2 +- arch/arm/boards/freescale-mx35-3-stack/env/config | 4 ++-- arch/arm/boards/freescale-mx51-pdk/env/config | 4 ++-- arch/arm/boards/guf-cupid/env/config | 4 ++-- arch/arm/boards/guf-neso/env/config | 4 ++-- arch/arm/boards/karo-tx25/env/config | 4 ++-- arch/arm/boards/karo-tx28/env/config | 4 ++-- arch/arm/boards/mini2440/env/config | 4 ++-- arch/arm/boards/nhk8815/env/config | 4 ++-- arch/arm/boards/pcm037/env/config | 4 ++-- arch/arm/boards/pcm038/env/config | 4 ++-- arch/arm/boards/pcm043/env/config | 4 ++-- arch/arm/boards/phycard-i.MX27/env/config | 4 ++-- arch/arm/boards/pm9261/env/config | 4 ++-- arch/arm/boards/pm9g45/env/config | 4 ++-- arch/arm/boards/versatile/env/config | 4 ++-- defaultenv/bin/boot | 13 ++++++++----- 22 files changed, 47 insertions(+), 44 deletions(-) diff --git a/arch/arm/boards/at91sam9261ek/env/config b/arch/arm/boards/at91sam9261ek/env/config index 3b922339fa..1203705cb8 100644 --- a/arch/arm/boards/at91sam9261ek/env/config +++ b/arch/arm/boards/at91sam9261ek/env/config @@ -10,8 +10,8 @@ ip=dhcp #eth0.gateway=a.b.c.d #eth0.serverip=a.b.c.d -# can be either 'net' or 'nand' -kernel_loc=net +# can be either 'nfs', 'tftp' or 'nand' +kernel_loc=tftp # can be either 'net', 'nand' or 'initrd' rootfs_loc=net diff --git a/arch/arm/boards/at91sam9263ek/env/config b/arch/arm/boards/at91sam9263ek/env/config index 49c4339f95..25036af9e5 100644 --- a/arch/arm/boards/at91sam9263ek/env/config +++ b/arch/arm/boards/at91sam9263ek/env/config @@ -10,8 +10,8 @@ ip=dhcp #eth0.gateway=a.b.c.d #eth0.serverip=a.b.c.d -# can be either 'net' , 'nor' or 'nand' -kernel_loc=net +# can be either 'nfs', 'tftp', 'nor' or 'nand' +kernel_loc=tftp # can be either 'net', 'nor', 'nand' or 'initrd' rootfs_loc=net diff --git a/arch/arm/boards/at91sam9m10g45ek/env/config b/arch/arm/boards/at91sam9m10g45ek/env/config index 3b922339fa..1203705cb8 100644 --- a/arch/arm/boards/at91sam9m10g45ek/env/config +++ b/arch/arm/boards/at91sam9m10g45ek/env/config @@ -10,8 +10,8 @@ ip=dhcp #eth0.gateway=a.b.c.d #eth0.serverip=a.b.c.d -# can be either 'net' or 'nand' -kernel_loc=net +# can be either 'nfs', 'tftp' or 'nand' +kernel_loc=tftp # can be either 'net', 'nand' or 'initrd' rootfs_loc=net diff --git a/arch/arm/boards/eukrea_cpuimx25/env/config b/arch/arm/boards/eukrea_cpuimx25/env/config index 927010c255..5cedbf8216 100644 --- a/arch/arm/boards/eukrea_cpuimx25/env/config +++ b/arch/arm/boards/eukrea_cpuimx25/env/config @@ -15,7 +15,7 @@ ip=none #eth0.gateway=a.b.c.d #eth0.serverip=a.b.c.d -# can be either 'net' or 'nand' +# can be either 'nfs', 'tftp' or 'nand' kernel_loc=nand # can be either 'net', 'nand' or 'initrd' rootfs_loc=nand diff --git a/arch/arm/boards/eukrea_cpuimx35/env/config b/arch/arm/boards/eukrea_cpuimx35/env/config index 6ed6b244c6..776d19a24d 100644 --- a/arch/arm/boards/eukrea_cpuimx35/env/config +++ b/arch/arm/boards/eukrea_cpuimx35/env/config @@ -15,7 +15,7 @@ ip=none #eth0.gateway=a.b.c.d #eth0.serverip=a.b.c.d -# can be either 'net' or 'nand' +# can be either 'nfs', 'tftp' or 'nand' kernel_loc=nand # can be either 'net', 'nand' or 'initrd' rootfs_loc=nand diff --git a/arch/arm/boards/eukrea_cpuimx51/env/config b/arch/arm/boards/eukrea_cpuimx51/env/config index 51fcdde39b..737f8e32fe 100644 --- a/arch/arm/boards/eukrea_cpuimx51/env/config +++ b/arch/arm/boards/eukrea_cpuimx51/env/config @@ -18,7 +18,7 @@ ip=none #eth0.gateway=a.b.c.d #eth0.serverip=a.b.c.d -# can be either 'net' or 'nand' +# can be either 'nfs', 'tftp' or 'nand' kernel_loc=nand # can be either 'net', 'nand' or 'initrd' rootfs_loc=nand diff --git a/arch/arm/boards/freescale-mx35-3-stack/env/config b/arch/arm/boards/freescale-mx35-3-stack/env/config index df01d4222f..ee9bd07e28 100644 --- a/arch/arm/boards/freescale-mx35-3-stack/env/config +++ b/arch/arm/boards/freescale-mx35-3-stack/env/config @@ -14,8 +14,8 @@ ip=dhcp #eth0.gateway=a.b.c.d #eth0.serverip=a.b.c.d -# can be either 'net', 'nor' or 'nand' -kernel_loc=net +# can be either 'nfs', 'tftp', 'nor' or 'nand' +kernel_loc=tftp # can be either 'net', 'nor', 'nand' or 'initrd' rootfs_loc=net diff --git a/arch/arm/boards/freescale-mx51-pdk/env/config b/arch/arm/boards/freescale-mx51-pdk/env/config index d9b84078f8..8e6b34eec1 100644 --- a/arch/arm/boards/freescale-mx51-pdk/env/config +++ b/arch/arm/boards/freescale-mx51-pdk/env/config @@ -14,8 +14,8 @@ ip=dhcp #eth0.gateway=a.b.c.d #eth0.serverip=a.b.c.d -# can be either 'net', 'nor' or 'nand' -kernel_loc=net +# can be either 'nfs', 'tftp', 'nor' or 'nand' +kernel_loc=tftp # can be either 'net', 'nor', 'nand' or 'initrd' rootfs_loc=net diff --git a/arch/arm/boards/guf-cupid/env/config b/arch/arm/boards/guf-cupid/env/config index 4db05b6c6d..cd11eb185d 100644 --- a/arch/arm/boards/guf-cupid/env/config +++ b/arch/arm/boards/guf-cupid/env/config @@ -14,8 +14,8 @@ ip=dhcp #eth0.gateway=a.b.c.d #eth0.serverip=a.b.c.d -# can be either 'net', 'nor' or 'nand' -kernel_loc=net +# can be either 'nfs', 'tftp', 'nor' or 'nand' +kernel_loc=tftp # can be either 'net', 'nor', 'nand' or 'initrd' rootfs_loc=net diff --git a/arch/arm/boards/guf-neso/env/config b/arch/arm/boards/guf-neso/env/config index 6327e69217..162488f8b6 100644 --- a/arch/arm/boards/guf-neso/env/config +++ b/arch/arm/boards/guf-neso/env/config @@ -14,8 +14,8 @@ ip=dhcp #eth0.gateway=a.b.c.d #eth0.serverip=a.b.c.d -# can be either 'net', 'nor' or 'nand' -kernel_loc=net +# can be either 'nfs', 'tftp', 'nor' or 'nand' +kernel_loc=tftp # can be either 'net', 'nor', 'nand' or 'initrd' rootfs_loc=net diff --git a/arch/arm/boards/karo-tx25/env/config b/arch/arm/boards/karo-tx25/env/config index e4ff7560a2..9113a87bc5 100644 --- a/arch/arm/boards/karo-tx25/env/config +++ b/arch/arm/boards/karo-tx25/env/config @@ -14,8 +14,8 @@ ip=dhcp #eth0.serverip=a.b.c.d #eth0.gateway=a.b.c.d -# can be either 'net' -kernel_loc=net +# can be either 'nfs' or 'tftp' +kernel_loc=tftp # can be either 'net' or 'initrd' rootfs_loc=net diff --git a/arch/arm/boards/karo-tx28/env/config b/arch/arm/boards/karo-tx28/env/config index 9b302b8e5d..fdf57ea662 100644 --- a/arch/arm/boards/karo-tx28/env/config +++ b/arch/arm/boards/karo-tx28/env/config @@ -15,8 +15,8 @@ ip=dhcp #eth0.serverip=a.b.c.d #eth0.gateway=a.b.c.d -# can be either 'net' -kernel_loc=net +# can be either 'nfs' or 'tftp' +kernel_loc=tftp # can be either 'net' or 'initrd' rootfs_loc=net diff --git a/arch/arm/boards/mini2440/env/config b/arch/arm/boards/mini2440/env/config index b24877e9dc..ff6f1ea5ed 100644 --- a/arch/arm/boards/mini2440/env/config +++ b/arch/arm/boards/mini2440/env/config @@ -14,8 +14,8 @@ ip=dhcp #eth0.gateway=a.b.c.d #eth0.serverip=a.b.c.d -# can be either 'net', or 'nand' -kernel_loc=net +# can be either 'nfs', 'tftp' or 'nand' +kernel_loc=tftp # can be either 'net', 'nand' or 'initrd' rootfs_loc=net diff --git a/arch/arm/boards/nhk8815/env/config b/arch/arm/boards/nhk8815/env/config index e657a76f99..7428c43713 100644 --- a/arch/arm/boards/nhk8815/env/config +++ b/arch/arm/boards/nhk8815/env/config @@ -10,8 +10,8 @@ ip=dhcp #eth0.gateway=a.b.c.d #eth0.serverip=a.b.c.d -# can be either 'net' or 'nand' -kernel_loc=net +# can be either 'nfs', 'tftp' or 'nand' +kernel_loc=tftp # can be either 'net', 'nand' or 'initrd' rootfs_loc=net diff --git a/arch/arm/boards/pcm037/env/config b/arch/arm/boards/pcm037/env/config index df2f694c88..3748cc4c32 100644 --- a/arch/arm/boards/pcm037/env/config +++ b/arch/arm/boards/pcm037/env/config @@ -14,8 +14,8 @@ ip=dhcp #eth0.gateway=a.b.c.d #eth0.serverip=a.b.c.d -# can be either 'net', 'nor' or 'nand' -kernel_loc=net +# can be either 'nfs', 'tftp', nor' or 'nand' +kernel_loc=tftp # can be either 'net', 'nor', 'nand' or 'initrd' rootfs_loc=net diff --git a/arch/arm/boards/pcm038/env/config b/arch/arm/boards/pcm038/env/config index a8be5c924d..9e28f5d1f2 100644 --- a/arch/arm/boards/pcm038/env/config +++ b/arch/arm/boards/pcm038/env/config @@ -14,8 +14,8 @@ ip=dhcp #eth0.gateway=a.b.c.d #eth0.serverip=a.b.c.d -# can be either 'net', 'nor' or 'nand' -kernel_loc=net +# can be either 'nfs', 'tftp', 'nor' or 'nand' +kernel_loc=tftp # can be either 'net', 'nor', 'nand' or 'initrd' rootfs_loc=net diff --git a/arch/arm/boards/pcm043/env/config b/arch/arm/boards/pcm043/env/config index 212b6a9cd8..e7f94f8dec 100644 --- a/arch/arm/boards/pcm043/env/config +++ b/arch/arm/boards/pcm043/env/config @@ -14,8 +14,8 @@ ip=dhcp #eth0.gateway=a.b.c.d #eth0.serverip=a.b.c.d -# can be either 'net', 'nor' or 'nand' -kernel_loc=net +# can be either 'nfs', 'tftp', 'nor' or 'nand' +kernel_loc=tftp # can be either 'net', 'nor', 'nand' or 'initrd' rootfs_loc=net diff --git a/arch/arm/boards/phycard-i.MX27/env/config b/arch/arm/boards/phycard-i.MX27/env/config index d0670dec2c..0e20b48ffe 100644 --- a/arch/arm/boards/phycard-i.MX27/env/config +++ b/arch/arm/boards/phycard-i.MX27/env/config @@ -14,8 +14,8 @@ ip=dhcp #eth0.gateway=a.b.c.d #eth0.serverip=a.b.c.d -# can be either 'net', 'nor' or 'nand' -kernel_loc=net +# can be either 'nfs', 'tftp', 'nor' or 'nand' +kernel_loc=tftp # can be either 'net', 'nor', 'nand' or 'initrd' rootfs_loc=net diff --git a/arch/arm/boards/pm9261/env/config b/arch/arm/boards/pm9261/env/config index f7e133ecf9..7933379b65 100644 --- a/arch/arm/boards/pm9261/env/config +++ b/arch/arm/boards/pm9261/env/config @@ -10,8 +10,8 @@ ip=dhcp #eth0.gateway=a.b.c.d #eth0.serverip=a.b.c.d -# can be either 'net' or 'nand' -kernel_loc=net +# can be either 'nfs', 'tftp' or 'nand' +kernel_loc=tftp # can be either 'net', 'nand' or 'initrd' rootfs_loc=net diff --git a/arch/arm/boards/pm9g45/env/config b/arch/arm/boards/pm9g45/env/config index 3b922339fa..1203705cb8 100644 --- a/arch/arm/boards/pm9g45/env/config +++ b/arch/arm/boards/pm9g45/env/config @@ -10,8 +10,8 @@ ip=dhcp #eth0.gateway=a.b.c.d #eth0.serverip=a.b.c.d -# can be either 'net' or 'nand' -kernel_loc=net +# can be either 'nfs', 'tftp' or 'nand' +kernel_loc=tftp # can be either 'net', 'nand' or 'initrd' rootfs_loc=net diff --git a/arch/arm/boards/versatile/env/config b/arch/arm/boards/versatile/env/config index 9dec3f25bd..9c5ce61330 100644 --- a/arch/arm/boards/versatile/env/config +++ b/arch/arm/boards/versatile/env/config @@ -10,8 +10,8 @@ ip=dhcp #eth0.gateway=a.b.c.d #eth0.serverip=a.b.c.d -# can be either 'net' or 'nor' -kernel_loc=net +# can be either 'nfs', 'tftp' or 'nor' +kernel_loc=tftp # can be either 'net', 'nor' or 'initrd' rootfs_loc=initrd diff --git a/defaultenv/bin/boot b/defaultenv/bin/boot index 7497791c0b..de4fa24f27 100644 --- a/defaultenv/bin/boot +++ b/defaultenv/bin/boot @@ -8,9 +8,12 @@ if [ x$1 = xnand ]; then elif [ x$1 = xnor ]; then rootfs_loc=nor kernel_loc=nor -elif [ x$1 = xnet ]; then +elif [ x$1 = xnfs ]; then rootfs_loc=net - kernel_loc=net + kernel_loc=nfs +elif [ x$1 = xtftp ]; then + rootfs_loc=net + kernel_loc=tftp fi if [ x$ip = xdhcp ]; then @@ -71,7 +74,7 @@ if [ ! -e /dev/ram0.kernel ]; then addpart /dev/ram0 8M@8M(kernel) fi -if [ x$kernel_loc = xnet ]; then +if [ x$kernel_loc = xnfs ] || [ x$kernel_loc = xtftp ]; then if [ x$ip = xdhcp ]; then dhcp fi @@ -87,14 +90,14 @@ if [ x$kernel_loc = xnet ]; then echo "error: set kernelimage_type to one of 'uimage', 'zimage', 'raw' or 'raw_lzo'" exit 1 fi - tftp $kernelimage $netload || exit 1 + $kernel_loc $kernelimage $netload || exit 1 kdev="$netload" elif [ x$kernel_loc = xnor ]; then kdev="/dev/nor0.kernel" elif [ x$kernel_loc = xnand ]; then kdev="/dev/nand0.kernel.bb" else - echo "error: set kernel_loc to one of 'net', 'nand' or 'nor'" + echo "error: set kernel_loc to one of 'nfs', 'tftp', 'nand' or 'nor'" exit 1 fi -- cgit v1.2.3