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 --- defaultenv/bin/boot | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'defaultenv') 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