mtcap: rename machine type mtp to mtcap

10 files changed, 19 insertions, 19 deletions

diff --git a/conf/machine/mtp.conf b/conf/machine/mtcap.conf
index 14669cf..18343bd 100644
--- a/conf/machine/mtp.conf
+++ b/conf/machine/mtcap.conf
@@ -1,6 +1,6 @@
 #@TYPE: Machine
-#@Name: MTP
-#@DESCRIPTION: Machine configuration for the MTP hardware
+#@Name: MTCAP
+#@DESCRIPTION: Machine configuration for the MTCAP hardware
 
 require conf/machine/include/tune-arm926ejs.inc
 
diff --git a/recipes-bsp/at91bootstrap/at91bootstrap_3.5.3.bb b/recipes-bsp/at91bootstrap/at91bootstrap_3.5.3.bb
index ea003c3..1858d49 100644
--- a/recipes-bsp/at91bootstrap/at91bootstrap_3.5.3.bb
+++ b/recipes-bsp/at91bootstrap/at91bootstrap_3.5.3.bb
@@ -14,7 +14,7 @@ SRC_URI = "git://github.com/linux4sam/at91bootstrap \
 S = "${WORKDIR}/git"
 
 SRC_URI_append_mtcdt = " file://at91bootstrap-3.5.3-mtcdt.patch "
-SRC_URI_append_mtp = " file://at91bootstrap-3.5.3-mtcdt.patch "
+SRC_URI_append_mtcap = " file://at91bootstrap-3.5.3-mtcdt.patch "
 
 # generate a bootstrap file padded with the header needed for 4-bit PMECC
 # The padded file can be flashed via u-boot without any need to set the PMECC header using SAM-BA
diff --git a/recipes-bsp/multitech/mts-io.inc b/recipes-bsp/multitech/mts-io.inc
index c9ee889..ca179c8 100644
--- a/recipes-bsp/multitech/mts-io.inc
+++ b/recipes-bsp/multitech/mts-io.inc
@@ -16,7 +16,7 @@ SRC_URI = " \
     file://led-status_heartbeat_trigger \
     file://lora-led-updater \
     file://mts-io.init \
-    file://mts-io.mtp.init \
+    file://mts-io.mtcap.init \
     file://radio-reset.init \
     file://radio-reset.default \
 "
@@ -47,7 +47,7 @@ FILES_${PN} = "${base_libdir}/modules/${KERNEL_VERSION}/extra/mts_io.ko"
 FILES_${PN} += "${sysconfdir}"
 FILES_${PN} += "${libdir}/mts-io-sysfs*"
 FILES_${PN} += "${sbindir}/mts-io-sysfs"
-FILES_${PN}_append_mtp += "${sbindir}/lora-led-updater"
+FILES_${PN}_append_mtcap += "${sbindir}/lora-led-updater"
 
 INITSCRIPT_NAME = "mts-io"
 INITSCRIPT_PARAMS = "start 39 S ."
@@ -87,11 +87,11 @@ fakeroot do_install () {
     install -m 0644 ${WORKDIR}/radio-reset.default ${D}${sysconfdir}/default/radio-reset
 }
 
