summaryrefslogtreecommitdiffstats
path: root/conf
diff options
context:
space:
mode:
Diffstat (limited to 'conf')
-rw-r--r--conf/machine/imx6qdlsabreauto.conf23
-rw-r--r--conf/machine/imx6qdlsabresd.conf17
2 files changed, 23 insertions, 17 deletions
diff --git a/conf/machine/imx6qdlsabreauto.conf b/conf/machine/imx6qdlsabreauto.conf
index a5ec1249..1bc78604 100644
--- a/conf/machine/imx6qdlsabreauto.conf
+++ b/conf/machine/imx6qdlsabreauto.conf
@@ -40,22 +40,25 @@ UBOOT_SUFFIX:pn-u-boot-fslc = "img"
40### u-boot-imx settings ### 40### u-boot-imx settings ###
41SPL_BINARY:pn-u-boot-imx = "" 41SPL_BINARY:pn-u-boot-imx = ""
42UBOOT_CONFIG:pn-u-boot-imx ??= " \ 42UBOOT_CONFIG:pn-u-boot-imx ??= " \
43 sd-imx \ 43 sd \
44 ${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'sd-optee-imx', '', d)} \ 44 ${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'sd-optee', '', d)} \
45" 45"
46UBOOT_MAKE_TARGET:pn-u-boot-imx = "u-boot.imx" 46UBOOT_MAKE_TARGET:pn-u-boot-imx = "u-boot.imx"
47UBOOT_SUFFIX:pn-u-boot-imx = "imx" 47UBOOT_SUFFIX:pn-u-boot-imx = "imx"
48 48
49UBOOT_CONFIG[sd] = "${UBOOT_CONFIG_MACHINE_NAME}_defconfig,sdcard"
50UBOOT_CONFIG[sd-optee] = "${UBOOT_CONFIG_MACHINE_NAME}_optee_defconfig,sdcard"
51UBOOT_CONFIG[eimnor] = "${UBOOT_CONFIG_MACHINE_NAME}_eimnor_defconfig"
52UBOOT_CONFIG[nand] = "${UBOOT_CONFIG_MACHINE_NAME}_nand_defconfig,ubifs"
53UBOOT_CONFIG[spinor] = "${UBOOT_CONFIG_MACHINE_NAME}_spinor_defconfig"
54UBOOT_CONFIG[sata] = "${UBOOT_CONFIG_MACHINE_NAME}_sata_defconfig"
55UBOOT_CONFIG[mfgtool] = "${UBOOT_CONFIG_MACHINE_NAME}_defconfig"
56
49# The u-boot-imx does not provide unified functionality for DL/Q/QP SoC 57# The u-boot-imx does not provide unified functionality for DL/Q/QP SoC
50# variants. Change the defconfig to the targeted SoC variant. 58# variants. Change the defconfig to the targeted SoC variant.
51UBOOT_CONFIG[sd-fslc] = "mx6sabreauto_defconfig,sdcard" 59UBOOT_CONFIG_MACHINE_NAME = "mx6sabreauto"
52UBOOT_CONFIG[sd-imx] = "mx6qpsabreauto_defconfig,sdcard" 60UBOOT_CONFIG_MACHINE_NAME:pn-u-boot-imx = "mx6qpsabreauto"
53UBOOT_CONFIG[sd-optee-imx] = "mx6qpsabreauto_optee_defconfig,sdcard" 61UBOOT_CONFIG_MACHINE_NAME:pn-u-boot-imx-mfgtool = "mx6qpsabreauto"
54UBOOT_CONFIG[eimnor-imx] = "mx6qpsabreauto_eimnor_defconfig"
55UBOOT_CONFIG[nand-imx] = "mx6qpsabreauto_nand_defconfig,ubifs"
56UBOOT_CONFIG[spinor-imx] = "mx6qpsabreauto_spinor_defconfig"
57UBOOT_CONFIG[sata-imx] = "mx6qpsabreauto_sata_defconfig"
58UBOOT_CONFIG[mfgtool-imx] = "mx6qpsabreauto_defconfig"
59 62
60WKS_FILE = " \ 63WKS_FILE = " \
61 ${@bb.utils.contains('IMX_DEFAULT_BOOTLOADER', \ 64 ${@bb.utils.contains('IMX_DEFAULT_BOOTLOADER', \
diff --git a/conf/machine/imx6qdlsabresd.conf b/conf/machine/imx6qdlsabresd.conf
index 81d1c962..787a2006 100644
--- a/conf/machine/imx6qdlsabresd.conf
+++ b/conf/machine/imx6qdlsabresd.conf
@@ -49,19 +49,22 @@ UBOOT_SUFFIX:pn-u-boot-fslc = "img"
49### u-boot-imx settings ### 49### u-boot-imx settings ###
50SPL_BINARY:pn-u-boot-imx = "" 50SPL_BINARY:pn-u-boot-imx = ""
51UBOOT_CONFIG:pn-u-boot-imx ??= " \ 51UBOOT_CONFIG:pn-u-boot-imx ??= " \
52 sd-imx \ 52 sd \
53 ${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'sd-optee-imx', '', d)} \ 53 ${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'sd-optee', '', d)} \
54" 54"
55UBOOT_MAKE_TARGET:pn-u-boot-imx = "u-boot.imx" 55UBOOT_MAKE_TARGET:pn-u-boot-imx = "u-boot.imx"
56UBOOT_SUFFIX:pn-u-boot-imx = "imx" 56UBOOT_SUFFIX:pn-u-boot-imx = "imx"
57 57
58UBOOT_CONFIG[sd] = "${UBOOT_CONFIG_MACHINE_NAME}_defconfig,sdcard"
59UBOOT_CONFIG[sd-optee] = "${UBOOT_CONFIG_MACHINE_NAME}_optee_defconfig,sdcard"
60UBOOT_CONFIG[sata] = "${UBOOT_CONFIG_MACHINE_NAME}_sata_defconfig"
61UBOOT_CONFIG[mfgtool] = "${UBOOT_CONFIG_MACHINE_NAME}_defconfig"
62
58# The u-boot-imx does not provide unified functionality for DL/Q/QP SoC 63# The u-boot-imx does not provide unified functionality for DL/Q/QP SoC
59# variants. Change the defconfig to the targeted SoC variant. 64# variants. Change the defconfig to the targeted SoC variant.
60UBOOT_CONFIG[sd-fslc] = "mx6sabresd_defconfig,sdcard" 65UBOOT_CONFIG_MACHINE_NAME = "mx6sabresd"
61UBOOT_CONFIG[sd-imx] = "mx6qsabresd_defconfig,sdcard" 66UBOOT_CONFIG_MACHINE_NAME:pn-u-boot-imx = "mx6qsabresd"
62UBOOT_CONFIG[sd-optee-imx] = "mx6qsabresd_optee_defconfig,sdcard" 67UBOOT_CONFIG_MACHINE_NAME:pn-u-boot-imx-mfgtool = "mx6qsabresd"
63UBOOT_CONFIG[sata-imx] = "mx6qsabresd_sata_defconfig"
64UBOOT_CONFIG[mfgtool-imx] = "mx6qsabresd_defconfig"
65 68
66WKS_FILE = " \ 69WKS_FILE = " \
67 ${@bb.utils.contains('IMX_DEFAULT_BOOTLOADER', \ 70 ${@bb.utils.contains('IMX_DEFAULT_BOOTLOADER', \