Merge branch 'daughter-cards'

16 files changed, 118 insertions, 70 deletions

diff --git a/multitech/recipes/at91bootstrap/at91bootstrap_3.5.3.bb b/multitech/recipes/at91bootstrap/at91bootstrap_3.5.3.bb
index 59e088c..1bb563e 100644
--- a/multitech/recipes/at91bootstrap/at91bootstrap_3.5.3.bb
+++ b/multitech/recipes/at91bootstrap/at91bootstrap_3.5.3.bb
@@ -7,7 +7,7 @@ SRC_URI = "https://github.com/linux4sam/at91bootstrap/archive/v3.5.3.tar.gz \
 		file://at91bootstrap-3.5.2-onetime-slow-clock-switch.patch \
         file://at91sam9x5_4bit_pmecc_header.bin "
 
-SRC_URI_append_mtocgd3 = " file://at91bootstrap-3.5.3-mtocgd.patch "
+SRC_URI_append_mtocgd2 = " file://at91bootstrap-3.5.3-mtocgd.patch "
 SRC_URI_append_mtocgd  = " file://at91bootstrap-3.5.3-mtocgd.patch "
 
 SRC_URI[md5sum] = "7379726f686f5b9c8f4a2012676b79fc"
@@ -24,7 +24,7 @@ do_install_append_mtocgd() {
 	do_pad_4bit_pmecc
 }
 
