Merge branch 'multitech-corecdp-1.x' into multitech-corecdp-dev

16 files changed, 76 insertions, 30 deletions

diff --git a/conf/distro/corecdp.conf b/conf/distro/corecdp.conf
index b5682fa74f..1acb1b6609 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 = "1.0.2"
+DISTRO_VERSION = "1.1.0"
 DISTRO_TYPE = "release"
 TARGET_VENDOR = "-corecdp"
 BUILDNAME = "${DISTRO_NAME} ${DISTRO_VERSION}"
diff --git a/conf/machine/mtcdp.conf b/conf/machine/mtcdp.conf
index 5588ead151..c48d1cb70f 100644
--- a/conf/machine/mtcdp.conf
+++ b/conf/machine/mtcdp.conf
@@ -5,7 +5,9 @@
 TARGET_ARCH = "arm"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux"
+
 PREFERRED_VERSION_linux = "2.6.32"
+PREFERRED_VERSION_mts-io ?= "0.4.0"
 
 KERNEL_IMAGETYPE = "uImage"
 UBOOT_MACHINE = "at91sam9g20ek_nandflash_config"
diff --git a/recipes/base-files/base-files_3.0.14.bb b/recipes/base-files/base-files_3.0.14.bb
index a3dd567e92..a43057266d 100644
--- a/recipes/base-files/base-files_3.0.14.bb
+++ b/recipes/base-files/base-files_3.0.14.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Miscellaneous files for the base system."
 SECTION = "base"
 PRIORITY = "required"
-PR = "r91"
+PR = "r92"
 LICENSE = "GPL"
 
 SRC_URI = " \
diff --git a/recipes/linux/linux-2.6.28/mtcdp/linux-2.6.28-mach-at91.patch b/recipes/linux/linux-2.6.28/mtcdp/linux-2.6.28-mach-at91.patch
index a311c7fee1..7e42eda198 100644
--- a/recipes/linux/linux-2.6.28/mtcdp/linux-2.6.28-mach-at91.patch
+++ b/recipes/linux/linux-2.6.28/mtcdp/linux-2.6.28-mach-at91.patch
@@ -1,6 +1,6 @@
 diff -uprN -X linux-2.6.28/Documentation/dontdiff linux-2.6.28-vanilla/arch/arm/mach-at91/at91sam9260_devices.c linux-2.6.28/arch/arm/mach-at91/at91sam9260_devices.c
 --- linux-2.6.28-vanilla/arch/arm/mach-at91/at91sam9260_devices.c	2008-12-24 17:26:37.000000000 -0600
-+++ linux-2.6.28/arch/arm/mach-at91/at91sam9260_devices.c	2010-04-05 15:25:29.000000000 -0500
++++ linux-2.6.28/arch/arm/mach-at91/at91sam9260_devices.c	2010-10-18 09:38:23.000000000 -0500
 @@ -183,9 +183,9 @@ void __init at91_add_device_eth(struct a
  		at91_set_B_periph(AT91_PIN_PA25, 0);	/* ERX2 */
  		at91_set_B_periph(AT91_PIN_PA26, 0);	/* ERX3 */
@@ -16,8 +16,16 @@ diff -uprN -X linux-2.6.28/Documentation/dontdiff linux-2.6.28-vanilla/arch/arm/
  	eth_data = *data;
 diff -uprN -X linux-2.6.28/Documentation/dontdiff linux-2.6.28-vanilla/arch/arm/mach-at91/board-sam9g20ek.c linux-2.6.28/arch/arm/mach-at91/board-sam9g20ek.c
 --- linux-2.6.28-vanilla/arch/arm/mach-at91/board-sam9g20ek.c	2008-12-24 17:26:37.000000000 -0600
-+++ linux-2.6.28/arch/arm/mach-at91/board-sam9g20ek.c	2010-05-03 14:46:54.000000000 -0500
-@@ -57,6 +57,9 @@ static void __init ek_map_io(void)
++++ linux-2.6.28/arch/arm/mach-at91/board-sam9g20ek.c	2010-10-18 09:30:44.000000000 -0500
+@@ -25,6 +25,7 @@
+ #include <linux/spi/spi.h>
+ #include <linux/spi/at73c213.h>
+ #include <linux/clk.h>
++#include <mach/at91_rtt.h>
+ 
+ #include <mach/hardware.h>
+ #include <asm/setup.h>
+@@ -57,12 +58,23 @@ static void __init ek_map_io(void)
  	/* USART1 on ttyS2. (Rx, Tx, RTS, CTS) */
  	at91_register_uart(AT91SAM9260_ID_US1, 2, ATMEL_UART_CTS | ATMEL_UART_RTS);
  
@@ -27,7 +35,21 @@ diff -uprN -X linux-2.6.28/Documentation/dontdiff linux-2.6.28-vanilla/arch/arm/
  	/* set serial console to ttyS0 (ie, DBGU) */
  	at91_set_serial_console(0);
  }
