From 9db3b8621a20c1be4a7b13fc87c690bbe0fd8032 Mon Sep 17 00:00:00 2001
From: James Maki <jmaki@multitech.com>
Date: Tue, 18 May 2010 15:54:03 -0500
Subject: remove \r from uboot-setenv

---
 contrib/multitech/uboot-setenv | 120 ++++++++++++++++++++---------------------
 1 file changed, 60 insertions(+), 60 deletions(-)

diff --git a/contrib/multitech/uboot-setenv b/contrib/multitech/uboot-setenv
index e0df5cd395..7f18490584 100644
--- a/contrib/multitech/uboot-setenv
+++ b/contrib/multitech/uboot-setenv
@@ -1,60 +1,60 @@
-print setting U-Boot variables...
-send setenv bootargs              \'mem=64M console=ttyS0,115200 root=/dev/mtdblock8 ro rootfstype=jffs2\'
-send setenv bootcmd               \'nboot.jffs2 ${loadaddr} 0 ${kernel_addr}; bootm ${loadaddr}\'
-send setenv bootdelay             3
-send setenv baudrate              115200
-send setenv serverip              192.168.2.2
-send setenv ipaddr                192.168.2.1
-send setenv netmask               255.255.255.0
-send setenv loadaddr              0x21400000
-send setenv hostname              MTCDP
-send setenv dnsip                 192.168.2.3
-send setenv stdin                 serial
-send setenv stdout                serial
-send setenv stderr                serial
-send setenv ethact                macb0
-send setenv bootstrap_file        oe_bootstrap.bin
-send setenv uboot_file            oe_u-boot.bin
-send setenv uboot_env1_file       oe_uboot_env1.bin
-send setenv uboot_env2_file       oe_uboot_env2.bin
-send setenv kernel_file           oe_uImage.bin
-send setenv config_file           oe_config.tar.gz
-send setenv oem_file              oe_oem.tar.gz
-send setenv rootfs_file           oe_rootfs.jffs2
-send setenv bootstrap_addr        0x00000000
-send setenv uboot_addr            0x00020000
-send setenv uboot_env1_addr       0x00060000
-send setenv uboot_env2_addr       0x00080000
-send setenv kernel_addr           0x000A0000
-send setenv config_addr           0x00800000
-send setenv oem_addr              0x01000000
-send setenv rootfs_addr           0x01800000
-send setenv bootstrap_size        0x00020000
-send setenv uboot_size            0x00040000
-send setenv uboot_env1_size       0x00020000
-send setenv uboot_env2_size       0x00020000
-send setenv kernel_size           0x00760000
-send setenv config_size           0x00800000
-send setenv oem_size              0x00800000
-send setenv erase_bootstrap       \'nand erase ${bootstrap_addr} ${bootstrap_size}\'
-send setenv erase_uboot           \'nand erase ${uboot_addr} ${uboot_size}\'
-send setenv erase_uboot_env1      \'nand erase ${uboot_env1_addr} ${uboot_env1_size}\'
-send setenv erase_uboot_env2      \'nand erase ${uboot_env2_addr} ${uboot_env2_size}\'
-send setenv erase_kernel          \'nand erase ${kernel_addr} ${kernel_size}\'
-send setenv erase_config          \'nand erase ${config_addr} ${config_size}\'
-send setenv erase_oem             \'nand erase ${oem_addr} ${oem_size}\'
-send setenv erase_rootfs          \'nand erase ${rootfs_addr}\'
-send setenv tftp_bootstrap        \'tftp ${loadaddr} ${bootstrap_file}; run erase_bootstrap; nand write.jffs2 ${fileaddr} ${bootstrap_addr} ${filesize}\'
-send setenv tftp_uboot            \'tftp ${loadaddr} ${uboot_file}; run erase_uboot; nand write.jffs2 ${fileaddr} ${uboot_addr} ${filesize}\'
-send setenv tftp_uboot_env1       \'tftp ${loadaddr} ${uboot_env1_file}; run erase_uboot_env1; nand write.jffs2 ${fileaddr} ${uboot_env1_addr} ${filesize}\'
-send setenv tftp_uboot_env2       \'tftp ${loadaddr} ${uboot_env2_file}; run erase_uboot_env2; nand write.jffs2 ${fileaddr} ${uboot_env2_addr} ${filesize}\'
-send setenv tftp_kernel           \'tftp ${loadaddr} ${kernel_file}; run erase_kernel; nand write.jffs2 ${fileaddr} ${kernel_addr} ${filesize}\'
-send setenv tftp_config           \'tftp ${loadaddr} ${config_file}; run erase_config; nand write.jffs2 ${fileaddr} ${config_addr} ${filesize}\'
-send setenv tftp_oem              \'tftp ${loadaddr} ${oem_file}; run erase_oem; nand write.jffs2 ${fileaddr} ${oem_addr} ${filesize}\'
-send setenv tftp_rootfs           \'tftp ${loadaddr} ${rootfs_file}; run erase_rootfs; nand write.jffs2 ${fileaddr} ${rootfs_addr} ${filesize}\'
-send setenv krb                   \'run tftp_kernel; run tftp_rootfs; boot\'
-send setenv rb                    \'run tftp_rootfs; boot\'
-print saving...
-send saveenv
-send saveenv
-send printenv
+print setting U-Boot variables...
+send setenv bootargs              \'mem=64M console=ttyS0,115200 root=/dev/mtdblock8 ro rootfstype=jffs2\'
+send setenv bootcmd               \'nboot.jffs2 ${loadaddr} 0 ${kernel_addr}; bootm ${loadaddr}\'
+send setenv bootdelay             3
+send setenv baudrate              115200
+send setenv serverip              192.168.2.2
+send setenv ipaddr                192.168.2.1
+send setenv netmask               255.255.255.0
+send setenv loadaddr              0x21400000
+send setenv hostname              MTCDP
+send setenv dnsip                 192.168.2.3
+send setenv stdin                 serial
+send setenv stdout                serial
+send setenv stderr                serial
+send setenv ethact                macb0
+send setenv bootstrap_file        oe_bootstrap.bin
+send setenv uboot_file            oe_u-boot.bin
+send setenv uboot_env1_file       oe_uboot_env1.bin
+send setenv uboot_env2_file       oe_uboot_env2.bin
+send setenv kernel_file           oe_uImage.bin
+send setenv config_file           oe_config.tar.gz
+send setenv oem_file              oe_oem.tar.gz
+send setenv rootfs_file           oe_rootfs.jffs2
+send setenv bootstrap_addr        0x00000000
+send setenv uboot_addr            0x00020000
+send setenv uboot_env1_addr       0x00060000
+send setenv uboot_env2_addr       0x00080000
+send setenv kernel_addr           0x000A0000
+send setenv config_addr           0x00800000
+send setenv oem_addr              0x01000000
+send setenv rootfs_addr           0x01800000
+send setenv bootstrap_size        0x00020000
+send setenv uboot_size            0x00040000
+send setenv uboot_env1_size       0x00020000
+send setenv uboot_env2_size       0x00020000
+send setenv kernel_size           0x00760000
+send setenv config_size           0x00800000
+send setenv oem_size              0x00800000
+send setenv erase_bootstrap       \'nand erase ${bootstrap_addr} ${bootstrap_size}\'
+send setenv erase_uboot           \'nand erase ${uboot_addr} ${uboot_size}\'
+send setenv erase_uboot_env1      \'nand erase ${uboot_env1_addr} ${uboot_env1_size}\'
+send setenv erase_uboot_env2      \'nand erase ${uboot_env2_addr} ${uboot_env2_size}\'
+send setenv erase_kernel          \'nand erase ${kernel_addr} ${kernel_size}\'
+send setenv erase_config          \'nand erase ${config_addr} ${config_size}\'
+send setenv erase_oem             \'nand erase ${oem_addr} ${oem_size}\'
+send setenv erase_rootfs          \'nand erase ${rootfs_addr}\'
+send setenv tftp_bootstrap        \'tftp ${loadaddr} ${bootstrap_file}; run erase_bootstrap; nand write.jffs2 ${fileaddr} ${bootstrap_addr} ${filesize}\'
+send setenv tftp_uboot            \'tftp ${loadaddr} ${uboot_file}; run erase_uboot; nand write.jffs2 ${fileaddr} ${uboot_addr} ${filesize}\'
+send setenv tftp_uboot_env1       \'tftp ${loadaddr} ${uboot_env1_file}; run erase_uboot_env1; nand write.jffs2 ${fileaddr} ${uboot_env1_addr} ${filesize}\'
+send setenv tftp_uboot_env2       \'tftp ${loadaddr} ${uboot_env2_file}; run erase_uboot_env2; nand write.jffs2 ${fileaddr} ${uboot_env2_addr} ${filesize}\'
+send setenv tftp_kernel           \'tftp ${loadaddr} ${kernel_file}; run erase_kernel; nand write.jffs2 ${fileaddr} ${kernel_addr} ${filesize}\'
+send setenv tftp_config           \'tftp ${loadaddr} ${config_file}; run erase_config; nand write.jffs2 ${fileaddr} ${config_addr} ${filesize}\'
+send setenv tftp_oem              \'tftp ${loadaddr} ${oem_file}; run erase_oem; nand write.jffs2 ${fileaddr} ${oem_addr} ${filesize}\'
+send setenv tftp_rootfs           \'tftp ${loadaddr} ${rootfs_file}; run erase_rootfs; nand write.jffs2 ${fileaddr} ${rootfs_addr} ${filesize}\'
+send setenv krb                   \'run tftp_kernel; run tftp_rootfs; boot\'
+send setenv rb                    \'run tftp_rootfs; boot\'
+print saving...
+send saveenv
+send saveenv
+send printenv
-- 
cgit v1.2.3