-do_install_append_mtocgd3() {
+do_install_append_mtocgd2() {
 	do_pad_4bit_pmecc
 }
 
diff --git a/multitech/recipes/base-files/base-files/mtocgd3/fstab b/multitech/recipes/base-files/base-files/mtocgd2/fstab
index 1d60d52..1d60d52 100644
--- a/multitech/recipes/base-files/base-files/mtocgd3/fstab
+++ b/multitech/recipes/base-files/base-files/mtocgd2/fstab
diff --git a/multitech/recipes/base-files/base-files/mtocgd3/profile b/multitech/recipes/base-files/base-files/mtocgd2/profile
index 0879251..0879251 100644
--- a/multitech/recipes/base-files/base-files/mtocgd3/profile
+++ b/multitech/recipes/base-files/base-files/mtocgd2/profile
diff --git a/multitech/recipes/bluez/bluez4.inc b/multitech/recipes/bluez/bluez4.inc
index 87008b4..6257db9 100644
--- a/multitech/recipes/bluez/bluez4.inc
+++ b/multitech/recipes/bluez/bluez4.inc
@@ -21,7 +21,7 @@ SRC_URI = "\
 "
 
 SRC_URI_append_mt100eocg-pcie-dk = "file://bluetooth.init"
-SRC_URI_append_mtocgd3 = "file://bluetooth.init"
+SRC_URI_append_mtocgd2 = "file://bluetooth.init"
 SRC_URI_append_mtocgd = "file://bluetooth.init"
 
 S = "${WORKDIR}/bluez-${PV}"
@@ -61,7 +61,7 @@ do_install_append_mt100eocg-pcie-dk() {
   install -d ${D}${sysconfdir}/init.d
   install -m 0755 ${WORKDIR}/bluetooth.init ${D}${sysconfdir}/init.d/bluetooth
 }
-do_install_append_mtocgd3() {
+do_install_append_mtocgd2() {
   install -d ${D}${sysconfdir}/init.d
   install -m 0755 ${WORKDIR}/bluetooth.init ${D}${sysconfdir}/init.d/bluetooth
 }
diff --git a/multitech/recipes/images/corecdp-base-image.bb b/multitech/recipes/images/corecdp-base-image.bb
index 2401103..cda6c4b 100644
--- a/multitech/recipes/images/corecdp-base-image.bb
+++ b/multitech/recipes/images/corecdp-base-image.bb
@@ -89,12 +89,12 @@ IMAGE_INSTALL = "task-boot \
                 "
 
 # Add Wi-fi/Bluetooth support for devices that support it
-IMAGE_INSTALL_append_mtocgd3 = " ${WIFI_FEATURES} ${WL1271_SUPPORT} ${BLUETOOTH_FEATURES} "
+IMAGE_INSTALL_append_mtocgd2 = " ${WIFI_FEATURES} ${WL1271_SUPPORT} ${BLUETOOTH_FEATURES} "
 IMAGE_INSTALL_append_mtocgd = " ${WIFI_FEATURES} ${WL1271_SUPPORT} ${BLUETOOTH_FEATURES} "
 IMAGE_INSTALL_append_mt100eocg-pcie-dk = " ${WIFI_FEATURES} ${WL1271_SUPPORT} ${BLUETOOTH_FEATURES} "
 
-# Add exar usb-serial driver for mtocgd/mtocgd3 hardware
-IMAGE_INSTALL_append_mtocgd3 += "vizzini"
+# Add exar usb-serial driver for mtocgd/mtocgd2 hardware
+IMAGE_INSTALL_append_mtocgd2 += "vizzini"
 IMAGE_INSTALL_append_mtocgd += "vizzini"
 
 IMAGE_PREPROCESS_COMMAND = "create_etc_timestamp"
diff --git a/multitech/recipes/linux/linux-2.6.39-at91/mtocgd3/defconfig b/multitech/recipes/linux/linux-2.6.39-at91/mtocgd2/defconfig
index 04fb2d9..04fb2d9 100644
--- a/multitech/recipes/linux/linux-2.6.39-at91/mtocgd3/defconfig
+++ b/multitech/recipes/linux/linux-2.6.39-at91/mtocgd2/defconfig
diff --git a/multitech/recipes/linux/linux-2.6.39-at91/mtocgd3/linux-2.6.39.4-macb-force-link.patch b/multitech/recipes/linux/linux-2.6.39-at91/mtocgd2/linux-2.6.39.4-macb-force-link.patch
index 2ef39a9..2ef39a9 100644
--- a/multitech/recipes/linux/linux-2.6.39-at91/mtocgd3/linux-2.6.39.4-macb-force-link.patch
+++ b/multitech/recipes/linux/linux-2.6.39-at91/mtocgd2/linux-2.6.39.4-macb-force-link.patch
diff --git a/multitech/recipes/linux/linux-2.6.39-at91/mtocgd3/linux-2.6.39.4-mach-at91-mtocgd3.patch b/multitech/recipes/linux/linux-2.6.39-at91/mtocgd2/linux-2.6.39.4-mach-at91-mtocgd2.patch
index 4e35e85..c61237e 100644
--- a/multitech/recipes/linux/linux-2.6.39-at91/mtocgd3/linux-2.6.39.4-mach-at91-mtocgd3.patch
+++ b/multitech/recipes/linux/linux-2.6.39-at91/mtocgd2/linux-2.6.39.4-mach-at91-mtocgd2.patch
@@ -1,7 +1,7 @@
 Index: git/arch/arm/mach-at91/board-sam9x5cm.c
 ===================================================================
---- git.orig/arch/arm/mach-at91/board-sam9x5cm.c	2013-04-17 17:15:13.000000000 -0500
-+++ git/arch/arm/mach-at91/board-sam9x5cm.c	2013-11-05 17:25:46.511692620 -0600
+--- git.orig/arch/arm/mach-at91/board-sam9x5cm.c	2013-12-27 14:27:13.000000000 -0600
++++ git/arch/arm/mach-at91/board-sam9x5cm.c	2014-02-06 16:31:32.817405456 -0600
 @@ -18,6 +18,9 @@
  #include <linux/platform_device.h>
  #include <linux/spi/flash.h>
@@ -26,18 +26,18 @@ Index: git/arch/arm/mach-at91/board-sam9x5cm.c
 +		.chip_select = 1,
 +		.bus_num = 1,
 +	},
-+	{ /* SPI1_NCS3 to daughter card */
-+		.modalias = "spidev",
++	{ /* SPI1_NCS3 to daughter card analog inputs */
++		.modalias = "mts-io-dc-adc",
 +		.chip_select = 2,
 +		.bus_num = 1,
 +	},
-+	{ /* SPI1_NCS4 to daughter card */
-+		.modalias = "spidev",
++	{ /* SPI1_NCS4 to daughter card digital inputs */
++		.modalias = "mts-io-dc-din",
 +		.chip_select = 3,
 +		.bus_num = 1,
 +	},
-+	{ /* SPI1_NCS5 to daughter card */
-+		.modalias = "spidev",
++	{ /* SPI1_NCS5 to daughter card digital outputs */
++		.modalias = "mts-io-dc-dout",
 +		.chip_select = 4,
 +		.bus_num = 1,
 +	},
@@ -68,10 +68,8 @@ Index: git/arch/arm/mach-at91/board-sam9x5cm.c
 +		.name	= "UBoot Config",
 +		.offset	= 768*1024,
 +		.size	= 640*1024,
- 	},
- 	{
--		.name	= "Partition 2",
--		.offset	= MTDPART_OFS_NXTBLK,
++	},
++	{
 +		.name	= "UBoot Redundant Config",
 +		.offset	= 1408*1024,
 +		.size	= 640*1024,
@@ -90,8 +88,10 @@ Index: git/arch/arm/mach-at91/board-sam9x5cm.c
 +		.name	= "Oem Config",
 +		.offset	= 16*1024*1024,
 +		.size	= 8*1024*1024,
-+	},
-+	{
+ 	},
+ 	{
+-		.name	= "Partition 2",
+-		.offset	= MTDPART_OFS_NXTBLK,
 +		.name	= "Rootfs",
 +		.offset	= 24*1024*1024,
  		.size	= MTDPART_SIZ_FULL,
@@ -102,7 +102,7 @@ Index: git/arch/arm/mach-at91/board-sam9x5cm.c
  	.ecc_mode	= NAND_ECC_HW,
  	.has_pmecc	= 1,
 -	.pmecc_corr_cap	= 2,
-+// MTOCGD3: 4-bit PMECC
++// MTOCGD2: 4-bit PMECC
 +	.pmecc_corr_cap	= 4,
  	.pmecc_sector_size = 512,
  	.pmecc_lookup_table_offset = 0x8000,
@@ -111,11 +111,11 @@ Index: git/arch/arm/mach-at91/board-sam9x5cm.c
  	else
  		cm_nand_smc_config.mode |= AT91_SMC_DBW_8;
  
-+	// MTOCGD3 Rev B
++	// MTOCGD2 Rev B
 +	cm_nand_data.bus_on_d0 = 0;
 +	cm_nand_data.rdy_pin = AT91_PIN_PC31;
 +
-+	// MTOCGD3: disable
++	// MTOCGD2: disable
  	/* revision of board modify NAND wiring */
 +	/*
  	if (cm_is_revA()) {
@@ -129,7 +129,7 @@ Index: git/arch/arm/mach-at91/board-sam9x5cm.c
  
  	/* configure chip-select 3 (NAND) */
  	sam9_smc_configure(3, &cm_nand_smc_config);
-@@ -189,17 +260,62 @@
+@@ -189,17 +260,90 @@
   * LEDs
   */
  static struct gpio_led cm_leds[] = {
@@ -156,7 +156,7 @@ Index: git/arch/arm/mach-at91/board-sam9x5cm.c
 +		.name			= "led-c",
 +		.gpio			= AT91_PIN_PA25,
 +		.active_low		= 1
- 	},
++	},
 +	{
 +		.name			= "led-d",
 +		.gpio			= AT91_PIN_PA26,
@@ -166,7 +166,7 @@ Index: git/arch/arm/mach-at91/board-sam9x5cm.c
 +		.name			= "led-e",
 +		.gpio			= AT91_PIN_PA27,
 +		.active_low		= 1
-+	},
+ 	},
 +	{
 +		.name			= "led-f",
 +		.gpio			= AT91_PIN_PA28,
@@ -176,9 +176,14 @@ Index: git/arch/arm/mach-at91/board-sam9x5cm.c
 +
 +
 +uint8_t mts_id_eeprom[512];
++uint8_t mts_dc_eeprom[512];
 +
 +EXPORT_SYMBOL(mts_id_eeprom);
++EXPORT_SYMBOL(mts_dc_eeprom);
 +
++/*
++ * On-board EEPROM
++ */
 +static void mts_id_eeprom_load(struct memory_accessor *macc, void *context)
 +{
 +	int tmp;
@@ -197,26 +202,53 @@ Index: git/arch/arm/mach-at91/board-sam9x5cm.c
 +	.byte_len	= SZ_4K / 8,
 +	.page_size	= 16,
 +	.setup		= mts_id_eeprom_load,
++};
++
++/*
++ * Daughter card EEPROM
++ */
++static void mts_dc_eeprom_load(struct memory_accessor *macc, void *context)
++{
++	int tmp;
++
++	memset(mts_dc_eeprom, 0, sizeof(mts_id_eeprom));
++
++	tmp = macc->read(macc, mts_dc_eeprom, 0, sizeof(mts_dc_eeprom));
++	if (tmp != sizeof(mts_dc_eeprom)) {
++		printk(KERN_INFO "sam9x5: dc eeprom read failed: %d\n", tmp);
++	} else {
++		printk(KERN_INFO "sam9x5: read %d bytes from dc eeprom\n", tmp);
++	}
++}
++
++static struct at24_platform_data dc_data = {
++	.byte_len	= SZ_4K / 8,
++	.page_size	= 16,
++	.setup		= mts_dc_eeprom_load,
  };
  
  /*
-@@ -207,7 +323,8 @@
+@@ -207,7 +351,12 @@
   */
  static struct i2c_board_info __initdata cm_i2c_devices[] = {
  	{
 -		I2C_BOARD_INFO("24c512", 0x50)
 +		I2C_BOARD_INFO("24c04", 0x56),
 +		.platform_data = &at24c04_data,
++	},
++	{
++		I2C_BOARD_INFO("24c04", 0x50),
++		.platform_data = &dc_data,
  	},
  };
  
-@@ -234,8 +351,12 @@
+@@ -234,8 +383,12 @@
  	/* LEDs */
  	at91_gpio_leds(cm_leds, ARRAY_SIZE(cm_leds));
  
-+	printk(KERN_CRIT "AT91: MTOCGD3 board\n");
++	printk(KERN_CRIT "AT91: MTOCGD2 board\n");
 +
-+	/* MTOCGD3: disable
++	/* MTOCGD2: disable
  	if (cm_is_revA())
  		printk(KERN_CRIT "AT91: CM rev A\n");
  	else
@@ -225,8 +257,8 @@ Index: git/arch/arm/mach-at91/board-sam9x5cm.c
  }
 Index: git/arch/arm/mach-at91/board-sam9x5ek.c
 ===================================================================
---- git.orig/arch/arm/mach-at91/board-sam9x5ek.c	2013-04-17 17:15:13.000000000 -0500
-+++ git/arch/arm/mach-at91/board-sam9x5ek.c	2013-11-01 12:16:09.080917828 -0500
+--- git.orig/arch/arm/mach-at91/board-sam9x5ek.c	2013-12-27 14:27:13.000000000 -0600
++++ git/arch/arm/mach-at91/board-sam9x5ek.c	2014-02-06 15:18:45.409321681 -0600
 @@ -23,6 +23,7 @@
  #include <linux/leds.h>
  #include <linux/clk.h>
@@ -245,9 +277,9 @@ Index: git/arch/arm/mach-at91/board-sam9x5ek.c
 -	at91_register_uart(AT91SAM9X5_ID_USART1, 2, 0);
 -	/* USART2 on ttyS3. (Rx, Tx) */
 -	at91_register_uart(AT91SAM9X5_ID_USART2, 3, 0);
-+	// MTOCGD3: GPS on UART0 as ttyS1 with Rx/Tx only
++	// MTOCGD2: GPS on UART0 as ttyS1 with Rx/Tx only
 +	at91_register_uart(AT91SAM9X5_ID_UART0, 1, 0);
-+	// MTOCGD3 Rev A: Daughter card serial on USART1 as ttyS2 with RTS/CTS
++	// MTOCGD2 Rev A: Daughter card serial on USART1 as ttyS2 with RTS/CTS
 +	at91_register_uart(AT91SAM9X5_ID_USART1, 2, ATMEL_UART_CTS | ATMEL_UART_RTS);
  }
  
@@ -261,7 +293,7 @@ Index: git/arch/arm/mach-at91/board-sam9x5ek.c
 +	.phy_irq_pin	= 0,
  };
  
-+/* MTOCGD3: no macb1
++/* MTOCGD2: no macb1
  static struct at91_eth_data __initdata ek_macb1_data = {
  	.phy_irq_pin	= AT91_PIN_PC26,
  	.is_rmii	= 1,
@@ -273,7 +305,7 @@ Index: git/arch/arm/mach-at91/board-sam9x5ek.c
   * MCI (SD/MMC)
   */
 -/* mci0 detect_pin is revision dependent */
-+// MTOCGD3: MCI0 is BT/Wifi
++// MTOCGD2: MCI0 is BT/Wifi
  static struct mci_platform_data __initdata mci0_data = {
  	.slot[0] = {
  		.bus_width	= 4,
@@ -282,7 +314,7 @@ Index: git/arch/arm/mach-at91/board-sam9x5ek.c
  	},
  };
  
-+// MTOCGD3: MCI1 is SD card slot
++// MTOCGD2: MCI1 is SD card slot
  static struct mci_platform_data __initdata mci1_data = {
  	.slot[0] = {
  		.bus_width	= 4,
@@ -339,7 +371,7 @@ Index: git/arch/arm/mach-at91/board-sam9x5ek.c
  
  	cm_board_init(&cm_config);
 -	ek_board_configure_pins();
-+	// MTOCGD3: disable
++	// MTOCGD2: disable
 +	//ek_board_configure_pins();
  	/* Serial */
  	at91_add_device_serial();
@@ -347,16 +379,16 @@ Index: git/arch/arm/mach-at91/board-sam9x5ek.c
  	at91_add_device_usbh_ohci(&ek_usbh_fs_data);
  	at91_add_device_usbh_ehci(&ek_usbh_hs_data);
  	/* USB HS Device */
-+	// MTOCGD3: set usb device vcc pin
++	// MTOCGD2: set usb device vcc pin
 +	ek_usba_udc_data.vbus_pin = AT91_PIN_PC7;
  	at91_add_device_usba(&ek_usba_udc_data);
  	/* Ethernet */
  	at91_add_device_eth(0, &ek_macb0_data);
-+	/* MTOCGD3: no macb1
++	/* MTOCGD2: no macb1
  	at91_add_device_eth(1, &ek_macb1_data);
 +	*/
  	/* MMC0 */
-+	// MTOCGD3: MCI0 for BT/Wifi
++	// MTOCGD2: MCI0 for BT/Wifi
  	at91_add_device_mci(0, &mci0_data);
  	/* I2C */
  	if (cm_config & CM_CONFIG_I2C0_ENABLE)
@@ -364,14 +396,14 @@ Index: git/arch/arm/mach-at91/board-sam9x5ek.c
  		at91_add_device_i2c(0,
  				ek_i2c_devices, ARRAY_SIZE(ek_i2c_devices));
  
-+	// MTOCGD3: Wi-fi
++	// MTOCGD2: Wi-fi
 +	at91_set_gpio_input(mtr_wlan_data.irq, 0);
 +	at91_set_deglitch(mtr_wlan_data.irq, 1);
 +
 +	if (wl12xx_set_platform_data(&mtr_wlan_data))
 +		pr_err("error setting wl12xx data\n");
 +
-+/* MTOCGD3: no LCD */
++/* MTOCGD2: no LCD */
 +#if 0
  	if (cpu_is_at91sam9g25()) {
  		/* ISI */
@@ -388,7 +420,7 @@ Index: git/arch/arm/mach-at91/board-sam9x5ek.c
 -	 */
 -	if (!(cm_config & CM_CONFIG_SPI0_ENABLE) && !config_isi_enabled)
 -		at91_add_device_mci(1, &mci1_data);
-+	// MTOCGD3: MCI1 to SD Card
++	// MTOCGD2: MCI1 to SD Card
 +	at91_add_device_mci(1, &mci1_data);
  
  #if 0
@@ -397,7 +429,7 @@ Index: git/arch/arm/mach-at91/board-sam9x5ek.c
  		at91_add_device_can(0, NULL);
  #endif
  
-+/* MTOCGD3: disable things we don't have */
++/* MTOCGD2: disable things we don't have */
 +#if 0
  	if (cpu_is_at91sam9x25() || cpu_is_at91sam9x35())
  		/* this conflicts with usart.1 */
@@ -408,14 +440,14 @@ Index: git/arch/arm/mach-at91/board-sam9x5ek.c
  			"AT91: ISI conficts with MCI1, disable MCI1\n");
 +#endif
 +
-+	printk(KERN_CRIT "AT91: MTOCGD3 board EK init\n");
++	printk(KERN_CRIT "AT91: MTOCGD2 board EK init\n");
  }
  
  MACHINE_START(AT91SAM9X5EK, "Atmel AT91SAM9X5-EK")
 Index: git/arch/arm/mach-at91/at91sam9x5_devices.c
 ===================================================================
---- git.orig/arch/arm/mach-at91/at91sam9x5_devices.c	2013-04-17 17:15:13.000000000 -0500
-+++ git/arch/arm/mach-at91/at91sam9x5_devices.c	2013-11-01 12:16:09.080917828 -0500
+--- git.orig/arch/arm/mach-at91/at91sam9x5_devices.c	2013-12-27 14:27:13.000000000 -0600
++++ git/arch/arm/mach-at91/at91sam9x5_devices.c	2014-02-06 15:18:45.409321681 -0600
 @@ -543,11 +543,11 @@
  #endif
  
@@ -435,7 +467,7 @@ Index: git/arch/arm/mach-at91/at91sam9x5_devices.c
  };
  
 -static const unsigned spi1_standard_cs[4] = { AT91_PIN_PA8, AT91_PIN_PA0, AT91_PIN_PA31, AT91_PIN_PA30 };
-+// MTOCGD3: SPI1 chip selects on pins SPI1_NCS1 to SPI1_NCS5
++// MTOCGD2: SPI1 chip selects on pins SPI1_NCS1 to SPI1_NCS5
 +static const unsigned spi1_standard_cs[5] = { AT91_PIN_PC15, AT91_PIN_PC16, AT91_PIN_PC17, AT91_PIN_PC18, AT91_PIN_PC19 };
  
  void __init at91_add_device_spi(struct spi_board_info *devices, int nr_devices)
diff --git a/multitech/recipes/linux/linux_2.6.39-at91.bb b/multitech/recipes/linux/linux_2.6.39-at91.bb
index e5c5d69..2c6982d 100644
--- a/multitech/recipes/linux/linux_2.6.39-at91.bb
+++ b/multitech/recipes/linux/linux_2.6.39-at91.bb
@@ -29,9 +29,9 @@ COMMON_PATCHES = " \
                     file://linux-2.6.39.4-cdc-acm-ignore-exar-devices.patch \
                     "
 
-SRC_URI_append_mtocgd3 = " \
+SRC_URI_append_mtocgd2 = " \
                     file://defconfig \
-                    file://linux-2.6.39.4-mach-at91-mtocgd3.patch \
+                    file://linux-2.6.39.4-mach-at91-mtocgd2.patch \
                     file://linux-2.6.39.4-macb-force-link.patch \
 					${COMMON_PATCHES} \
 					"
diff --git a/multitech/recipes/multitech/mts-id-eeprom_0.2.0.bb b/multitech/recipes/multitech/mts-id-eeprom_0.2.0.bb
new file mode 100644
index 0000000..ccf3521
--- /dev/null
+++ b/multitech/recipes/multitech/mts-id-eeprom_0.2.0.bb
@@ -0,0 +1,3 @@
+require mts-id-eeprom.inc
+
+PR = "${INC_PR}.0"
diff --git a/multitech/recipes/multitech/mts-io.inc b/multitech/recipes/multitech/mts-io.inc
index 701ebdd..5a3167e 100644
--- a/multitech/recipes/multitech/mts-io.inc
+++ b/multitech/recipes/multitech/mts-io.inc
@@ -26,8 +26,15 @@ do_configure () {
    echo "Nothing to configure for mts-io"
 }
 
+CFLAGS = ""
+CPPFLAGS = ""
+CXXFLAGS = ""
+LDFLAGS = ""
+
+DAUGHTER_CARD_mtocgd2 = "-DMTOCGD2"
+export DAUGHTER_CARD
+
 do_compile () {
-    unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
     oe_runmake
 }
 
diff --git a/multitech/recipes/multitech/mts-io_0.8.0.bb b/multitech/recipes/multitech/mts-io_0.8.0.bb
new file mode 100644
index 0000000..4ec3ead
--- /dev/null
+++ b/multitech/recipes/multitech/mts-io_0.8.0.bb
@@ -0,0 +1,6 @@
+require mts-io.inc
+
+SRC_URI_append_mt100eocg-pcie-dk = "file://mts-io-0.6.2-pcieh5.patch"
+
+LOCAL_PR = "${INC_PR}.1"
+MACHINE_KERNEL_PR_append = "${LOCAL_PR}"
diff --git a/multitech/recipes/u-boot/u-boot-2012.10/mtocgd3/u-boot-2012.10-mtocgd3.patch b/multitech/recipes/u-boot/u-boot-2012.10/mtocgd2/u-boot-2012.10-mtocgd2.patch
index dbe3247..cfd1225 100644
--- a/multitech/recipes/u-boot/u-boot-2012.10/mtocgd3/u-boot-2012.10-mtocgd3.patch
+++ b/multitech/recipes/u-boot/u-boot-2012.10/mtocgd2/u-boot-2012.10-mtocgd2.patch
@@ -15,7 +15,7 @@ Index: git/board/atmel/at91sam9x5ek/at91sam9x5ek.c
  
  #ifdef CONFIG_MACB
  	if (has_emac0())
-+		/* MTOCGD3: use phy addr 5 for ethernet switch */
++		/* MTOCGD2: use phy addr 5 for ethernet switch */
  		rc = macb_eth_initialize(0,
 -			(void *)ATMEL_BASE_EMAC0, 0x00);
 +			(void *)ATMEL_BASE_EMAC0, 0x05);