-@@ -78,8 +81,8 @@ static struct at91_usbh_data __initdata 
+ 
+ static void __init ek_init_irq(void)
+ {
++	/*
++	 * Ensure RTT interrupts are disabled
++	 */ 
++	u32 mr;
++	mr = __raw_readl(AT91_VA_BASE_SYS + AT91_RTT + AT91_RTT_MR);
++	__raw_writel(mr & ~(AT91_RTT_ALMIEN | AT91_RTT_RTTINCIEN),
++			AT91_VA_BASE_SYS + AT91_RTT + AT91_RTT_MR);
++
+ 	at91sam9260_init_interrupts(NULL);
+ }
+ 
+@@ -78,8 +90,8 @@ static struct at91_usbh_data __initdata 
   * USB Device port
   */
  static struct at91_udc_data __initdata ek_udc_data = {
@@ -38,7 +60,7 @@ diff -uprN -X linux-2.6.28/Documentation/dontdiff linux-2.6.28-vanilla/arch/arm/
  };
  
  
-@@ -103,6 +106,16 @@ static struct spi_board_info ek_spi_devi
+@@ -103,6 +115,16 @@ static struct spi_board_info ek_spi_devi
  	},
  #endif
  #endif
@@ -55,7 +77,7 @@ diff -uprN -X linux-2.6.28/Documentation/dontdiff linux-2.6.28-vanilla/arch/arm/
  };
  
  
-@@ -111,7 +124,7 @@ static struct spi_board_info ek_spi_devi
+@@ -111,7 +133,7 @@ static struct spi_board_info ek_spi_devi
   */
  static struct at91_eth_data __initdata ek_macb_data = {
  	.phy_irq_pin	= AT91_PIN_PA7,
@@ -64,7 +86,7 @@ diff -uprN -X linux-2.6.28/Documentation/dontdiff linux-2.6.28-vanilla/arch/arm/
  };
  
  
