* [3rdparty][PATCH 1/6] ccimx6ulsbcexpress: Separate machine configuration into SOM and board
2019-02-21 15:24 [3rdparty][PATCH 0/6] Add support for the ConnectCore 6UL SBC Pro board Alex Gonzalez
@ 2019-02-21 15:24 ` Alex Gonzalez
2019-02-21 15:24 ` [3rdparty][PATCH 2/6] init-ifupdown: ccimx6ulsbcexpress: Add interfaces file Alex Gonzalez
` (5 subsequent siblings)
6 siblings, 0 replies; 10+ messages in thread
From: Alex Gonzalez @ 2019-02-21 15:24 UTC (permalink / raw)
To: meta-freescale
This commit prepares for the introduction of a second ConnectCore 6UL
System-On-Module based board by grouping the SOM configuration into its
own file avoiding code redundancy.
Signed-off-by: Alex Gonzalez <alex.gonzalez@digi.com>
---
conf/machine/ccimx6ulsbcexpress.conf | 33 +++------------------------------
conf/machine/include/ccimx6ulsom.conf | 34 ++++++++++++++++++++++++++++++++++
2 files changed, 37 insertions(+), 30 deletions(-)
create mode 100644 conf/machine/include/ccimx6ulsom.conf
diff --git a/conf/machine/ccimx6ulsbcexpress.conf b/conf/machine/ccimx6ulsbcexpress.conf
index 455087270653..cefc49af1379 100644
--- a/conf/machine/ccimx6ulsbcexpress.conf
+++ b/conf/machine/ccimx6ulsbcexpress.conf
@@ -4,35 +4,8 @@
#@DESCRIPTION: Machine configuration for ConnectCore 6UL SBC Express board.
#@MAINTAINER: Alex Gonzalez <alex.gonzalez@digi.com>
-MACHINEOVERRIDES =. "mx6:mx6ul:ccimx6ul:use-mainline-bsp:"
-
-include conf/machine/include/imx-base.inc
-include conf/machine/include/tune-cortexa7.inc
-
-PREFERRED_PROVIDER_virtual/bootloader = "u-boot-digi"
-PREFERRED_PROVIDER_u-boot = "u-boot-digi"
-
-UBOOT_BOOTSCRIPT = "boot.scr"
-
-UBOOT_CONFIG ??= "ccimx6ulstarter1GB ccimx6ulstarter"
-UBOOT_CONFIG[ccimx6ulstarter1GB] = "ccimx6ulstarter1GB_defconfig"
-UBOOT_CONFIG[ccimx6ulstarter] = "ccimx6ulstarter_defconfig"
-
-MACHINE_EXTRA_RDEPENDS += " \
- mtd-utils-ubifs \
-"
-# mkfs.ubifs parameters for boot partition (the one holding kernel and device tree files)
-# Max LEB count (-c 255) calculated for a partition of up to 32 MiB considering 128 KiB erase-block size.
-MKUBIFS_BOOT_ARGS ?= "-m 2048 -e 126976 -c 255"
-
-# mkfs.ubifs parameters for rootfs partition
-# Max LEB count (-c 8191) calculated for a partition of up to 1 GiB considering 128 KiB erase-block size.
-MKUBIFS_ARGS ?= "-m 2048 -e 126976 -c 8191"
-
-IMAGE_CLASSES += "image_types_digi"
-# Overwrite the defaults in imx-base not to include wic images
-IMAGE_FSTYPES = "tar.bz2 ubifs boot.ubifs"
-
-SERIAL_CONSOLE = "115200 ttymxc4"
+include conf/machine/include/ccimx6ulsom.conf
KERNEL_DEVICETREE = "imx6ul-ccimx6ulsbcexpress.dtb"
+
+SERIAL_CONSOLES = "115200;ttymxc4"
diff --git a/conf/machine/include/ccimx6ulsom.conf b/conf/machine/include/ccimx6ulsom.conf
new file mode 100644
index 000000000000..0c15e7308524
--- /dev/null
+++ b/conf/machine/include/ccimx6ulsom.conf
@@ -0,0 +1,34 @@
+#@TYPE: Machine
+#@NAME: ConnecCore 6UL SOM
+#@SOC: i.MX6UL
+#@DESCRIPTION: Machine configuration for ConnectCore 6UL System-On-Module.
+#@MAINTAINER: Alex Gonzalez <alex.gonzalez@digi.com>
+
+MACHINEOVERRIDES =. "mx6:mx6ul:ccimx6ul:use-mainline-bsp:"
+
+include conf/machine/include/imx-base.inc
+include conf/machine/include/tune-cortexa7.inc
+
+PREFERRED_PROVIDER_virtual/bootloader = "u-boot-digi"
+PREFERRED_PROVIDER_u-boot = "u-boot-digi"
+
+UBOOT_BOOTSCRIPT = "boot.scr"
+
+UBOOT_CONFIG ??= "ccimx6ulstarter1GB ccimx6ulstarter"
+UBOOT_CONFIG[ccimx6ulstarter1GB] = "ccimx6ulstarter1GB_defconfig"
+UBOOT_CONFIG[ccimx6ulstarter] = "ccimx6ulstarter_defconfig"
+
+MACHINE_EXTRA_RDEPENDS += " \
+ mtd-utils-ubifs \
+"
+# mkfs.ubifs parameters for boot partition (the one holding kernel and device tree files)
+# Max LEB count (-c 255) calculated for a partition of up to 32 MiB considering 128 KiB erase-block size.
+MKUBIFS_BOOT_ARGS ?= "-m 2048 -e 126976 -c 255"
+
+# mkfs.ubifs parameters for rootfs partition
+# Max LEB count (-c 8191) calculated for a partition of up to 1 GiB considering 128 KiB erase-block size.
+MKUBIFS_ARGS ?= "-m 2048 -e 126976 -c 8191"
+
+IMAGE_CLASSES += "image_types_digi"
+# Overwrite the defaults in imx-base not to include wic images
+IMAGE_FSTYPES = "tar.bz2 ubifs boot.ubifs"
^ permalink raw reply related [flat|nested] 10+ messages in thread* [3rdparty][PATCH 2/6] init-ifupdown: ccimx6ulsbcexpress: Add interfaces file
2019-02-21 15:24 [3rdparty][PATCH 0/6] Add support for the ConnectCore 6UL SBC Pro board Alex Gonzalez
2019-02-21 15:24 ` [3rdparty][PATCH 1/6] ccimx6ulsbcexpress: Separate machine configuration into SOM and board Alex Gonzalez
@ 2019-02-21 15:24 ` Alex Gonzalez
2019-02-21 15:24 ` [3rdparty][PATCH 3/6] u-boot-digi: Generalize boot script Alex Gonzalez
` (4 subsequent siblings)
6 siblings, 0 replies; 10+ messages in thread
From: Alex Gonzalez @ 2019-02-21 15:24 UTC (permalink / raw)
To: meta-freescale
The ConnectCore 6UL SBC Express has a Wi-Fi interface with both station
and softAP functionality. This interfaces file adds the wlan0 interface for
station and wlan1 interface for softAP.
Note that for softAP functionality to work, MAC addresses for the virtual
wireless interfaces need to be programmed in the uboot environment with:
env set wlan1addr aa:cc:cc:xx:yy:zz
env set wlan2addr aa:cc:cc:xx:yy:zz
env set wlan3addr aa:cc:cc:xx:yy:zz
Signed-off-by: Alex Gonzalez <alex.gonzalez@digi.com>
---
.../init-ifupdown/ccimx6ulsbcexpress/interfaces | 45 ++++++++++++++++++++++
1 file changed, 45 insertions(+)
create mode 100644 recipes-core/init-ifupdown/init-ifupdown/ccimx6ulsbcexpress/interfaces
diff --git a/recipes-core/init-ifupdown/init-ifupdown/ccimx6ulsbcexpress/interfaces b/recipes-core/init-ifupdown/init-ifupdown/ccimx6ulsbcexpress/interfaces
new file mode 100644
index 000000000000..c94f8343dd07
--- /dev/null
+++ b/recipes-core/init-ifupdown/init-ifupdown/ccimx6ulsbcexpress/interfaces
@@ -0,0 +1,45 @@
+# /etc/network/interfaces -- configuration file for ifup(8), ifdown(8)
+
+# The loopback interface
+auto lo
+iface lo inet loopback
+
+# Wireless interfaces
+
+# Client infrastructure mode
+auto wlan0
+iface wlan0 inet static
+ address 192.168.8.2
+ netmask 255.255.255.0
+ network 192.168.8.0
+ wireless_mode managed
+ wireless_essid any
+ wpa-driver nl80211
+ wpa-conf /etc/wpa_supplicant.conf
+
+# SoftAP mode
+auto wlan1
+iface wlan1 inet static
+ address 192.168.9.2
+ netmask 255.255.255.0
+ network 192.168.9.0
+ post-up /etc/init.d/hostapd start
+ pre-down /etc/init.d/hostapd stop
+
+iface atml0 inet dhcp
+
+# Wired or wireless interfaces
+auto eth0
+iface eth0 inet dhcp
+
+# Ethernet/RNDIS gadget (g_ether)
+# ... or on host side, usbnet and random hwaddr
+iface usb0 inet static
+ address 192.168.7.2
+ netmask 255.255.255.0
+ network 192.168.7.0
+ gateway 192.168.7.1
+
+# Bluetooth networking
+iface bnep0 inet dhcp
+
^ permalink raw reply related [flat|nested] 10+ messages in thread* [3rdparty][PATCH 3/6] u-boot-digi: Generalize boot script
2019-02-21 15:24 [3rdparty][PATCH 0/6] Add support for the ConnectCore 6UL SBC Pro board Alex Gonzalez
2019-02-21 15:24 ` [3rdparty][PATCH 1/6] ccimx6ulsbcexpress: Separate machine configuration into SOM and board Alex Gonzalez
2019-02-21 15:24 ` [3rdparty][PATCH 2/6] init-ifupdown: ccimx6ulsbcexpress: Add interfaces file Alex Gonzalez
@ 2019-02-21 15:24 ` Alex Gonzalez
2019-02-21 15:24 ` [3rdparty][PATCH 4/6] ccimx6ulsbcpro: Add machine configuration Alex Gonzalez
` (3 subsequent siblings)
6 siblings, 0 replies; 10+ messages in thread
From: Alex Gonzalez @ 2019-02-21 15:24 UTC (permalink / raw)
To: meta-freescale
Generalize the boot script used to boot Linux so that it can be shared
by multiple ConnectCore 6UL SOM based boards.
Signed-off-by: Alex Gonzalez <alex.gonzalez@digi.com>
---
recipes-bsp/u-boot/u-boot-digi/ccimx6ul/bootscript.txt | 4 ++--
recipes-bsp/u-boot/u-boot-digi_2017.03.bb | 1 +
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/recipes-bsp/u-boot/u-boot-digi/ccimx6ul/bootscript.txt b/recipes-bsp/u-boot/u-boot-digi/ccimx6ul/bootscript.txt
index 06b42bedcf9a..8f2614d9ed7c 100644
--- a/recipes-bsp/u-boot/u-boot-digi/ccimx6ul/bootscript.txt
+++ b/recipes-bsp/u-boot/u-boot-digi/ccimx6ul/bootscript.txt
@@ -2,6 +2,6 @@
# U-Boot bootscript for NAND images created by Yocto.
#
-setenv fdt_file imx6ul-ccimx6ulsbcexpress.dtb
-setenv zimage zImage-ccimx6ulsbcexpress.bin
+setenv fdt_file imx6ul-${platform}.dtb
+setenv zimage zImage-${platform}.bin
dboot linux nand ${mtdbootpart}
diff --git a/recipes-bsp/u-boot/u-boot-digi_2017.03.bb b/recipes-bsp/u-boot/u-boot-digi_2017.03.bb
index aa7757276fdd..e5f9b9fdb4b6 100644
--- a/recipes-bsp/u-boot/u-boot-digi_2017.03.bb
+++ b/recipes-bsp/u-boot/u-boot-digi_2017.03.bb
@@ -30,6 +30,7 @@ UBOOT_ENV = "boot"
UBOOT_ENV_SUFFIX = "scr"
do_compile_append () {
+ sed -i -e 's/\${platform}/${MACHINE}/g' ${WORKDIR}/bootscript.txt
uboot-mkimage -A arm -O linux -T script -C none -a 0 -e 0 \
-n "boot script" -d ${WORKDIR}/bootscript.txt \
${WORKDIR}/${UBOOT_ENV_BINARY}
^ permalink raw reply related [flat|nested] 10+ messages in thread* [3rdparty][PATCH 4/6] ccimx6ulsbcpro: Add machine configuration
2019-02-21 15:24 [3rdparty][PATCH 0/6] Add support for the ConnectCore 6UL SBC Pro board Alex Gonzalez
` (2 preceding siblings ...)
2019-02-21 15:24 ` [3rdparty][PATCH 3/6] u-boot-digi: Generalize boot script Alex Gonzalez
@ 2019-02-21 15:24 ` Alex Gonzalez
2019-02-21 15:24 ` [3rdparty][PATCH 5/6] linux-fslc: Add support for the ConnectCore 6UL SBC Pro Alex Gonzalez
` (2 subsequent siblings)
6 siblings, 0 replies; 10+ messages in thread
From: Alex Gonzalez @ 2019-02-21 15:24 UTC (permalink / raw)
To: meta-freescale
The ConnectCore 6UL Single Board Computer (SBC) Pro contains the
ConnectCore 6UL System-On-Module.
Its hardware specifications are:
* 256MB DDR3 memory
* On module 256MB NAND flash
* Dual 10/100 Ethernet
* USB Host and USB OTG
* Parallel RGB display header
* LVDS display header
* CSI camera
* GPIO header
* I2C, SPI, CAN headers
* PCIe mini card and micro SIM slot
* MicroSD external storage
* On board 4GB eMMC flash
* Audio headphone, line in/out, microphone lines
The build artifacts are:
U-Boot images: u-boot.imx
Linux partition image: <image name>.boot.ubifs
Root filesystem image: <image name>.ubifs
Root filesystem tarball (for network booting): <image name>.tar.bz2
To program a board from the U-boot prompt, copy the U-Boot, Linux and
root filesystem partition images to your TFTP server root and do:
env set ipaddr <target ip address>
env set serverip <TFTP server ip address>
update uboot tftp u-boot.imx
update linux tftp <image name>.boot.ubifs
update rootfs tftp <image name>.ubifs
More details about the SBC can be found at:
https://www.digi.com/products/embedded-systems/single-board-computers/connectcore-for-i-mx6ul-sbc-pro
Signed-off-by: Alex Gonzalez <alex.gonzalez@digi.com>
---
conf/machine/ccimx6ulsbcpro.conf | 11 +++++++++++
1 file changed, 11 insertions(+)
create mode 100644 conf/machine/ccimx6ulsbcpro.conf
diff --git a/conf/machine/ccimx6ulsbcpro.conf b/conf/machine/ccimx6ulsbcpro.conf
new file mode 100644
index 000000000000..5b3d09a3d556
--- /dev/null
+++ b/conf/machine/ccimx6ulsbcpro.conf
@@ -0,0 +1,11 @@
+#@TYPE: Machine
+#@NAME: ConnecCore 6UL SBC Pro
+#@SOC: i.MX6UL
+#@DESCRIPTION: Machine configuration for ConnectCore 6UL SBC Pro board.
+#@MAINTAINER: Alex Gonzalez <alex.gonzalez@digi.com>
+
+include conf/machine/include/ccimx6ulsom.conf
+
+KERNEL_DEVICETREE = "imx6ul-ccimx6ulsbcpro.dtb"
+
+SERIAL_CONSOLES = "115200;ttymxc4"
^ permalink raw reply related [flat|nested] 10+ messages in thread* [3rdparty][PATCH 5/6] linux-fslc: Add support for the ConnectCore 6UL SBC Pro
2019-02-21 15:24 [3rdparty][PATCH 0/6] Add support for the ConnectCore 6UL SBC Pro board Alex Gonzalez
` (3 preceding siblings ...)
2019-02-21 15:24 ` [3rdparty][PATCH 4/6] ccimx6ulsbcpro: Add machine configuration Alex Gonzalez
@ 2019-02-21 15:24 ` Alex Gonzalez
2019-02-21 15:24 ` [3rdparty][PATCH 6/6] init-ifupdown: ccimx6ulsbcpro: Add interfaces file Alex Gonzalez
2019-02-21 16:36 ` [3rdparty][PATCH 0/6] Add support for the ConnectCore 6UL SBC Pro board Otavio Salvador
6 siblings, 0 replies; 10+ messages in thread
From: Alex Gonzalez @ 2019-02-21 15:24 UTC (permalink / raw)
To: meta-freescale
This commit adds support for Digi's ConnectCore 6UL SBC Pro
board.
This board will be supported on the v4.20 kernel and this commit will be
reverted.
Signed-off-by: Alex Gonzalez <alex.gonzalez@digi.com>
---
...mx6ul-Add-DTS-for-ConnectCore-6UL-SBC-Pro.patch | 440 +++++++++++++++++++++
recipes-kernel/linux/linux-fslc_%.bbappend | 4 +
2 files changed, 444 insertions(+)
create mode 100644 recipes-kernel/linux/linux-fslc/ccimx6ulsbcpro/0001-ARM-dts-imx6ul-Add-DTS-for-ConnectCore-6UL-SBC-Pro.patch
diff --git a/recipes-kernel/linux/linux-fslc/ccimx6ulsbcpro/0001-ARM-dts-imx6ul-Add-DTS-for-ConnectCore-6UL-SBC-Pro.patch b/recipes-kernel/linux/linux-fslc/ccimx6ulsbcpro/0001-ARM-dts-imx6ul-Add-DTS-for-ConnectCore-6UL-SBC-Pro.patch
new file mode 100644
index 000000000000..7d36242361d9
--- /dev/null
+++ b/recipes-kernel/linux/linux-fslc/ccimx6ulsbcpro/0001-ARM-dts-imx6ul-Add-DTS-for-ConnectCore-6UL-SBC-Pro.patch
@@ -0,0 +1,440 @@
+From: Alex Gonzalez <alex.gonzalez@digi.com>
+Date: Mon, 10 Sep 2018 11:37:52 +0200
+Subject: [PATCH] ARM: dts: imx6ul: Add DTS for ConnectCore 6UL SBC Pro
+
+The ConnectCore 6UL Single Board Computer (SBC) Pro contains the
+ConnectCore 6UL System-On-Module.
+
+Its hardware specifications are:
+
+* 256MB DDR3 memory
+* On module 256MB NAND flash
+* Dual 10/100 Ethernet
+* USB Host and USB OTG
+* Parallel RGB display header
+* LVDS display header
+* CSI camera
+* GPIO header
+* I2C, SPI, CAN headers
+* PCIe mini card and micro SIM slot
+* MicroSD external storage
+* On board 4GB eMMC flash
+* Audio headphone, line in/out, microphone lines
+
+Signed-off-by: Alex Gonzalez <alex.gonzalez@digi.com>
+Signed-off-by: Shawn Guo <shawnguo@kernel.org>
+(cherry picked from commit 742fdc0f2270ec2988518f9d7d629c4415048178)
+---
+ arch/arm/boot/dts/Makefile | 1 +
+ arch/arm/boot/dts/imx6ul-ccimx6ulsbcpro.dts | 390 ++++++++++++++++++++++++++++
+ 2 files changed, 391 insertions(+)
+ create mode 100644 arch/arm/boot/dts/imx6ul-ccimx6ulsbcpro.dts
+
+diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
+index b5bd3de87c33..b3ec70dc517a 100644
+--- a/arch/arm/boot/dts/Makefile
++++ b/arch/arm/boot/dts/Makefile
+@@ -548,6 +548,7 @@ dtb-$(CONFIG_SOC_IMX6SX) += \
+ dtb-$(CONFIG_SOC_IMX6UL) += \
+ imx6ul-14x14-evk.dtb \
+ imx6ul-ccimx6ulsbcexpress.dtb \
++ imx6ul-ccimx6ulsbcpro.dtb \
+ imx6ul-geam.dtb \
+ imx6ul-isiot-emmc.dtb \
+ imx6ul-isiot-nand.dtb \
+diff --git a/arch/arm/boot/dts/imx6ul-ccimx6ulsbcpro.dts b/arch/arm/boot/dts/imx6ul-ccimx6ulsbcpro.dts
+new file mode 100644
+index 000000000000..11966d12af76
+--- /dev/null
++++ b/arch/arm/boot/dts/imx6ul-ccimx6ulsbcpro.dts
+@@ -0,0 +1,390 @@
++// SPDX-License-Identifier: GPL-2.0
++/*
++ * Digi International's ConnectCore6UL SBC Pro board device tree source
++ *
++ * Copyright 2018 Digi International, Inc.
++ *
++ */
++
++/dts-v1/;
++#include <dt-bindings/input/input.h>
++#include <dt-bindings/interrupt-controller/irq.h>
++#include "imx6ul.dtsi"
++#include "imx6ul-ccimx6ulsom.dtsi"
++
++/ {
++ model = "Digi International ConnectCore 6UL SBC Pro.";
++ compatible = "digi,ccimx6ulsbcpro", "digi,ccimx6ulsom", "fsl,imx6ul";
++
++ lcd_backlight: backlight {
++ compatible = "pwm-backlight";
++ pwms = <&pwm5 0 50000>;
++ brightness-levels = <0 4 8 16 32 64 128 255>;
++ default-brightness-level = <6>;
++ status = "okay";
++ };
++
++ reg_usb_otg1_vbus: regulator-usb-otg1 {
++ compatible = "regulator-fixed";
++ regulator-name = "usb_otg1_vbus";
++ regulator-min-microvolt = <5000000>;
++ regulator-max-microvolt = <5000000>;
++ gpio = <&gpio1 4 GPIO_ACTIVE_HIGH>;
++ enable-active-high;
++ };
++};
++
++&adc1 {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_adc1>;
++ status = "okay";
++};
++
++&can1 {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_flexcan1>;
++ xceiver-supply = <&ext_3v3>;
++ status = "okay";
++};
++
++/* CAN2 is multiplexed with UART2 RTS/CTS */
++&can2 {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_flexcan2>;
++ xceiver-supply = <&ext_3v3>;
++ status = "disabled";
++};
++
++&ecspi1 {
++ cs-gpios = <&gpio3 26 GPIO_ACTIVE_LOW>;
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_ecspi1_master>;
++ status = "okay";
++};
++
++&fec1 {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_enet1>;
++ phy-mode = "rmii";
++ phy-handle = <ðphy0>;
++ status = "okay";
++};
++
++&fec2 {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_enet2 &pinctrl_enet2_mdio>;
++ phy-mode = "rmii";
++ phy-handle = <ðphy1>;
++ phy-reset-gpios = <&gpio5 6 GPIO_ACTIVE_LOW>;
++ phy-reset-duration = <26>;
++ status = "okay";
++
++ mdio {
++ #address-cells = <1>;
++ #size-cells = <0>;
++
++ ethphy0: ethernet-phy@0 {
++ compatible = "ethernet-phy-ieee802.3-c22";
++ smsc,disable-energy-detect;
++ reg = <0>;
++ };
++
++ ethphy1: ethernet-phy@1 {
++ compatible = "ethernet-phy-ieee802.3-c22";
++ smsc,disable-energy-detect;
++ reg = <1>;
++ };
++ };
++};
++
++&gpio5 {
++ emmc-usd-mux {
++ gpio-hog;
++ gpios = <1 GPIO_ACTIVE_LOW>;
++ output-high;
++ };
++};
++
++&lcdif {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_lcdif_dat0_17
++ &pinctrl_lcdif_clken
++ &pinctrl_lcdif_hvsync>;
++ lcd-supply = <&ldo4_ext>; /* BU90T82 LVDS bridge power */
++ status = "okay";
++};
++
++&ldo4_ext {
++ regulator-max-microvolt = <1800000>;
++};
++
++&pwm1 {
++ status = "okay";
++};
++
++&pwm2 {
++ status = "okay";
++};
++
++&pwm3 {
++ status = "okay";
++};
++
++&pwm4 {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_pwm4>;
++ status = "okay";
++};
++
++&pwm5 {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_pwm5>;
++ status = "okay";
++};
++
++&pwm6 {
++ status = "okay";
++};
++
++&pwm7 {
++ status = "okay";
++};
++
++&pwm8 {
++ status = "okay";
++};
++
++&sai2 {
++ pinctrl-names = "default", "sleep";
++ pinctrl-0 = <&pinctrl_sai2>;
++ pinctrl-1 = <&pinctrl_sai2_sleep>;
++ assigned-clocks = <&clks IMX6UL_CLK_SAI2_SEL>,
++ <&clks IMX6UL_CLK_PLL4_AUDIO_DIV>,
++ <&clks IMX6UL_CLK_SAI2>;
++ assigned-clock-rates = <0>, <786432000>, <12288000>;
++ assigned-clock-parents = <&clks IMX6UL_CLK_PLL4_AUDIO_DIV>;
++ status = "okay";
++};
++
++/* UART2 RTS/CTS muxed with CAN2 */
++&uart2 {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_uart2_4wires>;
++ uart-has-rtscts;
++ status = "okay";
++};
++
++/* UART3 RTS/CTS muxed with CAN 1 */
++&uart3 {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_uart3_2wires>;
++ status = "okay";
++};
++
++&uart5 {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_uart5>;
++ status = "okay";
++};
++
++&usbotg1 {
++ dr_mode = "otg";
++ vbus-supply = <®_usb_otg1_vbus>;
++ pinctrl-0 = <&pinctrl_usbotg1>;
++ status = "okay";
++};
++
++&usbotg2 {
++ dr_mode = "host";
++ disable-over-current;
++ status = "okay";
++};
++
++/* USDHC2 (microSD conflicts with eMMC) */
++&usdhc2 {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_usdhc2>;
++ no-1-8-v;
++ broken-cd; /* no carrier detect line (use polling) */
++ status = "okay";
++};
++
++&iomuxc {
++ pinctrl_adc1: adc1grp {
++ fsl,pins = <
++ /* EXP_GPIO_2 -> GPIO1_3/ADC1_IN3 */
++ MX6UL_PAD_GPIO1_IO03__GPIO1_IO03 0xb0
++ >;
++ };
++
++ pinctrl_ecspi1_master: ecspi1grp1 {
++ fsl,pins = <
++ MX6UL_PAD_LCD_DATA20__ECSPI1_SCLK 0x10b0
++ MX6UL_PAD_LCD_DATA22__ECSPI1_MOSI 0x10b0
++ MX6UL_PAD_LCD_DATA23__ECSPI1_MISO 0x10b0
++ MX6UL_PAD_LCD_DATA21__GPIO3_IO26 0x10b0
++ >;
++ };
++
++ pinctrl_enet1: enet1grp {
++ fsl,pins = <
++ MX6UL_PAD_ENET1_RX_EN__ENET1_RX_EN 0x1b0b0
++ MX6UL_PAD_ENET1_RX_ER__ENET1_RX_ER 0x1b0b0
++ MX6UL_PAD_ENET1_RX_DATA0__ENET1_RDATA00 0x1b0b0
++ MX6UL_PAD_ENET1_RX_DATA1__ENET1_RDATA01 0x1b0b0
++ MX6UL_PAD_ENET1_TX_EN__ENET1_TX_EN 0x1b0b0
++ MX6UL_PAD_ENET1_TX_DATA0__ENET1_TDATA00 0x1b0b0
++ MX6UL_PAD_ENET1_TX_DATA1__ENET1_TDATA01 0x1b0b0
++ MX6UL_PAD_ENET1_TX_CLK__ENET1_REF_CLK1 0x40017051
++ >;
++ };
++
++ pinctrl_enet2: enet2grp {
++ fsl,pins = <
++ MX6UL_PAD_ENET2_RX_EN__ENET2_RX_EN 0x1b0b0
++ MX6UL_PAD_ENET2_RX_ER__ENET2_RX_ER 0x1b0b0
++ MX6UL_PAD_ENET2_RX_DATA0__ENET2_RDATA00 0x1b0b0
++ MX6UL_PAD_ENET2_RX_DATA1__ENET2_RDATA01 0x1b0b0
++ MX6UL_PAD_ENET2_TX_EN__ENET2_TX_EN 0x1b0b0
++ MX6UL_PAD_ENET2_TX_DATA0__ENET2_TDATA00 0x1b0b0
++ MX6UL_PAD_ENET2_TX_DATA1__ENET2_TDATA01 0x1b0b0
++ MX6UL_PAD_ENET2_TX_CLK__ENET2_REF_CLK2 0x40017051
++ >;
++ };
++
++ pinctrl_enet2_mdio: mdioenet2grp {
++ fsl,pins = <
++ MX6UL_PAD_GPIO1_IO07__ENET2_MDC 0x1b0b0
++ MX6UL_PAD_GPIO1_IO06__ENET2_MDIO 0x1b0b0
++ >;
++ };
++
++ pinctrl_flexcan1: flexcan1grp{
++ fsl,pins = <
++ MX6UL_PAD_UART3_CTS_B__FLEXCAN1_TX 0x1b020
++ MX6UL_PAD_UART3_RTS_B__FLEXCAN1_RX 0x1b020
++ >;
++ };
++ pinctrl_flexcan2: flexcan2grp{
++ fsl,pins = <
++ MX6UL_PAD_UART2_CTS_B__FLEXCAN2_TX 0x1b020
++ MX6UL_PAD_UART2_RTS_B__FLEXCAN2_RX 0x1b020
++ >;
++ };
++
++ pinctrl_lcdif_dat0_17: lcdifdatgrp0-17 {
++ fsl,pins = <
++ MX6UL_PAD_LCD_DATA00__LCDIF_DATA00 0x79
++ MX6UL_PAD_LCD_DATA01__LCDIF_DATA01 0x79
++ MX6UL_PAD_LCD_DATA02__LCDIF_DATA02 0x79
++ MX6UL_PAD_LCD_DATA03__LCDIF_DATA03 0x79
++ MX6UL_PAD_LCD_DATA04__LCDIF_DATA04 0x79
++ MX6UL_PAD_LCD_DATA05__LCDIF_DATA05 0x79
++ MX6UL_PAD_LCD_DATA06__LCDIF_DATA06 0x79
++ MX6UL_PAD_LCD_DATA07__LCDIF_DATA07 0x79
++ MX6UL_PAD_LCD_DATA08__LCDIF_DATA08 0x79
++ MX6UL_PAD_LCD_DATA09__LCDIF_DATA09 0x79
++ MX6UL_PAD_LCD_DATA10__LCDIF_DATA10 0x79
++ MX6UL_PAD_LCD_DATA11__LCDIF_DATA11 0x79
++ MX6UL_PAD_LCD_DATA12__LCDIF_DATA12 0x79
++ MX6UL_PAD_LCD_DATA13__LCDIF_DATA13 0x79
++ MX6UL_PAD_LCD_DATA14__LCDIF_DATA14 0x79
++ MX6UL_PAD_LCD_DATA15__LCDIF_DATA15 0x79
++ MX6UL_PAD_LCD_DATA16__LCDIF_DATA16 0x79
++ MX6UL_PAD_LCD_DATA17__LCDIF_DATA17 0x79
++ >;
++ };
++
++ pinctrl_lcdif_clken: lcdifctrlgrp1 {
++ fsl,pins = <
++ MX6UL_PAD_LCD_CLK__LCDIF_CLK 0x17050
++ MX6UL_PAD_LCD_ENABLE__LCDIF_ENABLE 0x79
++ >;
++ };
++
++ pinctrl_lcdif_hvsync: lcdifctrlgrp2 {
++ fsl,pins = <
++ MX6UL_PAD_LCD_HSYNC__LCDIF_HSYNC 0x79
++ MX6UL_PAD_LCD_VSYNC__LCDIF_VSYNC 0x79
++ >;
++ };
++
++ pinctrl_pwm4: pwm4grp {
++ fsl,pins = <
++ MX6UL_PAD_GPIO1_IO05__PWM4_OUT 0x110b0
++ >;
++ };
++
++ pinctrl_pwm5: pwm5grp {
++ fsl,pins = <
++ MX6UL_PAD_NAND_DQS__PWM5_OUT 0x110b0
++ >;
++ };
++
++ pinctrl_sai2: sai2grp {
++ fsl,pins = <
++ MX6UL_PAD_JTAG_TRST_B__SAI2_TX_DATA 0x11088
++ MX6UL_PAD_JTAG_TCK__SAI2_RX_DATA 0x11088
++ MX6UL_PAD_JTAG_TMS__SAI2_MCLK 0x17088
++ MX6UL_PAD_JTAG_TDI__SAI2_TX_BCLK 0x17088
++ MX6UL_PAD_JTAG_TDO__SAI2_TX_SYNC 0x17088
++ /* Interrupt */
++ MX6UL_PAD_SNVS_TAMPER7__GPIO5_IO07 0x10b0
++ >;
++ };
++
++ pinctrl_sai2_sleep: sai2grp-sleep {
++ fsl,pins = <
++ MX6UL_PAD_JTAG_TRST_B__GPIO1_IO15 0x3000
++ MX6UL_PAD_JTAG_TCK__GPIO1_IO14 0x3000
++ MX6UL_PAD_JTAG_TMS__GPIO1_IO11 0x3000
++ MX6UL_PAD_JTAG_TDO__GPIO1_IO12 0x3000
++ /* Interrupt */
++ MX6UL_PAD_SNVS_TAMPER7__GPIO5_IO07 0x3000
++ >;
++ };
++
++ pinctrl_uart2_4wires: uart2grp-4wires {
++ fsl,pins = <
++ MX6UL_PAD_UART2_TX_DATA__UART2_DCE_TX 0x1b0b1
++ MX6UL_PAD_UART2_RX_DATA__UART2_DCE_RX 0x1b0b1
++ MX6UL_PAD_UART2_CTS_B__UART2_DCE_CTS 0x1b0b1
++ MX6UL_PAD_UART2_RTS_B__UART2_DCE_RTS 0x1b0b1
++ >;
++ };
++
++ pinctrl_uart3_2wires: uart3grp-2wires {
++ fsl,pins = <
++ MX6UL_PAD_UART3_TX_DATA__UART3_DCE_TX 0x1b0b1
++ MX6UL_PAD_UART3_RX_DATA__UART3_DCE_RX 0x1b0b1
++ >;
++ };
++
++ pinctrl_uart5: uart5grp {
++ fsl,pins = <
++ MX6UL_PAD_UART5_TX_DATA__UART5_DCE_TX 0x1b0b1
++ MX6UL_PAD_UART5_RX_DATA__UART5_DCE_RX 0x1b0b1
++ >;
++ };
++
++ pinctrl_usdhc2: usdhc2grp {
++ fsl,pins = <
++ MX6UL_PAD_CSI_HSYNC__USDHC2_CMD 0x17059
++ MX6UL_PAD_CSI_VSYNC__USDHC2_CLK 0x10039
++ MX6UL_PAD_CSI_DATA00__USDHC2_DATA0 0x17059
++ MX6UL_PAD_CSI_DATA01__USDHC2_DATA1 0x17059
++ MX6UL_PAD_CSI_DATA02__USDHC2_DATA2 0x17059
++ MX6UL_PAD_CSI_DATA03__USDHC2_DATA3 0x17059
++ /* Mux selector between eMMC/SD# */
++ MX6UL_PAD_SNVS_TAMPER1__GPIO5_IO01 0x79
++ >;
++ };
++
++ pinctrl_usbotg1: usbotg1grp {
++ fsl,pins = <
++ MX6UL_PAD_GPIO1_IO00__ANATOP_OTG1_ID 0x17059
++ MX6UL_PAD_GPIO1_IO04__GPIO1_IO04 0x17059
++ MX6UL_PAD_GPIO1_IO01__USB_OTG1_OC 0x17059
++ >;
++ };
++};
diff --git a/recipes-kernel/linux/linux-fslc_%.bbappend b/recipes-kernel/linux/linux-fslc_%.bbappend
index 5621c4999765..5134d7b0905d 100644
--- a/recipes-kernel/linux/linux-fslc_%.bbappend
+++ b/recipes-kernel/linux/linux-fslc_%.bbappend
@@ -8,6 +8,10 @@ SRC_URI_append_imx6qdl-variscite-som_use-mainline-bsp = " \
file://imx6q-var-som-vsc.dts \
"
+SRC_URI_append_ccimx6ulsbcpro = " \
+ file://0001-ARM-dts-imx6ul-Add-DTS-for-ConnectCore-6UL-SBC-Pro.patch \
+"
+
SRC_URI_append_ccimx6ul = " \
file://0001-MLK-11719-4-mtd-gpmi-change-the-BCH-layout-setting-f.patch \
file://0002-cpufreq-imx6q-read-OCOTP-through-nvmem-for-imx6ul-im.patch \
^ permalink raw reply related [flat|nested] 10+ messages in thread* [3rdparty][PATCH 6/6] init-ifupdown: ccimx6ulsbcpro: Add interfaces file
2019-02-21 15:24 [3rdparty][PATCH 0/6] Add support for the ConnectCore 6UL SBC Pro board Alex Gonzalez
` (4 preceding siblings ...)
2019-02-21 15:24 ` [3rdparty][PATCH 5/6] linux-fslc: Add support for the ConnectCore 6UL SBC Pro Alex Gonzalez
@ 2019-02-21 15:24 ` Alex Gonzalez
2019-02-21 16:36 ` [3rdparty][PATCH 0/6] Add support for the ConnectCore 6UL SBC Pro board Otavio Salvador
6 siblings, 0 replies; 10+ messages in thread
From: Alex Gonzalez @ 2019-02-21 15:24 UTC (permalink / raw)
To: meta-freescale
The ConnectCore 6UL SBC Pro has a Wi-Fi interface with support for both
station and softAP modes, as well as two ethernet interfaces.
This commit adds an interfaces file that defines a wlan0 interface for the
station mode, a wlan1 interface for the softAP, and both eth0 and eth1
interfaces.
Note that the ethernet interface that is enabled in U-Boot is the eth1
interface in the Linux kernel.
Signed-off-by: Alex Gonzalez <alex.gonzalez@digi.com>
---
.../init-ifupdown/ccimx6ulsbcpro/interfaces | 46 ++++++++++++++++++++++
1 file changed, 46 insertions(+)
create mode 100644 recipes-core/init-ifupdown/init-ifupdown/ccimx6ulsbcpro/interfaces
diff --git a/recipes-core/init-ifupdown/init-ifupdown/ccimx6ulsbcpro/interfaces b/recipes-core/init-ifupdown/init-ifupdown/ccimx6ulsbcpro/interfaces
new file mode 100644
index 000000000000..53539e51cf22
--- /dev/null
+++ b/recipes-core/init-ifupdown/init-ifupdown/ccimx6ulsbcpro/interfaces
@@ -0,0 +1,46 @@
+# /etc/network/interfaces -- configuration file for ifup(8), ifdown(8)
+
+# The loopback interface
+auto lo
+iface lo inet loopback
+
+# Wireless interfaces
+
+# Client infrastructure mode
+auto wlan0
+iface wlan0 inet static
+ address 192.168.8.2
+ netmask 255.255.255.0
+ network 192.168.8.0
+ wireless_mode managed
+ wireless_essid any
+ wpa-driver nl80211
+ wpa-conf /etc/wpa_supplicant.conf
+
+# SoftAP mode
+auto wlan1
+iface wlan1 inet static
+ address 192.168.9.2
+ netmask 255.255.255.0
+ network 192.168.9.0
+ post-up /etc/init.d/hostapd start
+ pre-down /etc/init.d/hostapd stop
+
+iface atml0 inet dhcp
+
+# Wired or wireless interfaces
+auto eth1
+iface eth0 inet dhcp
+iface eth1 inet dhcp
+
+# Ethernet/RNDIS gadget (g_ether)
+# ... or on host side, usbnet and random hwaddr
+iface usb0 inet static
+ address 192.168.7.2
+ netmask 255.255.255.0
+ network 192.168.7.0
+ gateway 192.168.7.1
+
+# Bluetooth networking
+iface bnep0 inet dhcp
+
^ permalink raw reply related [flat|nested] 10+ messages in thread* Re: [3rdparty][PATCH 0/6] Add support for the ConnectCore 6UL SBC Pro board
2019-02-21 15:24 [3rdparty][PATCH 0/6] Add support for the ConnectCore 6UL SBC Pro board Alex Gonzalez
` (5 preceding siblings ...)
2019-02-21 15:24 ` [3rdparty][PATCH 6/6] init-ifupdown: ccimx6ulsbcpro: Add interfaces file Alex Gonzalez
@ 2019-02-21 16:36 ` Otavio Salvador
2019-02-27 12:53 ` Gonzalez, Alex
6 siblings, 1 reply; 10+ messages in thread
From: Otavio Salvador @ 2019-02-21 16:36 UTC (permalink / raw)
To: Alex Gonzalez; +Cc: meta-freescale Mailing List
Hello Alex,
On Thu, Feb 21, 2019 at 12:39 PM Alex Gonzalez <alex.gonzalez@digi.com> wrote:
>
> This patchset adds support for the ConnectCore 6UL SBC Pro board based on the ConnectCore 6UL SOM.
>
> Support for this board is added to the linux-fslc v4.19 kernel. Mainline linux v4.20 will already contain the board's support.
>
> More information about the hardware can be found at:
> https://www.digi.com/products/embedded-systems/single-board-computers/connectcore-for-i-mx6ul-sbc-pro
Could you prepare a PR on GitHub? Also, we just merged 4.20 bump so
please use it as base.
--
Otavio Salvador O.S. Systems
http://www.ossystems.com.br http://code.ossystems.com.br
Mobile: +55 (53) 9 9981-7854 Mobile: +1 (347) 903-9750
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [3rdparty][PATCH 0/6] Add support for the ConnectCore 6UL SBC Pro board
2019-02-21 16:36 ` [3rdparty][PATCH 0/6] Add support for the ConnectCore 6UL SBC Pro board Otavio Salvador
@ 2019-02-27 12:53 ` Gonzalez, Alex
2019-02-27 19:53 ` Otavio Salvador
0 siblings, 1 reply; 10+ messages in thread
From: Gonzalez, Alex @ 2019-02-27 12:53 UTC (permalink / raw)
To: Otavio Salvador; +Cc: meta-freescale Mailing List
>Could you prepare a PR on GitHub? Also, we just merged 4.20 bump so
>please use it as base.
>
Thanks Otavio, this is now done.
Do you prefer future PRs to meta-freescale-3rdparty to be done directly on
github without passing through the mailing list?
Regards,
Alex
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [3rdparty][PATCH 0/6] Add support for the ConnectCore 6UL SBC Pro board
2019-02-27 12:53 ` Gonzalez, Alex
@ 2019-02-27 19:53 ` Otavio Salvador
0 siblings, 0 replies; 10+ messages in thread
From: Otavio Salvador @ 2019-02-27 19:53 UTC (permalink / raw)
To: Gonzalez, Alex; +Cc: meta-freescale Mailing List
Hello Alex,
On Wed, Feb 27, 2019 at 9:53 AM Gonzalez, Alex <Alex.Gonzalez@digi.com> wrote:
> >Could you prepare a PR on GitHub? Also, we just merged 4.20 bump so
> >please use it as base.
>
> Thanks Otavio, this is now done.
>
> Do you prefer future PRs to meta-freescale-3rdparty to be done directly on
> github without passing through the mailing list?
It works fine for me. We are using github now and it makes the
workflow easier for most people.
--
Otavio Salvador O.S. Systems
http://www.ossystems.com.br http://code.ossystems.com.br
Mobile: +55 (53) 9 9981-7854 Mobile: +1 (347) 903-9750
^ permalink raw reply [flat|nested] 10+ messages in thread