Merge branch 'mtre-thud' into mtre-dunfell

8 files changed, 508 insertions, 1 deletions

diff --git a/recipes-bsp/at91bootstrap/at91bootstrap.inc b/recipes-bsp/at91bootstrap/at91bootstrap.inc
index 25d72ee..07dfda4 100644
--- a/recipes-bsp/at91bootstrap/at91bootstrap.inc
+++ b/recipes-bsp/at91bootstrap/at91bootstrap.inc
@@ -31,6 +31,10 @@ SRC_URI_append_mtrv1 = " file://0001-mtrv1-DDRlowDriveStrength.patch \
 SRC_URI_append_mtr = " file://defconfig.mtr \
 	file://0005-at91bootstrap-3.8-mtr.patch \
 "
+SRC_URI_append_mtre = " file://0001-mtrv1-DDRlowDriveStrength.patch \
+	file://defconfig.mtr \
+	file://0005-at91bootstrap-3.8-mtr.patch \
+"
 
 SRC_URI_append_mtcdt = " file://0005-at91bootstrap-3.8-mtcdt.patch "
 SRC_URI_append_mtcap = " file://0005-at91bootstrap-3.8-mtcap.patch "
@@ -78,7 +82,7 @@ do_configure() {
 	# Copy defconfig to .config if .config does not exist. This allows
 	# recipes to manage the .config themselves in do_configure_prepend()
 	# and to override default settings with a custom file.
-	if [[ ${MACHINE} == mtr ]] || [[ ${MACHINE} == mtrv1 ]] ; then
+	if [[ ${MACHINE} == mtr ]] || [[ ${MACHINE} == mtrv1 ]] || [[ ${MACHINE} == mtre ]] ; then
             CTYPE=".mtr"
         fi
 	
diff --git a/recipes-bsp/multitech/mtre-leds.bb b/recipes-bsp/multitech/mtre-leds.bb
new file mode 100644
index 0000000..59660b4
--- /dev/null
+++ b/recipes-bsp/multitech/mtre-leds.bb
@@ -0,0 +1,30 @@
+DESCRIPTION = "MTRE led setup facilities"
+HOMEPAGE = "http://www.multitech.com/"
+LICENSE = "Proprietary"
+LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Proprietary;md5=0557f9d92cf58f2ccdd50f62f8ac0b28"
+RDEPENDS_${PN} += "bash"
+
+PR = "r2"
+
+SRC_URI = " file://mtre-leds.init \
+            file://mtre-leds.sh \
+            file://mtre-leds-monitor.sh \
+            file://mtre-leds-device-ready.init \
+"
+inherit update-rc.d
+
+INITSCRIPT_NAME = "mtre-leds"
+INITSCRIPT_PARAMS = "start 45 S . stop 30 6 ."
+
+do_install() {
+  install -d ${D}/etc/init.d
+  install -m 0755 ${WORKDIR}/mtre-leds.init ${D}/etc/init.d/mtre-leds
+  install -d ${D}/sbin
+  install -m 0744 ${WORKDIR}/mtre-leds.sh ${D}/sbin/mtre-leds
+  install -m 0744 ${WORKDIR}/mtre-leds-monitor.sh ${D}/sbin/mtre-leds-monitor
+
+  # Install mtre device ready hook which turns on ENABLED LED after Web Access is allowed
+  install -d ${D}${sysconfdir}/rc5.d
+  install -m 0755 ${WORKDIR}/mtre-leds-device-ready.init ${D}/etc/init.d/mtre-leds-device-ready
+  ln -s /etc/init.d/mtre-leds-device-ready ${D}${sysconfdir}/rc5.d/S76mtre-leds-device-ready
+}
diff --git a/recipes-bsp/multitech/mtre-leds/mtre-leds-device-ready.init b/recipes-bsp/multitech/mtre-leds/mtre-leds-device-ready.init
new file mode 100755
index 0000000..250f592
--- /dev/null
+++ b/recipes-bsp/multitech/mtre-leds/mtre-leds-device-ready.init
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+#
+# Notify LEDs engine that the device is now accessible.
+#
+
+mtre-leds device_ready
diff --git a/recipes-bsp/multitech/mtre-leds/mtre-leds-monitor.sh b/recipes-bsp/multitech/mtre-leds/mtre-leds-monitor.sh
new file mode 100755
index 0000000..087d8f3
--- /dev/null
+++ b/recipes-bsp/multitech/mtre-leds/mtre-leds-monitor.sh
@@ -0,0 +1,23 @@
+#!/bin/bash
+
+gpio=/sys/devices/platform/mts-io/reset
+#gpio=/tmp/pb
+
+status="0"
+
+while :
+do
+  usleep 150000
+  if [[ -r "$gpio" ]]; then
+    read -n 1 val < $gpio
+    if [[ ! -z "$val" && "$val" != "$status" ]]; then
+        if [[ "$val" == "1" ]]; then
+          mtre-leds start-test
+          status=$val
+        elif [[ "$val" == "0" ]]; then
+          mtre-leds stop-test
+          status=$val
+        fi
+    fi
+  fi
+done
diff --git a/recipes-bsp/multitech/mtre-leds/mtre-leds.init b/recipes-bsp/multitech/mtre-leds/mtre-leds.init
new file mode 100644
index 0000000..686fba8
--- /dev/null
+++ b/recipes-bsp/multitech/mtre-leds/mtre-leds.init
@@ -0,0 +1,21 @@
+#!/bin/bash
+
+case $1 in
+  start)
+    echo "Setting up leds"
+    # setup leds and triggers
+    mtre-leds start
+    # set to no-alarm initially
+    mtre-leds alarm-off
+    ;;
+
+  stop)
+    # turn leds off, disable triggers
+    mtre-leds stop
+    ;;
+
+  *)
+    echo "Usage: $0 {start|stop}"
+    exit 2
+    ;;
+esac
\ No newline at end of file
diff --git a/recipes-bsp/multitech/mtre-leds/mtre-leds.sh b/recipes-bsp/multitech/mtre-leds/mtre-leds.sh
new file mode 100755
index 0000000..773e331
--- /dev/null
+++ b/recipes-bsp/multitech/mtre-leds/mtre-leds.sh
@@ -0,0 +1,160 @@
+#!/bin/bash
+
+#
+# LED to trigger map
+#
+declare -A triggers
+
+##################################################################
+#                  #                 #                           #
+#     LED name     #    Trigger      #         Description       #
+# /sys/class/leds  #                 #                           #
+##################################################################
+triggers[pca955x:0]="led-no-alarm"   # ENABLE
+triggers[pca955x:1]="led-alarm"      # ALARM
+triggers[pca955x:2]="none"           # 10/100MBPS (HW controlled)
+triggers[pca955x:3]="none"           # LNK/ACT (HW controlled)
+triggers[pca955x:4]="vizzini1-tx"    # TX (serial)
+triggers[pca955x:5]="vizzini1-rx"    # RX (serial)
+triggers[pca955x:6]="led-sig4"       # LINK Quality Green
+triggers[pca955x:7]="led-sig3"       # LINK Quality Green
+triggers[pca955x:8]="led-sig2"       # LINK Quality Yellow
+triggers[pca955x:9]="led-sig1"       # LINK Quality Red
+triggers[pca955x:10]="led-cd"        # Celullar connectivity
+triggers[pca955x:11]="netdev"        # Cellular activity
+
+debug() {
+  [[ "$DEBUG" ]] && builtin echo $@
+}
+
+leds_enable() {
+    cd /sys/class/leds
+    for led in "${!triggers[@]}"
+    do
+        echo ${triggers[$led]} > $led/trigger
+        debug "LEDS: $led trigger enabled"
+    done
+}
+
+leds_disable() {
+    cd /sys/class/leds
+    for led in "${!triggers[@]}"
+    do
+        echo "none" > $led/trigger
+    done
+}
+
+led_set_alarm() {
+    local cmd="$1"
+
+    [ x"$cmd" == x"on" ]  && mts-io-sysfs store alarm 1
+    [ x"$cmd" == x"off" ] && mts-io-sysfs store alarm 0
+    [ x"$cmd" == x"minor" ] && mts-io-sysfs store alarm 2
+    [ x"$cmd" == x"update" ] && mts-io-sysfs store alarm 100
+    debug "LEDS: alarm set to $1"
+}
+
+led_set_device_ready() {
+    local cmd="$1"
+
+    [ x"$cmd" == x"on" ]  && mts-io-sysfs store device-ready 1
+    [ x"$cmd" == x"off" ] && mts-io-sysfs store device-ready 0
+    debug "LEDS: device_ready set to $1"
+}
+
+led_set_ppp_act() {
+    cd /sys/class/leds
+    for led in "${!triggers[@]}"
+    do
+        if [[ x"${triggers[$led]}" == x"netdev" ]]; then
+            echo "ppp0" > $led/device_name
+            echo "1" > $led/rx
+            echo "1" > $led/tx
+            debug "LEDS: ppp activity trigger is set"
+        fi
+    done
+}
+
+leds_set_brightness() {
+    cd /sys/class/leds
+    for led in "${!triggers[@]}"
+    do
+        local cmd="$1"
+
+        if [[ x"$cmd" == x"on" ]]; then
+            brightness="255"
+        elif [[ x"$cmd" == x"off" ]]; then
+            brightness="0"
+        fi
+
+        if [[ x"${triggers[$led]}" == x"led-alarm" ]]; then
+            #
+            # led alarm is inverted
+            #
+            if [[ x"$cmd" == x"on" ]]; then
+                brightness="0"
+            elif [[ x"$cmd" == x"off" ]]; then
+                brightness="255"
+            fi
+        fi
+
+        echo $brightness > $led/brightness
+
+        debug "LEDS: $led brightness set to $cmd"
+    done
+}
+
+case $1 in
+  start)
+    leds_disable            # disable all triggers
+    leds_set_brightness off # set all leds to off
+    leds_enable             # enable all triggers
+    led_set_alarm update    # update alarm leds with current alarm status
+    led_set_ppp_act         # setup ppp activity led
+    mtre-leds-monitor &     # start push-button monitor
+    ;;
+
+  stop)
+    killall -q mtre-leds-monitor
+    leds_disable            # disable all led triggers
+    leds_set_brightness off # set all leds to off
+    ;;
+
+  alarm-on)
+    led_set_alarm on        # store alarm
+    ;;
+
+  alarm-off)
+    led_set_alarm off       # set no alarm
+    ;;
+
+  alarm-minor)
+    led_set_alarm minor     # blink oneshot on minor alarm
+    ;;
+
+  device_ready)
+    led_set_device_ready on # indicate device readyness
+    ;;
+
+  device_not_ready)
+    led_set_device_ready off # indicate device readyness
+    ;;
+
+  start-test)
+    leds_disable            # disable all triggers
+    leds_set_brightness on  # set all leds to on
+    ;;
+
+  stop-test)
+    leds_disable            # disable all led triggers
+    leds_set_brightness off # set all leds to off
+    leds_enable             # enable all triggers
+    led_set_alarm update    # update alarm leds with current alarm status
+    led_set_ppp_act         # restore ppp activity settings
+    ;;
+
+  *)
+    echo "Usage: $0 <start|stop|alarm-on|alarm-off|alarm-minor|device_ready|device_not_ready|start-test|stop-test>"
+    exit 2
+    ;;
+esac
diff --git a/recipes-bsp/u-boot/u-boot-2016.09.01/mtre.patch b/recipes-bsp/u-boot/u-boot-2016.09.01/mtre.patch
new file mode 100644
index 0000000..887a6bc
--- /dev/null
+++ b/recipes-bsp/u-boot/u-boot-2016.09.01/mtre.patch
@@ -0,0 +1,259 @@
+diff -raNu a/board/atmel/at91sam9x5ek/at91sam9x5ek.c b/board/atmel/at91sam9x5ek/at91sam9x5ek.c
+--- a/board/atmel/at91sam9x5ek/at91sam9x5ek.c	2016-09-19 17:45:12.000000000 +0300
++++ b/board/atmel/at91sam9x5ek/at91sam9x5ek.c	2021-01-12 17:40:47.185029658 +0200
+@@ -44,7 +44,8 @@
+ 	csa = readl(&matrix->ebicsa);
+ 	csa |= AT91_MATRIX_EBI_CS3A_SMC_SMARTMEDIA;
+ 	/* NAND flash on D16 */
+-	csa |= AT91_MATRIX_NFD0_ON_D16;
++	/* MTR: nand flash is set up by bootstrap, so leave it alone here */
++	/* csa |= AT91_MATRIX_NFD0_ON_D16; */
+ 
+ 	/* Configure IO drive */
+ 	csa &= ~AT91_MATRIX_EBI_EBI_IOSR_NORMAL;
+@@ -256,6 +257,9 @@
+ 
+ int board_init(void)
+ {
++	/* Set Status LED High */
++	/* at91_set_gpio_output(BOOT_STATUS_LED, 0); */
++
+ 	/* arch number of AT91SAM9X5EK-Board */
+ 	gd->bd->bi_arch_number = MACH_TYPE_AT91SAM9X5EK;
+ 
+@@ -362,4 +366,61 @@
+ 	/* DDRAM2 Controller initialize */
+ 	ddr2_init(ATMEL_BASE_DDRSDRC, ATMEL_BASE_CS1, &ddr2);
+ }
++
+ #endif
++
++/* on-board EEPROM */
++struct mts_id_eeprom_layout {
++    char vendor_id[32];
++    char product_id[32];
++    char device_id[32];
++    char hw_version[32];
++    uint8_t mac_addr[6];
++    char imei[32];
++    uint8_t capa[32];
++    uint8_t mac_bluetooth[6];
++    uint8_t mac_wifi[6];
++    uint8_t reserved[302];
++};
++
++int board_get_enetaddr(uchar *enetaddr)
++{
++	struct mts_id_eeprom_layout eeprom_buffer = {0};
++
++	if (eeprom_read(CONFIG_SYS_I2C_EEPROM_ADDR, 0, &eeprom_buffer, sizeof(eeprom_buffer))) {
++		printf("EEPROM: read error\n");
++		return 0;
++	}
++
++	if (eeprom_buffer.vendor_id[0] == 0x00 || eeprom_buffer.vendor_id[0] == 0xFF) {
++		printf("EEPROM: uninitialized\n");
++		return 0;
++	}
++
++	printf("vendor-id:  %s\n", eeprom_buffer.vendor_id);
++	printf("product-id: %s\n", eeprom_buffer.product_id);
++	printf("device-id:  %s\n", eeprom_buffer.device_id);
++	printf("hw-version: %s\n", eeprom_buffer.hw_version);
++	printf("mac-addr:   %02x:%02x:%02x:%02x:%02x:%02x\n", eeprom_buffer.mac_addr[0],
++		eeprom_buffer.mac_addr[1],
++		eeprom_buffer.mac_addr[2],
++		eeprom_buffer.mac_addr[3],
++		eeprom_buffer.mac_addr[4],
++		eeprom_buffer.mac_addr[5]);
++
++	memcpy(enetaddr, eeprom_buffer.mac_addr, 6);
++
++	return 1;
++}
++
++int misc_init_r(void)
++{
++	uchar enetaddr[6];
++
++	/* set MAC address from EEPROM if read successful */
++	if (board_get_enetaddr(enetaddr)) {
++		eth_setenv_enetaddr("ethaddr", enetaddr);
++	}
++
++	return 0;
++}
+diff -raNu a/configs/at91sam9x5ek_nandflash_defconfig b/configs/at91sam9x5ek_nandflash_defconfig
+--- a/configs/at91sam9x5ek_nandflash_defconfig	2021-01-09 18:01:02.000000000 +0200
++++ b/configs/at91sam9x5ek_nandflash_defconfig	2021-01-09 18:24:57.023488603 +0200
+@@ -30,7 +30,6 @@
+ CONFIG_CMD_NAND=y
+ CONFIG_CMD_BOOTZ=y
+ CONFIG_CMD_MII=y
+-CONFIG_CMD_I2C=y
+ 
+ # The config option CONFIG_SILENT_CONSOLE can be used to quiet messages
+ # on the console.  If the option has been enabled, the output can be
+diff -raNu a/include/configs/at91sam9x5ek.h b/include/configs/at91sam9x5ek.h
+--- a/include/configs/at91sam9x5ek.h	2016-09-19 17:45:12.000000000 +0300
++++ b/include/configs/at91sam9x5ek.h	2021-01-09 18:38:28.231749990 +0200
+@@ -9,8 +9,10 @@
+ #ifndef __CONFIG_H__
+ #define __CONFIG_H__
+ 
++#include <linux/kconfig.h>
+ #include <asm/hardware.h>
+ 
++#define USE_MTR
+ #define CONFIG_SYS_TEXT_BASE		0x26f00000
+ 
+ /* ARM asynchronous clock */
+@@ -26,6 +28,8 @@
+ #define CONFIG_BOARD_EARLY_INIT_F
+ #define CONFIG_DISPLAY_CPUINFO
+ 
++#define CONFIG_MISC_INIT_R       /* enable platform-dependent misc_init_r() */
++
+ /* general purpose I/O */
+ #define CONFIG_ATMEL_LEGACY		/* required until (g)pio is fixed */
+ #define CONFIG_AT91_GPIO
+@@ -36,6 +40,8 @@
+ #define CONFIG_USART_ID		ATMEL_ID_SYS
+ 
+ /* LCD */
++/* MTR has no LCD */
++#if !defined(MTR)
+ #define CONFIG_LCD
+ #define LCD_BPP			LCD_COLOR16
+ #define LCD_OUTPUT_BPP		24
+@@ -46,7 +52,13 @@
+ #define CONFIG_ATMEL_HLCD
+ #define CONFIG_ATMEL_LCD_RGB565
+ #define CONFIG_SYS_CONSOLE_IS_IN_ENV
++#endif  /* !defined(MTR) */
++
++/* check for keypress even if bootdelay is 0 */
++#define CONFIG_ZERO_BOOTDELAY_CHECK
+ 
++/*STATUS LED*/
++#define BOOT_STATUS_LED AT91_PIN_PC21
+ 
+ /*
+  * BOOTP options
+@@ -59,10 +71,7 @@
+ /* no NOR flash */
+ #define CONFIG_SYS_NO_FLASH
+ 
+-/*
+- * Command line configuration.
+- */
+-#define CONFIG_CMD_NAND
++#define CONFIG_SYS_I2C
+ 
+ /*
+  * define CONFIG_USB_EHCI to enable USB Hi-Speed (aka 2.0)
+@@ -94,13 +103,30 @@
+ /* our CLE is AD22 */
+ #define CONFIG_SYS_NAND_MASK_CLE	(1 << 22)
+ #define CONFIG_SYS_NAND_ENABLE_PIN	AT91_PIN_PD4
+-#define CONFIG_SYS_NAND_READY_PIN	AT91_PIN_PD5
++/* MTR nand ready is PC31 */
++#define CONFIG_SYS_NAND_READY_PIN	AT91_PIN_PC31
+ 
+ /* PMECC & PMERRLOC */
+ #define CONFIG_ATMEL_NAND_HWECC		1
+ #define CONFIG_ATMEL_NAND_HW_PMECC	1
+-#define CONFIG_PMECC_CAP		2
++
++/* MTR: 4-bit PMECC */
++#define CONFIG_PMECC_CAP		4
+ #define CONFIG_PMECC_SECTOR_SIZE	512
++/* 
++ * CONFIG_PMECC_INDEX_TABLE_OFFSET has been replaced by:
++ *  ATMEL_PMECC_INDEX_OFFSET_512 and
++ *  ATMEL_PMECC_INDEX_OFFSET_1024
++ *
++ * Which as used depends on:
++ * host->pmecc_sector_size == 512
++ *
++ * 2012.10:
++ * #define CONFIG_PMECC_INDEX_TABLE_OFFSET	0x8000
++ * 2016.03 (at91sam9x5.h):
++ * 182:#define ATMEL_PMECC_INDEX_OFFSET_512	0x8000
++ */
++
+ 
+ #define CONFIG_CMD_NAND_TRIMFFS
+ 
+@@ -147,6 +173,23 @@
+ #endif
+ #endif
+ 
++#define CONFIG_SYS_I2C_SOFT
++#define CONFIG_SOFT_I2C
++#define CONFIG_SOFT_I2C_GPIO_SCL AT91_PIN_PA31
++#define CONFIG_SOFT_I2C_GPIO_SDA AT91_PIN_PA30
++#define CONFIG_SYS_I2C_SOFT_SPEED		50000
++#define CONFIG_SYS_I2C_SPEED		CONFIG_SYS_I2C_SOFT_SPEED
++/* Values from previous levels of Conduit U-Boot */
++#define CONFIG_SYS_I2C_SLAVE    0xfe
++#define I2C_RXTX_LEN	128
++
++/* I2C eeprom support */
++#define CONFIG_CMD_EEPROM
++#define CONFIG_SYS_I2C_EEPROM_ADDR 0x56			/* at24c04 */
++#define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1		/* Bytes of address<---><------>*/
++#define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS 3
++
++
+ #define CONFIG_SYS_LOAD_ADDR		0x22000000	/* load address */
+ 
+ #define CONFIG_SYS_MEMTEST_START	CONFIG_SYS_SDRAM_BASE
+@@ -156,11 +199,11 @@
+ /* bootstrap + u-boot + env + linux in nandflash */
+ #define CONFIG_ENV_IS_IN_NAND
+ #define CONFIG_ENV_OFFSET		0xc0000
+-#define CONFIG_ENV_OFFSET_REDUND	0x100000
++#define CONFIG_ENV_OFFSET_REDUND	0x160000
+ #define CONFIG_ENV_SIZE		0x20000		/* 1 sector = 128 kB */
+-#define CONFIG_BOOTCOMMAND	"nand read " \
+-				"0x22000000 0x200000 0x300000; " \
+-				"bootm 0x22000000"
++/* MTR: read from env variables for boot */
++#define CONFIG_BOOTCOMMAND "nboot.jffs2 ${loadaddr} 0 ${kernel_addr}; bootm ${loadaddr}"
++
+ #elif defined(CONFIG_SYS_USE_SPIFLASH)
+ /* bootstrap + u-boot + env + linux in spi flash */
+ #define CONFIG_ENV_IS_IN_SPI_FLASH
+@@ -197,6 +240,9 @@
+ 				"8M(bootstrap/uboot/kernel)ro,-(rootfs) " \
+ 				"root=/dev/mmcblk0p2 " \
+ 				"rw rootfstype=ext4 rootwait"
++#elif defined(USE_MTR)
++/* MTR uses jffs2 */
++#define CONFIG_BOOTARGS        "mem=128M console=ttyS0,115200 root=/dev/mtdblock8 ro rootfstype=jffs2"
+ #else
+ #define CONFIG_BOOTARGS							\
+ 	"console=ttyS0,115200 earlyprintk "				\
+@@ -274,4 +320,21 @@
+ 
+ #endif
+ 
++/* MTR defaults */
++#define CONFIG_ENV_OVERWRITE   1 /* Allow Overwrite of serial# & ethaddr */
++#define CONFIG_ETHADDR     00:08:00:87:00:02
++#define CONFIG_IPADDR      192.168.2.1
++#define CONFIG_NETMASK     255.255.255.0
++#define CONFIG_SERVERIP    192.168.2.2
++#define CONFIG_HOSTNAME    AT91SAM9G25
++#define CONFIG_LOADADDR    0x22000000
++
++/* MTR - enable watchdog */
++#define CONFIG_AT91SAM9_WATCHDOG 1
++#define CONFIG_HW_WATCHDOG 1
++#define CONFIG_AT91_HW_WDT_TIMEOUT 16
++#define CONFIG_EXTRA_ENV_SETTINGS          \
++   "kernel_addr=0x200000\0"          \
++   ""
++
+ #endif
diff --git a/recipes-bsp/u-boot/u-boot_2016.09.01.bb b/recipes-bsp/u-boot/u-boot_2016.09.01.bb
index 59b3c4c..3f4d2d5 100644
--- a/recipes-bsp/u-boot/u-boot_2016.09.01.bb
+++ b/recipes-bsp/u-boot/u-boot_2016.09.01.bb
@@ -27,6 +27,9 @@ SRC_URI_append_mtr = "\
 SRC_URI_append_mtrv1 = "\
            file://mtrv1.patch \
 "
+SRC_URI_append_mtre = "\
+           file://mtre.patch \
+"
 
 SRC_URI[md5sum] = "61c628f8034477c946e173ed174efeb4"
 SRC_URI[sha256sum] = "95728e89dd476d17428f94080752ab48884be477b6a678941582aeef618b70bb"