-@@ -120,22 +133,53 @@ static struct at91_eth_data __initdata e
+@@ -120,22 +142,53 @@ static struct at91_eth_data __initdata e
   */
  static struct mtd_partition __initdata ek_nand_partition[] = {
  	{
@@ -74,28 +96,28 @@ diff -uprN -X linux-2.6.28/Documentation/dontdiff linux-2.6.28-vanilla/arch/arm/
 +		.name	= "MTNCG-NANDFlash",
 +		.offset	= 0,
 +		.size	= 256*1024*1024,
++	},
++	{
++		.name	= "AT91Bootstrap",
++		.offset	= 0,
++		.size	= 128*1024,
++	},
++	{
++		.name	= "UBoot",
++		.offset	= 128*1024,
++		.size	= 256*1024,
  	},
  	{
 -		.name	= "Partition 1",
 -		.offset	= MTDPART_OFS_NXTBLK,
 -		.size	= 60 * SZ_1M,
-+		.name	= "AT91Bootstrap",
-+		.offset	= 0,
++		.name	= "UBoot Config",
++		.offset	= 384*1024,
 +		.size	= 128*1024,
  	},
  	{
 -		.name	= "Partition 2",
 -		.offset	= MTDPART_OFS_NXTBLK,
-+		.name	= "UBoot",
-+		.offset	= 128*1024,
-+		.size	= 256*1024,
-+	},
-+	{
-+		.name	= "UBoot Config",
-+		.offset	= 384*1024,
-+		.size	= 128*1024,
-+	},
-+	{
 +		.name	= "UBoot Redundant Config",
 +		.offset	= 512*1024,
 +		.size	= 128*1024,
@@ -126,7 +148,7 @@ diff -uprN -X linux-2.6.28/Documentation/dontdiff linux-2.6.28-vanilla/arch/arm/
  static struct mtd_partition * __init nand_partitions(int size, int *num_partitions)
  {
  	*num_partitions = ARRAY_SIZE(ek_nand_partition);
-@@ -159,11 +203,13 @@ static struct atmel_nand_data __initdata
+@@ -159,11 +212,13 @@ static struct atmel_nand_data __initdata
  
  /*
   * MCI (SD/MMC)
@@ -141,7 +163,7 @@ diff -uprN -X linux-2.6.28/Documentation/dontdiff linux-2.6.28-vanilla/arch/arm/
  };
  
  
-@@ -171,17 +217,12 @@ static struct at91_mmc_data __initdata e
+@@ -171,17 +226,12 @@ static struct at91_mmc_data __initdata e
   * LEDs
   */
  static struct gpio_led ek_leds[] = {
diff --git a/recipes/linux/linux-2.6.28/mtcdp/linux-2.6.28-sierra.patch b/recipes/linux/linux-2.6.28/mtcdp/linux-2.6.28-sierra.patch
index 5d93c0edd3..c575acaf6d 100644
--- a/recipes/linux/linux-2.6.28/mtcdp/linux-2.6.28-sierra.patch
+++ b/recipes/linux/linux-2.6.28/mtcdp/linux-2.6.28-sierra.patch
@@ -1666,3 +1666,4 @@ diff -uprN -X linux-2.6.28/Documentation/dontdiff linux-2.6.28-vanilla/drivers/u
  
  	return 0;
  
+Binary files linux-2.6.28-vanilla/scripts/basic/hash and linux-2.6.28/scripts/basic/hash differ
diff --git a/recipes/linux/linux_2.6.28.bb b/recipes/linux/linux_2.6.28.bb
index bf7fc32da3..0334d8f920 100644
--- a/recipes/linux/linux_2.6.28.bb
+++ b/recipes/linux/linux_2.6.28.bb
@@ -1,6 +1,6 @@
 require linux.inc
 
-PR = "r15"
+PR = "r16"
 
 # Mark archs/machines that this kernel supports
 DEFAULT_PREFERENCE = "-1"
diff --git a/recipes/linux/linux_2.6.32.bb b/recipes/linux/linux_2.6.32.bb
index caa19617ac..8b2292cdd4 100644
--- a/recipes/linux/linux_2.6.32.bb
+++ b/recipes/linux/linux_2.6.32.bb
@@ -1,6 +1,6 @@
 require linux.inc
 
-PR = "r5"
+PR = "r6"
 
 S = "${WORKDIR}/linux-${PV}"
 
diff --git a/recipes/multitech/config/ppp/peers/gsm b/recipes/multitech/config/ppp/peers/gsm
index fed62a34b5..f17fcffc25 100644
--- a/recipes/multitech/config/ppp/peers/gsm
+++ b/recipes/multitech/config/ppp/peers/gsm
@@ -4,6 +4,7 @@ defaultroute
 replacedefaultroute
 usepeerdns
 ipcp-max-failure 4
+ipcp-restart 10
 noauth
 crtscts
 novj
diff --git a/recipes/multitech/config_1.0.bb b/recipes/multitech/config_1.0.bb
index b1e2aadf41..76bba506cc 100644
--- a/recipes/multitech/config_1.0.bb
+++ b/recipes/multitech/config_1.0.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Provides default system config files and /var/config fs"
 SECTION = "base"
 LICENSE = "GPL"
-PR = "r12"
+PR = "r13"
 
 inherit update-rc.d
 
diff --git a/recipes/multitech/mts-id-eeprom_0.0.1.bb b/recipes/multitech/mts-id-eeprom_0.0.1.bb
new file mode 100644
index 0000000000..8a3a310d29
--- /dev/null
+++ b/recipes/multitech/mts-id-eeprom_0.0.1.bb
@@ -0,0 +1,14 @@
+DESCRIPTION = "ID EEPROM tool for MTCDP"
+HOMEPAGE = "http://www.multitech.net/"
+SECTION = "console/utils"
+PRIORITY = "optional"
+LICENSE = "GPL"
+PR = "r0"
+DEPENDS = "mts-io"
+
+SRC_URI = "git://git.multitech.net/mts-id-eeprom.git;protocol=git;tag=${PV}"
+S = "${WORKDIR}/git"
+
+inherit autotools
+
+PARALLEL_MAKE = ""
diff --git a/recipes/multitech/mts-io.inc b/recipes/multitech/mts-io.inc
index b6f6abe3ae..3c8fb29e5f 100644
--- a/recipes/multitech/mts-io.inc
+++ b/recipes/multitech/mts-io.inc
@@ -5,6 +5,7 @@ PRIORITY = "optional"
 LICENSE = "GPL"
 DEPENDS = "virtual/kernel"
 RDEPENDS = "kernel (${KERNEL_VERSION})"
+INC_PR = "r1"
 
 SRC_URI = " \
     file://mts-io.init \
@@ -45,6 +46,8 @@ fakeroot do_install () {
     install -m 0755 -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/extra
     # use cp instead of install so the driver doesn't get stripped
     cp ${S}/mts_io.ko ${D}${base_libdir}/modules/${KERNEL_VERSION}/extra
+    cp ${S}/mts_io.h ${STAGING_KERNEL_DIR}/include/linux/
+    cp ${S}/mts_io.h ${STAGING_INCDIR}/linux/
 
     install -d ${D}${sysconfdir}/init.d
     install -m 0755 ${WORKDIR}/mts-io.init ${D}${sysconfdir}/init.d/mts-io
diff --git a/recipes/multitech/mts-io_0.2.0.bb b/recipes/multitech/mts-io_0.2.0.bb
index bda1ebd15b..f903020cc7 100644
--- a/recipes/multitech/mts-io_0.2.0.bb
+++ b/recipes/multitech/mts-io_0.2.0.bb
@@ -1,3 +1,3 @@
 require mts-io.inc
 
-PR = "r0"
+PR = "${INC_PR}.0"
diff --git a/recipes/multitech/mts-io_0.3.0.bb b/recipes/multitech/mts-io_0.3.0.bb
index bda1ebd15b..f903020cc7 100644
--- a/recipes/multitech/mts-io_0.3.0.bb
+++ b/recipes/multitech/mts-io_0.3.0.bb
@@ -1,3 +1,3 @@
 require mts-io.inc
 
-PR = "r0"
+PR = "${INC_PR}.0"
diff --git a/recipes/multitech/mts-io_0.4.0.bb b/recipes/multitech/mts-io_0.4.0.bb
new file mode 100644
index 0000000000..f903020cc7
--- /dev/null
+++ b/recipes/multitech/mts-io_0.4.0.bb
@@ -0,0 +1,3 @@
+require mts-io.inc
+
+PR = "${INC_PR}.0"
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 412837a545..4d05ba3d75 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
@@ -2840,7 +2840,7 @@ diff -uprN u-boot-1.3.4-vanilla/include/configs/at91sam9g20ek.h u-boot-1.3.4/inc
 +#define CONFIG_AUTO_COMPLETE	1
 +
 +#define CONFIG_ENV_OVERWRITE	1
-+#define CONFIG_ETHADDR		00:D0:A0:02:0D:E1
++#define CONFIG_ETHADDR		00:08:00:87:00:02
 +#define CONFIG_IPADDR		192.168.2.1
 +#define CONFIG_NETMASK		255.255.255.0
 +#define CONFIG_SERVERIP		192.168.2.2
diff --git a/recipes/u-boot/u-boot_1.3.4.bb b/recipes/u-boot/u-boot_1.3.4.bb
index 4b6a20d1ba..1ad760f046 100644
--- a/recipes/u-boot/u-boot_1.3.4.bb
+++ b/recipes/u-boot/u-boot_1.3.4.bb
@@ -1,6 +1,6 @@
 require u-boot.inc
 
-PR = "r6"
+PR = "r7"
 ALLOW_EMPTY = 1
 
 SRC_URI = "ftp://ftp.denx.de/pub/u-boot/u-boot-${PV}.tar.bz2"