summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Hemp <c.hemp@phytec.de>2016-12-09 14:05:17 +0100
committerStefan Müller-Klieser <s.mueller-klieser@phytec.de>2016-12-09 15:42:10 +0100
commite8755c4dead912046449a1a5d2feb3f576c43806 (patch)
tree2294722bf868e4d7ddaa8e7021f24cbd503d4dbd
parentd284fa1ba829ea11847271bdb429105ffa74cd4b (diff)
downloadmeta-phytec-e8755c4dead912046449a1a5d2feb3f576c43806.tar.bz2
meta-phytec-e8755c4dead912046449a1a5d2feb3f576c43806.zip
machine: Add two new mira machines
Add phyboard-mira-imx6-10: * same as phyboard-mira-3 but with enabled wlan (PB-01501-004.A1) Add phyboard-mira-imx6-11: * same as phyboard-mira-3 but with enable display ETM700 by default (PB-01501-005.A1) Signed-off-by: Christian Hemp <c.hemp@phytec.de> Signed-off-by: Stefan Müller-Klieser <s.mueller-klieser@phytec.de>
-rw-r--r--conf/machine/phyboard-mira-imx6-10.conf21
-rw-r--r--conf/machine/phyboard-mira-imx6-11.conf21
-rw-r--r--recipes-bsp/barebox/barebox_2016.11.0-phy1.bb54
-rw-r--r--recipes-kernel/linux/linux-mainline_4.1.35-phy1.bb4
4 files changed, 99 insertions, 1 deletions
diff --git a/conf/machine/phyboard-mira-imx6-10.conf b/conf/machine/phyboard-mira-imx6-10.conf
new file mode 100644
index 0000000..3d50a05
--- /dev/null
+++ b/conf/machine/phyboard-mira-imx6-10.conf
@@ -0,0 +1,21 @@
+#@TYPE: Machine
+#@NAME: phyboard-mira-imx6-10
+#@DESCRIPTION: i.MX6 Quad, 1GB RAM, NAND with PEB-WLBT-01(Wifi)
+#@ARTICLENUMBERS: PB-01501-004.A1, PBA-C-06-002.A2, PCM-058-33230C0I.A3
+#@SUPPORTEDIMAGE: phytec-qt5demo-image
+#from http://www.phytec.de
+
+require conf/machine/include/phyimx6qdl.inc
+
+SOC_FAMILY .= ":mx6q"
+SOC_FAMILY .= ":phyboard-mira-imx6"
+
+# Kernel
+KERNEL_DEVICETREE = "imx6q-phytec-mira-rdk-nand.dtb"
+
+# Barebox Config
+BAREBOX_BIN = "images/barebox-phytec-phycore-imx6q-som-nand-1gib.img"
+
+MACHINE_FEATURES += "resistivetouch pci can wifi"
+
+SERIAL_CONSOLES = "115200;ttymxc1"
diff --git a/conf/machine/phyboard-mira-imx6-11.conf b/conf/machine/phyboard-mira-imx6-11.conf
new file mode 100644
index 0000000..2dc89da
--- /dev/null
+++ b/conf/machine/phyboard-mira-imx6-11.conf
@@ -0,0 +1,21 @@
+#@TYPE: Machine
+#@NAME: phyboard-mira-imx6-11
+#@DESCRIPTION: i.MX6 Quad, 1GB RAM, NAND with Display ETM700
+#@ARTICLENUMBERS: PB-01501-005.A2, PBA-C-06-002.A2, PCM-058-33230C0I.A3
+#@SUPPORTEDIMAGE: phytec-qt5demo-image
+#from http://www.phytec.de
+
+require conf/machine/include/phyimx6qdl.inc
+
+SOC_FAMILY .= ":mx6q"
+SOC_FAMILY .= ":phyboard-mira-imx6"
+
+# Kernel
+KERNEL_DEVICETREE = "imx6q-phytec-mira-rdk-nand.dtb"
+
+# Barebox Config
+BAREBOX_BIN = "images/barebox-phytec-phycore-imx6q-som-nand-1gib.img"
+
+MACHINE_FEATURES += "resistivetouch pci can wifi"
+
+SERIAL_CONSOLES = "115200;ttymxc1"
diff --git a/recipes-bsp/barebox/barebox_2016.11.0-phy1.bb b/recipes-bsp/barebox/barebox_2016.11.0-phy1.bb
index edcff07..89d0b83 100644
--- a/recipes-bsp/barebox/barebox_2016.11.0-phy1.bb
+++ b/recipes-bsp/barebox/barebox_2016.11.0-phy1.bb
@@ -300,6 +300,58 @@ python do_env_append_phyboard-mira-imx6-5() {
env_add(d, "nv/linux.bootargs.cma", "cma=265M@1G\n")
}
+python do_env_append_phyboard-mira-imx6-10() {
+ env_add(d, "config-expansions",
+"""#!/bin/sh
+
+. /env/expansions/imx6qdl-mira-peb-eval-01
+#. /env/expansions/imx6qdl-phytec-lcd-018-peb-av-02
+#. /env/expansions/imx6qdl-mira-enable-lvds
+. /env/expansions/imx6qdl-phytec-peb-wlbt-01
+
+# imx6qdl-phytec-lcd: 7" display
+#of_display_timings -S /display@di0/display-timings/ETM0700G0BDH6
+
+# imx6qdl-phytec-lcd: 5.7" display
+#of_display_timings -S /display@di0/display-timings/ETMV570G2DHU
+
+# imx6qdl-phytec-lcd: 4.3" display
+#of_display_timings -S /display@di0/display-timings/ETM0430G0DH6
+
+# imx6qdl-phytec-lcd: 3.5" display
+#of_display_timings -S /display@di0/display-timings/ETM0350G0DH6
+
+#Enable VM-010-BW-LVDS
+#of_camera_selection -a 0x48 -p 0 -b phyCAM-S+ VM-010-BW
+""")
+}
+
+python do_env_append_phyboard-mira-imx6-11() {
+ env_add(d, "config-expansions",
+"""#!/bin/sh
+
+. /env/expansions/imx6qdl-mira-peb-eval-01
+. /env/expansions/imx6qdl-phytec-lcd-018-peb-av-02
+#. /env/expansions/imx6qdl-mira-enable-lvds
+#. /env/expansions/imx6qdl-phytec-peb-wlbt-01
+
+# imx6qdl-phytec-lcd: 7" display
+of_display_timings -S /display@di0/display-timings/ETM0700G0BDH6
+
+# imx6qdl-phytec-lcd: 5.7" display
+#of_display_timings -S /display@di0/display-timings/ETMV570G2DHU
+
+# imx6qdl-phytec-lcd: 4.3" display
+#of_display_timings -S /display@di0/display-timings/ETM0430G0DH6
+
+# imx6qdl-phytec-lcd: 3.5" display
+#of_display_timings -S /display@di0/display-timings/ETM0350G0DH6
+
+#Enable VM-010-BW-LVDS
+#of_camera_selection -a 0x48 -p 0 -b phyCAM-S+ VM-010-BW
+""")
+}
+
COMPATIBLE_MACHINE = "phyflex-imx6-1"
COMPATIBLE_MACHINE .= "|phyflex-imx6-2"
COMPATIBLE_MACHINE .= "|phyflex-imx6-3"
@@ -322,3 +374,5 @@ COMPATIBLE_MACHINE .= "|phyboard-mira-imx6-3"
COMPATIBLE_MACHINE .= "|phyboard-mira-imx6-4"
COMPATIBLE_MACHINE .= "|phyboard-mira-imx6-5"
COMPATIBLE_MACHINE .= "|phyboard-mira-imx6-7"
+COMPATIBLE_MACHINE .= "|phyboard-mira-imx6-10"
+COMPATIBLE_MACHINE .= "|phyboard-mira-imx6-11"
diff --git a/recipes-kernel/linux/linux-mainline_4.1.35-phy1.bb b/recipes-kernel/linux/linux-mainline_4.1.35-phy1.bb
index 2989028..379215f 100644
--- a/recipes-kernel/linux/linux-mainline_4.1.35-phy1.bb
+++ b/recipes-kernel/linux/linux-mainline_4.1.35-phy1.bb
@@ -8,7 +8,7 @@ include linux-common.inc
GIT_URL = "git://git.phytec.de/${PN}"
SRC_URI = "${GIT_URL};branch=${BRANCH}"
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.1"
# NOTE: PV must be in the format "x.y.z-.*". It cannot begin with a 'v'.
# NOTE: Keep version in filename in sync with commit id!
@@ -38,3 +38,5 @@ COMPATIBLE_MACHINE .= "|phyboard-mira-imx6-3"
COMPATIBLE_MACHINE .= "|phyboard-mira-imx6-4"
COMPATIBLE_MACHINE .= "|phyboard-mira-imx6-5"
COMPATIBLE_MACHINE .= "|phyboard-mira-imx6-7"
+COMPATIBLE_MACHINE .= "|phyboard-mira-imx6-10"
+COMPATIBLE_MACHINE .= "|phyboard-mira-imx6-11"