@@ -30,7 +30,7 @@ Index: git/include/configs/at91sam9x5ek.h
  #define CONFIG_USART_ID		ATMEL_ID_SYS
  
  /* LCD */
-+/* MTOCGD3 has no LCD
++/* MTOCGD2 has no LCD
  #define CONFIG_LCD
  #define LCD_BPP			LCD_COLOR16
  #define LCD_OUTPUT_BPP		24
@@ -47,14 +47,14 @@ Index: git/include/configs/at91sam9x5ek.h
  #define CONFIG_SYS_NAND_MASK_CLE	(1 << 22)
  #define CONFIG_SYS_NAND_ENABLE_PIN	AT91_PIN_PD4
 -#define CONFIG_SYS_NAND_READY_PIN	AT91_PIN_PD5
-+/* MTOCGD3: nand ready is on PC31 */
++/* MTOCGD2: nand ready is on PC31 */
 +#define CONFIG_SYS_NAND_READY_PIN	AT91_PIN_PC31
  
  /* PMECC & PMERRLOC */
  #define CONFIG_ATMEL_NAND_HWECC		1
  #define CONFIG_ATMEL_NAND_HW_PMECC	1
 -#define CONFIG_PMECC_CAP		2
-+/* MTOCGD3: 4-bit PMECC */
++/* MTOCGD2: 4-bit PMECC */
 +#define CONFIG_PMECC_CAP		4
  #define CONFIG_PMECC_SECTOR_SIZE	512
  #define CONFIG_PMECC_INDEX_TABLE_OFFSET	0x8000
