diff options
| author | Otavio Salvador <otavio@ossystems.com.br> | 2021-03-19 11:55:22 -0300 |
|---|---|---|
| committer | Otavio Salvador <otavio@ossystems.com.br> | 2021-03-24 11:18:34 -0300 |
| commit | 7a029812002b93e9f51db45e640c234bdb75322b (patch) | |
| tree | da1139cca4e84542b19791d1dd2436f0a4e92521 | |
| parent | b7db8aa7b47023cb344d7c8e9a2c2eb125693e1b (diff) | |
| download | meta-freescale-7a029812002b93e9f51db45e640c234bdb75322b.tar.gz | |
Revert "imx6*.conf: Rework machine assignments for u-boot variables"
This reverts commit cc4b91bf3a3cf5c2034372c607783048aae44b65.
| -rw-r--r-- | conf/machine/imx6qdlsabreauto.conf | 11 | ||||
| -rw-r--r-- | conf/machine/imx6qdlsabresd.conf | 11 | ||||
| -rw-r--r-- | conf/machine/imx6ulevk.conf | 11 |
3 files changed, 15 insertions, 18 deletions
diff --git a/conf/machine/imx6qdlsabreauto.conf b/conf/machine/imx6qdlsabreauto.conf index 7464cb08a..a6d5908bb 100644 --- a/conf/machine/imx6qdlsabreauto.conf +++ b/conf/machine/imx6qdlsabreauto.conf | |||
| @@ -34,12 +34,11 @@ KERNEL_DEVICETREE_use-mainline-bsp = " \ | |||
| 34 | 34 | ||
| 35 | UBOOT_MACHINE ?= "mx6sabreauto_defconfig" | 35 | UBOOT_MACHINE ?= "mx6sabreauto_defconfig" |
| 36 | 36 | ||
| 37 | # These u-boot variables default to the correct settings for u-boot-imx. | 37 | # Use fslc u-boot by default. See also imx-base.inc. |
| 38 | # Set overrides for u-boot-fslc. | 38 | UBOOT_MAKE_TARGET = "all" |
| 39 | UBOOT_MAKE_TARGET_pn-u-boot-fslc = "all" | 39 | UBOOT_SUFFIX = "img" |
| 40 | UBOOT_SUFFIX_pn-u-boot-fslc = "img" | 40 | SPL_BINARY = "SPL" |
| 41 | SPL_BINARY_pn-u-boot-fslc = "SPL" | 41 | WKS_FILE = "imx-uboot-spl-bootpart.wks.in" |
| 42 | WKS_FILE_pn-u-boot-fslc = "imx-uboot-spl-bootpart.wks.in" | ||
| 43 | 42 | ||
| 44 | # The fsl distro uses u-boot-imx which does not provide unified functionality | 43 | # The fsl distro uses u-boot-imx which does not provide unified functionality |
| 45 | # for dl/q/qp SoC variants. Change the defconfig to the targeted SoC variant. | 44 | # for dl/q/qp SoC variants. Change the defconfig to the targeted SoC variant. |
diff --git a/conf/machine/imx6qdlsabresd.conf b/conf/machine/imx6qdlsabresd.conf index a2b959e3c..406ad7d78 100644 --- a/conf/machine/imx6qdlsabresd.conf +++ b/conf/machine/imx6qdlsabresd.conf | |||
| @@ -43,12 +43,11 @@ KERNEL_DEVICETREE_use-mainline-bsp = " \ | |||
| 43 | 43 | ||
| 44 | UBOOT_MACHINE ?= "mx6sabresd_defconfig" | 44 | UBOOT_MACHINE ?= "mx6sabresd_defconfig" |
| 45 | 45 | ||
| 46 | # These u-boot variables default to the correct settings for u-boot-imx. | 46 | # Use fslc u-boot by default. See also imx-base.inc. |
| 47 | # Set overrides for u-boot-fslc. | 47 | UBOOT_MAKE_TARGET = "all" |
| 48 | UBOOT_MAKE_TARGET_pn-u-boot-fslc = "all" | 48 | UBOOT_SUFFIX = "img" |
| 49 | UBOOT_SUFFIX_pn-u-boot-fslc = "img" | 49 | SPL_BINARY = "SPL" |
| 50 | SPL_BINARY_pn-u-boot-fslc = "SPL" | 50 | WKS_FILE = "imx-uboot-spl-bootpart.wks.in" |
| 51 | WKS_FILE_pn-u-boot-fslc = "imx-uboot-spl-bootpart.wks.in" | ||
| 52 | 51 | ||
| 53 | # The fsl distro uses u-boot-imx which does not provide unified functionality | 52 | # The fsl distro uses u-boot-imx which does not provide unified functionality |
| 54 | # for dl/q/qp SoC variants. Change the defconfig to the targeted SoC variant. | 53 | # for dl/q/qp SoC variants. Change the defconfig to the targeted SoC variant. |
diff --git a/conf/machine/imx6ulevk.conf b/conf/machine/imx6ulevk.conf index 63047d021..a8acb43dc 100644 --- a/conf/machine/imx6ulevk.conf +++ b/conf/machine/imx6ulevk.conf | |||
| @@ -23,12 +23,11 @@ KERNEL_DEVICETREE = " \ | |||
| 23 | " | 23 | " |
| 24 | KERNEL_DEVICETREE_use-mainline-bsp = "imx6ul-14x14-evk.dtb" | 24 | KERNEL_DEVICETREE_use-mainline-bsp = "imx6ul-14x14-evk.dtb" |
| 25 | 25 | ||
| 26 | # These u-boot variables default to the correct settings for u-boot-imx. | 26 | # Use fslc u-boot by default. See also imx-base.inc. |
| 27 | # Set overrides for u-boot-fslc. | 27 | UBOOT_MAKE_TARGET = "" |
| 28 | UBOOT_MAKE_TARGET_pn-u-boot-fslc = "" | 28 | UBOOT_SUFFIX = "img" |
| 29 | UBOOT_SUFFIX_pn-u-boot-fslc = "img" | 29 | SPL_BINARY = "SPL" |
| 30 | SPL_BINARY_pn-u-boot-fslc = "SPL" | 30 | WKS_FILE = "imx-uboot-spl-bootpart.wks.in" |
| 31 | WKS_FILE_pn-u-boot-fslc = "imx-uboot-spl-bootpart.wks.in" | ||
| 32 | 31 | ||
| 33 | UBOOT_CONFIG ??= " \ | 32 | UBOOT_CONFIG ??= " \ |
| 34 | sd \ | 33 | sd \ |