diff options
author | Otavio Salvador <otavio@ossystems.com.br> | 2021-03-19 18:51:30 -0300 |
---|---|---|
committer | Otavio Salvador <otavio@ossystems.com.br> | 2021-03-24 11:18:34 -0300 |
commit | 776932e187f38ca53ed57fc662461ba0da005520 (patch) | |
tree | 490e1782ed6e800bdc0146ed8990934abed5af97 /conf/machine/imx6qdlsabresd.conf | |
parent | d9d5068e7ae6b6e2b55236ff515b50172d44f803 (diff) | |
download | meta-freescale-776932e187f38ca53ed57fc662461ba0da005520.tar.gz |
Rework the u-boot-fslc and u-boot-imx settings logic
We need to make it more obvious what is in use, when we support both
bootloaders and for it we are now using the _pn suffix for both.
This also fixes the WIC_FILE depending on the choice otherwise image
build fails.
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Diffstat (limited to 'conf/machine/imx6qdlsabresd.conf')
-rw-r--r-- | conf/machine/imx6qdlsabresd.conf | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/conf/machine/imx6qdlsabresd.conf b/conf/machine/imx6qdlsabresd.conf index baf2192b..b3d09e93 100644 --- a/conf/machine/imx6qdlsabresd.conf +++ b/conf/machine/imx6qdlsabresd.conf | |||
@@ -41,17 +41,25 @@ KERNEL_DEVICETREE_use-mainline-bsp = " \ | |||
41 | imx6dl-sabresd.dtb \ | 41 | imx6dl-sabresd.dtb \ |
42 | " | 42 | " |
43 | 43 | ||
44 | UBOOT_MACHINE ?= "mx6sabresd_defconfig" | 44 | ### u-boot-fslc settings ### |
45 | 45 | ||
46 | # Use fslc u-boot by default. See also imx-base.inc. | 46 | SPL_BINARY_pn-u-boot-fslc = "SPL" |
47 | UBOOT_MAKE_TARGET = "all" | 47 | UBOOT_MACHINE_pn-u-boot-fslc ?= "mx6sabresd_defconfig" |
48 | UBOOT_SUFFIX = "img" | 48 | UBOOT_SUFFIX_pn-u-boot-fslc = "img" |
49 | SPL_BINARY = "SPL" | 49 | |
50 | WKS_FILE = "imx-uboot-spl-bootpart.wks.in" | 50 | ### u-boot-imx settings ### |
51 | 51 | ||
52 | # The u-boot-imx does not provide unified functionality for DL/Q/QP SoC | 52 | # The u-boot-imx does not provide unified functionality for DL/Q/QP SoC |
53 | # variants. Change the defconfig to the targeted SoC variant. | 53 | # variants. Change the defconfig to the targeted SoC variant. |
54 | UBOOT_MACHINE_pn-u-boot-imx = "mx6qsabresd_defconfig" | 54 | SPL_BINARY_pn-u-boot-imx = "" |
55 | UBOOT_MACHINE_pn-u-boot-imx ?= "mx6qsabresd_defconfig" | ||
56 | UBOOT_MAKE_TARGET_pn-u-boot-imx = "u-boot.imx" | ||
57 | UBOOT_SUFFIX_pn-u-boot-imx = "imx" | ||
58 | |||
59 | WKS_FILE = " \ | ||
60 | ${@bb.utils.contains('IMX_DEFAULT_BOOTLOADER', \ | ||
61 | 'u-boot-fslc', 'imx-uboot-spl-bootpart.wks.in', \ | ||
62 | 'imx-uboot-bootpart.wks.in', d)}" | ||
55 | 63 | ||
56 | SERIAL_CONSOLES = "115200;ttymxc0" | 64 | SERIAL_CONSOLES = "115200;ttymxc0" |
57 | 65 | ||