@@ -64,11 +64,11 @@ Index: git/include/configs/at91sam9x5ek.h
  /* Ethernet */
  #define CONFIG_MACB
 -#define CONFIG_RMII
-+/* MTOCGD3 is MII */
++/* MTOCGD2 is MII */
 +#undef CONFIG_RMII
  #define CONFIG_NET_RETRY_COUNT		20
 -#define CONFIG_MACB_SEARCH_PHY
-+/* MTOCGD3: MAC is connected to fixed-speed PHY on ethernet switch */
++/* MTOCGD2: MAC is connected to fixed-speed PHY on ethernet switch */
 +#undef CONFIG_MACB_SEARCH_PHY
 +#define CONFIG_FIXED_PHY   1
 +/* enable MII command */
@@ -83,7 +83,7 @@ Index: git/include/configs/at91sam9x5ek.h
 -#define CONFIG_BOOTCOMMAND	"nand read " \
 -				"0x22000000 0x200000 0x300000; " \
 -				"bootm 0x22000000"
-+/* MTOCGD3: read from env variables for boot */
++/* MTOCGD2: read from env variables for boot */
 +#define CONFIG_BOOTCOMMAND "nboot.jffs2 ${loadaddr} 0 ${kernel_addr}; bootm ${loadaddr}"
  #else
  #ifdef CONFIG_SYS_USE_SPIFLASH
