summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Hemp <c.hemp@phytec.de>2016-03-31 10:15:41 (GMT)
committerStefan Müller-Klieser <s.mueller-klieser@phytec.de>2016-03-31 13:57:58 (GMT)
commitb4cc30220c68be6b7b065fc053f0a37eae1aca58 (patch)
tree5ccc7f144c98f0270f7172b687dd5b520d938a4e
parent9310869f536028e6a3d913d993179f7ea2bb07b5 (diff)
downloadmeta-phytec-b4cc30220c68be6b7b065fc053f0a37eae1aca58.zip
meta-phytec-b4cc30220c68be6b7b065fc053f0a37eae1aca58.tar.bz2
barebox: imx6: Update to v2015.11.0-phy4
Changes since v2015.11.0-phy3: ARM: dts: pfla02: use long enough reset for ethernet phy ARM: imx_v7_defconfig: enable NANDTEST command ARM: imx6: physom: fix phyflex workaround on Dual and Solo ARM: i.MX6: add function cpu_is_mx6s() Signed-off-by: Christian Hemp <c.hemp@phytec.de> Signed-off-by: Stefan Müller-Klieser <s.mueller-klieser@phytec.de>
-rw-r--r--recipes-bsp/barebox/barebox/features/nandtest.cfg1
-rw-r--r--recipes-bsp/barebox/barebox_2015.11.0-phy4.bb (renamed from recipes-bsp/barebox/barebox_2015.11.0-phy3.bb)5
-rw-r--r--recipes-bsp/barebox/env-2015.11.0-phy4/mx6/boardenv/.gitignore (renamed from recipes-bsp/barebox/env-2015.11.0-phy3/mx6/machineenv/.gitignore)0
-rw-r--r--recipes-bsp/barebox/env-2015.11.0-phy4/mx6/commonenv/boot/mmc (renamed from recipes-bsp/barebox/env-2015.11.0-phy3/mx6/commonenv/boot/mmc)0
-rw-r--r--recipes-bsp/barebox/env-2015.11.0-phy4/mx6/commonenv/boot/nand (renamed from recipes-bsp/barebox/env-2015.11.0-phy3/mx6/commonenv/boot/nand)0
-rw-r--r--recipes-bsp/barebox/env-2015.11.0-phy4/mx6/commonenv/boot/net (renamed from recipes-bsp/barebox/env-2015.11.0-phy3/mx6/commonenv/boot/net)0
-rw-r--r--recipes-bsp/barebox/env-2015.11.0-phy4/mx6/commonenv/boot/spi (renamed from recipes-bsp/barebox/env-2015.11.0-phy3/mx6/commonenv/boot/spi)0
-rw-r--r--recipes-bsp/barebox/env-2015.11.0-phy4/mx6/commonenv/expansions/imx6qdl-mira-enable-lvds (renamed from recipes-bsp/barebox/env-2015.11.0-phy3/mx6/commonenv/expansions/imx6qdl-mira-enable-lvds)0
-rw-r--r--recipes-bsp/barebox/env-2015.11.0-phy4/mx6/commonenv/expansions/imx6qdl-mira-peb-eval-01 (renamed from recipes-bsp/barebox/env-2015.11.0-phy3/mx6/commonenv/expansions/imx6qdl-mira-peb-eval-01)0
-rw-r--r--recipes-bsp/barebox/env-2015.11.0-phy4/mx6/commonenv/expansions/imx6qdl-phytec-lcd (renamed from recipes-bsp/barebox/env-2015.11.0-phy3/mx6/commonenv/expansions/imx6qdl-phytec-lcd)0
-rw-r--r--recipes-bsp/barebox/env-2015.11.0-phy4/mx6/commonenv/expansions/imx6qdl-phytec-lcd-018-peb-av-02 (renamed from recipes-bsp/barebox/env-2015.11.0-phy3/mx6/commonenv/expansions/imx6qdl-phytec-lcd-018-peb-av-02)0
-rw-r--r--recipes-bsp/barebox/env-2015.11.0-phy4/mx6/commonenv/expansions/imx6qdl-phytec-peb-wlbt-01 (renamed from recipes-bsp/barebox/env-2015.11.0-phy3/mx6/commonenv/expansions/imx6qdl-phytec-peb-wlbt-01)0
-rw-r--r--recipes-bsp/barebox/env-2015.11.0-phy4/mx6/commonenv/network/eth0 (renamed from recipes-bsp/barebox/env-2015.11.0-phy3/mx6/commonenv/network/eth0)0
-rw-r--r--recipes-bsp/barebox/env-2015.11.0-phy4/mx6/commonenv/nv/allow_color (renamed from recipes-bsp/barebox/env-2015.11.0-phy3/mx6/commonenv/nv/allow_color)0
-rw-r--r--recipes-bsp/barebox/env-2015.11.0-phy4/mx6/commonenv/nv/linux.bootargs.base (renamed from recipes-bsp/barebox/env-2015.11.0-phy3/mx6/commonenv/nv/linux.bootargs.base)0
-rw-r--r--recipes-bsp/barebox/env-2015.11.0-phy4/mx6/commonenv/nv/linux.bootargs.rootfs (renamed from recipes-bsp/barebox/env-2015.11.0-phy3/mx6/commonenv/nv/linux.bootargs.rootfs)0
-rw-r--r--recipes-bsp/barebox/env-2015.11.0-phy4/mx6/machineenv/.gitignore (renamed from recipes-bsp/barebox/env-2015.11.0-phy3/mx6/boardenv/.gitignore)0
-rw-r--r--recipes-bsp/barebox/env-2015.11.0-phy4/phyboard-alcor-imx6/boardenv/config-expansions (renamed from recipes-bsp/barebox/env-2015.11.0-phy3/phyboard-alcor-imx6/boardenv/config-expansions)0
-rw-r--r--recipes-bsp/barebox/env-2015.11.0-phy4/phyboard-mira-imx6-4/machineenv/nv/linux.bootargs.cma (renamed from recipes-bsp/barebox/env-2015.11.0-phy3/phyboard-mira-imx6-4/machineenv/nv/linux.bootargs.cma)0
-rw-r--r--recipes-bsp/barebox/env-2015.11.0-phy4/phyboard-mira-imx6-5/machineenv/nv/linux.bootargs.cma (renamed from recipes-bsp/barebox/env-2015.11.0-phy3/phyflex-imx6-4/machineenv/nv/linux.bootargs.cma)0
-rw-r--r--recipes-bsp/barebox/env-2015.11.0-phy4/phyboard-mira-imx6/boardenv/boot/emmc (renamed from recipes-bsp/barebox/env-2015.11.0-phy3/phyboard-mira-imx6/boardenv/boot/emmc)0
-rw-r--r--recipes-bsp/barebox/env-2015.11.0-phy4/phyboard-mira-imx6/boardenv/boot/mmc (renamed from recipes-bsp/barebox/env-2015.11.0-phy3/phyboard-mira-imx6/boardenv/boot/mmc)0
-rw-r--r--recipes-bsp/barebox/env-2015.11.0-phy4/phyboard-mira-imx6/boardenv/config-expansions (renamed from recipes-bsp/barebox/env-2015.11.0-phy3/phyboard-mira-imx6/boardenv/config-expansions)0
-rw-r--r--recipes-bsp/barebox/env-2015.11.0-phy4/phyboard-subra-imx6/boardenv/config-expansions (renamed from recipes-bsp/barebox/env-2015.11.0-phy3/phyboard-subra-imx6/boardenv/config-expansions)0
-rw-r--r--recipes-bsp/barebox/env-2015.11.0-phy4/phycard-imx6/boardenv/config-expansions (renamed from recipes-bsp/barebox/env-2015.11.0-phy3/phycard-imx6/boardenv/config-expansions)0
-rw-r--r--recipes-bsp/barebox/env-2015.11.0-phy4/phycard-imx6/boardenv/expansions/imx6qdl-phytec-lcd-res (renamed from recipes-bsp/barebox/env-2015.11.0-phy3/phycard-imx6/boardenv/expansions/imx6qdl-phytec-lcd-res)0
-rw-r--r--recipes-bsp/barebox/env-2015.11.0-phy4/phyflex-imx6-3/machineenv/nv/linux.bootargs.cma (renamed from recipes-bsp/barebox/env-2015.11.0-phy3/phyflex-imx6-3/machineenv/nv/linux.bootargs.cma)0
-rw-r--r--recipes-bsp/barebox/env-2015.11.0-phy4/phyflex-imx6-4/machineenv/nv/linux.bootargs.cma (renamed from recipes-bsp/barebox/env-2015.11.0-phy3/phyboard-mira-imx6-5/machineenv/nv/linux.bootargs.cma)0
-rw-r--r--recipes-bsp/barebox/env-2015.11.0-phy4/phyflex-imx6/boardenv/config-expansions (renamed from recipes-bsp/barebox/env-2015.11.0-phy3/phyflex-imx6/boardenv/config-expansions)0
-rw-r--r--recipes-bsp/barebox/env-2015.11.0-phy4/phyflex-imx6/boardenv/expansions/imx6qdl-phytec-lcd-res (renamed from recipes-bsp/barebox/env-2015.11.0-phy3/phyflex-imx6/boardenv/expansions/imx6qdl-phytec-lcd-res)0
30 files changed, 2 insertions, 4 deletions
diff --git a/recipes-bsp/barebox/barebox/features/nandtest.cfg b/recipes-bsp/barebox/barebox/features/nandtest.cfg
deleted file mode 100644
index 1a78c7b..0000000
--- a/recipes-bsp/barebox/barebox/features/nandtest.cfg
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CMD_NANDTEST=y
diff --git a/recipes-bsp/barebox/barebox_2015.11.0-phy3.bb b/recipes-bsp/barebox/barebox_2015.11.0-phy4.bb
index e523b1a..5515d31 100644
--- a/recipes-bsp/barebox/barebox_2015.11.0-phy3.bb
+++ b/recipes-bsp/barebox/barebox_2015.11.0-phy4.bb
@@ -6,13 +6,12 @@ inherit buildinfo
require barebox.inc
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}/features:"
-FILESEXTRAPATHS_prepend := "${THISDIR}/env-2015.11.0-phy3:"
+FILESEXTRAPATHS_prepend := "${THISDIR}/env-2015.11.0-phy4:"
GIT_URL = "git://git.phytec.de/${PN}"
SRC_URI = "${GIT_URL};branch=${BRANCH}"
SRC_URI_append = " \
file://no-blspec.cfg \
- file://nandtest.cfg \
file://commonenv \
file://boardenv \
file://machineenv \
@@ -23,7 +22,7 @@ S = "${WORKDIR}/git"
PR = "${INC_PR}.0"
# NOTE: Keep version in filename in sync with commit id!
-SRCREV = "3f9234a0bf87eb9304f4a05cc109a5f7d2bf1ef2"
+SRCREV = "c6deeede5e01353947dc7d943522952619f5b69e"
COMPATIBLE_MACHINE = "phyflex-imx6-1"
COMPATIBLE_MACHINE .= "|phyflex-imx6-2"
diff --git a/recipes-bsp/barebox/env-2015.11.0-phy3/mx6/machineenv/.gitignore b/recipes-bsp/barebox/env-2015.11.0-phy4/mx6/boardenv/.gitignore
index c5ca663..c5ca663 100644
--- a/recipes-bsp/barebox/env-2015.11.0-phy3/mx6/machineenv/.gitignore
+++ b/recipes-bsp/barebox/env-2015.11.0-phy4/mx6/boardenv/.gitignore
diff --git a/recipes-bsp/barebox/env-2015.11.0-phy3/mx6/commonenv/boot/mmc b/recipes-bsp/barebox/env-2015.11.0-phy4/mx6/commonenv/boot/mmc
index 2b1f714..2b1f714 100644
--- a/recipes-bsp/barebox/env-2015.11.0-phy3/mx6/commonenv/boot/mmc
+++ b/recipes-bsp/barebox/env-2015.11.0-phy4/mx6/commonenv/boot/mmc
diff --git a/recipes-bsp/barebox/env-2015.11.0-phy3/mx6/commonenv/boot/nand b/recipes-bsp/barebox/env-2015.11.0-phy4/mx6/commonenv/boot/nand
index 792fd9e..792fd9e 100644
--- a/recipes-bsp/barebox/env-2015.11.0-phy3/mx6/commonenv/boot/nand
+++ b/recipes-bsp/barebox/env-2015.11.0-phy4/mx6/commonenv/boot/nand
diff --git a/recipes-bsp/barebox/env-2015.11.0-phy3/mx6/commonenv/boot/net b/recipes-bsp/barebox/env-2015.11.0-phy4/mx6/commonenv/boot/net
index aa39d63..aa39d63 100644
--- a/recipes-bsp/barebox/env-2015.11.0-phy3/mx6/commonenv/boot/net
+++ b/recipes-bsp/barebox/env-2015.11.0-phy4/mx6/commonenv/boot/net
diff --git a/recipes-bsp/barebox/env-2015.11.0-phy3/mx6/commonenv/boot/spi b/recipes-bsp/barebox/env-2015.11.0-phy4/mx6/commonenv/boot/spi
index 9663467..9663467 100644
--- a/recipes-bsp/barebox/env-2015.11.0-phy3/mx6/commonenv/boot/spi
+++ b/recipes-bsp/barebox/env-2015.11.0-phy4/mx6/commonenv/boot/spi
diff --git a/recipes-bsp/barebox/env-2015.11.0-phy3/mx6/commonenv/expansions/imx6qdl-mira-enable-lvds b/recipes-bsp/barebox/env-2015.11.0-phy4/mx6/commonenv/expansions/imx6qdl-mira-enable-lvds
index 4c10b12..4c10b12 100644
--- a/recipes-bsp/barebox/env-2015.11.0-phy3/mx6/commonenv/expansions/imx6qdl-mira-enable-lvds
+++ b/recipes-bsp/barebox/env-2015.11.0-phy4/mx6/commonenv/expansions/imx6qdl-mira-enable-lvds
diff --git a/recipes-bsp/barebox/env-2015.11.0-phy3/mx6/commonenv/expansions/imx6qdl-mira-peb-eval-01 b/recipes-bsp/barebox/env-2015.11.0-phy4/mx6/commonenv/expansions/imx6qdl-mira-peb-eval-01
index 126f72e..126f72e 100644
--- a/recipes-bsp/barebox/env-2015.11.0-phy3/mx6/commonenv/expansions/imx6qdl-mira-peb-eval-01
+++ b/recipes-bsp/barebox/env-2015.11.0-phy4/mx6/commonenv/expansions/imx6qdl-mira-peb-eval-01
diff --git a/recipes-bsp/barebox/env-2015.11.0-phy3/mx6/commonenv/expansions/imx6qdl-phytec-lcd b/recipes-bsp/barebox/env-2015.11.0-phy4/mx6/commonenv/expansions/imx6qdl-phytec-lcd
index 7747bf2..7747bf2 100644
--- a/recipes-bsp/barebox/env-2015.11.0-phy3/mx6/commonenv/expansions/imx6qdl-phytec-lcd
+++ b/recipes-bsp/barebox/env-2015.11.0-phy4/mx6/commonenv/expansions/imx6qdl-phytec-lcd
diff --git a/recipes-bsp/barebox/env-2015.11.0-phy3/mx6/commonenv/expansions/imx6qdl-phytec-lcd-018-peb-av-02 b/recipes-bsp/barebox/env-2015.11.0-phy4/mx6/commonenv/expansions/imx6qdl-phytec-lcd-018-peb-av-02
index 6e3adda..6e3adda 100644
--- a/recipes-bsp/barebox/env-2015.11.0-phy3/mx6/commonenv/expansions/imx6qdl-phytec-lcd-018-peb-av-02
+++ b/recipes-bsp/barebox/env-2015.11.0-phy4/mx6/commonenv/expansions/imx6qdl-phytec-lcd-018-peb-av-02
diff --git a/recipes-bsp/barebox/env-2015.11.0-phy3/mx6/commonenv/expansions/imx6qdl-phytec-peb-wlbt-01 b/recipes-bsp/barebox/env-2015.11.0-phy4/mx6/commonenv/expansions/imx6qdl-phytec-peb-wlbt-01
index e73932d..e73932d 100644
--- a/recipes-bsp/barebox/env-2015.11.0-phy3/mx6/commonenv/expansions/imx6qdl-phytec-peb-wlbt-01
+++ b/recipes-bsp/barebox/env-2015.11.0-phy4/mx6/commonenv/expansions/imx6qdl-phytec-peb-wlbt-01
diff --git a/recipes-bsp/barebox/env-2015.11.0-phy3/mx6/commonenv/network/eth0 b/recipes-bsp/barebox/env-2015.11.0-phy4/mx6/commonenv/network/eth0
index 22b1c03..22b1c03 100644
--- a/recipes-bsp/barebox/env-2015.11.0-phy3/mx6/commonenv/network/eth0
+++ b/recipes-bsp/barebox/env-2015.11.0-phy4/mx6/commonenv/network/eth0
diff --git a/recipes-bsp/barebox/env-2015.11.0-phy3/mx6/commonenv/nv/allow_color b/recipes-bsp/barebox/env-2015.11.0-phy4/mx6/commonenv/nv/allow_color
index c508d53..c508d53 100644
--- a/recipes-bsp/barebox/env-2015.11.0-phy3/mx6/commonenv/nv/allow_color
+++ b/recipes-bsp/barebox/env-2015.11.0-phy4/mx6/commonenv/nv/allow_color
diff --git a/recipes-bsp/barebox/env-2015.11.0-phy3/mx6/commonenv/nv/linux.bootargs.base b/recipes-bsp/barebox/env-2015.11.0-phy4/mx6/commonenv/nv/linux.bootargs.base
index efc4ee6..efc4ee6 100644
--- a/recipes-bsp/barebox/env-2015.11.0-phy3/mx6/commonenv/nv/linux.bootargs.base
+++ b/recipes-bsp/barebox/env-2015.11.0-phy4/mx6/commonenv/nv/linux.bootargs.base
diff --git a/recipes-bsp/barebox/env-2015.11.0-phy3/mx6/commonenv/nv/linux.bootargs.rootfs b/recipes-bsp/barebox/env-2015.11.0-phy4/mx6/commonenv/nv/linux.bootargs.rootfs
index 199c7b5..199c7b5 100644
--- a/recipes-bsp/barebox/env-2015.11.0-phy3/mx6/commonenv/nv/linux.bootargs.rootfs
+++ b/recipes-bsp/barebox/env-2015.11.0-phy4/mx6/commonenv/nv/linux.bootargs.rootfs
diff --git a/recipes-bsp/barebox/env-2015.11.0-phy3/mx6/boardenv/.gitignore b/recipes-bsp/barebox/env-2015.11.0-phy4/mx6/machineenv/.gitignore
index c5ca663..c5ca663 100644
--- a/recipes-bsp/barebox/env-2015.11.0-phy3/mx6/boardenv/.gitignore
+++ b/recipes-bsp/barebox/env-2015.11.0-phy4/mx6/machineenv/.gitignore
diff --git a/recipes-bsp/barebox/env-2015.11.0-phy3/phyboard-alcor-imx6/boardenv/config-expansions b/recipes-bsp/barebox/env-2015.11.0-phy4/phyboard-alcor-imx6/boardenv/config-expansions
index 621b077..621b077 100644
--- a/recipes-bsp/barebox/env-2015.11.0-phy3/phyboard-alcor-imx6/boardenv/config-expansions
+++ b/recipes-bsp/barebox/env-2015.11.0-phy4/phyboard-alcor-imx6/boardenv/config-expansions
diff --git a/recipes-bsp/barebox/env-2015.11.0-phy3/phyboard-mira-imx6-4/machineenv/nv/linux.bootargs.cma b/recipes-bsp/barebox/env-2015.11.0-phy4/phyboard-mira-imx6-4/machineenv/nv/linux.bootargs.cma
index ba6030a..ba6030a 100644
--- a/recipes-bsp/barebox/env-2015.11.0-phy3/phyboard-mira-imx6-4/machineenv/nv/linux.bootargs.cma
+++ b/recipes-bsp/barebox/env-2015.11.0-phy4/phyboard-mira-imx6-4/machineenv/nv/linux.bootargs.cma
diff --git a/recipes-bsp/barebox/env-2015.11.0-phy3/phyflex-imx6-4/machineenv/nv/linux.bootargs.cma b/recipes-bsp/barebox/env-2015.11.0-phy4/phyboard-mira-imx6-5/machineenv/nv/linux.bootargs.cma
index b8a8b45..b8a8b45 100644
--- a/recipes-bsp/barebox/env-2015.11.0-phy3/phyflex-imx6-4/machineenv/nv/linux.bootargs.cma
+++ b/recipes-bsp/barebox/env-2015.11.0-phy4/phyboard-mira-imx6-5/machineenv/nv/linux.bootargs.cma
diff --git a/recipes-bsp/barebox/env-2015.11.0-phy3/phyboard-mira-imx6/boardenv/boot/emmc b/recipes-bsp/barebox/env-2015.11.0-phy4/phyboard-mira-imx6/boardenv/boot/emmc
index 8826e2c..8826e2c 100644
--- a/recipes-bsp/barebox/env-2015.11.0-phy3/phyboard-mira-imx6/boardenv/boot/emmc
+++ b/recipes-bsp/barebox/env-2015.11.0-phy4/phyboard-mira-imx6/boardenv/boot/emmc
diff --git a/recipes-bsp/barebox/env-2015.11.0-phy3/phyboard-mira-imx6/boardenv/boot/mmc b/recipes-bsp/barebox/env-2015.11.0-phy4/phyboard-mira-imx6/boardenv/boot/mmc
index 708d1e9..708d1e9 100644
--- a/recipes-bsp/barebox/env-2015.11.0-phy3/phyboard-mira-imx6/boardenv/boot/mmc
+++ b/recipes-bsp/barebox/env-2015.11.0-phy4/phyboard-mira-imx6/boardenv/boot/mmc
diff --git a/recipes-bsp/barebox/env-2015.11.0-phy3/phyboard-mira-imx6/boardenv/config-expansions b/recipes-bsp/barebox/env-2015.11.0-phy4/phyboard-mira-imx6/boardenv/config-expansions
index fb59900..fb59900 100644
--- a/recipes-bsp/barebox/env-2015.11.0-phy3/phyboard-mira-imx6/boardenv/config-expansions
+++ b/recipes-bsp/barebox/env-2015.11.0-phy4/phyboard-mira-imx6/boardenv/config-expansions
diff --git a/recipes-bsp/barebox/env-2015.11.0-phy3/phyboard-subra-imx6/boardenv/config-expansions b/recipes-bsp/barebox/env-2015.11.0-phy4/phyboard-subra-imx6/boardenv/config-expansions
index 92f08ca..92f08ca 100644
--- a/recipes-bsp/barebox/env-2015.11.0-phy3/phyboard-subra-imx6/boardenv/config-expansions
+++ b/recipes-bsp/barebox/env-2015.11.0-phy4/phyboard-subra-imx6/boardenv/config-expansions
diff --git a/recipes-bsp/barebox/env-2015.11.0-phy3/phycard-imx6/boardenv/config-expansions b/recipes-bsp/barebox/env-2015.11.0-phy4/phycard-imx6/boardenv/config-expansions
index 98d1944..98d1944 100644
--- a/recipes-bsp/barebox/env-2015.11.0-phy3/phycard-imx6/boardenv/config-expansions
+++ b/recipes-bsp/barebox/env-2015.11.0-phy4/phycard-imx6/boardenv/config-expansions
diff --git a/recipes-bsp/barebox/env-2015.11.0-phy3/phycard-imx6/boardenv/expansions/imx6qdl-phytec-lcd-res b/recipes-bsp/barebox/env-2015.11.0-phy4/phycard-imx6/boardenv/expansions/imx6qdl-phytec-lcd-res
index 49b4a7d..49b4a7d 100644
--- a/recipes-bsp/barebox/env-2015.11.0-phy3/phycard-imx6/boardenv/expansions/imx6qdl-phytec-lcd-res
+++ b/recipes-bsp/barebox/env-2015.11.0-phy4/phycard-imx6/boardenv/expansions/imx6qdl-phytec-lcd-res
diff --git a/recipes-bsp/barebox/env-2015.11.0-phy3/phyflex-imx6-3/machineenv/nv/linux.bootargs.cma b/recipes-bsp/barebox/env-2015.11.0-phy4/phyflex-imx6-3/machineenv/nv/linux.bootargs.cma
index b8a8b45..b8a8b45 100644
--- a/recipes-bsp/barebox/env-2015.11.0-phy3/phyflex-imx6-3/machineenv/nv/linux.bootargs.cma
+++ b/recipes-bsp/barebox/env-2015.11.0-phy4/phyflex-imx6-3/machineenv/nv/linux.bootargs.cma
diff --git a/recipes-bsp/barebox/env-2015.11.0-phy3/phyboard-mira-imx6-5/machineenv/nv/linux.bootargs.cma b/recipes-bsp/barebox/env-2015.11.0-phy4/phyflex-imx6-4/machineenv/nv/linux.bootargs.cma
index b8a8b45..b8a8b45 100644
--- a/recipes-bsp/barebox/env-2015.11.0-phy3/phyboard-mira-imx6-5/machineenv/nv/linux.bootargs.cma
+++ b/recipes-bsp/barebox/env-2015.11.0-phy4/phyflex-imx6-4/machineenv/nv/linux.bootargs.cma
diff --git a/recipes-bsp/barebox/env-2015.11.0-phy3/phyflex-imx6/boardenv/config-expansions b/recipes-bsp/barebox/env-2015.11.0-phy4/phyflex-imx6/boardenv/config-expansions
index 2a36fa7..2a36fa7 100644
--- a/recipes-bsp/barebox/env-2015.11.0-phy3/phyflex-imx6/boardenv/config-expansions
+++ b/recipes-bsp/barebox/env-2015.11.0-phy4/phyflex-imx6/boardenv/config-expansions
diff --git a/recipes-bsp/barebox/env-2015.11.0-phy3/phyflex-imx6/boardenv/expansions/imx6qdl-phytec-lcd-res b/recipes-bsp/barebox/env-2015.11.0-phy4/phyflex-imx6/boardenv/expansions/imx6qdl-phytec-lcd-res
index 2b228f0..2b228f0 100644
--- a/recipes-bsp/barebox/env-2015.11.0-phy3/phyflex-imx6/boardenv/expansions/imx6qdl-phytec-lcd-res
+++ b/recipes-bsp/barebox/env-2015.11.0-phy4/phyflex-imx6/boardenv/expansions/imx6qdl-phytec-lcd-res