diff options
| author | Chirag Shilwant <c-shilwant@ti.com> | 2024-09-12 15:07:51 -0500 |
|---|---|---|
| committer | Ryan Eatmon <reatmon@ti.com> | 2024-09-13 10:38:39 -0500 |
| commit | 82e8543cdcec09f1fe95fd2c937121ed3c513c22 (patch) | |
| tree | 58c16befa638fc11c1602144546fbdb45e7e8945 /meta-ti-bsp/conf/machine/include/k3.inc | |
| parent | ad3ccfd1e38c22ffdde63a9abae06985e93268ea (diff) | |
| download | meta-ti-82e8543cdcec09f1fe95fd2c937121ed3c513c22.tar.gz | |
conf: machine: Remove multiconfig compulsion for k3 platformscicd.master.202409240100cicd.master.202409200100cicd.master.202409180100cicd.master.202409170100
- While implementing k3.inc, there was an assumption that all
k3 based TI SOC's would always have a Cortex-R5F core [1]. This
assumption is not true.
- Hence, create a new mc_k3r5 include file & move the multiconfig
dependencies to it. Also, include this file only in those k3 platforms
which needs the R5 multiconfig support.
[1]: https://git.ti.com/cgit/arago-project/meta-ti/commit/conf/machine/include/k3.inc?h=scarthgap&id=f814840465358a6b5429ad20165742ac6e6e6a29
Signed-off-by: Chirag Shilwant <c-shilwant@ti.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
Diffstat (limited to 'meta-ti-bsp/conf/machine/include/k3.inc')
| -rw-r--r-- | meta-ti-bsp/conf/machine/include/k3.inc | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/meta-ti-bsp/conf/machine/include/k3.inc b/meta-ti-bsp/conf/machine/include/k3.inc index 34991ec9..a296f64f 100644 --- a/meta-ti-bsp/conf/machine/include/k3.inc +++ b/meta-ti-bsp/conf/machine/include/k3.inc | |||
| @@ -5,8 +5,6 @@ SOC_FAMILY:append = ":k3" | |||
| 5 | 5 | ||
| 6 | require conf/machine/include/arm/arch-arm64.inc | 6 | require conf/machine/include/arm/arch-arm64.inc |
| 7 | 7 | ||
| 8 | BBMULTICONFIG += "k3r5" | ||
| 9 | |||
| 10 | require conf/machine/include/ti-bsp.inc | 8 | require conf/machine/include/ti-bsp.inc |
| 11 | 9 | ||
| 12 | KERNEL_IMAGETYPE = "Image" | 10 | KERNEL_IMAGETYPE = "Image" |
| @@ -57,6 +55,5 @@ MACHINE_FEATURES += "efi" | |||
| 57 | WKS_FILE ?= "${@bb.utils.contains("MACHINE_FEATURES", "efi", "sdimage-2part-efi.wks.in", "sdimage-2part.wks", d)}" | 55 | WKS_FILE ?= "${@bb.utils.contains("MACHINE_FEATURES", "efi", "sdimage-2part-efi.wks.in", "sdimage-2part.wks", d)}" |
| 58 | 56 | ||
| 59 | do_image_wic[depends] += "virtual/bootloader:do_deploy" | 57 | do_image_wic[depends] += "virtual/bootloader:do_deploy" |
| 60 | do_image[mcdepends] += "mc::k3r5:virtual/bootloader:do_deploy" | ||
| 61 | 58 | ||
| 62 | SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS2" | 59 | SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS2" |