@@ -97,7 +97,7 @@ Index: git/include/configs/at91sam9x5ek.h
 -				"8M(bootstrap/uboot/kernel)ro,-(rootfs) " \
 -				"root=/dev/mtdblock1 rw " \
 -				"rootfstype=ubifs ubi.mtd=1 root=ubi0:rootfs"
-+/* MTOCGD3: rootfs is jffs2 */
++/* MTOCGD2: rootfs is jffs2 */
 +#define CONFIG_BOOTARGS	"mem=128M console=ttyS0,115200 root=/dev/mtdblock8 ro rootfstype=jffs2"
  
  #define CONFIG_BAUDRATE		115200
@@ -106,7 +106,7 @@ Index: git/include/configs/at91sam9x5ek.h
  #error CONFIG_USE_IRQ not supported
  #endif
  
-+// MTOCGD3 defaults
++// MTOCGD2 defaults
 +#define CONFIG_ENV_OVERWRITE   1 /* Allow Overwrite of serial# & ethaddr */
 +#define CONFIG_ETHADDR     00:08:00:87:00:02
 +#define CONFIG_IPADDR      192.168.2.1
@@ -115,7 +115,7 @@ Index: git/include/configs/at91sam9x5ek.h
 +#define CONFIG_HOSTNAME    AT91SAM9G25
 +#define CONFIG_LOADADDR    0x22000000
 +
