summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaik Otto <m.otto@phytec.de>2019-12-16 12:52:01 (GMT)
committerStefan Müller-Klieser <s.mueller-klieser@phytec.de>2019-12-19 12:20:15 (GMT)
commitf15a872f40d39a57ad7cb2d0612ec17096e5950b (patch)
tree6ef57f1e2080b6e8ea78ab80a8fcbf7fff924617
parent28c37d32195d204d1a82ff2a10452f5edce978d5 (diff)
downloadmeta-phytec-f15a872f40d39a57ad7cb2d0612ec17096e5950b.zip
meta-phytec-f15a872f40d39a57ad7cb2d0612ec17096e5950b.tar.bz2
i.mx6: change to generic path for barebox image name
the barebox in PD20 will be have a parallel image build for unsigned, signed, usb signed and encrypted images. so the machines have been reworked to integrate this functionality with a generic barebox image name Signed-off-by: Maik Otto <m.otto@phytec.de> Signed-off-by: Stefan Müller-Klieser <s.mueller-klieser@phytec.de>
-rw-r--r--conf/machine/phyboard-mira-imx6-10.conf2
-rw-r--r--conf/machine/phyboard-mira-imx6-11.conf2
-rw-r--r--conf/machine/phyboard-mira-imx6-12.conf2
-rw-r--r--conf/machine/phyboard-mira-imx6-13.conf2
-rw-r--r--conf/machine/phyboard-mira-imx6-14.conf2
-rw-r--r--conf/machine/phyboard-mira-imx6-15.conf2
-rw-r--r--conf/machine/phyboard-mira-imx6-3.conf2
-rw-r--r--conf/machine/phyboard-mira-imx6-4.conf2
-rw-r--r--conf/machine/phyboard-mira-imx6-5.conf2
-rw-r--r--conf/machine/phyboard-mira-imx6-6.conf2
-rw-r--r--conf/machine/phyboard-mira-imx6-7.conf2
-rw-r--r--conf/machine/phyboard-mira-imx6-8.conf2
-rw-r--r--conf/machine/phyboard-mira-imx6-9.conf2
-rw-r--r--conf/machine/phyboard-nunki-imx6-1.conf2
-rw-r--r--conf/machine/phyboard-segin-imx6ul-2.conf2
-rw-r--r--conf/machine/phyboard-segin-imx6ul-3.conf2
-rw-r--r--conf/machine/phyboard-segin-imx6ul-4.conf2
-rw-r--r--conf/machine/phyboard-segin-imx6ul-5.conf2
-rw-r--r--conf/machine/phyboard-segin-imx6ul-6.conf2
-rw-r--r--conf/machine/phyboard-segin-imx6ul-7.conf2
-rw-r--r--conf/machine/phyflex-imx6-1.conf2
-rw-r--r--conf/machine/phyflex-imx6-10.conf2
-rw-r--r--conf/machine/phyflex-imx6-11.conf2
-rw-r--r--conf/machine/phyflex-imx6-2.conf2
-rw-r--r--conf/machine/phyflex-imx6-3.conf2
-rw-r--r--conf/machine/phyflex-imx6-4.conf2
-rw-r--r--conf/machine/phyflex-imx6-5.conf2
-rw-r--r--conf/machine/phyflex-imx6-6.conf2
-rw-r--r--conf/machine/phyflex-imx6-7.conf2
-rw-r--r--conf/machine/phyflex-imx6-8.conf2
-rw-r--r--conf/machine/phyflex-imx6-9.conf2
-rw-r--r--recipes-bsp/barebox/barebox.inc3
32 files changed, 33 insertions, 32 deletions
diff --git a/conf/machine/phyboard-mira-imx6-10.conf b/conf/machine/phyboard-mira-imx6-10.conf
index c089053..052f0fe 100644
--- a/conf/machine/phyboard-mira-imx6-10.conf
+++ b/conf/machine/phyboard-mira-imx6-10.conf
@@ -12,7 +12,7 @@ SOC_FAMILY .= ":phyboard-mira-imx6"
KERNEL_DEVICETREE = "imx6q-phytec-mira-ff-rdk-nand.dtb"
# Barebox Config
-BAREBOX_BIN = "images/barebox-phytec-phycore-imx6q-som-nand-1gib.img"
+BAREBOX_BASE_BIN = "barebox-phytec-phycore-imx6q-som-nand-1gib"
MACHINE_FEATURES += "resistivetouch pci can wifi"
diff --git a/conf/machine/phyboard-mira-imx6-11.conf b/conf/machine/phyboard-mira-imx6-11.conf
index 327fc6e..20096c6 100644
--- a/conf/machine/phyboard-mira-imx6-11.conf
+++ b/conf/machine/phyboard-mira-imx6-11.conf
@@ -12,7 +12,7 @@ SOC_FAMILY .= ":phyboard-mira-imx6"
KERNEL_DEVICETREE = "imx6q-phytec-mira-ff-rdk-nand.dtb"
# Barebox Config
-BAREBOX_BIN = "images/barebox-phytec-phycore-imx6q-som-nand-1gib.img"
+BAREBOX_BASE_BIN = "barebox-phytec-phycore-imx6q-som-nand-1gib"
MACHINE_FEATURES += "resistivetouch pci can wifi"
diff --git a/conf/machine/phyboard-mira-imx6-12.conf b/conf/machine/phyboard-mira-imx6-12.conf
index 4f3bd56..dfddea4 100644
--- a/conf/machine/phyboard-mira-imx6-12.conf
+++ b/conf/machine/phyboard-mira-imx6-12.conf
@@ -12,7 +12,7 @@ SOC_FAMILY .= ":phyboard-mira-imx6"
KERNEL_DEVICETREE = "imx6q-phytec-mira-ff-rdk-nand-rs485.dtb"
# Barebox Config
-BAREBOX_BIN = "images/barebox-phytec-phycore-imx6q-som-nand-1gib.img"
+BAREBOX_BASE_BIN = "barebox-phytec-phycore-imx6q-som-nand-1gib"
MACHINE_FEATURES += "resistivetouch pci can wifi"
diff --git a/conf/machine/phyboard-mira-imx6-13.conf b/conf/machine/phyboard-mira-imx6-13.conf
index 0039514..dbfeda3 100644
--- a/conf/machine/phyboard-mira-imx6-13.conf
+++ b/conf/machine/phyboard-mira-imx6-13.conf
@@ -12,7 +12,7 @@ SOC_FAMILY .= ":phyboard-mira-imx6"
KERNEL_DEVICETREE = "imx6q-phytec-mira-ff-rdk-nand.dtb"
# Barebox Config
-BAREBOX_BIN = "images/barebox-phytec-phycore-imx6q-som-nand-1gib.img"
+BAREBOX_BASE_BIN = "barebox-phytec-phycore-imx6q-som-nand-1gib"
MACHINE_FEATURES += "resistivetouch pci can wifi"
diff --git a/conf/machine/phyboard-mira-imx6-14.conf b/conf/machine/phyboard-mira-imx6-14.conf
index 1c0b676..aaa987e 100644
--- a/conf/machine/phyboard-mira-imx6-14.conf
+++ b/conf/machine/phyboard-mira-imx6-14.conf
@@ -12,7 +12,7 @@ SOC_FAMILY .= ":phyboard-mira-imx6"
KERNEL_DEVICETREE = "imx6dl-phytec-mira-ff-rdk-emmc.dtb"
# Barebox Config
-BAREBOX_BIN = "images/barebox-phytec-phycore-imx6dl-som-emmc-1gib.img"
+BAREBOX_BASE_BIN = "barebox-phytec-phycore-imx6dl-som-emmc-1gib"
MACHINE_FEATURES += "resistivetouch pci can wifi"
diff --git a/conf/machine/phyboard-mira-imx6-15.conf b/conf/machine/phyboard-mira-imx6-15.conf
index a55365c..7cbce56 100644
--- a/conf/machine/phyboard-mira-imx6-15.conf
+++ b/conf/machine/phyboard-mira-imx6-15.conf
@@ -12,7 +12,7 @@ SOC_FAMILY .= ":phyboard-mira-imx6"
KERNEL_DEVICETREE = "imx6dl-phytec-mira-ff-rdk-nand.dtb"
# Barebox Config
-BAREBOX_BIN = "images/barebox-phytec-phycore-imx6dl-som-nand-256mb.img"
+BAREBOX_BASE_BIN = "barebox-phytec-phycore-imx6dl-som-nand-256mb"
MACHINE_FEATURES += "resistivetouch pci can wifi"
diff --git a/conf/machine/phyboard-mira-imx6-3.conf b/conf/machine/phyboard-mira-imx6-3.conf
index d64e897..4b5adb0 100644
--- a/conf/machine/phyboard-mira-imx6-3.conf
+++ b/conf/machine/phyboard-mira-imx6-3.conf
@@ -12,7 +12,7 @@ SOC_FAMILY .= ":phyboard-mira-imx6"
KERNEL_DEVICETREE = "imx6q-phytec-mira-ff-rdk-nand.dtb"
# Barebox Config
-BAREBOX_BIN = "images/barebox-phytec-phycore-imx6q-som-nand-1gib.img"
+BAREBOX_BASE_BIN = "barebox-phytec-phycore-imx6q-som-nand-1gib"
MACHINE_FEATURES += "resistivetouch pci can wifi"
diff --git a/conf/machine/phyboard-mira-imx6-4.conf b/conf/machine/phyboard-mira-imx6-4.conf
index d07adb8..2ac1a8d 100644
--- a/conf/machine/phyboard-mira-imx6-4.conf
+++ b/conf/machine/phyboard-mira-imx6-4.conf
@@ -12,7 +12,7 @@ SOC_FAMILY .= ":phyboard-mira-imx6"
KERNEL_DEVICETREE = "imx6dl-phytec-mira-lc-rdk-nand.dtb"
# Barebox Config
-BAREBOX_BIN = "images/barebox-phytec-phycore-imx6dl-som-lc-nand-256mb.img"
+BAREBOX_BASE_BIN = "barebox-phytec-phycore-imx6dl-som-lc-nand-256mb"
MACHINE_FEATURES += "wifi"
diff --git a/conf/machine/phyboard-mira-imx6-5.conf b/conf/machine/phyboard-mira-imx6-5.conf
index b92dfa4..6dfe6c3 100644
--- a/conf/machine/phyboard-mira-imx6-5.conf
+++ b/conf/machine/phyboard-mira-imx6-5.conf
@@ -12,7 +12,7 @@ SOC_FAMILY .= ":phyboard-mira-imx6"
KERNEL_DEVICETREE = "imx6q-phytec-mira-ff-rdk-emmc.dtb"
# Barebox Config
-BAREBOX_BIN = "images/barebox-phytec-phycore-imx6q-som-emmc-2gib.img"
+BAREBOX_BASE_BIN = "barebox-phytec-phycore-imx6q-som-emmc-2gib"
MACHINE_FEATURES += "resistivetouch pci can wifi emmc"
diff --git a/conf/machine/phyboard-mira-imx6-6.conf b/conf/machine/phyboard-mira-imx6-6.conf
index 2905a02..671e472 100644
--- a/conf/machine/phyboard-mira-imx6-6.conf
+++ b/conf/machine/phyboard-mira-imx6-6.conf
@@ -12,7 +12,7 @@ SOC_FAMILY .= ":phyboard-mira-imx6"
KERNEL_DEVICETREE = "imx6dl-phytec-mira-lc-rdk-nand.dtb"
# Barebox Config
-BAREBOX_BIN = "images/barebox-phytec-phycore-imx6dl-som-nand-1gib.img"
+BAREBOX_BASE_BIN = "barebox-phytec-phycore-imx6dl-som-nand-1gib"
MACHINE_FEATURES += "wifi"
diff --git a/conf/machine/phyboard-mira-imx6-7.conf b/conf/machine/phyboard-mira-imx6-7.conf
index 23ed4fa..eb7ef39 100644
--- a/conf/machine/phyboard-mira-imx6-7.conf
+++ b/conf/machine/phyboard-mira-imx6-7.conf
@@ -12,7 +12,7 @@ SOC_FAMILY .= ":phyboard-mira-imx6"
KERNEL_DEVICETREE = "imx6dl-phytec-mira-lc-rdk-emmc.dtb"
# Barebox Config
-BAREBOX_BIN = "images/barebox-phytec-phycore-imx6dl-som-lc-emmc-1gib.img"
+BAREBOX_BASE_BIN = "barebox-phytec-phycore-imx6dl-som-lc-emmc-1gib"
MACHINE_FEATURES += "wifi emmc"
diff --git a/conf/machine/phyboard-mira-imx6-8.conf b/conf/machine/phyboard-mira-imx6-8.conf
index 4191dc0..00f3b31 100644
--- a/conf/machine/phyboard-mira-imx6-8.conf
+++ b/conf/machine/phyboard-mira-imx6-8.conf
@@ -12,7 +12,7 @@ SOC_FAMILY .= ":phyboard-mira-imx6"
KERNEL_DEVICETREE = "imx6q-phytec-mira-ff-rdk-emmc.dtb"
# Barebox Config
-BAREBOX_BIN = "images/barebox-phytec-phycore-imx6q-som-emmc-1gib.img"
+BAREBOX_BASE_BIN = "barebox-phytec-phycore-imx6q-som-emmc-1gib"
MACHINE_FEATURES += "resistivetouch pci can wifi"
diff --git a/conf/machine/phyboard-mira-imx6-9.conf b/conf/machine/phyboard-mira-imx6-9.conf
index 145d5f6..f638769 100644
--- a/conf/machine/phyboard-mira-imx6-9.conf
+++ b/conf/machine/phyboard-mira-imx6-9.conf
@@ -12,7 +12,7 @@ SOC_FAMILY .= ":phyboard-mira-imx6"
KERNEL_DEVICETREE = "imx6qp-phytec-mira-ff-rdk-nand.dtb"
# Barebox Config
-BAREBOX_BIN = "images/barebox-phytec-phycore-imx6qp-som-nand-1gib.img"
+BAREBOX_BASE_BIN = "barebox-phytec-phycore-imx6qp-som-nand-1gib"
MACHINE_FEATURES += "resistivetouch pci can wifi"
diff --git a/conf/machine/phyboard-nunki-imx6-1.conf b/conf/machine/phyboard-nunki-imx6-1.conf
index 0e190c5..e71b80d 100644
--- a/conf/machine/phyboard-nunki-imx6-1.conf
+++ b/conf/machine/phyboard-nunki-imx6-1.conf
@@ -12,7 +12,7 @@ SOC_FAMILY .= ":phyboard-nunki-imx6"
KERNEL_DEVICETREE = "imx6q-phytec-nunki-rdk-nand.dtb"
# Barebox Config
-BAREBOX_BIN = "images/barebox-phytec-phycore-imx6q-som-nand-1gib.img"
+BAREBOX_BASE_BIN = "barebox-phytec-phycore-imx6q-som-nand-1gib"
MACHINE_FEATURES += "resistivetouch pci can"
diff --git a/conf/machine/phyboard-segin-imx6ul-2.conf b/conf/machine/phyboard-segin-imx6ul-2.conf
index e7a8da9..6d6d7bb 100644
--- a/conf/machine/phyboard-segin-imx6ul-2.conf
+++ b/conf/machine/phyboard-segin-imx6ul-2.conf
@@ -11,6 +11,6 @@ SOC_FAMILY .= ":phyboard-segin-imx6ul"
KERNEL_DEVICETREE = "imx6ul-phytec-segin-ff-rdk-nand.dtb"
# Barebox Config
-BAREBOX_BIN = "images/barebox-phytec-phycore-imx6ul-nand-512mb.img"
+BAREBOX_BASE_BIN = "barebox-phytec-phycore-imx6ul-nand-512mb"
MACHINE_FEATURES += "resistivetouch can alsa wifi"
diff --git a/conf/machine/phyboard-segin-imx6ul-3.conf b/conf/machine/phyboard-segin-imx6ul-3.conf
index 4e6345b..bb7b489 100644
--- a/conf/machine/phyboard-segin-imx6ul-3.conf
+++ b/conf/machine/phyboard-segin-imx6ul-3.conf
@@ -11,6 +11,6 @@ SOC_FAMILY .= ":phyboard-segin-imx6ul"
KERNEL_DEVICETREE = "imx6ull-phytec-segin-lc-rdk-nand.dtb"
# Barebox Config
-BAREBOX_BIN = "images/barebox-phytec-phycore-imx6ull-lc-nand-256mb.img"
+BAREBOX_BASE_BIN = "barebox-phytec-phycore-imx6ull-lc-nand-256mb"
MACHINE_FEATURES += "resistivetouch can alsa"
diff --git a/conf/machine/phyboard-segin-imx6ul-4.conf b/conf/machine/phyboard-segin-imx6ul-4.conf
index 74cd7eb..7e2ced4 100644
--- a/conf/machine/phyboard-segin-imx6ul-4.conf
+++ b/conf/machine/phyboard-segin-imx6ul-4.conf
@@ -11,6 +11,6 @@ SOC_FAMILY .= ":phyboard-segin-imx6ul"
KERNEL_DEVICETREE = "imx6ul-phytec-segin-ff-rdk-nand-rs485.dtb"
# Barebox Config
-BAREBOX_BIN = "images/barebox-phytec-phycore-imx6ul-nand-512mb.img"
+BAREBOX_BASE_BIN = "barebox-phytec-phycore-imx6ul-nand-512mb"
MACHINE_FEATURES += "resistivetouch can alsa wifi"
diff --git a/conf/machine/phyboard-segin-imx6ul-5.conf b/conf/machine/phyboard-segin-imx6ul-5.conf
index 5c895cd..c3a8018 100644
--- a/conf/machine/phyboard-segin-imx6ul-5.conf
+++ b/conf/machine/phyboard-segin-imx6ul-5.conf
@@ -11,6 +11,6 @@ SOC_FAMILY .= ":phyboard-segin-imx6ul"
KERNEL_DEVICETREE = "imx6ul-phytec-segin-ff-rdk-nand.dtb"
# Barebox Config
-BAREBOX_BIN = "images/barebox-phytec-phycore-imx6ul-nand-512mb.img"
+BAREBOX_BASE_BIN = "barebox-phytec-phycore-imx6ul-nand-512mb"
MACHINE_FEATURES += "resistivetouch can alsa wifi"
diff --git a/conf/machine/phyboard-segin-imx6ul-6.conf b/conf/machine/phyboard-segin-imx6ul-6.conf
index 9be898c..fe70b93 100644
--- a/conf/machine/phyboard-segin-imx6ul-6.conf
+++ b/conf/machine/phyboard-segin-imx6ul-6.conf
@@ -11,6 +11,6 @@ SOC_FAMILY .= ":phyboard-segin-imx6ul"
KERNEL_DEVICETREE = "imx6ull-phytec-segin-ff-rdk-nand.dtb"
# Barebox Config
-BAREBOX_BIN = "images/barebox-phytec-phycore-imx6ull-nand-512mb.img"
+BAREBOX_BASE_BIN = "barebox-phytec-phycore-imx6ull-nand-512mb"
MACHINE_FEATURES += "resistivetouch can alsa wifi"
diff --git a/conf/machine/phyboard-segin-imx6ul-7.conf b/conf/machine/phyboard-segin-imx6ul-7.conf
index 69a149f..4a51d0a 100644
--- a/conf/machine/phyboard-segin-imx6ul-7.conf
+++ b/conf/machine/phyboard-segin-imx6ul-7.conf
@@ -11,6 +11,6 @@ SOC_FAMILY .= ":phyboard-segin-imx6ul"
KERNEL_DEVICETREE = "imx6ull-phytec-segin-ff-rdk-emmc.dtb"
# Barebox Config
-BAREBOX_BIN = "images/barebox-phytec-phycore-imx6ull-emmc-512mb.img"
+BAREBOX_BASE_BIN = "barebox-phytec-phycore-imx6ull-emmc-512mb"
MACHINE_FEATURES += "resistivetouch can alsa wifi emmc"
diff --git a/conf/machine/phyflex-imx6-1.conf b/conf/machine/phyflex-imx6-1.conf
index e6c0a77..8db1572 100644
--- a/conf/machine/phyflex-imx6-1.conf
+++ b/conf/machine/phyflex-imx6-1.conf
@@ -12,7 +12,7 @@ SOC_FAMILY .= ":phyflex-imx6"
KERNEL_DEVICETREE = "imx6q-phytec-pbab01.dtb"
# Barebox Config
-BAREBOX_BIN = "images/barebox-phytec-pbab01-1gib.img"
+BAREBOX_BASE_BIN = "barebox-phytec-pbab01-1gib"
# resistivetouch, the rdk has one attached
MACHINE_FEATURES += "resistivetouch pci can alsa"
diff --git a/conf/machine/phyflex-imx6-10.conf b/conf/machine/phyflex-imx6-10.conf
index a40430d..188c0af 100644
--- a/conf/machine/phyflex-imx6-10.conf
+++ b/conf/machine/phyflex-imx6-10.conf
@@ -12,7 +12,7 @@ SOC_FAMILY .= ":phyflex-imx6"
KERNEL_DEVICETREE = "imx6dl-phytec-pbab01-nonor.dtb"
# Barebox Config
-BAREBOX_BIN = "images/barebox-phytec-pbab01s-128mb-1bank.img"
+BAREBOX_BASE_BIN = "barebox-phytec-pbab01s-128mb-1bank"
# resistivetouch, the rdk has one attached
MACHINE_FEATURES += "resistivetouch pci can alsa"
diff --git a/conf/machine/phyflex-imx6-11.conf b/conf/machine/phyflex-imx6-11.conf
index a647390..9f3c638 100644
--- a/conf/machine/phyflex-imx6-11.conf
+++ b/conf/machine/phyflex-imx6-11.conf
@@ -12,7 +12,7 @@ SOC_FAMILY .= ":phyflex-imx6"
KERNEL_DEVICETREE = "imx6q-phytec-pbab01.dtb"
# Barebox Config
-BAREBOX_BIN = "images/barebox-phytec-pbab01-4gib.img"
+BAREBOX_BASE_BIN = "barebox-phytec-pbab01-4gib"
# resistivetouch, the rdk has one attached
MACHINE_FEATURES += "resistivetouch pci can alsa"
diff --git a/conf/machine/phyflex-imx6-2.conf b/conf/machine/phyflex-imx6-2.conf
index 60f233d..ed765eb 100644
--- a/conf/machine/phyflex-imx6-2.conf
+++ b/conf/machine/phyflex-imx6-2.conf
@@ -12,7 +12,7 @@ SOC_FAMILY .= ":phyflex-imx6"
KERNEL_DEVICETREE = "imx6q-phytec-pbab01.dtb"
# Barebox Config
-BAREBOX_BIN = "images/barebox-phytec-pbab01-1gib-1bank.img"
+BAREBOX_BASE_BIN = "barebox-phytec-pbab01-1gib-1bank"
# resistivetouch, the rdk has one attached
MACHINE_FEATURES += "resistivetouch pci can alsa"
diff --git a/conf/machine/phyflex-imx6-3.conf b/conf/machine/phyflex-imx6-3.conf
index 727b278..1f9992f 100644
--- a/conf/machine/phyflex-imx6-3.conf
+++ b/conf/machine/phyflex-imx6-3.conf
@@ -12,7 +12,7 @@ SOC_FAMILY .= ":phyflex-imx6"
KERNEL_DEVICETREE = "imx6q-phytec-pbab01.dtb"
# Barebox Config
-BAREBOX_BIN = "images/barebox-phytec-pbab01-2gib.img"
+BAREBOX_BASE_BIN = "barebox-phytec-pbab01-2gib"
# resistivetouch, the rdk has one attached
MACHINE_FEATURES += "resistivetouch pci can alsa"
diff --git a/conf/machine/phyflex-imx6-4.conf b/conf/machine/phyflex-imx6-4.conf
index d655a47..7217a61 100644
--- a/conf/machine/phyflex-imx6-4.conf
+++ b/conf/machine/phyflex-imx6-4.conf
@@ -12,7 +12,7 @@ SOC_FAMILY .= ":phyflex-imx6"
KERNEL_DEVICETREE = "imx6q-phytec-pbab01.dtb"
# Barebox Config
-BAREBOX_BIN = "images/barebox-phytec-pbab01-4gib.img"
+BAREBOX_BASE_BIN = "barebox-phytec-pbab01-4gib"
# resistivetouch, the rdk has one attached
MACHINE_FEATURES += "resistivetouch pci can alsa"
diff --git a/conf/machine/phyflex-imx6-5.conf b/conf/machine/phyflex-imx6-5.conf
index 4a99bcd..321a160 100644
--- a/conf/machine/phyflex-imx6-5.conf
+++ b/conf/machine/phyflex-imx6-5.conf
@@ -12,7 +12,7 @@ SOC_FAMILY .= ":phyflex-imx6"
KERNEL_DEVICETREE = "imx6q-phytec-pbab01.dtb"
# Barebox Config
-BAREBOX_BIN = "images/barebox-phytec-pbab01-512mb-1bank.img"
+BAREBOX_BASE_BIN = "barebox-phytec-pbab01-512mb-1bank"
# resistivetouch, the rdk has one attached
MACHINE_FEATURES += "resistivetouch pci can alsa"
diff --git a/conf/machine/phyflex-imx6-6.conf b/conf/machine/phyflex-imx6-6.conf
index 51d1a83..37d21b5 100644
--- a/conf/machine/phyflex-imx6-6.conf
+++ b/conf/machine/phyflex-imx6-6.conf
@@ -12,7 +12,7 @@ SOC_FAMILY .= ":phyflex-imx6"
KERNEL_DEVICETREE = "imx6dl-phytec-pbab01.dtb"
# Barebox Config
-BAREBOX_BIN = "images/barebox-phytec-pbab01dl-1gib.img"
+BAREBOX_BASE_BIN = "barebox-phytec-pbab01dl-1gib"
# resistivetouch, the rdk has one attached
MACHINE_FEATURES += "resistivetouch pci can alsa"
diff --git a/conf/machine/phyflex-imx6-7.conf b/conf/machine/phyflex-imx6-7.conf
index 6229382..f859fcf 100644
--- a/conf/machine/phyflex-imx6-7.conf
+++ b/conf/machine/phyflex-imx6-7.conf
@@ -12,7 +12,7 @@ SOC_FAMILY .= ":phyflex-imx6"
KERNEL_DEVICETREE = "imx6dl-phytec-pbab01.dtb"
# Barebox Config
-BAREBOX_BIN = "images/barebox-phytec-pbab01dl-1gib-1bank.img"
+BAREBOX_BASE_BIN = "barebox-phytec-pbab01dl-1gib-1bank"
# resistivetouch, the rdk has one attached
MACHINE_FEATURES += "resistivetouch pci can alsa"
diff --git a/conf/machine/phyflex-imx6-8.conf b/conf/machine/phyflex-imx6-8.conf
index 14f1aa9..2571465 100644
--- a/conf/machine/phyflex-imx6-8.conf
+++ b/conf/machine/phyflex-imx6-8.conf
@@ -12,7 +12,7 @@ SOC_FAMILY .= ":phyflex-imx6"
KERNEL_DEVICETREE = "imx6dl-phytec-pbab01-nonor.dtb"
# Barebox Config
-BAREBOX_BIN = "images/barebox-phytec-pbab01s-512mb-1bank.img"
+BAREBOX_BASE_BIN = "barebox-phytec-pbab01s-512mb-1bank"
# resistivetouch, the rdk has one attached
MACHINE_FEATURES += "resistivetouch pci can alsa"
diff --git a/conf/machine/phyflex-imx6-9.conf b/conf/machine/phyflex-imx6-9.conf
index e74c352..9aad86a 100644
--- a/conf/machine/phyflex-imx6-9.conf
+++ b/conf/machine/phyflex-imx6-9.conf
@@ -12,7 +12,7 @@ SOC_FAMILY .= ":phyflex-imx6"
KERNEL_DEVICETREE = "imx6dl-phytec-pbab01-nonor.dtb"
# Barebox Config
-BAREBOX_BIN = "images/barebox-phytec-pbab01s-256mb-1bank.img"
+BAREBOX_BASE_BIN = "barebox-phytec-pbab01s-256mb-1bank"
# resistivetouch, the rdk has one attached
MACHINE_FEATURES += "resistivetouch pci can alsa"
diff --git a/recipes-bsp/barebox/barebox.inc b/recipes-bsp/barebox/barebox.inc
index b37fc9b..56f0cb2 100644
--- a/recipes-bsp/barebox/barebox.inc
+++ b/recipes-bsp/barebox/barebox.inc
@@ -27,7 +27,8 @@ EXTRA_OEMAKE = 'CROSS_COMPILE="${TARGET_PREFIX}" CC="${TARGET_PREFIX}gcc" V="${V
B = "${WORKDIR}/build"
# name of the image created by barebox Makefile
-BAREBOX_BIN ?= "barebox.bin"
+BAREBOX_BASE_BIN ?= "barebox"
+BAREBOX_BIN ?= "images/${BAREBOX_BASE_BIN}.img"
# filename of file to be deployed by this recipe
BAREBOX_IMAGE_NAME ?= "barebox-${MACHINE}-${PKGV}-${PKGR}${IMAGE_VERSION_SUFFIX}"
BAREBOX_IMAGE_NAME[vardepsexclude] += "IMAGE_VERSION_SUFFIX"