Merge remote branch 'origin/multitech-corecdp-1.x' into multitech-corecdp-dev

Conflicts:
	recipes/multitech/helloworld-autotools_git.bb
	recipes/multitech/mts-io_git.bb
	recipes/multitech/sms-utils_git.bb
	recipes/multitech/u-boot-linux-utils_git.bb
	recipes/multitech/upgrade-reboot_git.bb
	recipes/multitech/venus-gps_git.bb

3 files changed, 64 insertions, 74 deletions

diff --git a/conf/distro/corecdp.conf b/conf/distro/corecdp.conf
index 470098125d..ef650e8836 100644
--- a/conf/distro/corecdp.conf
+++ b/conf/distro/corecdp.conf
@@ -11,7 +11,7 @@ require conf/amend-recipes.inc
 
 DISTRO_NAME = "CoreCDP"
 DISTRO = "corecdp"
-DISTRO_VERSION = "2010.04"
+DISTRO_VERSION = "1.0.0"
 DISTRO_TYPE = "release"
 TARGET_VENDOR = "-corecdp"
 BUILDNAME = "${DISTRO_NAME} ${DISTRO_VERSION}"
diff --git a/contrib/multitech/uboot-setenv b/contrib/multitech/uboot-setenv
index 9c7ee57e00..7f18490584 100644
--- a/contrib/multitech/uboot-setenv
+++ b/contrib/multitech/uboot-setenv
@@ -1,61 +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 ethaddr               00:D0:A0:02:0D:E1

-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              AT91SAM9G20

-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
diff --git a/recipes/u-boot/u-boot-1.3.4/mtcdp/u-boot-1.3.4-mts.patch b/recipes/u-boot/u-boot-1.3.4/mtcdp/u-boot-1.3.4-mts.patch
index 97dc2f193d..412837a545 100644
--- a/recipes/u-boot/u-boot-1.3.4/mtcdp/u-boot-1.3.4-mts.patch
+++ b/recipes/u-boot/u-boot-1.3.4/mtcdp/u-boot-1.3.4-mts.patch
@@ -3090,17 +3090,8 @@ diff -uprN u-boot-1.3.4-vanilla/include/configs/at91sam9rlek.h u-boot-1.3.4/incl
  /* bootstrap + u-boot + env + linux in dataflash on CS0 */
 diff -uprN u-boot-1.3.4-vanilla/Makefile u-boot-1.3.4/Makefile
 --- u-boot-1.3.4-vanilla/Makefile	2008-08-12 09:08:38.000000000 -0500
-+++ u-boot-1.3.4/Makefile	2010-03-25 17:04:31.000000000 -0500
-@@ -21,6 +21,8 @@
- # MA 02111-1307 USA
- #
- 
-+export CROSS_COMPILE = /opt/timesys/toolchains/armv5l-linux/bin/armv5l-linux-
-+
- VERSION = 1
- PATCHLEVEL = 3
- SUBLEVEL = 4
-@@ -2353,15 +2355,6 @@ shannon_config	:	unconfig
++++ u-boot-1.3.4/Makefile	2010-05-13 14:00:22.000000000 -0500
+@@ -2353,15 +2353,6 @@ shannon_config	:	unconfig
  at91rm9200dk_config	:	unconfig
  	@$(MKCONFIG) $(@:_config=) arm arm920t at91rm9200dk atmel at91rm9200
  
@@ -3116,7 +3107,7 @@ diff -uprN u-boot-1.3.4-vanilla/Makefile u-boot-1.3.4/Makefile
  cmc_pu2_config	:	unconfig
  	@$(MKCONFIG) $(@:_config=) arm arm920t cmc_pu2 NULL at91rm9200
  
-@@ -2384,8 +2377,175 @@ mp2usb_config	:	unconfig
+@@ -2384,8 +2375,175 @@ mp2usb_config	:	unconfig
  at91cap9adk_config	:	unconfig
  	@$(MKCONFIG) $(@:_config=) arm arm926ejs at91cap9adk atmel at91sam9