-+// MTOCGD3 - enable watchdog
++// MTOCGD2 - enable watchdog
 +#define CONFIG_AT91SAM9_WATCHDOG 1
 +#define CONFIG_HW_WATCHDOG 1
 +
@@ -306,7 +306,7 @@ Index: git/drivers/net/macb.c
  
 +#ifdef CONFIG_FIXED_PHY
 +	ncfgr = macb_readl(macb, NCFGR);
-+	// MTOCGD3: force link to 100, full duplex
++	// MTOCGD2: force link to 100, full duplex
 +	ncfgr |= MACB_BIT(SPD);
 +	ncfgr |= MACB_BIT(FD);
 +	macb_writel(macb, NCFGR, ncfgr);
@@ -336,7 +336,7 @@ Index: git/drivers/net/macb.c
  	miiphy_register(netdev->name, macb_miiphy_read, macb_miiphy_write);
  #endif
 +
-+	// MTOCGD3: enable micrel switch
++	// MTOCGD2: enable micrel switch
 +	macb_miiphy_write("macb0", 6, 1, 0x41);
 +
  	return 0;
diff --git a/multitech/recipes/u-boot/u-boot_2012.10.bb b/multitech/recipes/u-boot/u-boot_2012.10.bb
index a91ec92..f5b436c 100644
--- a/multitech/recipes/u-boot/u-boot_2012.10.bb
+++ b/multitech/recipes/u-boot/u-boot_2012.10.bb
@@ -13,7 +13,7 @@ SRC_URI = "git://github.com/linux4sam/u-boot-at91.git;protocol=http;tag=${SRCREV
 # add patch to speed up boot if ethernet autonegotiation fails
 SRC_URI += "file://u-boot-2010.06-macb-autoneg-timeout.patch"
 
