summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Hemp <c.hemp@phytec.de>2015-08-12 08:56:33 (GMT)
committerStefan Müller-Klieser <s.mueller-klieser@phytec.de>2015-08-12 09:50:34 (GMT)
commit21f373f325054609b5fa10f4124978ced295b396 (patch)
tree34e7675184235cfea6a7de743bc5dce742e4ad66
parentc8e09efa3b4785a1beef9a141b5d6e690d2c9cab (diff)
downloadmeta-phytec-21f373f325054609b5fa10f4124978ced295b396.zip
meta-phytec-21f373f325054609b5fa10f4124978ced295b396.tar.bz2
Add new phyboard-mira machines
Add the machine phyboard-mira-imx6-3 and phyboard-mira-imx6-4 and remove the old prototype machines phyboard-mira-imx6-1 and phyboard-mira-imx6-2. phyboard-mira-imx6-3: Full featured MIRA with: - phyCORE-i.MX6 Quad 1GB RAM - 1Gbit Ethernet - mPCIe - CAN - HDMI - Camera (VM-010 mono) - UART3 - SD - USB - USB otg phyboard-mira-imx6-4: Low Cost MIRA with: - phyCORE-i.MX6 SOLO 256MB RAM - 10/100 Mbit Ethernet - HDMI - SD - USB - USB otg Signed-off-by: Christian Hemp <c.hemp@phytec.de> Conflicts: conf/machine/phyboard-mira-imx6-3.conf conf/machine/phyboard-mira-imx6-4.conf Signed-off-by: Stefan Müller-Klieser <s.mueller-klieser@phytec.de>
-rw-r--r--conf/machine/phyboard-mira-imx6-2.conf20
-rw-r--r--conf/machine/phyboard-mira-imx6-3.conf (renamed from conf/machine/phyboard-mira-imx6-1.conf)10
-rw-r--r--conf/machine/phyboard-mira-imx6-4.conf18
-rw-r--r--recipes-bsp/barebox/barebox_2015.02.0-phy2.bb2
-rw-r--r--recipes-kernel/linux/linux-mainline_3.19.5-phy4.bb2
5 files changed, 23 insertions, 29 deletions
diff --git a/conf/machine/phyboard-mira-imx6-2.conf b/conf/machine/phyboard-mira-imx6-2.conf
deleted file mode 100644
index 2375117..0000000
--- a/conf/machine/phyboard-mira-imx6-2.conf
+++ /dev/null
@@ -1,20 +0,0 @@
-#@TYPE: Machine
-#@NAME: phyboard-mira-imx6-2
-#@DESCRIPTION: PB-01501-001.A0 (i.MX6 Solo, 256MB RAM) [Prototype Hardware!]
-#from http://www.phytec.de
-
-require conf/machine/include/phyimx6.inc
-
-SOC_FAMILY_append := ":mx6q"
-
-# Kernel
-KERNEL_DEVICETREE = "imx6dl-phytec-mira-rdk.dtb"
-KBUILD_DEFCONFIG = "imx_v6_v7_defconfig"
-
-# Barebox Config
-BAREBOX_BIN = "images/barebox-phytec-phycore-imx6dl-som-256mb.img"
-BAREBOX_DEFAULT_ENV = "arch/arm/boards/phytec-phycore-imx6/defaultenv-phycore-imx6"
-
-MACHINE_FEATURES += "can"
-
-SERIAL_CONSOLES = "115200;ttymxc1"
diff --git a/conf/machine/phyboard-mira-imx6-1.conf b/conf/machine/phyboard-mira-imx6-3.conf
index 9e1deeb..5a44fe9 100644
--- a/conf/machine/phyboard-mira-imx6-1.conf
+++ b/conf/machine/phyboard-mira-imx6-3.conf
@@ -1,6 +1,6 @@
#@TYPE: Machine
-#@NAME: phyboard-mira-imx6-1
-#@DESCRIPTION: PB-01501-002.A0 (i.MX6 Quad, 1GB RAM) [Prototype Hardware!]
+#@NAME: phyboard-mira-imx6-3
+#@DESCRIPTION: PB-01501-002.A2 (i.MX6 Quad, 1GB RAM)
#from http://www.phytec.de
require conf/machine/include/phyimx6.inc
@@ -8,13 +8,13 @@ require conf/machine/include/phyimx6.inc
SOC_FAMILY_append := ":mx6q"
# Kernel
-KERNEL_DEVICETREE = "imx6q-phytec-mira-rdk.dtb"
+KERNEL_DEVICETREE = "imx6q-phytec-mira-rdk-nand.dtb"
KBUILD_DEFCONFIG = "imx_v6_v7_defconfig"
# Barebox Config
-BAREBOX_BIN = "images/barebox-phytec-phycore-imx6q-som-1gib.img"
+BAREBOX_BIN = "images/barebox-phytec-phycore-imx6q-som-nand-1gib.img"
BAREBOX_DEFAULT_ENV = "arch/arm/boards/phytec-phycore-imx6/defaultenv-phycore-imx6"
-MACHINE_FEATURES += "pci can"
+MACHINE_FEATURES += "touchscreen pci can"
SERIAL_CONSOLES = "115200;ttymxc1"
diff --git a/conf/machine/phyboard-mira-imx6-4.conf b/conf/machine/phyboard-mira-imx6-4.conf
new file mode 100644
index 0000000..c752ede
--- /dev/null
+++ b/conf/machine/phyboard-mira-imx6-4.conf
@@ -0,0 +1,18 @@
+#@TYPE: Machine
+#@NAME: phyboard-mira-imx6-4
+#@DESCRIPTION: PB-01501-001.A2 (i.MX6 Solo, 256MB RAM) [Not verified RAM calibration values]
+#from http://www.phytec.de
+
+require conf/machine/include/phyimx6.inc
+
+SOC_FAMILY_append := ":mx6dl"
+
+# Kernel
+KERNEL_DEVICETREE = "imx6dl-phytec-mira-rdk-nand.dtb"
+KBUILD_DEFCONFIG = "imx_v6_v7_defconfig"
+
+# Barebox Config
+BAREBOX_BIN = "images/barebox-phytec-phycore-imx6dl-som-nand-256mb.img"
+BAREBOX_DEFAULT_ENV = "arch/arm/boards/phytec-phycore-imx6/defaultenv-phycore-imx6"
+
+SERIAL_CONSOLES = "115200;ttymxc1"
diff --git a/recipes-bsp/barebox/barebox_2015.02.0-phy2.bb b/recipes-bsp/barebox/barebox_2015.02.0-phy2.bb
index 7e5d9c5..ab77eb7 100644
--- a/recipes-bsp/barebox/barebox_2015.02.0-phy2.bb
+++ b/recipes-bsp/barebox/barebox_2015.02.0-phy2.bb
@@ -40,5 +40,3 @@ COMPATIBLE_MACHINE .= "|phycard-imx6-2"
COMPATIBLE_MACHINE .= "|phyboard-alcor-imx6-1"
COMPATIBLE_MACHINE .= "|phyboard-subra-imx6-1"
-COMPATIBLE_MACHINE .= "|phyboard-mira-imx6-1"
-COMPATIBLE_MACHINE .= "|phyboard-mira-imx6-2"
diff --git a/recipes-kernel/linux/linux-mainline_3.19.5-phy4.bb b/recipes-kernel/linux/linux-mainline_3.19.5-phy4.bb
index a8e3d44..8b392e2 100644
--- a/recipes-kernel/linux/linux-mainline_3.19.5-phy4.bb
+++ b/recipes-kernel/linux/linux-mainline_3.19.5-phy4.bb
@@ -40,5 +40,3 @@ COMPATIBLE_MACHINE .= "|phycard-imx6-2"
COMPATIBLE_MACHINE .= "|phyboard-alcor-imx6-1"
COMPATIBLE_MACHINE .= "|phyboard-subra-imx6-1"
-COMPATIBLE_MACHINE .= "|phyboard-mira-imx6-1"
-COMPATIBLE_MACHINE .= "|phyboard-mira-imx6-2"