summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--conf/machine/apalis-tk1-mainline.conf9
-rw-r--r--conf/machine/apalis-tk1.conf8
2 files changed, 9 insertions, 8 deletions
diff --git a/conf/machine/apalis-tk1-mainline.conf b/conf/machine/apalis-tk1-mainline.conf
index 92f2192..65f2a7b 100644
--- a/conf/machine/apalis-tk1-mainline.conf
+++ b/conf/machine/apalis-tk1-mainline.conf
@@ -10,23 +10,24 @@ require conf/machine/include/soc-family.inc
SOC_FAMILY = "tegra124m"
-EXTRA_IMAGEDEPENDS += "u-boot-distro-boot"
-IMAGE_BOOT_FILES += "${MACHINE_BOOT_FILES}"
-MACHINE_BOOT_FILES = "boot.scr"
-
PREFERRED_PROVIDER_virtual/kernel = "linux-toradex-mainline"
KERNEL_IMAGETYPE = "zImage"
KERNEL_DEFCONFIG = "tegra_defconfig"
KERNEL_DEVICETREE += "tegra124-apalis-eval.dtb tegra124-apalis-v1.2-eval.dtb"
+MACHINE_BOOT_FILES = "boot.scr"
+
# wic support
IMAGE_BOOT_FILES ?= " \
${KERNEL_IMAGETYPE} \
${KERNEL_DEVICETREE} \
+ ${MACHINE_BOOT_FILES} \
"
+
WKS_FILE_DEPENDS ?= " \
virtual/bootloader \
+ u-boot-distro-boot \
\
e2fsprogs-native \
bmap-tools-native \
diff --git a/conf/machine/apalis-tk1.conf b/conf/machine/apalis-tk1.conf
index bb5124a..1a17720 100644
--- a/conf/machine/apalis-tk1.conf
+++ b/conf/machine/apalis-tk1.conf
@@ -10,22 +10,22 @@ require conf/machine/include/soc-family.inc
SOC_FAMILY = "tegra124"
-EXTRA_IMAGEDEPENDS += "u-boot-distro-boot"
-IMAGE_BOOT_FILES += "${MACHINE_BOOT_FILES}"
-MACHINE_BOOT_FILES = "boot.scr"
-
PREFERRED_PROVIDER_virtual/kernel = "linux-toradex"
KERNEL_IMAGETYPE = "zImage"
KERNEL_DEVICETREE += "tegra124-apalis-eval.dtb tegra124-apalis-v1.2-eval.dtb"
+MACHINE_BOOT_FILES = "boot.scr"
+
# wic support
IMAGE_BOOT_FILES ?= " \
${KERNEL_IMAGETYPE} \
${KERNEL_DEVICETREE} \
+ ${MACHINE_BOOT_FILES} \
"
WKS_FILE_DEPENDS ?= " \
virtual/bootloader \
+ u-boot-distro-boot \
\
e2fsprogs-native \
bmap-tools-native \