-SRC_URI_append_mtocgd3 = " file://u-boot-2012.10-mtocgd3.patch"
+SRC_URI_append_mtocgd2 = " file://u-boot-2012.10-mtocgd2.patch"
 
 SRC_URI_append_mtocgd = " file://u-boot-2012.10-mtocgd.patch"
 
diff --git a/multitech/recipes/udev/udev-165/mtocgd/corecdp.rules b/multitech/recipes/udev/udev-165/mtocgd/corecdp.rules
index 60189fb..196102b 100644
--- a/multitech/recipes/udev/udev-165/mtocgd/corecdp.rules
+++ b/multitech/recipes/udev/udev-165/mtocgd/corecdp.rules
@@ -48,10 +48,10 @@ ATTRS{idVendor}=="1199", ATTRS{idProduct}=="683c", ENV{ID_IFACE}=="05", SYMLINK+
 # EV2: ttyUSB0
 ATTRS{idVendor}=="1199", ATTRS{idProduct}=="0028", ENV{ID_PORT}=="0", SYMLINK+="modem_at0"
 
-# mtocgd3: bluetooth on exar chip (ACM0, iface 0)
+# mtocgd: bluetooth on exar chip (ACM0, iface 0)
 ATTRS{idVendor}=="04e2", ATTRS{idProduct}=="1412", ENV{ID_IFACE}=="00", SYMLINK+="bt"
 