-fakeroot do_install_append_mtp() {
-    # install MTP mts-io init script
-    install -m 0755 ${WORKDIR}/mts-io.mtp.init ${D}${sysconfdir}/init.d/mts-io
+fakeroot do_install_append_mtcap() {
+    # install MTCAP mts-io init script
+    install -m 0755 ${WORKDIR}/mts-io.mtcap.init ${D}${sysconfdir}/init.d/mts-io
     install -m 0755 ${WORKDIR}/lora-led-updater ${D}${sbindir}/lora-led-updater
 
-    # disable radio-reset for the mtp hardware
+    # disable radio-reset for the mtcap hardware
     sed -i 's/ENABLED="yes"/ENABLED="no"/g' ${D}${sysconfdir}/default/radio-reset
 }
diff --git a/recipes-bsp/multitech/mts-io/mts-io.mtp.init b/recipes-bsp/multitech/mts-io/mts-io.mtcap.init
index b4aa489..b4aa489 100644
--- a/recipes-bsp/multitech/mts-io/mts-io.mtp.init
+++ b/recipes-bsp/multitech/mts-io/mts-io.mtcap.init
diff --git a/recipes-bsp/multitech/mts-io_1.4.2.bb b/recipes-bsp/multitech/mts-io_1.5.0.bb
index 85b3de1..85b3de1 100644
--- a/recipes-bsp/multitech/mts-io_1.4.2.bb
+++ b/recipes-bsp/multitech/mts-io_1.5.0.bb
diff --git a/recipes-bsp/u-boot/u-boot_2012.10.bb b/recipes-bsp/u-boot/u-boot_2012.10.bb
index aa3576f..47f6ea2 100644
--- a/recipes-bsp/u-boot/u-boot_2012.10.bb
+++ b/recipes-bsp/u-boot/u-boot_2012.10.bb
@@ -18,7 +18,7 @@ SRC_URI = "git://github.com/linux4sam/u-boot-at91.git;branch=u-boot-2012.10-at91
 SRC_URI += "file://u-boot-2010.06-macb-autoneg-timeout.patch"
 
 SRC_URI_append_mtcdt = " file://u-boot-2012.10-mtcdt.patch"
-SRC_URI_append_mtp = " file://u-boot-2012.10-mtcdt.patch"
+SRC_URI_append_mtcap = " file://u-boot-2012.10-mtcdt.patch"
 
 TARGET_LDFLAGS = ""
 
diff --git a/recipes-kernel/linux/linux-3.12.27/mtp/defconfig b/recipes-kernel/linux/linux-3.12.27/mtcap/defconfig
index 155ff82..155ff82 100644
--- a/recipes-kernel/linux/linux-3.12.27/mtp/defconfig
+++ b/recipes-kernel/linux/linux-3.12.27/mtcap/defconfig
diff --git a/recipes-kernel/linux/linux-3.12.27/mtp/linux-3.12-eeprom-setup-mtcdt.patch b/recipes-kernel/linux/linux-3.12.27/mtcap/linux-3.12-eeprom-setup-mtcdt.patch
index 4075005..4075005 100644
--- a/recipes-kernel/linux/linux-3.12.27/mtp/linux-3.12-eeprom-setup-mtcdt.patch
+++ b/recipes-kernel/linux/linux-3.12.27/mtcap/linux-3.12-eeprom-setup-mtcdt.patch
diff --git a/recipes-kernel/linux/linux-3.12.27/mtp/linux-3.12-mtp-device-tree.patch b/recipes-kernel/linux/linux-3.12.27/mtcap/linux-3.12-mtcap-device-tree.patch
index 27e8df2..474f606 100644
--- a/recipes-kernel/linux/linux-3.12.27/mtp/linux-3.12-mtp-device-tree.patch
+++ b/recipes-kernel/linux/linux-3.12.27/mtcap/linux-3.12-mtcap-device-tree.patch
@@ -1,17 +1,17 @@
-Index: linux-3.12.27/arch/arm/boot/dts/mtp.dts
+Index: linux-3.12.27/arch/arm/boot/dts/mtcap.dts
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.12.27/arch/arm/boot/dts/mtp.dts	2015-01-13 13:58:20.766078428 -0600
++++ linux-3.12.27/arch/arm/boot/dts/mtcap.dts	2015-01-13 13:58:20.766078428 -0600
 @@ -0,0 +1,210 @@
 +/*
-+ * DTS file for Multi-Tech Systems MTP Hardware
++ * DTS file for Multi-Tech Systems MTCAP Hardware
 + */
 +
 +/dts-v1/;
 +#include "at91sam9g25.dtsi"
 +
 +/ {
-+	model = "Multi-Tech Systems MTP";
++	model = "Multi-Tech Systems MTCAP";
 +	compatible = "atmel,at91sam9g25ek", "atmel,at91sam9x5ek", "atmel,at91sam9x5", "atmel,at91sam9";
 +
 +	chosen {
@@ -221,7 +221,7 @@ Index: linux-3.12.27/arch/arm/boot/dts/Makefile
  dtb-$(CONFIG_ARCH_AT91) += at91sam9g35ek.dtb
  dtb-$(CONFIG_ARCH_AT91) += at91sam9x25ek.dtb
  dtb-$(CONFIG_ARCH_AT91) += at91sam9x35ek.dtb
-+dtb-$(CONFIG_ARCH_AT91) += mtp.dtb
++dtb-$(CONFIG_ARCH_AT91) += mtcap.dtb
  # sama5d3
  dtb-$(CONFIG_ARCH_AT91)	+= sama5d31ek.dtb
  dtb-$(CONFIG_ARCH_AT91)	+= sama5d33ek.dtb
diff --git a/recipes-kernel/linux/linux_3.12.27.bb b/recipes-kernel/linux/linux_3.12.27.bb
index 5a238e1..074ac48 100644
--- a/recipes-kernel/linux/linux_3.12.27.bb
+++ b/recipes-kernel/linux/linux_3.12.27.bb
@@ -36,20 +36,20 @@ SRC_URI_append_mtcdt = "\
             file://linux-3.12-add-num_accessory_ports-config-option.patch \
             "
 
-SRC_URI_append_mtp = "\
+SRC_URI_append_mtcap = "\
             ${COMMON_PATCHES} \
             file://defconfig \
             file://linux-3.12-eeprom-setup-mtcdt.patch \
-            file://linux-3.12-mtp-device-tree.patch \
+            file://linux-3.12-mtcap-device-tree.patch \
             file://linux-3.12-add-num_accessory_ports-config-option.patch \
             "
 
 SRC_URI[md5sum] = "2f05332bfca89ae1348ae454af2f5ffb"
 SRC_URI[sha256sum] = "2014c55257dda311779359d6b42931079a687c154777cc528c44e25f262194cd"
 
-COMPATIBLE_MACHINE = "(mtcdt|mtp)"
+COMPATIBLE_MACHINE = "(mtcdt|mtcap)"
 DTB_APPEND_mtcdt = "mtcdt"
-DTB_APPEND_mtp = "mtp"
+DTB_APPEND_mtcap = "mtcap"
 
 # disable this on purpose for dev purposes
 do_rm_work() {