diff options
| author | Otavio Salvador <otavio@ossystems.com.br> | 2022-12-13 20:54:32 -0300 |
|---|---|---|
| committer | github-actions[bot] <github-actions[bot]@users.noreply.github.com> | 2022-12-14 13:48:56 +0000 |
| commit | bfc9a925d6f8c401f3c97c5601b0b1acceebb217 (patch) | |
| tree | f5a3da80348726ac2de324b71c6ede20f4fd65d4 | |
| parent | a99bfd038e09ee16e28ce95e0925594005ed9c06 (diff) | |
| download | meta-freescale-bfc9a925d6f8c401f3c97c5601b0b1acceebb217.tar.gz | |
imx-base.inc: Use generic-bsp to define the WKS_FILE for mx8 devices
The bootloader support is generic however the override in use was
nxp-bsp and causing the wrong wks file being used in the mainline BSP
case.
This commit changes the override and also remove the mx8m specific
setting as it is redundant.
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
(cherry picked from commit 1323b81259d2cf7c1d943658320a5f7128830aac)
| -rw-r--r-- | conf/machine/include/imx-base.inc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc index 355ecaac..d5458165 100644 --- a/conf/machine/include/imx-base.inc +++ b/conf/machine/include/imx-base.inc | |||
| @@ -543,9 +543,7 @@ WKS_FILE_DEPENDS:append:imx-generic-bsp:aarch64 = " \ | |||
| 543 | " | 543 | " |
| 544 | 544 | ||
| 545 | SOC_DEFAULT_WKS_FILE ?= "imx-uboot-bootpart.wks.in" | 545 | SOC_DEFAULT_WKS_FILE ?= "imx-uboot-bootpart.wks.in" |
| 546 | SOC_DEFAULT_WKS_FILE:mx8m-nxp-bsp ?= "imx-imx-boot-bootpart.wks.in" | 546 | SOC_DEFAULT_WKS_FILE:mx8-generic-bsp ?= "imx-imx-boot-bootpart.wks.in" |
| 547 | |||
| 548 | SOC_DEFAULT_WKS_FILE:mx8-nxp-bsp ?= "imx-imx-boot-bootpart.wks.in" | ||
| 549 | SOC_DEFAULT_WKS_FILE:mxs-generic-bsp ?= "imx-uboot-mxs-bootpart.wks.in" | 547 | SOC_DEFAULT_WKS_FILE:mxs-generic-bsp ?= "imx-uboot-mxs-bootpart.wks.in" |
| 550 | 548 | ||
| 551 | WKS_FILE ?= "${SOC_DEFAULT_WKS_FILE}" | 549 | WKS_FILE ?= "${SOC_DEFAULT_WKS_FILE}" |