-# mtocgd3: external serial on exar chip (ACM0, iface 2)
+# mtocgd: external serial on exar chip (ACM0, iface 2)
 ATTRS{idVendor}=="04e2", ATTRS{idProduct}=="1412", ENV{ID_IFACE}=="02", SYMLINK+="ext_serial"
 
 LABEL="corecdp_end"
diff --git a/multitech/recipes/udev/udev-165/mtocgd3/corecdp.rules b/multitech/recipes/udev/udev-165/mtocgd2/corecdp.rules
index be32fa0..9677908 100644
--- a/multitech/recipes/udev/udev-165/mtocgd3/corecdp.rules
+++ b/multitech/recipes/udev/udev-165/mtocgd2/corecdp.rules
@@ -48,10 +48,10 @@ ATTRS{idVendor}=="1199", ATTRS{idProduct}=="683c", ENV{ID_IFACE}=="05", SYMLINK+
 # EV2: ttyUSB0
 ATTRS{idVendor}=="1199", ATTRS{idProduct}=="0028", ENV{ID_PORT}=="0", SYMLINK+="modem_at0"
 
-# mtocgd3: bluetooth on exar chip (ACM1, iface 2)
+# mtocgd2: bluetooth on exar chip (ACM1, iface 2)
 ATTRS{idVendor}=="04e2", ATTRS{idProduct}=="1414", ENV{ID_IFACE}=="02", SYMLINK+="bt"
 
-# mtocgd3: external serial on exar chip (ACM2, iface 4)
+# mtocgd2: external serial on exar chip (ACM2, iface 4)
 ATTRS{idVendor}=="04e2", ATTRS{idProduct}=="1414", ENV{ID_IFACE}=="04", SYMLINK+="ext_serial"
 
 LABEL="corecdp_end"