diff options
Diffstat (limited to 'conf/machine/include/imx-base.inc')
-rw-r--r-- | conf/machine/include/imx-base.inc | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc index 6295ccd0..4dae43d0 100644 --- a/conf/machine/include/imx-base.inc +++ b/conf/machine/include/imx-base.inc | |||
@@ -5,10 +5,6 @@ include conf/machine/include/fsl-default-versions.inc | |||
5 | 5 | ||
6 | require conf/machine/include/utilities.inc | 6 | require conf/machine/include/utilities.inc |
7 | 7 | ||
8 | # Set specific make target and binary suffix | ||
9 | IMX_DEFAULT_BOOTLOADER = "u-boot-fslc" | ||
10 | IMX_DEFAULT_BOOTLOADER_mx8 = "u-boot-imx" | ||
11 | |||
12 | # Machines or distros can define which BSP it should use by default. We are | 8 | # Machines or distros can define which BSP it should use by default. We are |
13 | # intending to default for mainline BSP by default and specific machines or | 9 | # intending to default for mainline BSP by default and specific machines or |
14 | # DISTROs might change it if need. | 10 | # DISTROs might change it if need. |
@@ -22,6 +18,11 @@ IMX_DEFAULT_BSP_mx5 ?= "mainline" | |||
22 | 18 | ||
23 | MACHINEOVERRIDES =. "use-${IMX_DEFAULT_BSP}-bsp:" | 19 | MACHINEOVERRIDES =. "use-${IMX_DEFAULT_BSP}-bsp:" |
24 | 20 | ||
21 | # Set specific make target and binary suffix | ||
22 | IMX_DEFAULT_BOOTLOADER = "u-boot-fslc" | ||
23 | IMX_DEFAULT_BOOTLOADER_mx8 = "u-boot-imx" | ||
24 | IMX_DEFAULT_BOOTLOADER_use-mainline-bsp = "u-boot-fslc" | ||
25 | |||
25 | PREFERRED_PROVIDER_u-boot ??= "${IMX_DEFAULT_BOOTLOADER}" | 26 | PREFERRED_PROVIDER_u-boot ??= "${IMX_DEFAULT_BOOTLOADER}" |
26 | PREFERRED_PROVIDER_u-boot-tools-native ??= "${IMX_DEFAULT_BOOTLOADER}-tools-native" | 27 | PREFERRED_PROVIDER_u-boot-tools-native ??= "${IMX_DEFAULT_BOOTLOADER}-tools-native" |
27 | PREFERRED_PROVIDER_nativesdk-u-boot-tools ??= "nativesdk-${IMX_DEFAULT_BOOTLOADER}-tools" | 28 | PREFERRED_PROVIDER_nativesdk-u-boot-tools ??= "nativesdk-${IMX_DEFAULT_BOOTLOADER}-tools" |
@@ -364,9 +365,12 @@ WKS_FILE_DEPENDS ?= " \ | |||
364 | ${@bb.utils.contains('MACHINE_FEATURES', 'optee', '${OPTEE_WKS_FILE_DEPENDS}', '', d)} \ | 365 | ${@bb.utils.contains('MACHINE_FEATURES', 'optee', '${OPTEE_WKS_FILE_DEPENDS}', '', d)} \ |
365 | " | 366 | " |
366 | 367 | ||
367 | WKS_FILE_DEPENDS_append_mx8 = " imx-boot " | 368 | WKS_FILE_DEPENDS_append_mx8 = " imx-boot" |
369 | WKS_FILE_DEPENDS_append_use-mainline-bsp = " imx-boot" | ||
368 | 370 | ||
369 | SOC_DEFAULT_WKS_FILE ?= "imx-uboot-bootpart.wks.in" | 371 | SOC_DEFAULT_WKS_FILE ?= "imx-uboot-bootpart.wks.in" |
372 | SOC_DEFAULT_WKS_FILE_mx8m ?= "imx-imx-boot-bootpart.wks.in" | ||
373 | |||
370 | SOC_DEFAULT_WKS_FILE_mx8 ?= "imx-imx-boot-bootpart.wks.in" | 374 | SOC_DEFAULT_WKS_FILE_mx8 ?= "imx-imx-boot-bootpart.wks.in" |
371 | SOC_DEFAULT_WKS_FILE_mxs ?= "imx-uboot-mxs-bootpart.wks.in" | 375 | SOC_DEFAULT_WKS_FILE_mxs ?= "imx-uboot-mxs-bootpart.wks.in" |
372 | 376 | ||