summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Schultz <d.schultz@phytec.de>2018-04-03 15:58:49 (GMT)
committerStefan Müller-Klieser <s.mueller-klieser@phytec.de>2018-04-10 14:28:07 (GMT)
commitaf20d84f60827bfea172e54794d3244598b4d6b0 (patch)
treedd41db089dccbdcf403c5bd6d39c9473bda2f56f
parentd00973a3647ad700786aa549d5c065de9b644276 (diff)
downloadmeta-phytec-af20d84f60827bfea172e54794d3244598b4d6b0.zip
meta-phytec-af20d84f60827bfea172e54794d3244598b4d6b0.tar.bz2
conf: machine: Add emmc MACHINE_FEATURE
Add MACHINE_FEATURE for emmc to all machines with eMMC. Currently this feature is only for RAUC to load the correct system.conf file, but can be used in future images to resolve dependencies to this media. Signed-off-by: Daniel Schultz <d.schultz@phytec.de> Signed-off-by: Stefan Müller-Klieser <s.mueller-klieser@phytec.de>
-rw-r--r--conf/machine/beagleboneblack-1.conf2
-rw-r--r--conf/machine/phyboard-mira-imx6-5.conf2
-rw-r--r--conf/machine/phyboard-mira-imx6-7.conf2
-rw-r--r--conf/machine/phycore-emmc-am335x-1.conf2
-rw-r--r--conf/machine/phycore-rk3288-3.conf2
5 files changed, 6 insertions, 4 deletions
diff --git a/conf/machine/beagleboneblack-1.conf b/conf/machine/beagleboneblack-1.conf
index 42e3beb..67fa008 100644
--- a/conf/machine/beagleboneblack-1.conf
+++ b/conf/machine/beagleboneblack-1.conf
@@ -15,4 +15,4 @@ KERNEL_DEVICETREE = "am335x-boneblack.dtb"
BAREBOX_BIN = "images/barebox-am33xx-beaglebone.img"
BAREBOX_IPL_BIN = "images/barebox-am33xx-beaglebone-mlo.img"
-MACHINE_FEATURES += "sgx"
+MACHINE_FEATURES += "sgx emmc"
diff --git a/conf/machine/phyboard-mira-imx6-5.conf b/conf/machine/phyboard-mira-imx6-5.conf
index 6475e63..c2ec3d2 100644
--- a/conf/machine/phyboard-mira-imx6-5.conf
+++ b/conf/machine/phyboard-mira-imx6-5.conf
@@ -15,6 +15,6 @@ KERNEL_DEVICETREE = "imx6q-phytec-mira-rdk-emmc.dtb"
# Barebox Config
BAREBOX_BIN = "images/barebox-phytec-phycore-imx6q-som-emmc-2gib.img"
-MACHINE_FEATURES += "resistivetouch pci can wifi"
+MACHINE_FEATURES += "resistivetouch pci can wifi emmc"
SERIAL_CONSOLES = "115200;ttymxc1"
diff --git a/conf/machine/phyboard-mira-imx6-7.conf b/conf/machine/phyboard-mira-imx6-7.conf
index aca182c..19b2abb 100644
--- a/conf/machine/phyboard-mira-imx6-7.conf
+++ b/conf/machine/phyboard-mira-imx6-7.conf
@@ -15,6 +15,6 @@ KERNEL_DEVICETREE = "imx6dl-phytec-mira-rdk-emmc.dtb"
# Barebox Config
BAREBOX_BIN = "images/barebox-phytec-phycore-imx6dl-som-emmc-1gib.img"
-MACHINE_FEATURES += "wifi"
+MACHINE_FEATURES += "wifi emmc"
SERIAL_CONSOLES = "115200;ttymxc1"
diff --git a/conf/machine/phycore-emmc-am335x-1.conf b/conf/machine/phycore-emmc-am335x-1.conf
index 2e7ceb9..1a936c8 100644
--- a/conf/machine/phycore-emmc-am335x-1.conf
+++ b/conf/machine/phycore-emmc-am335x-1.conf
@@ -16,7 +16,7 @@ BAREBOX_BIN = "images/barebox-am33xx-phytec-phycore-emmc.img"
BAREBOX_IPL_BIN = "images/barebox-am33xx-phytec-phycore-r2-mlo-1024mb.img"
# resistivetouch, the rdk has one attached
-MACHINE_FEATURES += "resistivetouch sgx suspend"
+MACHINE_FEATURES += "resistivetouch sgx suspend emmc"
IMAGE_FSTYPES_append = " emmc"
IMAGE_TYPEDEP_wic ?= " ext4"
diff --git a/conf/machine/phycore-rk3288-3.conf b/conf/machine/phycore-rk3288-3.conf
index 564b74d..1f38336 100644
--- a/conf/machine/phycore-rk3288-3.conf
+++ b/conf/machine/phycore-rk3288-3.conf
@@ -12,3 +12,5 @@ include conf/machine/include/phyrk3288.inc
KERNEL_DEVICETREE = "rk3288-phycore-rdk.dtb"
UBOOT_MACHINE = "phycore-rk3288_defconfig"
+
+MACHINE_FEATURES += "emmc"