summaryrefslogtreecommitdiffstats
path: root/bsp/meta-freescale-3rdparty/conf/machine/imx6ul-pico.conf
diff options
context:
space:
mode:
Diffstat (limited to 'bsp/meta-freescale-3rdparty/conf/machine/imx6ul-pico.conf')
-rw-r--r--bsp/meta-freescale-3rdparty/conf/machine/imx6ul-pico.conf14
1 files changed, 9 insertions, 5 deletions
diff --git a/bsp/meta-freescale-3rdparty/conf/machine/imx6ul-pico.conf b/bsp/meta-freescale-3rdparty/conf/machine/imx6ul-pico.conf
index 3448318a..11ea23bd 100644
--- a/bsp/meta-freescale-3rdparty/conf/machine/imx6ul-pico.conf
+++ b/bsp/meta-freescale-3rdparty/conf/machine/imx6ul-pico.conf
@@ -4,14 +4,17 @@
#@DESCRIPTION: Machine configuration for IMX6UL-PICO board.
#@MAINTAINER: Daiane Angolini <daiane.angolini@nxp.com>
-MACHINEOVERRIDES =. "use-mainline-bsp:mx6:mx6ul:"
+MACHINEOVERRIDES =. "mx6:mx6ul:"
include conf/machine/include/imx-base.inc
include conf/machine/include/tune-cortexa7.inc
-SERIAL_CONSOLE = "115200 ttymxc5"
+IMX_DEFAULT_BSP = "mainline"
+
+SERIAL_CONSOLES = "115200;ttymxc5"
KERNEL_DEVICETREE = " \
+ imx6ul-pico-dwarf.dtb \
imx6ul-pico-hobbit.dtb \
imx6ul-pico-pi.dtb \
"
@@ -20,7 +23,8 @@ SPL_BINARY = "SPL"
UBOOT_SUFFIX = "img"
UBOOT_MAKE_TARGET = ""
-UBOOT_CONFIG ??= "hobbit pi generic"
+UBOOT_CONFIG ??= "dwarf hobbit pi generic"
+UBOOT_CONFIG[dwarf] = "pico-dwarf-imx6ul_defconfig"
UBOOT_CONFIG[generic] = "pico-imx6ul_defconfig"
UBOOT_CONFIG[hobbit] = "pico-hobbit-imx6ul_defconfig"
UBOOT_CONFIG[pi] = "pico-pi-imx6ul_defconfig"
@@ -37,6 +41,6 @@ MACHINE_ESSENTIAL_EXTRA_RDEPENDS += " \
MACHINE_FEATURES += "wifi bluetooth"
-WKS_FILES ?= "imx-uboot-spl.wks"
+WKS_FILES ?= "imx-uboot-spl.wks.in"
WKS_FILE_DEPENDS ?= ""
-IMAGE_FSTYPES = "wic.xz ext4.gz"
+IMAGE_FSTYPES = "wic.bmap wic.xz ext4.gz"