From 74b40c3b3f6a6748041702861afb1306e10e3533 Mon Sep 17 00:00:00 2001 From: John Klug Date: Wed, 6 Oct 2021 08:29:37 -0500 Subject: Move gps0 symlink to UDEV --- recipes-bsp/multitech/mts-io.inc | 2 +- recipes-bsp/multitech/mts-io/mts-io.init | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes-bsp/multitech/mts-io.inc b/recipes-bsp/multitech/mts-io.inc index a00f9aa..9dbc72a 100644 --- a/recipes-bsp/multitech/mts-io.inc +++ b/recipes-bsp/multitech/mts-io.inc @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://io-module/COPYING;md5=94d55d512a9ba36caa9b7df079bae19 file://io-tool/COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ " do_fetch[depends] += "virtual/kernel:do_shared_workdir" -INC_PR = "r2" +INC_PR = "r3" SRCREV = "${PV}" PR = "${INC_PR}.0" diff --git a/recipes-bsp/multitech/mts-io/mts-io.init b/recipes-bsp/multitech/mts-io/mts-io.init index 2dd5405..c520597 100755 --- a/recipes-bsp/multitech/mts-io/mts-io.init +++ b/recipes-bsp/multitech/mts-io/mts-io.init @@ -313,7 +313,7 @@ set_links() { fi # Default MTCDT-0.1 echo "u-blox" >"$GPSCONFIGTYPE" - ln -sf /dev/ttyXRUSB2 /dev/gps0 + # Link up GPS for MTCDT and MTCDTIP in udev } case $1 in -- cgit v1.2.3 From 5e9f89a26acb0ae3e8affafd1c3a01f5e02887a5 Mon Sep 17 00:00:00 2001 From: John Klug Date: Thu, 7 Oct 2021 10:09:12 -0500 Subject: Development patch for MTCDT-0.2 mts-io --- recipes-bsp/multitech/mts-io.inc | 3 +- recipes-bsp/multitech/mts-io/MTCDT-0.2.patch | 71 ++++++++++++++++++++++++++++ 2 files changed, 73 insertions(+), 1 deletion(-) create mode 100644 recipes-bsp/multitech/mts-io/MTCDT-0.2.patch diff --git a/recipes-bsp/multitech/mts-io.inc b/recipes-bsp/multitech/mts-io.inc index 9dbc72a..2d6c5c6 100644 --- a/recipes-bsp/multitech/mts-io.inc +++ b/recipes-bsp/multitech/mts-io.inc @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://io-module/COPYING;md5=94d55d512a9ba36caa9b7df079bae19 file://io-tool/COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ " do_fetch[depends] += "virtual/kernel:do_shared_workdir" -INC_PR = "r3" +INC_PR = "r4" SRCREV = "${PV}" PR = "${INC_PR}.0" @@ -26,6 +26,7 @@ SRC_URI = " \ file://mts-io.blacklist \ file://mts-io.mtcap.init \ file://mts-io.conf \ + file://MTCDT-0.2.patch \ " S = "${WORKDIR}/git" diff --git a/recipes-bsp/multitech/mts-io/MTCDT-0.2.patch b/recipes-bsp/multitech/mts-io/MTCDT-0.2.patch new file mode 100644 index 0000000..77c7457 --- /dev/null +++ b/recipes-bsp/multitech/mts-io/MTCDT-0.2.patch @@ -0,0 +1,71 @@ +diff --git a/configure.ac b/configure.ac +index 7c25e08..27696b9 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1,4 +1,4 @@ +-AC_INIT([mts-io], [4.7.2]) ++AC_INIT([mts-io], [4.7.3]) + AC_CONFIG_SRCDIR([util/mts_util_lora2_reset.c]) + AM_INIT_AUTOMAKE + AM_CONFIG_HEADER([config.h]) +diff --git a/io-module/mts-io.c b/io-module/mts-io.c +index ed0cb49..6fad83f 100644 +--- a/io-module/mts-io.c ++++ b/io-module/mts-io.c +@@ -80,6 +80,13 @@ MODULE_DEVICE_TABLE(of, mts_io_dt_ids); + /* on-board EEPROM */ + static struct mts_id_eeprom_layout id_eeprom; + ++// Allow other modules to query the hardware version ++const char *mts_get_hw_version(void) ++{ ++ return id_eeprom.hw_version; ++} ++EXPORT_SYMBOL(mts_get_hw_version); ++ + #include "adc.c" + + static int mts_io_probe(struct platform_device *pdev) +@@ -544,6 +551,9 @@ static DEVICE_ATTR_MTS(dev_attr_led_d_gpio, "led-d", + static DEVICE_ATTR_MTS(dev_attr_led_e_gpio, "led-e", + mts_attr_show_gpio_pin, mts_attr_store_gpio_pin); + ++ ++ ++ + /* eeprom info */ + static ssize_t mts_attr_show_product_info(struct device *dev, + struct device_attribute *attr, +diff --git a/io-module/mts_io.h b/io-module/mts_io.h +index 2c4b7b6..4f46804 100644 +--- a/io-module/mts_io.h ++++ b/io-module/mts_io.h +@@ -50,6 +50,7 @@ struct gpio_pin { + }; + + extern int mts_has_radio(const char *product_id, size_t len); ++extern const char *mts_get_hw_version(void); + + #endif /* __MTS_IO_H */ + +diff --git a/io-module/mts_io_module.h b/io-module/mts_io_module.h +index eca15a3..83a2994 100644 +--- a/io-module/mts_io_module.h ++++ b/io-module/mts_io_module.h +@@ -5,7 +5,7 @@ + * MTAC cards. + */ + +-#define DRIVER_VERSION "v4.7.2" ++#define DRIVER_VERSION "v4.7.3" + #define DRIVER_AUTHOR "Multitech Systems" + #define DRIVER_DESC "MTS-IO Controller" + #define DRIVER_NAME "mts-io" +@@ -36,6 +36,7 @@ + #define HW_VERSION_MTRE "MTRE-0.0" + #define HW_VERSION_MTCDT_0_0 "MTCDT-0.0" // No GPS or WiFi Capability + #define HW_VERSION_MTCDT_0_1 "MTCDT-0.1" // Conduit refresh with GPS and WiFi possible ++#define HW_VERSION_MTCDT_0_2 "MTCDT-0.2" // FTDI with no multi-drop serial support + #define HW_VERSION_MTCDTIP_0_0 "MTCDTIP-0.0" + #define HW_VERSION_MTCDTIPHP_0_0 "MTCDTIPHP-0.0" // Also known as LoRa 2.1 + #define HW_VERSION_MTCAP_0_0 "MTCAP-0.0" -- cgit v1.2.3 From 8258480e0f4703063cb083cec3bbd2e80ea3bcab Mon Sep 17 00:00:00 2001 From: John Klug Date: Thu, 7 Oct 2021 10:38:38 -0500 Subject: Development patch for MTCDT-0.2 mts-io for MTAC-MFSER --- .../multitech/mtac/serial-enable-tx-enable.patch | 49 ++++++++++++++++++++++ recipes-bsp/multitech/mtac_4.0.9.bb | 2 +- 2 files changed, 50 insertions(+), 1 deletion(-) create mode 100644 recipes-bsp/multitech/mtac/serial-enable-tx-enable.patch diff --git a/recipes-bsp/multitech/mtac/serial-enable-tx-enable.patch b/recipes-bsp/multitech/mtac/serial-enable-tx-enable.patch new file mode 100644 index 0000000..095c518 --- /dev/null +++ b/recipes-bsp/multitech/mtac/serial-enable-tx-enable.patch @@ -0,0 +1,49 @@ +diff --git a/configure.ac b/configure.ac +index 8e49919..6855328 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1,4 +1,4 @@ +-AC_INIT([mtac], [4.0.6]) ++AC_INIT([mtac], [4.0.8]) + AM_INIT_AUTOMAKE + AM_CONFIG_HEADER([config.h]) + +diff --git a/machine/sam9g25_gpio.h b/machine/sam9g25_gpio.h +index 3848576..eaeb42b 100644 +--- a/machine/sam9g25_gpio.h ++++ b/machine/sam9g25_gpio.h +@@ -22,4 +22,9 @@ + #define M_AP2_NRESET AT91_PIN_PB13 + #define M_AP2_NINT1 AT91_PIN_PB17 + #define M_AP2_NINT2 AT91_PIN_PB18 ++ ++// Special control pins for serial interface ++#define M_AP1_ENABLE_TX_ENABLE AT91_PIN_PC31 ++#define M_AP2_ENABLE_TX_ENABLE AT91_PIN_PC30 ++ + #endif /* SAM9G25_MFSER_GPIO_H */ +diff --git a/machine/ti43x_gpio.h b/machine/ti43x_gpio.h +index 734998d..3f27e95 100644 +--- a/machine/ti43x_gpio.h ++++ b/machine/ti43x_gpio.h +@@ -22,4 +22,10 @@ + #define M_AP2_NRESET OMAP_GPIO(5,29) + #define M_AP2_NINT1 OMAP_GPIO(3,17) + #define M_AP2_NINT2 OMAP_GPIO(3,18) ++ ++// Special control pins for serial interface ++// which don't exist on the TI platform. ++#define M_AP1_ENABLE_TX_ENABLE 0 ++#define M_AP2_ENABLE_TX_ENABLE 0 ++ + #endif /* TI MTCDT3-BB */ +diff --git a/mtac.c b/mtac.c +index 2fefc0e..b7b59cd 100644 +--- a/mtac.c ++++ b/mtac.c +@@ -1,4 +1,4 @@ +-#define DRIVER_VERSION "v4.0.5" ++#define DRIVER_VERSION "v4.0.8" + #define DRIVER_AUTHOR "Multi-Tech" + #define DRIVER_DESC "MTS driver to supervise MTAC slots" + #define DRIVER_NAME "mtac-slots" diff --git a/recipes-bsp/multitech/mtac_4.0.9.bb b/recipes-bsp/multitech/mtac_4.0.9.bb index ecabcb3..0327ebf 100644 --- a/recipes-bsp/multitech/mtac_4.0.9.bb +++ b/recipes-bsp/multitech/mtac_4.0.9.bb @@ -6,7 +6,7 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" do_fetch[depends]+="virtual/kernel:do_shared_workdir" DEPENDS = "virtual/kernel mts-io" -INC_PR = "r0" +INC_PR = "r1" COMPATIBLE_MACHINE = "(mtcdt|mtcpmhs)" SRCREV = "${AUTOREV}" -- cgit v1.2.3 From eba8f2e0bdd00faff0347dadebbb1b949e7c2de4 Mon Sep 17 00:00:00 2001 From: John Klug Date: Thu, 7 Oct 2021 11:59:59 -0500 Subject: Need mts_io_module.h for hardware version decoding --- recipes-bsp/multitech/mts-io.inc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/recipes-bsp/multitech/mts-io.inc b/recipes-bsp/multitech/mts-io.inc index 2d6c5c6..4d7da97 100644 --- a/recipes-bsp/multitech/mts-io.inc +++ b/recipes-bsp/multitech/mts-io.inc @@ -86,6 +86,7 @@ fakeroot do_install () { # install headers for kernel modules install -d ${D}${includedir}/mts-kernel-headers/linux install -m 0644 ${S}/io-module/mts_io.h ${D}${includedir}/mts-kernel-headers/linux + install -m 0644 ${S}/io-module/mts_io_module.h ${D}${includedir}/mts-kernel-headers/linux install -m 0644 ${S}/io-module/mts_eeprom.h ${D}${includedir}/mts-kernel-headers/linux install -m 0644 ${S}/io-module/at91gpio.h ${D}${includedir}/mts-kernel-headers/linux @@ -95,6 +96,7 @@ fakeroot do_install () { # install -d ${D}${includedir}/linux install -m 0644 ${S}/io-module/mts_io.h ${D}${includedir}/linux + install -m 0644 ${S}/io-module/mts_io_module.h ${D}${includedir}/linux install -m 0644 ${S}/io-module/mts_eeprom.h ${D}${includedir}/linux install -m 0644 ${S}/io-module/at91gpio.h ${D}${includedir}/linux -- cgit v1.2.3 From 0a530e44b823d51dbf7fd28f3beeecdc35756cb0 Mon Sep 17 00:00:00 2001 From: John Klug Date: Thu, 7 Oct 2021 12:03:28 -0500 Subject: Add new GPIOs to mtac-mfser --- .../mtac-mfser/serial-enable-tx-enable.patch | 173 +++++++++++++++++++++ recipes-bsp/multitech/mtac-mfser_1.1.1.bb | 3 +- 2 files changed, 175 insertions(+), 1 deletion(-) create mode 100644 recipes-bsp/multitech/mtac-mfser/serial-enable-tx-enable.patch diff --git a/recipes-bsp/multitech/mtac-mfser/serial-enable-tx-enable.patch b/recipes-bsp/multitech/mtac-mfser/serial-enable-tx-enable.patch new file mode 100644 index 0000000..01a2142 --- /dev/null +++ b/recipes-bsp/multitech/mtac-mfser/serial-enable-tx-enable.patch @@ -0,0 +1,173 @@ +diff --git a/mtac_mfser.c b/mtac_mfser.c +index d8548cb..fd7b0b6 100644 +--- a/mtac_mfser.c ++++ b/mtac_mfser.c +@@ -1,4 +1,4 @@ +-#define DRIVER_VERSION "v1.1.1" ++#define DRIVER_VERSION "v1.2.0" + #define DRIVER_AUTHOR "Multi-Tech" + #define DRIVER_DESC "MTS Multi-Fuction Serial Accessory Card" + #define DRIVER_NAME "mtac-mfser" +@@ -12,6 +12,7 @@ + #include + #include + #include ++#include + #ifdef TI43X + #include + #endif +@@ -54,6 +55,86 @@ static struct gpio_pin gpio_pins_mtac_mfser[] = { + .label = "ap1-gpio4", + } + }, ++ ++ // gpio pins for Accessory Card 2 ++ { ++ .name = "AP2_GPIO1", ++ .pin = { ++ .gpio = M_AP2_GPIO1, ++ .flags = GPIOF_OUT_INIT_LOW, ++ .label = "ap2-gpio1", ++ }, ++ .active_low = 1, ++ }, ++ { ++ .name = "AP2_GPIO2", ++ .pin = { ++ .gpio = M_AP2_GPIO2, ++ .flags = GPIOF_OUT_INIT_LOW, ++ .label = "ap2-gpio2", ++ } ++ }, ++ { ++ .name = "AP2_GPIO3", ++ .pin = { ++ .gpio = M_AP2_GPIO3, ++ .flags = GPIOF_OUT_INIT_LOW, ++ .label = "ap2-gpio3", ++ } ++ }, ++ { ++ .name = "AP2_GPIO4", ++ .pin = { ++ .gpio = M_AP2_GPIO4, ++ .flags = GPIOF_OUT_INIT_LOW, ++ .label = "ap2-gpio4", ++ } ++ }, ++ { }, ++}; ++static struct gpio_pin gpio_pins_mtac_mfser_RI[] = { ++ // gpio pins for Accessory Card 1 ++ { ++ .name = "AP1_GPIO1", ++ .pin = { ++ .gpio = M_AP1_GPIO1, ++ .flags = GPIOF_OUT_INIT_LOW, ++ .label = "ap1-gpio1", ++ }, ++ .active_low = 1, ++ }, ++ { ++ .name = "AP1_GPIO2", ++ .pin = { ++ .gpio = M_AP1_GPIO2, ++ .flags = GPIOF_OUT_INIT_LOW, ++ .label = "ap1-gpio2", ++ } ++ }, ++ { ++ .name = "AP1_GPIO3", ++ .pin = { ++ .gpio = M_AP1_GPIO3, ++ .flags = GPIOF_OUT_INIT_LOW, ++ .label = "ap1-gpio3", ++ } ++ }, ++ { ++ .name = "AP1_GPIO4", ++ .pin = { ++ .gpio = M_AP1_GPIO4, ++ .flags = GPIOF_OUT_INIT_LOW, ++ .label = "ap1-gpio4", ++ } ++ }, ++ { // MTCDT-0.4 only ++ .name = "AP1_ENABLE_TX_ENABLE", ++ .pin = { ++ .gpio = AT91_PIN_PC31, ++ .flags = GPIOF_OUT_INIT_LOW, ++ .label = "ap1-enable-tx-enable", ++ } ++ }, + + + // gpio pins for Accessory Card 2 +@@ -90,7 +171,15 @@ static struct gpio_pin gpio_pins_mtac_mfser[] = { + .label = "ap2-gpio4", + } + }, +- { }, ++ { // MTCDT-0.4 only ++ .name = "AP2_ENABLE_TX_ENABLE", ++ .pin = { ++ .gpio = AT91_PIN_PC30, ++ .flags = GPIOF_OUT_INIT_LOW, ++ .label = "ap2-enable-tx-enable", ++ } ++ }, ++ { }, + }; + + static char* mfser_gpio_pin_name_by_attr_name(const char* name, int port) { +@@ -251,8 +340,9 @@ static ssize_t mts_attr_store_mfser_mode(struct kobject *kobj, + // 1 product-id + // 1 device-id + // 1 hw-version ++// 1 enable_tx_enable + // NULL +-static size_t ap_mfser_attrs_size = 8; ++static size_t ap_mfser_attrs_size = 9; + + static bool mfser_setup(enum ap port) { + int i; +@@ -264,6 +354,7 @@ static bool mfser_setup(enum ap port) { + struct kobj_attribute* attr; + struct attribute **attrs; + struct kobject *subdir; ++ char *tmp; + + log_info("loading MFSER accessory card in port %d", port); + +@@ -273,8 +364,10 @@ static bool mfser_setup(enum ap port) { + log_error("kobject_create_and_add for MFSER in port %d failed", port); + return false; + } +- +- mtac_set_port_pins(port_index,gpio_pins_mtac_mfser,subdir); ++ if ((tmp=HW_VERSION_MTCDT_0_2),strncmp(mts_get_hw_version(), tmp, strlen(tmp)) == 0) ++ mtac_set_port_pins(port_index,gpio_pins_mtac_mfser_RI,subdir); ++ else ++ mtac_set_port_pins(port_index,gpio_pins_mtac_mfser,subdir); + + // create the link to the apX directory this card is in + // if we're in the first slot, we get plain "mfser" +@@ -334,6 +427,18 @@ static bool mfser_setup(enum ap port) { + attr->store = mtac_attr_store_ap_gpio_pin; + attrs[index++] = &attr->attr; + ++ if ((tmp=HW_VERSION_MTCDT_0_2),strncmp(mts_get_hw_version(), tmp, strlen(tmp)) == 0) { ++ sprintf(buf, "enable-tx-enable"); ++ attr = mtac_create_attribute(buf, MTS_ATTR_MODE_RW); ++ if (! attr) { ++ log_error("failed to create attribute [%s] for MFSER in port %d", buf, port); ++ return false; ++ } ++ attr->show = mtac_attr_show_ap_gpio_pin; ++ attr->store = mtac_attr_store_ap_gpio_pin; ++ attrs[index++] = &attr->attr; ++ } ++ + // add attributes for eeprom contents + if (! mtac_add_product_info_attributes(port, attrs, &index)) { + log_error("failed to add product info attributes for MFSER in port %d", port); diff --git a/recipes-bsp/multitech/mtac-mfser_1.1.1.bb b/recipes-bsp/multitech/mtac-mfser_1.1.1.bb index 213ec1d..5f107b8 100644 --- a/recipes-bsp/multitech/mtac-mfser_1.1.1.bb +++ b/recipes-bsp/multitech/mtac-mfser_1.1.1.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" do_fetch[depends]+="virtual/kernel:do_shared_workdir" DEPENDS = "virtual/kernel mtac mts-io" RDEPENDS_${PN} = "kernel-module-mtac" -INC_PR = "r1" +INC_PR = "r2" COMPATIBLE_MACHINE = "(mtcdt|mtcpmhs)" SRCREV = "${PV}" @@ -18,6 +18,7 @@ PKGR = "${PR}${KERNEL_MODULE_PACKAGE_SUFFIX}${EXTENDPRAUTO}" SRC_URI = " \ git://git.multitech.net/mtac-mfser.git;protocol=git;branch=master \ + file://serial-enable-tx-enable.patch \ " S = "${WORKDIR}/git" -- cgit v1.2.3 From 5d31246701422d2bc314f0542d9392e48f9af75d Mon Sep 17 00:00:00 2001 From: John Klug Date: Wed, 13 Oct 2021 10:03:42 -0500 Subject: Fix wrong version in comment --- recipes-bsp/multitech/mtac-mfser/serial-enable-tx-enable.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes-bsp/multitech/mtac-mfser/serial-enable-tx-enable.patch b/recipes-bsp/multitech/mtac-mfser/serial-enable-tx-enable.patch index 01a2142..5fc216d 100644 --- a/recipes-bsp/multitech/mtac-mfser/serial-enable-tx-enable.patch +++ b/recipes-bsp/multitech/mtac-mfser/serial-enable-tx-enable.patch @@ -92,7 +92,7 @@ index d8548cb..fd7b0b6 100644 + .label = "ap1-gpio4", + } + }, -+ { // MTCDT-0.4 only ++ { // MTCDT-0.2 only + .name = "AP1_ENABLE_TX_ENABLE", + .pin = { + .gpio = AT91_PIN_PC31, @@ -108,7 +108,7 @@ index d8548cb..fd7b0b6 100644 } }, - { }, -+ { // MTCDT-0.4 only ++ { // MTCDT-0.2 only + .name = "AP2_ENABLE_TX_ENABLE", + .pin = { + .gpio = AT91_PIN_PC30, -- cgit v1.2.3 From e5360bf650bae2e2c224d3f7ceced4f6a0aa7b95 Mon Sep 17 00:00:00 2001 From: John Klug Date: Fri, 29 Oct 2021 05:10:52 -0500 Subject: Add the names of the GPIOs for the MTCDT-0.2 IO expander --- recipes-bsp/multitech/mts-io.inc | 3 ++- .../multitech/mts-io/ioport-gpio-expand.patch | 28 ++++++++++++++++++++++ 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 recipes-bsp/multitech/mts-io/ioport-gpio-expand.patch diff --git a/recipes-bsp/multitech/mts-io.inc b/recipes-bsp/multitech/mts-io.inc index 4d7da97..a0679b5 100644 --- a/recipes-bsp/multitech/mts-io.inc +++ b/recipes-bsp/multitech/mts-io.inc @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://io-module/COPYING;md5=94d55d512a9ba36caa9b7df079bae19 file://io-tool/COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ " do_fetch[depends] += "virtual/kernel:do_shared_workdir" -INC_PR = "r4" +INC_PR = "r5" SRCREV = "${PV}" PR = "${INC_PR}.0" @@ -27,6 +27,7 @@ SRC_URI = " \ file://mts-io.mtcap.init \ file://mts-io.conf \ file://MTCDT-0.2.patch \ + file://ioport-gpio-expand.patch \ " S = "${WORKDIR}/git" diff --git a/recipes-bsp/multitech/mts-io/ioport-gpio-expand.patch b/recipes-bsp/multitech/mts-io/ioport-gpio-expand.patch new file mode 100644 index 0000000..c413d21 --- /dev/null +++ b/recipes-bsp/multitech/mts-io/ioport-gpio-expand.patch @@ -0,0 +1,28 @@ +diff --git a/io-module/at91gpio.h b/io-module/at91gpio.h +index c2f8a77..d6328f1 100644 +--- a/io-module/at91gpio.h ++++ b/io-module/at91gpio.h +@@ -179,4 +179,23 @@ + #define AT91_PIN_PE30 (0x80 + 30) + #define AT91_PIN_PE31 (0x80 + 31) + ++// MTCDT-0.2 I2C I/O Port expanders ++#define PCA9557_0_IO0 (0xa0 + 0) ++#define PCA9557_0_IO1 (0xa0 + 1) ++#define PCA9557_0_IO2 (0xa0 + 2) ++#define PCA9557_0_IO3 (0xa0 + 3) ++#define PCA9557_0_IO4 (0xa0 + 4) ++#define PCA9557_0_IO5 (0xa0 + 5) ++#define PCA9557_0_IO6 (0xa0 + 6) ++#define PCA9557_0_IO7 (0xa0 + 7) ++ ++#define PCA9557_1_IO0 (0xa8 + 0) ++#define PCA9557_1_IO1 (0xa8 + 1) ++#define PCA9557_1_IO2 (0xa8 + 2) ++#define PCA9557_1_IO3 (0xa8 + 3) ++#define PCA9557_1_IO4 (0xa8 + 4) ++#define PCA9557_1_IO5 (0xa8 + 5) ++#define PCA9557_1_IO6 (0xa8 + 6) ++#define PCA9557_1_IO7 (0xa8 + 7) ++ + #endif -- cgit v1.2.3 From ef73fa2e24cfd1d7fcaf34eb1ea89dd7775dc553 Mon Sep 17 00:00:00 2001 From: John Klug Date: Fri, 29 Oct 2021 11:01:20 -0500 Subject: FTDI serial is removed --- .../multitech/mtac/serial-enable-tx-enable.patch | 49 ---------------------- recipes-bsp/multitech/mtac_4.0.9.bb | 2 +- 2 files changed, 1 insertion(+), 50 deletions(-) delete mode 100644 recipes-bsp/multitech/mtac/serial-enable-tx-enable.patch diff --git a/recipes-bsp/multitech/mtac/serial-enable-tx-enable.patch b/recipes-bsp/multitech/mtac/serial-enable-tx-enable.patch deleted file mode 100644 index 095c518..0000000 --- a/recipes-bsp/multitech/mtac/serial-enable-tx-enable.patch +++ /dev/null @@ -1,49 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 8e49919..6855328 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1,4 +1,4 @@ --AC_INIT([mtac], [4.0.6]) -+AC_INIT([mtac], [4.0.8]) - AM_INIT_AUTOMAKE - AM_CONFIG_HEADER([config.h]) - -diff --git a/machine/sam9g25_gpio.h b/machine/sam9g25_gpio.h -index 3848576..eaeb42b 100644 ---- a/machine/sam9g25_gpio.h -+++ b/machine/sam9g25_gpio.h -@@ -22,4 +22,9 @@ - #define M_AP2_NRESET AT91_PIN_PB13 - #define M_AP2_NINT1 AT91_PIN_PB17 - #define M_AP2_NINT2 AT91_PIN_PB18 -+ -+// Special control pins for serial interface -+#define M_AP1_ENABLE_TX_ENABLE AT91_PIN_PC31 -+#define M_AP2_ENABLE_TX_ENABLE AT91_PIN_PC30 -+ - #endif /* SAM9G25_MFSER_GPIO_H */ -diff --git a/machine/ti43x_gpio.h b/machine/ti43x_gpio.h -index 734998d..3f27e95 100644 ---- a/machine/ti43x_gpio.h -+++ b/machine/ti43x_gpio.h -@@ -22,4 +22,10 @@ - #define M_AP2_NRESET OMAP_GPIO(5,29) - #define M_AP2_NINT1 OMAP_GPIO(3,17) - #define M_AP2_NINT2 OMAP_GPIO(3,18) -+ -+// Special control pins for serial interface -+// which don't exist on the TI platform. -+#define M_AP1_ENABLE_TX_ENABLE 0 -+#define M_AP2_ENABLE_TX_ENABLE 0 -+ - #endif /* TI MTCDT3-BB */ -diff --git a/mtac.c b/mtac.c -index 2fefc0e..b7b59cd 100644 ---- a/mtac.c -+++ b/mtac.c -@@ -1,4 +1,4 @@ --#define DRIVER_VERSION "v4.0.5" -+#define DRIVER_VERSION "v4.0.8" - #define DRIVER_AUTHOR "Multi-Tech" - #define DRIVER_DESC "MTS driver to supervise MTAC slots" - #define DRIVER_NAME "mtac-slots" diff --git a/recipes-bsp/multitech/mtac_4.0.9.bb b/recipes-bsp/multitech/mtac_4.0.9.bb index 0327ebf..ecabcb3 100644 --- a/recipes-bsp/multitech/mtac_4.0.9.bb +++ b/recipes-bsp/multitech/mtac_4.0.9.bb @@ -6,7 +6,7 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" do_fetch[depends]+="virtual/kernel:do_shared_workdir" DEPENDS = "virtual/kernel mts-io" -INC_PR = "r1" +INC_PR = "r0" COMPATIBLE_MACHINE = "(mtcdt|mtcpmhs)" SRCREV = "${AUTOREV}" -- cgit v1.2.3 From bcf55d23e30e0fa713286c2acb05045de9164855 Mon Sep 17 00:00:00 2001 From: John Klug Date: Fri, 29 Oct 2021 11:33:30 -0500 Subject: Move mts-io to MTCDT-0.2 branch for now --- recipes-bsp/multitech/mts-io.inc | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/recipes-bsp/multitech/mts-io.inc b/recipes-bsp/multitech/mts-io.inc index a0679b5..35240a8 100644 --- a/recipes-bsp/multitech/mts-io.inc +++ b/recipes-bsp/multitech/mts-io.inc @@ -9,7 +9,8 @@ LIC_FILES_CHKSUM = "file://io-module/COPYING;md5=94d55d512a9ba36caa9b7df079bae19 do_fetch[depends] += "virtual/kernel:do_shared_workdir" INC_PR = "r5" -SRCREV = "${PV}" +# Not for release. Autorev is development +SRCREV = "${AUTOREV}" PR = "${INC_PR}.0" PKGR = "${PR}-${KERNEL_MODULE_PACKAGE_SUFFIX}${EXTENDPRAUTO}" @@ -18,16 +19,16 @@ RPROVIDES_kernel-module-${PN} = "mts-io" RDEPENDS_${PN}-noarch_append = " mts-io-sysfs" RDEPENDS_${PN}-noarch_append_mtcap = " mts-io-sysfs i2c-tools" +# Temporary MTCDT-0.2 branch +# git://git.multitech.net/mts-io.git;protocol=git SRC_URI = " \ - git://git.multitech.net/mts-io.git;protocol=git \ + git://git@gitlab.multitech.net/mirrors/mts-io.git;protocol=ssh;branch=MTCDT-0.2 \ file://led-status_heartbeat_trigger \ file://lora-led-updater \ file://mts-io.init \ file://mts-io.blacklist \ file://mts-io.mtcap.init \ file://mts-io.conf \ - file://MTCDT-0.2.patch \ - file://ioport-gpio-expand.patch \ " S = "${WORKDIR}/git" -- cgit v1.2.3 From 4f107071a14a79a97135f924f8535b7d225bde50 Mon Sep 17 00:00:00 2001 From: John Klug Date: Wed, 3 Nov 2021 12:40:46 -0500 Subject: Remove rs9113 reset from /etc/init.d/mts-io, as it is redundant --- recipes-bsp/multitech/mts-io/mts-io.init | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/recipes-bsp/multitech/mts-io/mts-io.init b/recipes-bsp/multitech/mts-io/mts-io.init index c520597..cd93fbb 100755 --- a/recipes-bsp/multitech/mts-io/mts-io.init +++ b/recipes-bsp/multitech/mts-io/mts-io.init @@ -80,7 +80,10 @@ HWNAME="" HWLVL="" -RST[0]="${sysdir}/wifi-bt-reset" +# WIFIBTRESET is used later, so it must match +# the index of the RST variable for wifi-bt-reset. +WIFIBTRESET=0 +RST[${WIFIBTRESET}]="${sysdir}/wifi-bt-reset" RST[1]="${sysdir}/mtq-reset" RST[2]="${sysdir}/ap1/reset" RST[3]="${sysdir}/ap1/creset" @@ -355,6 +358,13 @@ case $1 in /usr/bin/logger -t "mts-io" -p daemon.info -s "Resetting system modules" read_card_info /bin/busybox usleep $USLPTIME + + # MTCDT-0.2 has issues with resetting RS9113 twice. + # RS9113 is reset in /etc/init.d/rs9113. + # Remove for MTRV1 reset as well, as it is redundant. + if [[ $hw_name == MTCDT ]] || [[ $hw_name == MTRV1 ]] ; then + RST[${WIFIBTRESET}]="/dev/null" + fi reset_array # use radio-reset init script for radio-reset mfser_init -- cgit v1.2.3 From 676f5fe1586b9e4230f72d8acbcc77f898e52e85 Mon Sep 17 00:00:00 2001 From: John Klug Date: Wed, 3 Nov 2021 12:41:40 -0500 Subject: Bump version of mts-io for now. --- recipes-bsp/multitech/mts-io.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-bsp/multitech/mts-io.inc b/recipes-bsp/multitech/mts-io.inc index 35240a8..caa62a2 100644 --- a/recipes-bsp/multitech/mts-io.inc +++ b/recipes-bsp/multitech/mts-io.inc @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://io-module/COPYING;md5=94d55d512a9ba36caa9b7df079bae19 file://io-tool/COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ " do_fetch[depends] += "virtual/kernel:do_shared_workdir" -INC_PR = "r5" +INC_PR = "r6" # Not for release. Autorev is development SRCREV = "${AUTOREV}" -- cgit v1.2.3 From 7397c5242a9445b35792d7428a884fac055cf3a8 Mon Sep 17 00:00:00 2001 From: John Klug Date: Thu, 4 Nov 2021 06:31:51 -0500 Subject: Put mtac-gpiob, mtac-mfser, mtac all on MTCDT-0.2 branch, autorev --- recipes-bsp/multitech/mtac-gpiob_1.1.4.bb | 8 +++++--- recipes-bsp/multitech/mtac-mfser_1.1.1.bb | 6 ++++-- recipes-bsp/multitech/mtac_4.0.9.bb | 7 ++++--- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/recipes-bsp/multitech/mtac-gpiob_1.1.4.bb b/recipes-bsp/multitech/mtac-gpiob_1.1.4.bb index f004cec..11b3870 100644 --- a/recipes-bsp/multitech/mtac-gpiob_1.1.4.bb +++ b/recipes-bsp/multitech/mtac-gpiob_1.1.4.bb @@ -9,17 +9,19 @@ DEPENDS = "virtual/kernel mtac mts-io" RDEPENDS_${PN} = "kernel-module-mtac" INC_PR = "r1" COMPATIBLE_MACHINE = "(mtcdt|mtcpmhs)" -SRCREV = "${PV}" +# SRCREV = "${PV}" # AUTOREV breaks mLinux source tarballs in Thud -# SRCREV = "${AUTOREV}" +SRCREV = "${AUTOREV}" PR = "${INC_PR}.2" PKGR = "${PR}${KERNEL_MODULE_PACKAGE_SUFFIX}${EXTENDPRAUTO}" +# git://git.multitech.net/mtac-gpiob.git;protocol=git;branch=master + SRC_URI = " \ - git://git@gitlab.multitech.net/mirrors/mtac-gpiob;protocol=ssh;branch=master \ + git://git@gitlab.multitech.net/mirrors/mtac-gpiob.git;protocol=ssh;branch=MTCDT-0.2 \ " S = "${WORKDIR}/git" diff --git a/recipes-bsp/multitech/mtac-mfser_1.1.1.bb b/recipes-bsp/multitech/mtac-mfser_1.1.1.bb index 5f107b8..6ec8ed3 100644 --- a/recipes-bsp/multitech/mtac-mfser_1.1.1.bb +++ b/recipes-bsp/multitech/mtac-mfser_1.1.1.bb @@ -10,14 +10,16 @@ RDEPENDS_${PN} = "kernel-module-mtac" INC_PR = "r2" COMPATIBLE_MACHINE = "(mtcdt|mtcpmhs)" -SRCREV = "${PV}" +#SRCREV = "${PV}" +SRCREV = "${AUTOREV}" PR = "${INC_PR}.1" PKGR = "${PR}${KERNEL_MODULE_PACKAGE_SUFFIX}${EXTENDPRAUTO}" +# git://git.multitech.net/mtac-mfser.git;protocol=git;branch=master SRC_URI = " \ - git://git.multitech.net/mtac-mfser.git;protocol=git;branch=master \ + git://git@gitlab.multitech.net/mirrors/mtac-mfser.git;protocol=ssh;branch=MTCDT-0.2 \ file://serial-enable-tx-enable.patch \ " S = "${WORKDIR}/git" diff --git a/recipes-bsp/multitech/mtac_4.0.9.bb b/recipes-bsp/multitech/mtac_4.0.9.bb index ecabcb3..1b8dd3d 100644 --- a/recipes-bsp/multitech/mtac_4.0.9.bb +++ b/recipes-bsp/multitech/mtac_4.0.9.bb @@ -9,10 +9,10 @@ DEPENDS = "virtual/kernel mts-io" INC_PR = "r0" COMPATIBLE_MACHINE = "(mtcdt|mtcpmhs)" -SRCREV = "${AUTOREV}" +# SRCREV = "${PV}" # AUTOREV breaks mLinux source tarballs in Thud -# SRCREV = "${AUTOREV}" +SRCREV = "${AUTOREV}" # Some packages depend on mtac RPROVIDES_kernel-module-${PN} = "mtac" @@ -21,8 +21,9 @@ PR = "${INC_PR}.1" PKGR = "${PR}${KERNEL_MODULE_PACKAGE_SUFFIX}${EXTENDPRAUTO}" +# git://git.multitech.net/mtac.git;protocol=git;branch=master SRC_URI = " \ - git://git@gitlab.multitech.net/mirrors/mtac;protocol=ssh;branch=master \ + git://git@gitlab.multitech.net/mirrors/mtac.git;protocol=ssh;branch=MTCDT-0.2 \ " S = "${WORKDIR}/git" -- cgit v1.2.3 From 0b7036679cf0c057f0ae492e84438270797faf4f Mon Sep 17 00:00:00 2001 From: Serhii Voloshynov Date: Fri, 5 Nov 2021 14:03:55 +0200 Subject: remove unneeded patch --- .../mtac-mfser/serial-enable-tx-enable.patch | 173 --------------------- recipes-bsp/multitech/mtac-mfser_1.1.1.bb | 1 - 2 files changed, 174 deletions(-) delete mode 100644 recipes-bsp/multitech/mtac-mfser/serial-enable-tx-enable.patch diff --git a/recipes-bsp/multitech/mtac-mfser/serial-enable-tx-enable.patch b/recipes-bsp/multitech/mtac-mfser/serial-enable-tx-enable.patch deleted file mode 100644 index 5fc216d..0000000 --- a/recipes-bsp/multitech/mtac-mfser/serial-enable-tx-enable.patch +++ /dev/null @@ -1,173 +0,0 @@ -diff --git a/mtac_mfser.c b/mtac_mfser.c -index d8548cb..fd7b0b6 100644 ---- a/mtac_mfser.c -+++ b/mtac_mfser.c -@@ -1,4 +1,4 @@ --#define DRIVER_VERSION "v1.1.1" -+#define DRIVER_VERSION "v1.2.0" - #define DRIVER_AUTHOR "Multi-Tech" - #define DRIVER_DESC "MTS Multi-Fuction Serial Accessory Card" - #define DRIVER_NAME "mtac-mfser" -@@ -12,6 +12,7 @@ - #include - #include - #include -+#include - #ifdef TI43X - #include - #endif -@@ -54,6 +55,86 @@ static struct gpio_pin gpio_pins_mtac_mfser[] = { - .label = "ap1-gpio4", - } - }, -+ -+ // gpio pins for Accessory Card 2 -+ { -+ .name = "AP2_GPIO1", -+ .pin = { -+ .gpio = M_AP2_GPIO1, -+ .flags = GPIOF_OUT_INIT_LOW, -+ .label = "ap2-gpio1", -+ }, -+ .active_low = 1, -+ }, -+ { -+ .name = "AP2_GPIO2", -+ .pin = { -+ .gpio = M_AP2_GPIO2, -+ .flags = GPIOF_OUT_INIT_LOW, -+ .label = "ap2-gpio2", -+ } -+ }, -+ { -+ .name = "AP2_GPIO3", -+ .pin = { -+ .gpio = M_AP2_GPIO3, -+ .flags = GPIOF_OUT_INIT_LOW, -+ .label = "ap2-gpio3", -+ } -+ }, -+ { -+ .name = "AP2_GPIO4", -+ .pin = { -+ .gpio = M_AP2_GPIO4, -+ .flags = GPIOF_OUT_INIT_LOW, -+ .label = "ap2-gpio4", -+ } -+ }, -+ { }, -+}; -+static struct gpio_pin gpio_pins_mtac_mfser_RI[] = { -+ // gpio pins for Accessory Card 1 -+ { -+ .name = "AP1_GPIO1", -+ .pin = { -+ .gpio = M_AP1_GPIO1, -+ .flags = GPIOF_OUT_INIT_LOW, -+ .label = "ap1-gpio1", -+ }, -+ .active_low = 1, -+ }, -+ { -+ .name = "AP1_GPIO2", -+ .pin = { -+ .gpio = M_AP1_GPIO2, -+ .flags = GPIOF_OUT_INIT_LOW, -+ .label = "ap1-gpio2", -+ } -+ }, -+ { -+ .name = "AP1_GPIO3", -+ .pin = { -+ .gpio = M_AP1_GPIO3, -+ .flags = GPIOF_OUT_INIT_LOW, -+ .label = "ap1-gpio3", -+ } -+ }, -+ { -+ .name = "AP1_GPIO4", -+ .pin = { -+ .gpio = M_AP1_GPIO4, -+ .flags = GPIOF_OUT_INIT_LOW, -+ .label = "ap1-gpio4", -+ } -+ }, -+ { // MTCDT-0.2 only -+ .name = "AP1_ENABLE_TX_ENABLE", -+ .pin = { -+ .gpio = AT91_PIN_PC31, -+ .flags = GPIOF_OUT_INIT_LOW, -+ .label = "ap1-enable-tx-enable", -+ } -+ }, - - - // gpio pins for Accessory Card 2 -@@ -90,7 +171,15 @@ static struct gpio_pin gpio_pins_mtac_mfser[] = { - .label = "ap2-gpio4", - } - }, -- { }, -+ { // MTCDT-0.2 only -+ .name = "AP2_ENABLE_TX_ENABLE", -+ .pin = { -+ .gpio = AT91_PIN_PC30, -+ .flags = GPIOF_OUT_INIT_LOW, -+ .label = "ap2-enable-tx-enable", -+ } -+ }, -+ { }, - }; - - static char* mfser_gpio_pin_name_by_attr_name(const char* name, int port) { -@@ -251,8 +340,9 @@ static ssize_t mts_attr_store_mfser_mode(struct kobject *kobj, - // 1 product-id - // 1 device-id - // 1 hw-version -+// 1 enable_tx_enable - // NULL --static size_t ap_mfser_attrs_size = 8; -+static size_t ap_mfser_attrs_size = 9; - - static bool mfser_setup(enum ap port) { - int i; -@@ -264,6 +354,7 @@ static bool mfser_setup(enum ap port) { - struct kobj_attribute* attr; - struct attribute **attrs; - struct kobject *subdir; -+ char *tmp; - - log_info("loading MFSER accessory card in port %d", port); - -@@ -273,8 +364,10 @@ static bool mfser_setup(enum ap port) { - log_error("kobject_create_and_add for MFSER in port %d failed", port); - return false; - } -- -- mtac_set_port_pins(port_index,gpio_pins_mtac_mfser,subdir); -+ if ((tmp=HW_VERSION_MTCDT_0_2),strncmp(mts_get_hw_version(), tmp, strlen(tmp)) == 0) -+ mtac_set_port_pins(port_index,gpio_pins_mtac_mfser_RI,subdir); -+ else -+ mtac_set_port_pins(port_index,gpio_pins_mtac_mfser,subdir); - - // create the link to the apX directory this card is in - // if we're in the first slot, we get plain "mfser" -@@ -334,6 +427,18 @@ static bool mfser_setup(enum ap port) { - attr->store = mtac_attr_store_ap_gpio_pin; - attrs[index++] = &attr->attr; - -+ if ((tmp=HW_VERSION_MTCDT_0_2),strncmp(mts_get_hw_version(), tmp, strlen(tmp)) == 0) { -+ sprintf(buf, "enable-tx-enable"); -+ attr = mtac_create_attribute(buf, MTS_ATTR_MODE_RW); -+ if (! attr) { -+ log_error("failed to create attribute [%s] for MFSER in port %d", buf, port); -+ return false; -+ } -+ attr->show = mtac_attr_show_ap_gpio_pin; -+ attr->store = mtac_attr_store_ap_gpio_pin; -+ attrs[index++] = &attr->attr; -+ } -+ - // add attributes for eeprom contents - if (! mtac_add_product_info_attributes(port, attrs, &index)) { - log_error("failed to add product info attributes for MFSER in port %d", port); diff --git a/recipes-bsp/multitech/mtac-mfser_1.1.1.bb b/recipes-bsp/multitech/mtac-mfser_1.1.1.bb index 6ec8ed3..9341d2f 100644 --- a/recipes-bsp/multitech/mtac-mfser_1.1.1.bb +++ b/recipes-bsp/multitech/mtac-mfser_1.1.1.bb @@ -20,7 +20,6 @@ PKGR = "${PR}${KERNEL_MODULE_PACKAGE_SUFFIX}${EXTENDPRAUTO}" # git://git.multitech.net/mtac-mfser.git;protocol=git;branch=master SRC_URI = " \ git://git@gitlab.multitech.net/mirrors/mtac-mfser.git;protocol=ssh;branch=MTCDT-0.2 \ - file://serial-enable-tx-enable.patch \ " S = "${WORKDIR}/git" -- cgit v1.2.3 From cbcd9e1dcc299fcbb2ccbf09bc8aa1aa1750618c Mon Sep 17 00:00:00 2001 From: John Klug Date: Mon, 8 Nov 2021 03:41:21 -0600 Subject: mt-dt-overlay must come before mts-io for gpio-leds driver --- recipes-bsp/multitech/mt-dt-overlay/init | 6 +++++- recipes-bsp/multitech/mt-dt-overlay_1.0.5.bb | 17 +++++++++++------ 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/recipes-bsp/multitech/mt-dt-overlay/init b/recipes-bsp/multitech/mt-dt-overlay/init index 5bd8523..bb6790b 100755 --- a/recipes-bsp/multitech/mt-dt-overlay/init +++ b/recipes-bsp/multitech/mt-dt-overlay/init @@ -5,6 +5,8 @@ # device tree. sysdir=/sys/devices/platform/mts-io +i2c=/sys/bus/i2c/devices/ +eepromPath="/sys/devices/platform/i2c-gpio-0/i2c-0/0-0056/eeprom" DEVTREE="/sys/kernel/config/device-tree/overlays/" SYSFS="/usr/sbin/mts-io-sysfs" @@ -47,7 +49,9 @@ install_dtbo_dir() { # [flag] # [file1] [file2] [file3] setdevtree() { - hw=$(${SYSFS} show hw-version) + hwlin=$(mts-id-eeprom --in-file "$eepromPath" 2>/dev/null | grep '^hw-version:') + [[ $hwlin =~ hw-version:[[:space:]]*\"([^\"]+) ]] + hw=${BASH_REMATCH[1]} mach=${hw/%-*} rev=${hw/#*-/} echo mach is $mach diff --git a/recipes-bsp/multitech/mt-dt-overlay_1.0.5.bb b/recipes-bsp/multitech/mt-dt-overlay_1.0.5.bb index 5727e14..a023a4e 100644 --- a/recipes-bsp/multitech/mt-dt-overlay_1.0.5.bb +++ b/recipes-bsp/multitech/mt-dt-overlay_1.0.5.bb @@ -5,12 +5,16 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" inherit update-rc.d INITSCRIPT_NAME = "${PN}" -INITSCRIPT_PARAMS = "start 40 S ." -DEPENDS = "dtc-native" +# mt-dt-overlay must start before mts-io +# because the gpio-leds driver will not load +# after mts-io. +INITSCRIPT_PARAMS = "start 39 S ." +DEPENDS = "dtc-native linux-at91" RDEPENDS_${PN} = "bash" -COMPATIBLE_MACHINE = "(mtcap|mtcdt|mtrv1)" +# For now, just mtcap +COMPATIBLE_MACHINE = "(mtcap|mtrv1|mtcdt)" # By using an overlay, we should be able to support multiple pinouts # using the same image. The overlays go into /lib/dtoverlays. @@ -21,14 +25,15 @@ COMPATIBLE_MACHINE = "(mtcap|mtcdt|mtrv1)" dt_dir = "/lib/dtoverlays" -PR = "r1" +PR = "r2" +# git://git.multitech.net/mt-dt-overlay.git;protocol=git SRC_URI = " \ - git://git.multitech.net/mt-dt-overlay.git;protocol=git \ + git://git@gitlab.multitech.net/mirrors/mt-dt-overlay.git;protocol=ssh;branch=MTCDT-0.2 \ file://init \ " -SRCREV = "${PV}" +SRCREV = "${AUTOREV}" DEPENDS = "virtual/kernel u-boot-mkimage-native" -- cgit v1.2.3 From 8a72a2be2a6e7962c2e8da833a87c4c73e96dbd6 Mon Sep 17 00:00:00 2001 From: John Klug Date: Fri, 12 Nov 2021 14:09:52 -0600 Subject: Use git.multitech.net for repositories --- recipes-bsp/multitech/mt-dt-overlay_1.0.5.bb | 98 ---------------------------- recipes-bsp/multitech/mt-dt-overlay_1.1.0 | 97 +++++++++++++++++++++++++++ recipes-bsp/multitech/mtac-gpiob_1.1.4.bb | 62 ------------------ recipes-bsp/multitech/mtac-gpiob_1.3.0.bb | 57 ++++++++++++++++ recipes-bsp/multitech/mtac-mfser_1.1.1.bb | 60 ----------------- recipes-bsp/multitech/mtac-mfser_1.2.0.bb | 58 ++++++++++++++++ recipes-bsp/multitech/mtac_4.0.9.bb | 70 -------------------- recipes-bsp/multitech/mtac_4.1.0.bb | 67 +++++++++++++++++++ recipes-bsp/multitech/mts-io.inc | 7 +- recipes-bsp/multitech/mts-io_4.7.2.bb | 2 - recipes-bsp/multitech/mts-io_4.8.0.bb | 2 + 11 files changed, 283 insertions(+), 297 deletions(-) delete mode 100644 recipes-bsp/multitech/mt-dt-overlay_1.0.5.bb create mode 100644 recipes-bsp/multitech/mt-dt-overlay_1.1.0 delete mode 100644 recipes-bsp/multitech/mtac-gpiob_1.1.4.bb create mode 100644 recipes-bsp/multitech/mtac-gpiob_1.3.0.bb delete mode 100644 recipes-bsp/multitech/mtac-mfser_1.1.1.bb create mode 100644 recipes-bsp/multitech/mtac-mfser_1.2.0.bb delete mode 100644 recipes-bsp/multitech/mtac_4.0.9.bb create mode 100644 recipes-bsp/multitech/mtac_4.1.0.bb delete mode 100644 recipes-bsp/multitech/mts-io_4.7.2.bb create mode 100644 recipes-bsp/multitech/mts-io_4.8.0.bb diff --git a/recipes-bsp/multitech/mt-dt-overlay_1.0.5.bb b/recipes-bsp/multitech/mt-dt-overlay_1.0.5.bb deleted file mode 100644 index a023a4e..0000000 --- a/recipes-bsp/multitech/mt-dt-overlay_1.0.5.bb +++ /dev/null @@ -1,98 +0,0 @@ -DESCRIPTION = "Compile MT board device tree overlays" -LICENSE = "(GPLv2+)" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" -PACKAGE_ARCH = "${MACHINE_ARCH}" - -inherit update-rc.d -INITSCRIPT_NAME = "${PN}" -# mt-dt-overlay must start before mts-io -# because the gpio-leds driver will not load -# after mts-io. -INITSCRIPT_PARAMS = "start 39 S ." -DEPENDS = "dtc-native linux-at91" -RDEPENDS_${PN} = "bash" - - -# For now, just mtcap -COMPATIBLE_MACHINE = "(mtcap|mtrv1|mtcdt)" - -# By using an overlay, we should be able to support multiple pinouts -# using the same image. The overlays go into /lib/dtoverlays. -# There names are: [hw-version]-driver.dtbo -# e.g. /lib/dtoverlays/MTRV1-0.0-pps.dtbo -# The idea is that mts-io will search for the overlays, and install the -# appropriate device tree overlay for the current hw-version. - -dt_dir = "/lib/dtoverlays" - -PR = "r2" - -# git://git.multitech.net/mt-dt-overlay.git;protocol=git -SRC_URI = " \ - git://git@gitlab.multitech.net/mirrors/mt-dt-overlay.git;protocol=ssh;branch=MTCDT-0.2 \ - file://init \ -" - -SRCREV = "${AUTOREV}" - -DEPENDS = "virtual/kernel u-boot-mkimage-native" - -S = "${WORKDIR}/git" - -do_compile[depends] += "virtual/kernel:do_deploy virtual/kernel:do_shared_workdir" -do_compile[nostamp] = "1" - -# Make sure we are using the Yocto version of DTC, not what is installed in /usr/bin -DTC_BIN_DIR = "${COMPONENTS_DIR}/x86_64/dtc-native/usr/bin" - -do_compile () { - echo MACHINE is ${MACHINE} - oe_runmake DTC=${DTC_BIN_DIR}/dtc KERNEL_DIR=${STAGING_KERNEL_DIR} KERNEL_BUILD_DIR=${KERNEL_PATH} ${MACHINE}_dtbos -} - -FILES_${PN} = "${dt_dir} ${sysconfdir}" - -addtask install after do_compile - -# The destination and any symlinks are defined in the source file. -# -# A line starting as follows " * Put: [destination]" in the source -# defines the destination file name for the device tree binaries. -# -# A line starting as follows " * Link: [destination]" defines a symlink -# to the device tree binary file. -# -do_install () { - install -d ${D}/${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/init ${D}/${sysconfdir}/init.d/${PN} - # Copy files to /lib/dt-overlay/main (mtac cards will be in mtac) - if [ -e ${AT91BOOTSTRAP_MACHINE} ]; then - install -d ${D}/${dt_dir} - ( - cd ${MACHINE} - echo "Current directory is $(pwd)" - for f in *.dtbo ; do - s=$(basename -s .dtbo $f).dtso - location_ln=$(egrep '^[[:space:]]*\*[[:space:]]*Put:[[:space:]]*[^[:space:]]+' $s | sed -r 's/.*Put:[[:space:]]*//') - echo "Binary: $f Source: $s" - echo "Destination: $location_ln" - dirname=$(dirname $location_ln) - install -d ${D}/${dt_dir}/$dirname - install ${f} ${D}/${dt_dir}/$location_ln - links=$(egrep '^[[:space:]]*\*[[:space:]]*Link:[[:space:]]*[^[:space:]]+' $s | sed -r 's/.*Link:[[:space:]]*//') - echo "All Links: " - echo "$links" - echo "End links" - for l in $links ; do - ldirname=$(dirname $l) - if ! [ -d "${D}/$ldirname" ] ; then - install -d ${D}/${dt_dir}/$ldirname - fi - echo ln -sf ${dt_dir}/$dirname/$f ${D}/${dt_dir}/$l - ln -sf ${dt_dir}/$location_ln ${D}/${dt_dir}/$l - done - done - ) - fi -} - diff --git a/recipes-bsp/multitech/mt-dt-overlay_1.1.0 b/recipes-bsp/multitech/mt-dt-overlay_1.1.0 new file mode 100644 index 0000000..313aef3 --- /dev/null +++ b/recipes-bsp/multitech/mt-dt-overlay_1.1.0 @@ -0,0 +1,97 @@ +DESCRIPTION = "Compile MT board device tree overlays" +LICENSE = "(GPLv2+)" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" +PACKAGE_ARCH = "${MACHINE_ARCH}" + +inherit update-rc.d +INITSCRIPT_NAME = "${PN}" +# mt-dt-overlay must start before mts-io +# because the gpio-leds driver will not load +# after mts-io. +INITSCRIPT_PARAMS = "start 39 S ." +DEPENDS = "dtc-native linux-at91" +RDEPENDS_${PN} = "bash" + + +# For now, just mtcap +COMPATIBLE_MACHINE = "(mtcap|mtrv1|mtcdt)" + +# By using an overlay, we should be able to support multiple pinouts +# using the same image. The overlays go into /lib/dtoverlays. +# There names are: [hw-version]-driver.dtbo +# e.g. /lib/dtoverlays/MTRV1-0.0-pps.dtbo +# The idea is that mts-io will search for the overlays, and install the +# appropriate device tree overlay for the current hw-version. + +dt_dir = "/lib/dtoverlays" + +PR = "r2" + +SRC_URI = " \ + git://git.multitech.net/mt-dt-overlay.git;protocol=git \ + file://init \ +" + +SRCREV = "${PR}" + +DEPENDS = "virtual/kernel u-boot-mkimage-native" + +S = "${WORKDIR}/git" + +do_compile[depends] += "virtual/kernel:do_deploy virtual/kernel:do_shared_workdir" +do_compile[nostamp] = "1" + +# Make sure we are using the Yocto version of DTC, not what is installed in /usr/bin +DTC_BIN_DIR = "${COMPONENTS_DIR}/x86_64/dtc-native/usr/bin" + +do_compile () { + echo MACHINE is ${MACHINE} + oe_runmake DTC=${DTC_BIN_DIR}/dtc KERNEL_DIR=${STAGING_KERNEL_DIR} KERNEL_BUILD_DIR=${KERNEL_PATH} ${MACHINE}_dtbos +} + +FILES_${PN} = "${dt_dir} ${sysconfdir}" + +addtask install after do_compile + +# The destination and any symlinks are defined in the source file. +# +# A line starting as follows " * Put: [destination]" in the source +# defines the destination file name for the device tree binaries. +# +# A line starting as follows " * Link: [destination]" defines a symlink +# to the device tree binary file. +# +do_install () { + install -d ${D}/${sysconfdir}/init.d + install -m 0755 ${WORKDIR}/init ${D}/${sysconfdir}/init.d/${PN} + # Copy files to /lib/dt-overlay/main (mtac cards will be in mtac) + if [ -e ${AT91BOOTSTRAP_MACHINE} ]; then + install -d ${D}/${dt_dir} + ( + cd ${MACHINE} + echo "Current directory is $(pwd)" + for f in *.dtbo ; do + s=$(basename -s .dtbo $f).dtso + location_ln=$(egrep '^[[:space:]]*\*[[:space:]]*Put:[[:space:]]*[^[:space:]]+' $s | sed -r 's/.*Put:[[:space:]]*//') + echo "Binary: $f Source: $s" + echo "Destination: $location_ln" + dirname=$(dirname $location_ln) + install -d ${D}/${dt_dir}/$dirname + install ${f} ${D}/${dt_dir}/$location_ln + links=$(egrep '^[[:space:]]*\*[[:space:]]*Link:[[:space:]]*[^[:space:]]+' $s | sed -r 's/.*Link:[[:space:]]*//') + echo "All Links: " + echo "$links" + echo "End links" + for l in $links ; do + ldirname=$(dirname $l) + if ! [ -d "${D}/$ldirname" ] ; then + install -d ${D}/${dt_dir}/$ldirname + fi + echo ln -sf ${dt_dir}/$dirname/$f ${D}/${dt_dir}/$l + ln -sf ${dt_dir}/$location_ln ${D}/${dt_dir}/$l + done + done + ) + fi +} + diff --git a/recipes-bsp/multitech/mtac-gpiob_1.1.4.bb b/recipes-bsp/multitech/mtac-gpiob_1.1.4.bb deleted file mode 100644 index 11b3870..0000000 --- a/recipes-bsp/multitech/mtac-gpiob_1.1.4.bb +++ /dev/null @@ -1,62 +0,0 @@ -DESCRIPTION = "MTAC GPIOB Card" -HOMEPAGE = "http://www.multitech.net/developer/products/multiconnect-conduit-platform/accessory-cards/mtac-gpiob/" -SECTION = "base" -PRIORITY = "optional" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" -do_fetch[depends]+="virtual/kernel:do_shared_workdir" -DEPENDS = "virtual/kernel mtac mts-io" -RDEPENDS_${PN} = "kernel-module-mtac" -INC_PR = "r1" -COMPATIBLE_MACHINE = "(mtcdt|mtcpmhs)" -# SRCREV = "${PV}" - -# AUTOREV breaks mLinux source tarballs in Thud -SRCREV = "${AUTOREV}" - -PR = "${INC_PR}.2" - -PKGR = "${PR}${KERNEL_MODULE_PACKAGE_SUFFIX}${EXTENDPRAUTO}" - -# git://git.multitech.net/mtac-gpiob.git;protocol=git;branch=master - -SRC_URI = " \ - git://git@gitlab.multitech.net/mirrors/mtac-gpiob.git;protocol=ssh;branch=MTCDT-0.2 \ -" -S = "${WORKDIR}/git" - -inherit module - -MTS_EXTRA_SYMBOLS="${STAGING_INCDIR}/mts-io/Module.symvers \ - ${STAGING_INCDIR}/mtac/Module.symvers" - -COMMON_OEMAKE = " -C ${STAGING_KERNEL_DIR} \ - KBUILD_VERBOSE=1 \ - KBUILD_EXTRA_SYMBOLS='${MTS_EXTRA_SYMBOLS}' \ - M=${S} \ - modules \ - " - -EXTRA_OEMAKE_mtcdt = "${COMMON_OEMAKE} EXTRA_CFLAGS='-I${STAGING_INCDIR}/mts-kernel-headers \ - -D SAM9G25'" -EXTRA_OEMAKE_mtcpmhs = "${COMMON_OEMAKE} EXTRA_CFLAGS='-I${STAGING_INCDIR}/mts-kernel-headers \ - -D TI43X -D CONFIG_MTS_NUM_ACCESSORY_PORTS=2'" - -do_compile () { - bbnote make "$@" - make "$@" - unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS - oe_runmake -} - -PACKAGES = "kernel-module-${PN}" - -FILES_kernel-module-${PN} = "${base_libdir}/modules/${KERNEL_VERSION}/extra/mt_ac_gpiob.ko" - -PARALLEL_MAKE = "" - -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}/mtac_gpiob.ko ${D}${base_libdir}/modules/${KERNEL_VERSION}/extra/mt_ac_gpiob.ko -} diff --git a/recipes-bsp/multitech/mtac-gpiob_1.3.0.bb b/recipes-bsp/multitech/mtac-gpiob_1.3.0.bb new file mode 100644 index 0000000..1cecf92 --- /dev/null +++ b/recipes-bsp/multitech/mtac-gpiob_1.3.0.bb @@ -0,0 +1,57 @@ +DESCRIPTION = "MTAC GPIOB Card" +HOMEPAGE = "http://www.multitech.net/developer/products/multiconnect-conduit-platform/accessory-cards/mtac-gpiob/" +SECTION = "base" +PRIORITY = "optional" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" +do_fetch[depends]+="virtual/kernel:do_shared_workdir" +DEPENDS = "virtual/kernel mtac mts-io" +RDEPENDS_${PN} = "kernel-module-mtac" +INC_PR = "r1" +COMPATIBLE_MACHINE = "(mtcdt|mtcpmhs)" +SRCREV = "${PV}" + +PR = "${INC_PR}.2" + +PKGR = "${PR}${KERNEL_MODULE_PACKAGE_SUFFIX}${EXTENDPRAUTO}" + +SRC_URI = " \ + git://git.multitech.net/mtac-gpiob.git;protocol=git;branch=master +" +S = "${WORKDIR}/git" + +inherit module + +MTS_EXTRA_SYMBOLS="${STAGING_INCDIR}/mts-io/Module.symvers \ + ${STAGING_INCDIR}/mtac/Module.symvers" + +COMMON_OEMAKE = " -C ${STAGING_KERNEL_DIR} \ + KBUILD_VERBOSE=1 \ + KBUILD_EXTRA_SYMBOLS='${MTS_EXTRA_SYMBOLS}' \ + M=${S} \ + modules \ + " + +EXTRA_OEMAKE_mtcdt = "${COMMON_OEMAKE} EXTRA_CFLAGS='-I${STAGING_INCDIR}/mts-kernel-headers \ + -D SAM9G25'" +EXTRA_OEMAKE_mtcpmhs = "${COMMON_OEMAKE} EXTRA_CFLAGS='-I${STAGING_INCDIR}/mts-kernel-headers \ + -D TI43X -D CONFIG_MTS_NUM_ACCESSORY_PORTS=2'" + +do_compile () { + bbnote make "$@" + make "$@" + unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS + oe_runmake +} + +PACKAGES = "kernel-module-${PN}" + +FILES_kernel-module-${PN} = "${base_libdir}/modules/${KERNEL_VERSION}/extra/mt_ac_gpiob.ko" + +PARALLEL_MAKE = "" + +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}/mtac_gpiob.ko ${D}${base_libdir}/modules/${KERNEL_VERSION}/extra/mt_ac_gpiob.ko +} diff --git a/recipes-bsp/multitech/mtac-mfser_1.1.1.bb b/recipes-bsp/multitech/mtac-mfser_1.1.1.bb deleted file mode 100644 index 9341d2f..0000000 --- a/recipes-bsp/multitech/mtac-mfser_1.1.1.bb +++ /dev/null @@ -1,60 +0,0 @@ -DESCRIPTION = "MTAC Multi-Function Serial Card" -HOMEPAGE = "http://www.multitech.net/developer/products/multiconnect-conduit-platform/accessory-cards/mtac-mfser/" -SECTION = "base" -PRIORITY = "optional" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" -do_fetch[depends]+="virtual/kernel:do_shared_workdir" -DEPENDS = "virtual/kernel mtac mts-io" -RDEPENDS_${PN} = "kernel-module-mtac" -INC_PR = "r2" -COMPATIBLE_MACHINE = "(mtcdt|mtcpmhs)" - -#SRCREV = "${PV}" -SRCREV = "${AUTOREV}" - -PR = "${INC_PR}.1" - -PKGR = "${PR}${KERNEL_MODULE_PACKAGE_SUFFIX}${EXTENDPRAUTO}" - -# git://git.multitech.net/mtac-mfser.git;protocol=git;branch=master -SRC_URI = " \ - git://git@gitlab.multitech.net/mirrors/mtac-mfser.git;protocol=ssh;branch=MTCDT-0.2 \ -" -S = "${WORKDIR}/git" - -inherit module - -MTS_EXTRA_SYMBOLS="${STAGING_INCDIR}/mts-io/Module.symvers \ - ${STAGING_INCDIR}/mtac/Module.symvers" - -COMMON_OEMAKE = " -C ${STAGING_KERNEL_DIR} \ - KBUILD_VERBOSE=1 \ - KBUILD_EXTRA_SYMBOLS='${MTS_EXTRA_SYMBOLS}' \ - M=${S} \ - modules \ - " - -EXTRA_OEMAKE_mtcdt = "${COMMON_OEMAKE} EXTRA_CFLAGS='-I${STAGING_INCDIR}/mts-kernel-headers \ - -D SAM9G25'" -EXTRA_OEMAKE_mtcpmhs = "${COMMON_OEMAKE} EXTRA_CFLAGS='-I${STAGING_INCDIR}/mts-kernel-headers \ - -D TI43X'" - -do_compile () { - bbnote make "$@" - make "$@" - unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS - oe_runmake -} - -PACKAGES = "kernel-module-${PN}" - -FILES_kernel-module-${PN} = "${base_libdir}/modules/${KERNEL_VERSION}/extra/mtac_mfser.ko" - -PARALLEL_MAKE = "" - -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}/mtac_mfser.ko ${D}${base_libdir}/modules/${KERNEL_VERSION}/extra -} diff --git a/recipes-bsp/multitech/mtac-mfser_1.2.0.bb b/recipes-bsp/multitech/mtac-mfser_1.2.0.bb new file mode 100644 index 0000000..4598beb --- /dev/null +++ b/recipes-bsp/multitech/mtac-mfser_1.2.0.bb @@ -0,0 +1,58 @@ +DESCRIPTION = "MTAC Multi-Function Serial Card" +HOMEPAGE = "http://www.multitech.net/developer/products/multiconnect-conduit-platform/accessory-cards/mtac-mfser/" +SECTION = "base" +PRIORITY = "optional" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" +do_fetch[depends]+="virtual/kernel:do_shared_workdir" +DEPENDS = "virtual/kernel mtac mts-io" +RDEPENDS_${PN} = "kernel-module-mtac" +INC_PR = "r2" +COMPATIBLE_MACHINE = "(mtcdt|mtcpmhs)" + +SRCREV = "${PV}" + +PR = "${INC_PR}.1" + +PKGR = "${PR}${KERNEL_MODULE_PACKAGE_SUFFIX}${EXTENDPRAUTO}" + +SRC_URI = " \ + git://git.multitech.net/mtac-mfser.git;protocol=git;branch=master \ +" +S = "${WORKDIR}/git" + +inherit module + +MTS_EXTRA_SYMBOLS="${STAGING_INCDIR}/mts-io/Module.symvers \ + ${STAGING_INCDIR}/mtac/Module.symvers" + +COMMON_OEMAKE = " -C ${STAGING_KERNEL_DIR} \ + KBUILD_VERBOSE=1 \ + KBUILD_EXTRA_SYMBOLS='${MTS_EXTRA_SYMBOLS}' \ + M=${S} \ + modules \ + " + +EXTRA_OEMAKE_mtcdt = "${COMMON_OEMAKE} EXTRA_CFLAGS='-I${STAGING_INCDIR}/mts-kernel-headers \ + -D SAM9G25'" +EXTRA_OEMAKE_mtcpmhs = "${COMMON_OEMAKE} EXTRA_CFLAGS='-I${STAGING_INCDIR}/mts-kernel-headers \ + -D TI43X'" + +do_compile () { + bbnote make "$@" + make "$@" + unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS + oe_runmake +} + +PACKAGES = "kernel-module-${PN}" + +FILES_kernel-module-${PN} = "${base_libdir}/modules/${KERNEL_VERSION}/extra/mtac_mfser.ko" + +PARALLEL_MAKE = "" + +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}/mtac_mfser.ko ${D}${base_libdir}/modules/${KERNEL_VERSION}/extra +} diff --git a/recipes-bsp/multitech/mtac_4.0.9.bb b/recipes-bsp/multitech/mtac_4.0.9.bb deleted file mode 100644 index 1b8dd3d..0000000 --- a/recipes-bsp/multitech/mtac_4.0.9.bb +++ /dev/null @@ -1,70 +0,0 @@ -DESCRIPTION = "mtac drivers" -HOMEPAGE = "http://www.multitech.net/" -SECTION = "base" -PRIORITY = "optional" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" -do_fetch[depends]+="virtual/kernel:do_shared_workdir" -DEPENDS = "virtual/kernel mts-io" -INC_PR = "r0" -COMPATIBLE_MACHINE = "(mtcdt|mtcpmhs)" - -# SRCREV = "${PV}" - -# AUTOREV breaks mLinux source tarballs in Thud -SRCREV = "${AUTOREV}" - -# Some packages depend on mtac -RPROVIDES_kernel-module-${PN} = "mtac" - -PR = "${INC_PR}.1" - -PKGR = "${PR}${KERNEL_MODULE_PACKAGE_SUFFIX}${EXTENDPRAUTO}" - -# git://git.multitech.net/mtac.git;protocol=git;branch=master -SRC_URI = " \ - git://git@gitlab.multitech.net/mirrors/mtac.git;protocol=ssh;branch=MTCDT-0.2 \ -" -S = "${WORKDIR}/git" - -inherit module - -MTS_EXTRA_SYMBOLS="${STAGING_INCDIR}/mts-io/Module.symvers" - -COMMON_OEMAKE = " -C ${STAGING_KERNEL_DIR} \ - KBUILD_VERBOSE=1 \ - KBUILD_EXTRA_SYMBOLS="${MTS_EXTRA_SYMBOLS}" \ - M=${S} \ - modules \ - " - -EXTRA_OEMAKE_mtcdt = "${COMMON_OEMAKE} EXTRA_CFLAGS='-I${STAGING_INCDIR}/mts-kernel-headers \ - -D ${MACHINE}'" -EXTRA_OEMAKE_mtcpmhs = "${COMMON_OEMAKE} EXTRA_CFLAGS='-I${STAGING_INCDIR}/mts-kernel-headers \ - -D ${MACHINE} -D CONFIG_MTS_NUM_ACCESSORY_PORTS=2'" - -do_compile () { - bbnote make "$@" - make "$@" - unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS - oe_runmake -} - -PACKAGES = "kernel-module-${PN} ${PN}-dev" - -FILES_kernel-module-${PN} = "${base_libdir}/modules/${KERNEL_VERSION}/extra/mtac.ko" - -PARALLEL_MAKE = "" - -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}/mtac.ko ${D}${base_libdir}/modules/${KERNEL_VERSION}/extra - - install -Dm0644 ${S}/Module.symvers ${D}${includedir}/${BPN}/Module.symvers - - install -d ${D}${includedir}/mts-kernel-headers/linux - install -m 0644 ${S}/mtac.h ${D}${includedir}/mts-kernel-headers/linux - cp ${S}/machine/* ${D}${includedir}/mts-kernel-headers/linux - chmod -R 0644 ${D}${includedir}/mts-kernel-headers/linux -} diff --git a/recipes-bsp/multitech/mtac_4.1.0.bb b/recipes-bsp/multitech/mtac_4.1.0.bb new file mode 100644 index 0000000..b0a667a --- /dev/null +++ b/recipes-bsp/multitech/mtac_4.1.0.bb @@ -0,0 +1,67 @@ +DESCRIPTION = "mtac drivers" +HOMEPAGE = "http://www.multitech.net/" +SECTION = "base" +PRIORITY = "optional" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" +do_fetch[depends]+="virtual/kernel:do_shared_workdir" +DEPENDS = "virtual/kernel mts-io" +INC_PR = "r0" +COMPATIBLE_MACHINE = "(mtcdt|mtcpmhs)" + +SRCREV = "${PV}" + +# Some packages depend on mtac +RPROVIDES_kernel-module-${PN} = "mtac" + +PR = "${INC_PR}.1" + +PKGR = "${PR}${KERNEL_MODULE_PACKAGE_SUFFIX}${EXTENDPRAUTO}" + + git://git.multitech.net/mtac.git;protocol=git;branch=master +SRC_URI = " \ + git://git.multitech.net/mtac.git;protocol=git;branch=master \ +" +S = "${WORKDIR}/git" + +inherit module + +MTS_EXTRA_SYMBOLS="${STAGING_INCDIR}/mts-io/Module.symvers" + +COMMON_OEMAKE = " -C ${STAGING_KERNEL_DIR} \ + KBUILD_VERBOSE=1 \ + KBUILD_EXTRA_SYMBOLS="${MTS_EXTRA_SYMBOLS}" \ + M=${S} \ + modules \ + " + +EXTRA_OEMAKE_mtcdt = "${COMMON_OEMAKE} EXTRA_CFLAGS='-I${STAGING_INCDIR}/mts-kernel-headers \ + -D ${MACHINE}'" +EXTRA_OEMAKE_mtcpmhs = "${COMMON_OEMAKE} EXTRA_CFLAGS='-I${STAGING_INCDIR}/mts-kernel-headers \ + -D ${MACHINE} -D CONFIG_MTS_NUM_ACCESSORY_PORTS=2'" + +do_compile () { + bbnote make "$@" + make "$@" + unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS + oe_runmake +} + +PACKAGES = "kernel-module-${PN} ${PN}-dev" + +FILES_kernel-module-${PN} = "${base_libdir}/modules/${KERNEL_VERSION}/extra/mtac.ko" + +PARALLEL_MAKE = "" + +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}/mtac.ko ${D}${base_libdir}/modules/${KERNEL_VERSION}/extra + + install -Dm0644 ${S}/Module.symvers ${D}${includedir}/${BPN}/Module.symvers + + install -d ${D}${includedir}/mts-kernel-headers/linux + install -m 0644 ${S}/mtac.h ${D}${includedir}/mts-kernel-headers/linux + cp ${S}/machine/* ${D}${includedir}/mts-kernel-headers/linux + chmod -R 0644 ${D}${includedir}/mts-kernel-headers/linux +} diff --git a/recipes-bsp/multitech/mts-io.inc b/recipes-bsp/multitech/mts-io.inc index caa62a2..10d4527 100644 --- a/recipes-bsp/multitech/mts-io.inc +++ b/recipes-bsp/multitech/mts-io.inc @@ -9,8 +9,7 @@ LIC_FILES_CHKSUM = "file://io-module/COPYING;md5=94d55d512a9ba36caa9b7df079bae19 do_fetch[depends] += "virtual/kernel:do_shared_workdir" INC_PR = "r6" -# Not for release. Autorev is development -SRCREV = "${AUTOREV}" +SRCREV = "${PV}" PR = "${INC_PR}.0" PKGR = "${PR}-${KERNEL_MODULE_PACKAGE_SUFFIX}${EXTENDPRAUTO}" @@ -19,10 +18,8 @@ RPROVIDES_kernel-module-${PN} = "mts-io" RDEPENDS_${PN}-noarch_append = " mts-io-sysfs" RDEPENDS_${PN}-noarch_append_mtcap = " mts-io-sysfs i2c-tools" -# Temporary MTCDT-0.2 branch -# git://git.multitech.net/mts-io.git;protocol=git SRC_URI = " \ - git://git@gitlab.multitech.net/mirrors/mts-io.git;protocol=ssh;branch=MTCDT-0.2 \ + git://git.multitech.net/mts-io.git;protocol=git \ file://led-status_heartbeat_trigger \ file://lora-led-updater \ file://mts-io.init \ diff --git a/recipes-bsp/multitech/mts-io_4.7.2.bb b/recipes-bsp/multitech/mts-io_4.7.2.bb deleted file mode 100644 index ee4fcfa..0000000 --- a/recipes-bsp/multitech/mts-io_4.7.2.bb +++ /dev/null @@ -1,2 +0,0 @@ -require mts-io.inc - diff --git a/recipes-bsp/multitech/mts-io_4.8.0.bb b/recipes-bsp/multitech/mts-io_4.8.0.bb new file mode 100644 index 0000000..ee4fcfa --- /dev/null +++ b/recipes-bsp/multitech/mts-io_4.8.0.bb @@ -0,0 +1,2 @@ +require mts-io.inc + -- cgit v1.2.3 From 0b7d820e1b133c32aef7fbf941486b5cc2108859 Mon Sep 17 00:00:00 2001 From: John Klug Date: Fri, 12 Nov 2021 14:33:56 -0600 Subject: Corrections for Using git.multitech.net for repositories --- recipes-bsp/multitech/mt-dt-overlay_1.1.0 | 97 ---------------------------- recipes-bsp/multitech/mt-dt-overlay_1.1.0.bb | 97 ++++++++++++++++++++++++++++ recipes-bsp/multitech/mtac-gpiob_1.3.0.bb | 2 +- recipes-bsp/multitech/mtac_4.1.0.bb | 1 - 4 files changed, 98 insertions(+), 99 deletions(-) delete mode 100644 recipes-bsp/multitech/mt-dt-overlay_1.1.0 create mode 100644 recipes-bsp/multitech/mt-dt-overlay_1.1.0.bb diff --git a/recipes-bsp/multitech/mt-dt-overlay_1.1.0 b/recipes-bsp/multitech/mt-dt-overlay_1.1.0 deleted file mode 100644 index 313aef3..0000000 --- a/recipes-bsp/multitech/mt-dt-overlay_1.1.0 +++ /dev/null @@ -1,97 +0,0 @@ -DESCRIPTION = "Compile MT board device tree overlays" -LICENSE = "(GPLv2+)" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" -PACKAGE_ARCH = "${MACHINE_ARCH}" - -inherit update-rc.d -INITSCRIPT_NAME = "${PN}" -# mt-dt-overlay must start before mts-io -# because the gpio-leds driver will not load -# after mts-io. -INITSCRIPT_PARAMS = "start 39 S ." -DEPENDS = "dtc-native linux-at91" -RDEPENDS_${PN} = "bash" - - -# For now, just mtcap -COMPATIBLE_MACHINE = "(mtcap|mtrv1|mtcdt)" - -# By using an overlay, we should be able to support multiple pinouts -# using the same image. The overlays go into /lib/dtoverlays. -# There names are: [hw-version]-driver.dtbo -# e.g. /lib/dtoverlays/MTRV1-0.0-pps.dtbo -# The idea is that mts-io will search for the overlays, and install the -# appropriate device tree overlay for the current hw-version. - -dt_dir = "/lib/dtoverlays" - -PR = "r2" - -SRC_URI = " \ - git://git.multitech.net/mt-dt-overlay.git;protocol=git \ - file://init \ -" - -SRCREV = "${PR}" - -DEPENDS = "virtual/kernel u-boot-mkimage-native" - -S = "${WORKDIR}/git" - -do_compile[depends] += "virtual/kernel:do_deploy virtual/kernel:do_shared_workdir" -do_compile[nostamp] = "1" - -# Make sure we are using the Yocto version of DTC, not what is installed in /usr/bin -DTC_BIN_DIR = "${COMPONENTS_DIR}/x86_64/dtc-native/usr/bin" - -do_compile () { - echo MACHINE is ${MACHINE} - oe_runmake DTC=${DTC_BIN_DIR}/dtc KERNEL_DIR=${STAGING_KERNEL_DIR} KERNEL_BUILD_DIR=${KERNEL_PATH} ${MACHINE}_dtbos -} - -FILES_${PN} = "${dt_dir} ${sysconfdir}" - -addtask install after do_compile - -# The destination and any symlinks are defined in the source file. -# -# A line starting as follows " * Put: [destination]" in the source -# defines the destination file name for the device tree binaries. -# -# A line starting as follows " * Link: [destination]" defines a symlink -# to the device tree binary file. -# -do_install () { - install -d ${D}/${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/init ${D}/${sysconfdir}/init.d/${PN} - # Copy files to /lib/dt-overlay/main (mtac cards will be in mtac) - if [ -e ${AT91BOOTSTRAP_MACHINE} ]; then - install -d ${D}/${dt_dir} - ( - cd ${MACHINE} - echo "Current directory is $(pwd)" - for f in *.dtbo ; do - s=$(basename -s .dtbo $f).dtso - location_ln=$(egrep '^[[:space:]]*\*[[:space:]]*Put:[[:space:]]*[^[:space:]]+' $s | sed -r 's/.*Put:[[:space:]]*//') - echo "Binary: $f Source: $s" - echo "Destination: $location_ln" - dirname=$(dirname $location_ln) - install -d ${D}/${dt_dir}/$dirname - install ${f} ${D}/${dt_dir}/$location_ln - links=$(egrep '^[[:space:]]*\*[[:space:]]*Link:[[:space:]]*[^[:space:]]+' $s | sed -r 's/.*Link:[[:space:]]*//') - echo "All Links: " - echo "$links" - echo "End links" - for l in $links ; do - ldirname=$(dirname $l) - if ! [ -d "${D}/$ldirname" ] ; then - install -d ${D}/${dt_dir}/$ldirname - fi - echo ln -sf ${dt_dir}/$dirname/$f ${D}/${dt_dir}/$l - ln -sf ${dt_dir}/$location_ln ${D}/${dt_dir}/$l - done - done - ) - fi -} - diff --git a/recipes-bsp/multitech/mt-dt-overlay_1.1.0.bb b/recipes-bsp/multitech/mt-dt-overlay_1.1.0.bb new file mode 100644 index 0000000..e75828d --- /dev/null +++ b/recipes-bsp/multitech/mt-dt-overlay_1.1.0.bb @@ -0,0 +1,97 @@ +DESCRIPTION = "Compile MT board device tree overlays" +LICENSE = "(GPLv2+)" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" +PACKAGE_ARCH = "${MACHINE_ARCH}" + +inherit update-rc.d +INITSCRIPT_NAME = "${PN}" +# mt-dt-overlay must start before mts-io +# because the gpio-leds driver will not load +# after mts-io. +INITSCRIPT_PARAMS = "start 39 S ." +DEPENDS = "dtc-native linux-at91" +RDEPENDS_${PN} = "bash" + + +# For now, just mtcap +COMPATIBLE_MACHINE = "(mtcap|mtrv1|mtcdt)" + +# By using an overlay, we should be able to support multiple pinouts +# using the same image. The overlays go into /lib/dtoverlays. +# There names are: [hw-version]-driver.dtbo +# e.g. /lib/dtoverlays/MTRV1-0.0-pps.dtbo +# The idea is that mts-io will search for the overlays, and install the +# appropriate device tree overlay for the current hw-version. + +dt_dir = "/lib/dtoverlays" + +PR = "r2" + +SRC_URI = " \ + git://git.multitech.net/mt-dt-overlay.git;protocol=git \ + file://init \ +" + +SRCREV = "${PV}" + +DEPENDS = "virtual/kernel u-boot-mkimage-native" + +S = "${WORKDIR}/git" + +do_compile[depends] += "virtual/kernel:do_deploy virtual/kernel:do_shared_workdir" +do_compile[nostamp] = "1" + +# Make sure we are using the Yocto version of DTC, not what is installed in /usr/bin +DTC_BIN_DIR = "${COMPONENTS_DIR}/x86_64/dtc-native/usr/bin" + +do_compile () { + echo MACHINE is ${MACHINE} + oe_runmake DTC=${DTC_BIN_DIR}/dtc KERNEL_DIR=${STAGING_KERNEL_DIR} KERNEL_BUILD_DIR=${KERNEL_PATH} ${MACHINE}_dtbos +} + +FILES_${PN} = "${dt_dir} ${sysconfdir}" + +addtask install after do_compile + +# The destination and any symlinks are defined in the source file. +# +# A line starting as follows " * Put: [destination]" in the source +# defines the destination file name for the device tree binaries. +# +# A line starting as follows " * Link: [destination]" defines a symlink +# to the device tree binary file. +# +do_install () { + install -d ${D}/${sysconfdir}/init.d + install -m 0755 ${WORKDIR}/init ${D}/${sysconfdir}/init.d/${PN} + # Copy files to /lib/dt-overlay/main (mtac cards will be in mtac) + if [ -e ${AT91BOOTSTRAP_MACHINE} ]; then + install -d ${D}/${dt_dir} + ( + cd ${MACHINE} + echo "Current directory is $(pwd)" + for f in *.dtbo ; do + s=$(basename -s .dtbo $f).dtso + location_ln=$(egrep '^[[:space:]]*\*[[:space:]]*Put:[[:space:]]*[^[:space:]]+' $s | sed -r 's/.*Put:[[:space:]]*//') + echo "Binary: $f Source: $s" + echo "Destination: $location_ln" + dirname=$(dirname $location_ln) + install -d ${D}/${dt_dir}/$dirname + install ${f} ${D}/${dt_dir}/$location_ln + links=$(egrep '^[[:space:]]*\*[[:space:]]*Link:[[:space:]]*[^[:space:]]+' $s | sed -r 's/.*Link:[[:space:]]*//') + echo "All Links: " + echo "$links" + echo "End links" + for l in $links ; do + ldirname=$(dirname $l) + if ! [ -d "${D}/$ldirname" ] ; then + install -d ${D}/${dt_dir}/$ldirname + fi + echo ln -sf ${dt_dir}/$dirname/$f ${D}/${dt_dir}/$l + ln -sf ${dt_dir}/$location_ln ${D}/${dt_dir}/$l + done + done + ) + fi +} + diff --git a/recipes-bsp/multitech/mtac-gpiob_1.3.0.bb b/recipes-bsp/multitech/mtac-gpiob_1.3.0.bb index 1cecf92..2f2cb0e 100644 --- a/recipes-bsp/multitech/mtac-gpiob_1.3.0.bb +++ b/recipes-bsp/multitech/mtac-gpiob_1.3.0.bb @@ -16,7 +16,7 @@ PR = "${INC_PR}.2" PKGR = "${PR}${KERNEL_MODULE_PACKAGE_SUFFIX}${EXTENDPRAUTO}" SRC_URI = " \ - git://git.multitech.net/mtac-gpiob.git;protocol=git;branch=master + git://git.multitech.net/mtac-gpiob.git;protocol=git;branch=master \ " S = "${WORKDIR}/git" diff --git a/recipes-bsp/multitech/mtac_4.1.0.bb b/recipes-bsp/multitech/mtac_4.1.0.bb index b0a667a..c6de690 100644 --- a/recipes-bsp/multitech/mtac_4.1.0.bb +++ b/recipes-bsp/multitech/mtac_4.1.0.bb @@ -18,7 +18,6 @@ PR = "${INC_PR}.1" PKGR = "${PR}${KERNEL_MODULE_PACKAGE_SUFFIX}${EXTENDPRAUTO}" - git://git.multitech.net/mtac.git;protocol=git;branch=master SRC_URI = " \ git://git.multitech.net/mtac.git;protocol=git;branch=master \ " -- cgit v1.2.3 From 49d484da198268f0842a008b468a1b67a73a5ecf Mon Sep 17 00:00:00 2001 From: John Klug Date: Sun, 14 Nov 2021 13:52:26 -0600 Subject: Update mt-dt-overlay PCA9557 related pins per schematic Rev L 11/08/2021 --- recipes-bsp/multitech/mt-dt-overlay_1.1.0.bb | 97 ---------------------------- recipes-bsp/multitech/mt-dt-overlay_1.1.1.bb | 97 ++++++++++++++++++++++++++++ 2 files changed, 97 insertions(+), 97 deletions(-) delete mode 100644 recipes-bsp/multitech/mt-dt-overlay_1.1.0.bb create mode 100644 recipes-bsp/multitech/mt-dt-overlay_1.1.1.bb diff --git a/recipes-bsp/multitech/mt-dt-overlay_1.1.0.bb b/recipes-bsp/multitech/mt-dt-overlay_1.1.0.bb deleted file mode 100644 index e75828d..0000000 --- a/recipes-bsp/multitech/mt-dt-overlay_1.1.0.bb +++ /dev/null @@ -1,97 +0,0 @@ -DESCRIPTION = "Compile MT board device tree overlays" -LICENSE = "(GPLv2+)" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" -PACKAGE_ARCH = "${MACHINE_ARCH}" - -inherit update-rc.d -INITSCRIPT_NAME = "${PN}" -# mt-dt-overlay must start before mts-io -# because the gpio-leds driver will not load -# after mts-io. -INITSCRIPT_PARAMS = "start 39 S ." -DEPENDS = "dtc-native linux-at91" -RDEPENDS_${PN} = "bash" - - -# For now, just mtcap -COMPATIBLE_MACHINE = "(mtcap|mtrv1|mtcdt)" - -# By using an overlay, we should be able to support multiple pinouts -# using the same image. The overlays go into /lib/dtoverlays. -# There names are: [hw-version]-driver.dtbo -# e.g. /lib/dtoverlays/MTRV1-0.0-pps.dtbo -# The idea is that mts-io will search for the overlays, and install the -# appropriate device tree overlay for the current hw-version. - -dt_dir = "/lib/dtoverlays" - -PR = "r2" - -SRC_URI = " \ - git://git.multitech.net/mt-dt-overlay.git;protocol=git \ - file://init \ -" - -SRCREV = "${PV}" - -DEPENDS = "virtual/kernel u-boot-mkimage-native" - -S = "${WORKDIR}/git" - -do_compile[depends] += "virtual/kernel:do_deploy virtual/kernel:do_shared_workdir" -do_compile[nostamp] = "1" - -# Make sure we are using the Yocto version of DTC, not what is installed in /usr/bin -DTC_BIN_DIR = "${COMPONENTS_DIR}/x86_64/dtc-native/usr/bin" - -do_compile () { - echo MACHINE is ${MACHINE} - oe_runmake DTC=${DTC_BIN_DIR}/dtc KERNEL_DIR=${STAGING_KERNEL_DIR} KERNEL_BUILD_DIR=${KERNEL_PATH} ${MACHINE}_dtbos -} - -FILES_${PN} = "${dt_dir} ${sysconfdir}" - -addtask install after do_compile - -# The destination and any symlinks are defined in the source file. -# -# A line starting as follows " * Put: [destination]" in the source -# defines the destination file name for the device tree binaries. -# -# A line starting as follows " * Link: [destination]" defines a symlink -# to the device tree binary file. -# -do_install () { - install -d ${D}/${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/init ${D}/${sysconfdir}/init.d/${PN} - # Copy files to /lib/dt-overlay/main (mtac cards will be in mtac) - if [ -e ${AT91BOOTSTRAP_MACHINE} ]; then - install -d ${D}/${dt_dir} - ( - cd ${MACHINE} - echo "Current directory is $(pwd)" - for f in *.dtbo ; do - s=$(basename -s .dtbo $f).dtso - location_ln=$(egrep '^[[:space:]]*\*[[:space:]]*Put:[[:space:]]*[^[:space:]]+' $s | sed -r 's/.*Put:[[:space:]]*//') - echo "Binary: $f Source: $s" - echo "Destination: $location_ln" - dirname=$(dirname $location_ln) - install -d ${D}/${dt_dir}/$dirname - install ${f} ${D}/${dt_dir}/$location_ln - links=$(egrep '^[[:space:]]*\*[[:space:]]*Link:[[:space:]]*[^[:space:]]+' $s | sed -r 's/.*Link:[[:space:]]*//') - echo "All Links: " - echo "$links" - echo "End links" - for l in $links ; do - ldirname=$(dirname $l) - if ! [ -d "${D}/$ldirname" ] ; then - install -d ${D}/${dt_dir}/$ldirname - fi - echo ln -sf ${dt_dir}/$dirname/$f ${D}/${dt_dir}/$l - ln -sf ${dt_dir}/$location_ln ${D}/${dt_dir}/$l - done - done - ) - fi -} - diff --git a/recipes-bsp/multitech/mt-dt-overlay_1.1.1.bb b/recipes-bsp/multitech/mt-dt-overlay_1.1.1.bb new file mode 100644 index 0000000..e75828d --- /dev/null +++ b/recipes-bsp/multitech/mt-dt-overlay_1.1.1.bb @@ -0,0 +1,97 @@ +DESCRIPTION = "Compile MT board device tree overlays" +LICENSE = "(GPLv2+)" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" +PACKAGE_ARCH = "${MACHINE_ARCH}" + +inherit update-rc.d +INITSCRIPT_NAME = "${PN}" +# mt-dt-overlay must start before mts-io +# because the gpio-leds driver will not load +# after mts-io. +INITSCRIPT_PARAMS = "start 39 S ." +DEPENDS = "dtc-native linux-at91" +RDEPENDS_${PN} = "bash" + + +# For now, just mtcap +COMPATIBLE_MACHINE = "(mtcap|mtrv1|mtcdt)" + +# By using an overlay, we should be able to support multiple pinouts +# using the same image. The overlays go into /lib/dtoverlays. +# There names are: [hw-version]-driver.dtbo +# e.g. /lib/dtoverlays/MTRV1-0.0-pps.dtbo +# The idea is that mts-io will search for the overlays, and install the +# appropriate device tree overlay for the current hw-version. + +dt_dir = "/lib/dtoverlays" + +PR = "r2" + +SRC_URI = " \ + git://git.multitech.net/mt-dt-overlay.git;protocol=git \ + file://init \ +" + +SRCREV = "${PV}" + +DEPENDS = "virtual/kernel u-boot-mkimage-native" + +S = "${WORKDIR}/git" + +do_compile[depends] += "virtual/kernel:do_deploy virtual/kernel:do_shared_workdir" +do_compile[nostamp] = "1" + +# Make sure we are using the Yocto version of DTC, not what is installed in /usr/bin +DTC_BIN_DIR = "${COMPONENTS_DIR}/x86_64/dtc-native/usr/bin" + +do_compile () { + echo MACHINE is ${MACHINE} + oe_runmake DTC=${DTC_BIN_DIR}/dtc KERNEL_DIR=${STAGING_KERNEL_DIR} KERNEL_BUILD_DIR=${KERNEL_PATH} ${MACHINE}_dtbos +} + +FILES_${PN} = "${dt_dir} ${sysconfdir}" + +addtask install after do_compile + +# The destination and any symlinks are defined in the source file. +# +# A line starting as follows " * Put: [destination]" in the source +# defines the destination file name for the device tree binaries. +# +# A line starting as follows " * Link: [destination]" defines a symlink +# to the device tree binary file. +# +do_install () { + install -d ${D}/${sysconfdir}/init.d + install -m 0755 ${WORKDIR}/init ${D}/${sysconfdir}/init.d/${PN} + # Copy files to /lib/dt-overlay/main (mtac cards will be in mtac) + if [ -e ${AT91BOOTSTRAP_MACHINE} ]; then + install -d ${D}/${dt_dir} + ( + cd ${MACHINE} + echo "Current directory is $(pwd)" + for f in *.dtbo ; do + s=$(basename -s .dtbo $f).dtso + location_ln=$(egrep '^[[:space:]]*\*[[:space:]]*Put:[[:space:]]*[^[:space:]]+' $s | sed -r 's/.*Put:[[:space:]]*//') + echo "Binary: $f Source: $s" + echo "Destination: $location_ln" + dirname=$(dirname $location_ln) + install -d ${D}/${dt_dir}/$dirname + install ${f} ${D}/${dt_dir}/$location_ln + links=$(egrep '^[[:space:]]*\*[[:space:]]*Link:[[:space:]]*[^[:space:]]+' $s | sed -r 's/.*Link:[[:space:]]*//') + echo "All Links: " + echo "$links" + echo "End links" + for l in $links ; do + ldirname=$(dirname $l) + if ! [ -d "${D}/$ldirname" ] ; then + install -d ${D}/${dt_dir}/$ldirname + fi + echo ln -sf ${dt_dir}/$dirname/$f ${D}/${dt_dir}/$l + ln -sf ${dt_dir}/$location_ln ${D}/${dt_dir}/$l + done + done + ) + fi +} + -- cgit v1.2.3 From e79c58cf9e7b3a50f702a046229b11e0d850dd4d Mon Sep 17 00:00:00 2001 From: Andrii Pientsov Date: Thu, 18 Nov 2021 18:20:26 +0200 Subject: Switch back mtac-lora tag to 1.1.5 --- recipes-bsp/multitech/mtac-lora_1.1.5.bb | 59 ++++++++++++++++++++++++++++++++ recipes-bsp/multitech/mtac-lora_1.1.7.bb | 59 -------------------------------- 2 files changed, 59 insertions(+), 59 deletions(-) create mode 100644 recipes-bsp/multitech/mtac-lora_1.1.5.bb delete mode 100644 recipes-bsp/multitech/mtac-lora_1.1.7.bb diff --git a/recipes-bsp/multitech/mtac-lora_1.1.5.bb b/recipes-bsp/multitech/mtac-lora_1.1.5.bb new file mode 100644 index 0000000..447eb6e --- /dev/null +++ b/recipes-bsp/multitech/mtac-lora_1.1.5.bb @@ -0,0 +1,59 @@ +DESCRIPTION = "MTAC LoRa Card" +HOMEPAGE = "http://www.multitech.net/developer/products/multiconnect-conduit-platform/accessory-cards/mtac-lora/" +SECTION = "base" +PRIORITY = "optional" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" +do_fetch[depends]+="virtual/kernel:do_shared_workdir" +DEPENDS = "virtual/kernel mtac mts-io" +RDEPENDS_${PN} = "kernel-module-mtac" +INC_PR = "r1" +COMPATIBLE_MACHINE = "(mtcdt|mtcpmhs)" + +SRCREV = "${PV}" + +PR = "${INC_PR}.1" + +PKGR = "${PR}${KERNEL_MODULE_PACKAGE_SUFFIX}${EXTENDPRAUTO}" + +SRC_URI = " \ + git://git@gitlab.multitech.net/mirrors/mtac-lora;protocol=ssh;branch=master \ +" + +S = "${WORKDIR}/git" + +inherit module + +MTS_EXTRA_SYMBOLS="${STAGING_INCDIR}/mts-io/Module.symvers \ + ${STAGING_INCDIR}/mtac/Module.symvers" + +COMMON_OEMAKE = " -C ${STAGING_KERNEL_DIR} \ + KBUILD_VERBOSE=1 \ + KBUILD_EXTRA_SYMBOLS='${MTS_EXTRA_SYMBOLS}' \ + M=${S} \ + modules \ + " + +EXTRA_OEMAKE_mtcdt = "${COMMON_OEMAKE} EXTRA_CFLAGS='-I${STAGING_INCDIR}/mts-kernel-headers \ + -D SAM9G25'" +EXTRA_OEMAKE_mtcpmhs = "${COMMON_OEMAKE} EXTRA_CFLAGS='-I${STAGING_INCDIR}/mts-kernel-headers \ + -D TI43X'" + +do_compile () { + bbnote make "$@" + make "$@" + unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS + oe_runmake +} + +PACKAGES = "kernel-module-${PN}" + +FILES_kernel-module-${PN} = "${base_libdir}/modules/${KERNEL_VERSION}/extra/mtac_lora.ko" + +PARALLEL_MAKE = "" + +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}/mtac_lora.ko ${D}${base_libdir}/modules/${KERNEL_VERSION}/extra +} diff --git a/recipes-bsp/multitech/mtac-lora_1.1.7.bb b/recipes-bsp/multitech/mtac-lora_1.1.7.bb deleted file mode 100644 index 447eb6e..0000000 --- a/recipes-bsp/multitech/mtac-lora_1.1.7.bb +++ /dev/null @@ -1,59 +0,0 @@ -DESCRIPTION = "MTAC LoRa Card" -HOMEPAGE = "http://www.multitech.net/developer/products/multiconnect-conduit-platform/accessory-cards/mtac-lora/" -SECTION = "base" -PRIORITY = "optional" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" -do_fetch[depends]+="virtual/kernel:do_shared_workdir" -DEPENDS = "virtual/kernel mtac mts-io" -RDEPENDS_${PN} = "kernel-module-mtac" -INC_PR = "r1" -COMPATIBLE_MACHINE = "(mtcdt|mtcpmhs)" - -SRCREV = "${PV}" - -PR = "${INC_PR}.1" - -PKGR = "${PR}${KERNEL_MODULE_PACKAGE_SUFFIX}${EXTENDPRAUTO}" - -SRC_URI = " \ - git://git@gitlab.multitech.net/mirrors/mtac-lora;protocol=ssh;branch=master \ -" - -S = "${WORKDIR}/git" - -inherit module - -MTS_EXTRA_SYMBOLS="${STAGING_INCDIR}/mts-io/Module.symvers \ - ${STAGING_INCDIR}/mtac/Module.symvers" - -COMMON_OEMAKE = " -C ${STAGING_KERNEL_DIR} \ - KBUILD_VERBOSE=1 \ - KBUILD_EXTRA_SYMBOLS='${MTS_EXTRA_SYMBOLS}' \ - M=${S} \ - modules \ - " - -EXTRA_OEMAKE_mtcdt = "${COMMON_OEMAKE} EXTRA_CFLAGS='-I${STAGING_INCDIR}/mts-kernel-headers \ - -D SAM9G25'" -EXTRA_OEMAKE_mtcpmhs = "${COMMON_OEMAKE} EXTRA_CFLAGS='-I${STAGING_INCDIR}/mts-kernel-headers \ - -D TI43X'" - -do_compile () { - bbnote make "$@" - make "$@" - unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS - oe_runmake -} - -PACKAGES = "kernel-module-${PN}" - -FILES_kernel-module-${PN} = "${base_libdir}/modules/${KERNEL_VERSION}/extra/mtac_lora.ko" - -PARALLEL_MAKE = "" - -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}/mtac_lora.ko ${D}${base_libdir}/modules/${KERNEL_VERSION}/extra -} -- cgit v1.2.3 From 565aeeb151655c39c8401e6b2ba47a8439756728 Mon Sep 17 00:00:00 2001 From: Andrii Pientsov Date: Wed, 24 Nov 2021 14:12:39 +0200 Subject: Fix USART4 overlay for MTRV1-0.4 --- recipes-bsp/multitech/mt-dt-overlay/init | 2 +- recipes-bsp/multitech/mt-dt-overlay_1.1.1.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes-bsp/multitech/mt-dt-overlay/init b/recipes-bsp/multitech/mt-dt-overlay/init index bb6790b..c2d9716 100755 --- a/recipes-bsp/multitech/mt-dt-overlay/init +++ b/recipes-bsp/multitech/mt-dt-overlay/init @@ -30,7 +30,7 @@ install_dtbo_dir() { done modprobe mt_ac_gpiob else - for f in *lora.dtbo ; do + for f in *.dtbo ; do if ! [[ -f $f ]] ; then continue fi diff --git a/recipes-bsp/multitech/mt-dt-overlay_1.1.1.bb b/recipes-bsp/multitech/mt-dt-overlay_1.1.1.bb index e75828d..0458c76 100644 --- a/recipes-bsp/multitech/mt-dt-overlay_1.1.1.bb +++ b/recipes-bsp/multitech/mt-dt-overlay_1.1.1.bb @@ -25,7 +25,7 @@ COMPATIBLE_MACHINE = "(mtcap|mtrv1|mtcdt)" dt_dir = "/lib/dtoverlays" -PR = "r2" +PR = "r3" SRC_URI = " \ git://git.multitech.net/mt-dt-overlay.git;protocol=git \ -- cgit v1.2.3 From ac68432fa0b77c5d43a7e292f1d0c4fcf0b4a80c Mon Sep 17 00:00:00 2001 From: John Klug Date: Sun, 21 Nov 2021 13:39:25 -0600 Subject: MTAC 4.1.1 to fix some AP2 pins --- recipes-bsp/multitech/mtac_4.1.0.bb | 66 ------------------------------------- recipes-bsp/multitech/mtac_4.1.1.bb | 66 +++++++++++++++++++++++++++++++++++++ 2 files changed, 66 insertions(+), 66 deletions(-) delete mode 100644 recipes-bsp/multitech/mtac_4.1.0.bb create mode 100644 recipes-bsp/multitech/mtac_4.1.1.bb diff --git a/recipes-bsp/multitech/mtac_4.1.0.bb b/recipes-bsp/multitech/mtac_4.1.0.bb deleted file mode 100644 index c6de690..0000000 --- a/recipes-bsp/multitech/mtac_4.1.0.bb +++ /dev/null @@ -1,66 +0,0 @@ -DESCRIPTION = "mtac drivers" -HOMEPAGE = "http://www.multitech.net/" -SECTION = "base" -PRIORITY = "optional" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" -do_fetch[depends]+="virtual/kernel:do_shared_workdir" -DEPENDS = "virtual/kernel mts-io" -INC_PR = "r0" -COMPATIBLE_MACHINE = "(mtcdt|mtcpmhs)" - -SRCREV = "${PV}" - -# Some packages depend on mtac -RPROVIDES_kernel-module-${PN} = "mtac" - -PR = "${INC_PR}.1" - -PKGR = "${PR}${KERNEL_MODULE_PACKAGE_SUFFIX}${EXTENDPRAUTO}" - -SRC_URI = " \ - git://git.multitech.net/mtac.git;protocol=git;branch=master \ -" -S = "${WORKDIR}/git" - -inherit module - -MTS_EXTRA_SYMBOLS="${STAGING_INCDIR}/mts-io/Module.symvers" - -COMMON_OEMAKE = " -C ${STAGING_KERNEL_DIR} \ - KBUILD_VERBOSE=1 \ - KBUILD_EXTRA_SYMBOLS="${MTS_EXTRA_SYMBOLS}" \ - M=${S} \ - modules \ - " - -EXTRA_OEMAKE_mtcdt = "${COMMON_OEMAKE} EXTRA_CFLAGS='-I${STAGING_INCDIR}/mts-kernel-headers \ - -D ${MACHINE}'" -EXTRA_OEMAKE_mtcpmhs = "${COMMON_OEMAKE} EXTRA_CFLAGS='-I${STAGING_INCDIR}/mts-kernel-headers \ - -D ${MACHINE} -D CONFIG_MTS_NUM_ACCESSORY_PORTS=2'" - -do_compile () { - bbnote make "$@" - make "$@" - unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS - oe_runmake -} - -PACKAGES = "kernel-module-${PN} ${PN}-dev" - -FILES_kernel-module-${PN} = "${base_libdir}/modules/${KERNEL_VERSION}/extra/mtac.ko" - -PARALLEL_MAKE = "" - -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}/mtac.ko ${D}${base_libdir}/modules/${KERNEL_VERSION}/extra - - install -Dm0644 ${S}/Module.symvers ${D}${includedir}/${BPN}/Module.symvers - - install -d ${D}${includedir}/mts-kernel-headers/linux - install -m 0644 ${S}/mtac.h ${D}${includedir}/mts-kernel-headers/linux - cp ${S}/machine/* ${D}${includedir}/mts-kernel-headers/linux - chmod -R 0644 ${D}${includedir}/mts-kernel-headers/linux -} diff --git a/recipes-bsp/multitech/mtac_4.1.1.bb b/recipes-bsp/multitech/mtac_4.1.1.bb new file mode 100644 index 0000000..c6de690 --- /dev/null +++ b/recipes-bsp/multitech/mtac_4.1.1.bb @@ -0,0 +1,66 @@ +DESCRIPTION = "mtac drivers" +HOMEPAGE = "http://www.multitech.net/" +SECTION = "base" +PRIORITY = "optional" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" +do_fetch[depends]+="virtual/kernel:do_shared_workdir" +DEPENDS = "virtual/kernel mts-io" +INC_PR = "r0" +COMPATIBLE_MACHINE = "(mtcdt|mtcpmhs)" + +SRCREV = "${PV}" + +# Some packages depend on mtac +RPROVIDES_kernel-module-${PN} = "mtac" + +PR = "${INC_PR}.1" + +PKGR = "${PR}${KERNEL_MODULE_PACKAGE_SUFFIX}${EXTENDPRAUTO}" + +SRC_URI = " \ + git://git.multitech.net/mtac.git;protocol=git;branch=master \ +" +S = "${WORKDIR}/git" + +inherit module + +MTS_EXTRA_SYMBOLS="${STAGING_INCDIR}/mts-io/Module.symvers" + +COMMON_OEMAKE = " -C ${STAGING_KERNEL_DIR} \ + KBUILD_VERBOSE=1 \ + KBUILD_EXTRA_SYMBOLS="${MTS_EXTRA_SYMBOLS}" \ + M=${S} \ + modules \ + " + +EXTRA_OEMAKE_mtcdt = "${COMMON_OEMAKE} EXTRA_CFLAGS='-I${STAGING_INCDIR}/mts-kernel-headers \ + -D ${MACHINE}'" +EXTRA_OEMAKE_mtcpmhs = "${COMMON_OEMAKE} EXTRA_CFLAGS='-I${STAGING_INCDIR}/mts-kernel-headers \ + -D ${MACHINE} -D CONFIG_MTS_NUM_ACCESSORY_PORTS=2'" + +do_compile () { + bbnote make "$@" + make "$@" + unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS + oe_runmake +} + +PACKAGES = "kernel-module-${PN} ${PN}-dev" + +FILES_kernel-module-${PN} = "${base_libdir}/modules/${KERNEL_VERSION}/extra/mtac.ko" + +PARALLEL_MAKE = "" + +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}/mtac.ko ${D}${base_libdir}/modules/${KERNEL_VERSION}/extra + + install -Dm0644 ${S}/Module.symvers ${D}${includedir}/${BPN}/Module.symvers + + install -d ${D}${includedir}/mts-kernel-headers/linux + install -m 0644 ${S}/mtac.h ${D}${includedir}/mts-kernel-headers/linux + cp ${S}/machine/* ${D}${includedir}/mts-kernel-headers/linux + chmod -R 0644 ${D}${includedir}/mts-kernel-headers/linux +} -- cgit v1.2.3 From 2079a858d75e65eaaf5b6a17af1e9124205594da Mon Sep 17 00:00:00 2001 From: John Klug Date: Mon, 22 Nov 2021 14:30:53 -0600 Subject: AP2 GPIO3 and GPIO4 were incorrect for MTCDT-0.2 --- recipes-bsp/multitech/mtac_4.1.1.bb | 66 ------------------------------------- recipes-bsp/multitech/mtac_4.1.2.bb | 66 +++++++++++++++++++++++++++++++++++++ 2 files changed, 66 insertions(+), 66 deletions(-) delete mode 100644 recipes-bsp/multitech/mtac_4.1.1.bb create mode 100644 recipes-bsp/multitech/mtac_4.1.2.bb diff --git a/recipes-bsp/multitech/mtac_4.1.1.bb b/recipes-bsp/multitech/mtac_4.1.1.bb deleted file mode 100644 index c6de690..0000000 --- a/recipes-bsp/multitech/mtac_4.1.1.bb +++ /dev/null @@ -1,66 +0,0 @@ -DESCRIPTION = "mtac drivers" -HOMEPAGE = "http://www.multitech.net/" -SECTION = "base" -PRIORITY = "optional" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" -do_fetch[depends]+="virtual/kernel:do_shared_workdir" -DEPENDS = "virtual/kernel mts-io" -INC_PR = "r0" -COMPATIBLE_MACHINE = "(mtcdt|mtcpmhs)" - -SRCREV = "${PV}" - -# Some packages depend on mtac -RPROVIDES_kernel-module-${PN} = "mtac" - -PR = "${INC_PR}.1" - -PKGR = "${PR}${KERNEL_MODULE_PACKAGE_SUFFIX}${EXTENDPRAUTO}" - -SRC_URI = " \ - git://git.multitech.net/mtac.git;protocol=git;branch=master \ -" -S = "${WORKDIR}/git" - -inherit module - -MTS_EXTRA_SYMBOLS="${STAGING_INCDIR}/mts-io/Module.symvers" - -COMMON_OEMAKE = " -C ${STAGING_KERNEL_DIR} \ - KBUILD_VERBOSE=1 \ - KBUILD_EXTRA_SYMBOLS="${MTS_EXTRA_SYMBOLS}" \ - M=${S} \ - modules \ - " - -EXTRA_OEMAKE_mtcdt = "${COMMON_OEMAKE} EXTRA_CFLAGS='-I${STAGING_INCDIR}/mts-kernel-headers \ - -D ${MACHINE}'" -EXTRA_OEMAKE_mtcpmhs = "${COMMON_OEMAKE} EXTRA_CFLAGS='-I${STAGING_INCDIR}/mts-kernel-headers \ - -D ${MACHINE} -D CONFIG_MTS_NUM_ACCESSORY_PORTS=2'" - -do_compile () { - bbnote make "$@" - make "$@" - unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS - oe_runmake -} - -PACKAGES = "kernel-module-${PN} ${PN}-dev" - -FILES_kernel-module-${PN} = "${base_libdir}/modules/${KERNEL_VERSION}/extra/mtac.ko" - -PARALLEL_MAKE = "" - -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}/mtac.ko ${D}${base_libdir}/modules/${KERNEL_VERSION}/extra - - install -Dm0644 ${S}/Module.symvers ${D}${includedir}/${BPN}/Module.symvers - - install -d ${D}${includedir}/mts-kernel-headers/linux - install -m 0644 ${S}/mtac.h ${D}${includedir}/mts-kernel-headers/linux - cp ${S}/machine/* ${D}${includedir}/mts-kernel-headers/linux - chmod -R 0644 ${D}${includedir}/mts-kernel-headers/linux -} diff --git a/recipes-bsp/multitech/mtac_4.1.2.bb b/recipes-bsp/multitech/mtac_4.1.2.bb new file mode 100644 index 0000000..c6de690 --- /dev/null +++ b/recipes-bsp/multitech/mtac_4.1.2.bb @@ -0,0 +1,66 @@ +DESCRIPTION = "mtac drivers" +HOMEPAGE = "http://www.multitech.net/" +SECTION = "base" +PRIORITY = "optional" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" +do_fetch[depends]+="virtual/kernel:do_shared_workdir" +DEPENDS = "virtual/kernel mts-io" +INC_PR = "r0" +COMPATIBLE_MACHINE = "(mtcdt|mtcpmhs)" + +SRCREV = "${PV}" + +# Some packages depend on mtac +RPROVIDES_kernel-module-${PN} = "mtac" + +PR = "${INC_PR}.1" + +PKGR = "${PR}${KERNEL_MODULE_PACKAGE_SUFFIX}${EXTENDPRAUTO}" + +SRC_URI = " \ + git://git.multitech.net/mtac.git;protocol=git;branch=master \ +" +S = "${WORKDIR}/git" + +inherit module + +MTS_EXTRA_SYMBOLS="${STAGING_INCDIR}/mts-io/Module.symvers" + +COMMON_OEMAKE = " -C ${STAGING_KERNEL_DIR} \ + KBUILD_VERBOSE=1 \ + KBUILD_EXTRA_SYMBOLS="${MTS_EXTRA_SYMBOLS}" \ + M=${S} \ + modules \ + " + +EXTRA_OEMAKE_mtcdt = "${COMMON_OEMAKE} EXTRA_CFLAGS='-I${STAGING_INCDIR}/mts-kernel-headers \ + -D ${MACHINE}'" +EXTRA_OEMAKE_mtcpmhs = "${COMMON_OEMAKE} EXTRA_CFLAGS='-I${STAGING_INCDIR}/mts-kernel-headers \ + -D ${MACHINE} -D CONFIG_MTS_NUM_ACCESSORY_PORTS=2'" + +do_compile () { + bbnote make "$@" + make "$@" + unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS + oe_runmake +} + +PACKAGES = "kernel-module-${PN} ${PN}-dev" + +FILES_kernel-module-${PN} = "${base_libdir}/modules/${KERNEL_VERSION}/extra/mtac.ko" + +PARALLEL_MAKE = "" + +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}/mtac.ko ${D}${base_libdir}/modules/${KERNEL_VERSION}/extra + + install -Dm0644 ${S}/Module.symvers ${D}${includedir}/${BPN}/Module.symvers + + install -d ${D}${includedir}/mts-kernel-headers/linux + install -m 0644 ${S}/mtac.h ${D}${includedir}/mts-kernel-headers/linux + cp ${S}/machine/* ${D}${includedir}/mts-kernel-headers/linux + chmod -R 0644 ${D}${includedir}/mts-kernel-headers/linux +} -- cgit v1.2.3 From 2071cfc761d785ee4900ab99893fbc31a1e01d5a Mon Sep 17 00:00:00 2001 From: Andrii Pientsov Date: Tue, 30 Nov 2021 17:29:44 +0200 Subject: MTAC-GPIO: Rename mt_ac_gpiob.ko -> mtac_gpiob.ko --- recipes-bsp/multitech/mtac-gpiob_1.3.0.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes-bsp/multitech/mtac-gpiob_1.3.0.bb b/recipes-bsp/multitech/mtac-gpiob_1.3.0.bb index 2f2cb0e..17a4962 100644 --- a/recipes-bsp/multitech/mtac-gpiob_1.3.0.bb +++ b/recipes-bsp/multitech/mtac-gpiob_1.3.0.bb @@ -46,12 +46,12 @@ do_compile () { PACKAGES = "kernel-module-${PN}" -FILES_kernel-module-${PN} = "${base_libdir}/modules/${KERNEL_VERSION}/extra/mt_ac_gpiob.ko" +FILES_kernel-module-${PN} = "${base_libdir}/modules/${KERNEL_VERSION}/extra/mtac_gpiob.ko" PARALLEL_MAKE = "" 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}/mtac_gpiob.ko ${D}${base_libdir}/modules/${KERNEL_VERSION}/extra/mt_ac_gpiob.ko + cp ${S}/mtac_gpiob.ko ${D}${base_libdir}/modules/${KERNEL_VERSION}/extra } -- cgit v1.2.3 From bcfa52043aaef910f0adb11f2ba12a39ef4a890e Mon Sep 17 00:00:00 2001 From: Andrii Pientsov Date: Thu, 23 Dec 2021 14:46:29 +0200 Subject: Remove unnecessary patches for mts-io. Switch mtac-lora from 1.1.5 to 1.1.9. --- recipes-bsp/multitech/mt-dt-overlay_1.1.1.bb | 1 - recipes-bsp/multitech/mtac-lora_1.1.5.bb | 59 ------------------ recipes-bsp/multitech/mtac-lora_1.1.9.bb | 59 ++++++++++++++++++ recipes-bsp/multitech/mts-io/MTCDT-0.2.patch | 71 ---------------------- .../multitech/mts-io/ioport-gpio-expand.patch | 28 --------- 5 files changed, 59 insertions(+), 159 deletions(-) delete mode 100644 recipes-bsp/multitech/mtac-lora_1.1.5.bb create mode 100644 recipes-bsp/multitech/mtac-lora_1.1.9.bb delete mode 100644 recipes-bsp/multitech/mts-io/MTCDT-0.2.patch delete mode 100644 recipes-bsp/multitech/mts-io/ioport-gpio-expand.patch diff --git a/recipes-bsp/multitech/mt-dt-overlay_1.1.1.bb b/recipes-bsp/multitech/mt-dt-overlay_1.1.1.bb index 0458c76..09c8f4a 100644 --- a/recipes-bsp/multitech/mt-dt-overlay_1.1.1.bb +++ b/recipes-bsp/multitech/mt-dt-overlay_1.1.1.bb @@ -13,7 +13,6 @@ DEPENDS = "dtc-native linux-at91" RDEPENDS_${PN} = "bash" -# For now, just mtcap COMPATIBLE_MACHINE = "(mtcap|mtrv1|mtcdt)" # By using an overlay, we should be able to support multiple pinouts diff --git a/recipes-bsp/multitech/mtac-lora_1.1.5.bb b/recipes-bsp/multitech/mtac-lora_1.1.5.bb deleted file mode 100644 index 447eb6e..0000000 --- a/recipes-bsp/multitech/mtac-lora_1.1.5.bb +++ /dev/null @@ -1,59 +0,0 @@ -DESCRIPTION = "MTAC LoRa Card" -HOMEPAGE = "http://www.multitech.net/developer/products/multiconnect-conduit-platform/accessory-cards/mtac-lora/" -SECTION = "base" -PRIORITY = "optional" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" -do_fetch[depends]+="virtual/kernel:do_shared_workdir" -DEPENDS = "virtual/kernel mtac mts-io" -RDEPENDS_${PN} = "kernel-module-mtac" -INC_PR = "r1" -COMPATIBLE_MACHINE = "(mtcdt|mtcpmhs)" - -SRCREV = "${PV}" - -PR = "${INC_PR}.1" - -PKGR = "${PR}${KERNEL_MODULE_PACKAGE_SUFFIX}${EXTENDPRAUTO}" - -SRC_URI = " \ - git://git@gitlab.multitech.net/mirrors/mtac-lora;protocol=ssh;branch=master \ -" - -S = "${WORKDIR}/git" - -inherit module - -MTS_EXTRA_SYMBOLS="${STAGING_INCDIR}/mts-io/Module.symvers \ - ${STAGING_INCDIR}/mtac/Module.symvers" - -COMMON_OEMAKE = " -C ${STAGING_KERNEL_DIR} \ - KBUILD_VERBOSE=1 \ - KBUILD_EXTRA_SYMBOLS='${MTS_EXTRA_SYMBOLS}' \ - M=${S} \ - modules \ - " - -EXTRA_OEMAKE_mtcdt = "${COMMON_OEMAKE} EXTRA_CFLAGS='-I${STAGING_INCDIR}/mts-kernel-headers \ - -D SAM9G25'" -EXTRA_OEMAKE_mtcpmhs = "${COMMON_OEMAKE} EXTRA_CFLAGS='-I${STAGING_INCDIR}/mts-kernel-headers \ - -D TI43X'" - -do_compile () { - bbnote make "$@" - make "$@" - unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS - oe_runmake -} - -PACKAGES = "kernel-module-${PN}" - -FILES_kernel-module-${PN} = "${base_libdir}/modules/${KERNEL_VERSION}/extra/mtac_lora.ko" - -PARALLEL_MAKE = "" - -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}/mtac_lora.ko ${D}${base_libdir}/modules/${KERNEL_VERSION}/extra -} diff --git a/recipes-bsp/multitech/mtac-lora_1.1.9.bb b/recipes-bsp/multitech/mtac-lora_1.1.9.bb new file mode 100644 index 0000000..447eb6e --- /dev/null +++ b/recipes-bsp/multitech/mtac-lora_1.1.9.bb @@ -0,0 +1,59 @@ +DESCRIPTION = "MTAC LoRa Card" +HOMEPAGE = "http://www.multitech.net/developer/products/multiconnect-conduit-platform/accessory-cards/mtac-lora/" +SECTION = "base" +PRIORITY = "optional" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" +do_fetch[depends]+="virtual/kernel:do_shared_workdir" +DEPENDS = "virtual/kernel mtac mts-io" +RDEPENDS_${PN} = "kernel-module-mtac" +INC_PR = "r1" +COMPATIBLE_MACHINE = "(mtcdt|mtcpmhs)" + +SRCREV = "${PV}" + +PR = "${INC_PR}.1" + +PKGR = "${PR}${KERNEL_MODULE_PACKAGE_SUFFIX}${EXTENDPRAUTO}" + +SRC_URI = " \ + git://git@gitlab.multitech.net/mirrors/mtac-lora;protocol=ssh;branch=master \ +" + +S = "${WORKDIR}/git" + +inherit module + +MTS_EXTRA_SYMBOLS="${STAGING_INCDIR}/mts-io/Module.symvers \ + ${STAGING_INCDIR}/mtac/Module.symvers" + +COMMON_OEMAKE = " -C ${STAGING_KERNEL_DIR} \ + KBUILD_VERBOSE=1 \ + KBUILD_EXTRA_SYMBOLS='${MTS_EXTRA_SYMBOLS}' \ + M=${S} \ + modules \ + " + +EXTRA_OEMAKE_mtcdt = "${COMMON_OEMAKE} EXTRA_CFLAGS='-I${STAGING_INCDIR}/mts-kernel-headers \ + -D SAM9G25'" +EXTRA_OEMAKE_mtcpmhs = "${COMMON_OEMAKE} EXTRA_CFLAGS='-I${STAGING_INCDIR}/mts-kernel-headers \ + -D TI43X'" + +do_compile () { + bbnote make "$@" + make "$@" + unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS + oe_runmake +} + +PACKAGES = "kernel-module-${PN}" + +FILES_kernel-module-${PN} = "${base_libdir}/modules/${KERNEL_VERSION}/extra/mtac_lora.ko" + +PARALLEL_MAKE = "" + +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}/mtac_lora.ko ${D}${base_libdir}/modules/${KERNEL_VERSION}/extra +} diff --git a/recipes-bsp/multitech/mts-io/MTCDT-0.2.patch b/recipes-bsp/multitech/mts-io/MTCDT-0.2.patch deleted file mode 100644 index 77c7457..0000000 --- a/recipes-bsp/multitech/mts-io/MTCDT-0.2.patch +++ /dev/null @@ -1,71 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 7c25e08..27696b9 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1,4 +1,4 @@ --AC_INIT([mts-io], [4.7.2]) -+AC_INIT([mts-io], [4.7.3]) - AC_CONFIG_SRCDIR([util/mts_util_lora2_reset.c]) - AM_INIT_AUTOMAKE - AM_CONFIG_HEADER([config.h]) -diff --git a/io-module/mts-io.c b/io-module/mts-io.c -index ed0cb49..6fad83f 100644 ---- a/io-module/mts-io.c -+++ b/io-module/mts-io.c -@@ -80,6 +80,13 @@ MODULE_DEVICE_TABLE(of, mts_io_dt_ids); - /* on-board EEPROM */ - static struct mts_id_eeprom_layout id_eeprom; - -+// Allow other modules to query the hardware version -+const char *mts_get_hw_version(void) -+{ -+ return id_eeprom.hw_version; -+} -+EXPORT_SYMBOL(mts_get_hw_version); -+ - #include "adc.c" - - static int mts_io_probe(struct platform_device *pdev) -@@ -544,6 +551,9 @@ static DEVICE_ATTR_MTS(dev_attr_led_d_gpio, "led-d", - static DEVICE_ATTR_MTS(dev_attr_led_e_gpio, "led-e", - mts_attr_show_gpio_pin, mts_attr_store_gpio_pin); - -+ -+ -+ - /* eeprom info */ - static ssize_t mts_attr_show_product_info(struct device *dev, - struct device_attribute *attr, -diff --git a/io-module/mts_io.h b/io-module/mts_io.h -index 2c4b7b6..4f46804 100644 ---- a/io-module/mts_io.h -+++ b/io-module/mts_io.h -@@ -50,6 +50,7 @@ struct gpio_pin { - }; - - extern int mts_has_radio(const char *product_id, size_t len); -+extern const char *mts_get_hw_version(void); - - #endif /* __MTS_IO_H */ - -diff --git a/io-module/mts_io_module.h b/io-module/mts_io_module.h -index eca15a3..83a2994 100644 ---- a/io-module/mts_io_module.h -+++ b/io-module/mts_io_module.h -@@ -5,7 +5,7 @@ - * MTAC cards. - */ - --#define DRIVER_VERSION "v4.7.2" -+#define DRIVER_VERSION "v4.7.3" - #define DRIVER_AUTHOR "Multitech Systems" - #define DRIVER_DESC "MTS-IO Controller" - #define DRIVER_NAME "mts-io" -@@ -36,6 +36,7 @@ - #define HW_VERSION_MTRE "MTRE-0.0" - #define HW_VERSION_MTCDT_0_0 "MTCDT-0.0" // No GPS or WiFi Capability - #define HW_VERSION_MTCDT_0_1 "MTCDT-0.1" // Conduit refresh with GPS and WiFi possible -+#define HW_VERSION_MTCDT_0_2 "MTCDT-0.2" // FTDI with no multi-drop serial support - #define HW_VERSION_MTCDTIP_0_0 "MTCDTIP-0.0" - #define HW_VERSION_MTCDTIPHP_0_0 "MTCDTIPHP-0.0" // Also known as LoRa 2.1 - #define HW_VERSION_MTCAP_0_0 "MTCAP-0.0" diff --git a/recipes-bsp/multitech/mts-io/ioport-gpio-expand.patch b/recipes-bsp/multitech/mts-io/ioport-gpio-expand.patch deleted file mode 100644 index c413d21..0000000 --- a/recipes-bsp/multitech/mts-io/ioport-gpio-expand.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/io-module/at91gpio.h b/io-module/at91gpio.h -index c2f8a77..d6328f1 100644 ---- a/io-module/at91gpio.h -+++ b/io-module/at91gpio.h -@@ -179,4 +179,23 @@ - #define AT91_PIN_PE30 (0x80 + 30) - #define AT91_PIN_PE31 (0x80 + 31) - -+// MTCDT-0.2 I2C I/O Port expanders -+#define PCA9557_0_IO0 (0xa0 + 0) -+#define PCA9557_0_IO1 (0xa0 + 1) -+#define PCA9557_0_IO2 (0xa0 + 2) -+#define PCA9557_0_IO3 (0xa0 + 3) -+#define PCA9557_0_IO4 (0xa0 + 4) -+#define PCA9557_0_IO5 (0xa0 + 5) -+#define PCA9557_0_IO6 (0xa0 + 6) -+#define PCA9557_0_IO7 (0xa0 + 7) -+ -+#define PCA9557_1_IO0 (0xa8 + 0) -+#define PCA9557_1_IO1 (0xa8 + 1) -+#define PCA9557_1_IO2 (0xa8 + 2) -+#define PCA9557_1_IO3 (0xa8 + 3) -+#define PCA9557_1_IO4 (0xa8 + 4) -+#define PCA9557_1_IO5 (0xa8 + 5) -+#define PCA9557_1_IO6 (0xa8 + 6) -+#define PCA9557_1_IO7 (0xa8 + 7) -+ - #endif -- cgit v1.2.3 From d7a9a9dd6c1c8531a6e5d2ae32dc865f078e90a5 Mon Sep 17 00:00:00 2001 From: Andrii Pientsov Date: Thu, 23 Dec 2021 16:27:05 +0200 Subject: Set AUTOREV for mtac 4.1.2 --- recipes-bsp/multitech/mtac_4.1.2.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-bsp/multitech/mtac_4.1.2.bb b/recipes-bsp/multitech/mtac_4.1.2.bb index c6de690..49b97a7 100644 --- a/recipes-bsp/multitech/mtac_4.1.2.bb +++ b/recipes-bsp/multitech/mtac_4.1.2.bb @@ -9,7 +9,7 @@ DEPENDS = "virtual/kernel mts-io" INC_PR = "r0" COMPATIBLE_MACHINE = "(mtcdt|mtcpmhs)" -SRCREV = "${PV}" +SRCREV = "${AUTOREV}" # Some packages depend on mtac RPROVIDES_kernel-module-${PN} = "mtac" -- cgit v1.2.3