Message ID | 20240912200751.11917-1-reatmon@ti.com |
---|---|
State | Accepted |
Delegated to: | Ryan Eatmon |
Headers | show |
Series | [meta-ti,master/scarthgap,v2] conf: machine: Remove multiconfig compulsion for k3 platforms | expand |
diff --git a/meta-ti-bsp/conf/machine/beagleplay.conf b/meta-ti-bsp/conf/machine/beagleplay.conf index d420c6c7..c5ce3902 100644 --- a/meta-ti-bsp/conf/machine/beagleplay.conf +++ b/meta-ti-bsp/conf/machine/beagleplay.conf @@ -3,6 +3,8 @@ #@DESCRIPTION: Machine configuration for the BeaglePlay board (A53 core) require conf/machine/include/k3.inc +require conf/machine/include/mc_k3r5.inc + SOC_FAMILY:append = ":am62xx" MACHINE_FEATURES += "screen gpu" diff --git a/meta-ti-bsp/conf/machine/include/am62axx.inc b/meta-ti-bsp/conf/machine/include/am62axx.inc index 93a41d8d..98cea203 100644 --- a/meta-ti-bsp/conf/machine/include/am62axx.inc +++ b/meta-ti-bsp/conf/machine/include/am62axx.inc @@ -1,4 +1,6 @@ require conf/machine/include/k3.inc +require conf/machine/include/mc_k3r5.inc + SOC_FAMILY:append = ":am62axx" MACHINE_FEATURES += "screen touchscreen" diff --git a/meta-ti-bsp/conf/machine/include/am62pxx.inc b/meta-ti-bsp/conf/machine/include/am62pxx.inc index a2825905..2c6a729a 100644 --- a/meta-ti-bsp/conf/machine/include/am62pxx.inc +++ b/meta-ti-bsp/conf/machine/include/am62pxx.inc @@ -1,4 +1,6 @@ require conf/machine/include/k3.inc +require conf/machine/include/mc_k3r5.inc + SOC_FAMILY:append = ":am62pxx" MACHINE_FEATURES += "screen gpu" diff --git a/meta-ti-bsp/conf/machine/include/am62xx.inc b/meta-ti-bsp/conf/machine/include/am62xx.inc index 070a691b..1eb77b4e 100644 --- a/meta-ti-bsp/conf/machine/include/am62xx.inc +++ b/meta-ti-bsp/conf/machine/include/am62xx.inc @@ -1,4 +1,6 @@ require conf/machine/include/k3.inc +require conf/machine/include/mc_k3r5.inc + SOC_FAMILY:append = ":am62xx" MACHINE_FEATURES += "screen gpu" diff --git a/meta-ti-bsp/conf/machine/include/am64xx.inc b/meta-ti-bsp/conf/machine/include/am64xx.inc index 56b6df78..7f388953 100644 --- a/meta-ti-bsp/conf/machine/include/am64xx.inc +++ b/meta-ti-bsp/conf/machine/include/am64xx.inc @@ -1,4 +1,6 @@ require conf/machine/include/k3.inc +require conf/machine/include/mc_k3r5.inc + SOC_FAMILY:append = ":am64xx" KERNEL_DEVICETREE_PREFIX = "ti/k3-am642" diff --git a/meta-ti-bsp/conf/machine/include/am65xx.inc b/meta-ti-bsp/conf/machine/include/am65xx.inc index 46513141..803e369c 100644 --- a/meta-ti-bsp/conf/machine/include/am65xx.inc +++ b/meta-ti-bsp/conf/machine/include/am65xx.inc @@ -1,4 +1,6 @@ require conf/machine/include/k3.inc +require conf/machine/include/mc_k3r5.inc + SOC_FAMILY:append = ":am65xx" MACHINE_FEATURES += "screen touchscreen gpu" diff --git a/meta-ti-bsp/conf/machine/include/am68.inc b/meta-ti-bsp/conf/machine/include/am68.inc index 327366be..330a2973 100644 --- a/meta-ti-bsp/conf/machine/include/am68.inc +++ b/meta-ti-bsp/conf/machine/include/am68.inc @@ -1,4 +1,6 @@ require conf/machine/include/k3.inc +require conf/machine/include/mc_k3r5.inc + SOC_FAMILY:append = ":j721s2" MACHINE_FEATURES += "screen gpu" diff --git a/meta-ti-bsp/conf/machine/include/am69.inc b/meta-ti-bsp/conf/machine/include/am69.inc index 488f9c33..da8a5a8b 100644 --- a/meta-ti-bsp/conf/machine/include/am69.inc +++ b/meta-ti-bsp/conf/machine/include/am69.inc @@ -1,4 +1,6 @@ require conf/machine/include/k3.inc +require conf/machine/include/mc_k3r5.inc + SOC_FAMILY:append = ":j784s4" MACHINE_FEATURES += "screen gpu" diff --git a/meta-ti-bsp/conf/machine/include/j7200.inc b/meta-ti-bsp/conf/machine/include/j7200.inc index 2a11e3dd..b60b98e1 100644 --- a/meta-ti-bsp/conf/machine/include/j7200.inc +++ b/meta-ti-bsp/conf/machine/include/j7200.inc @@ -1,4 +1,6 @@ require conf/machine/include/k3.inc +require conf/machine/include/mc_k3r5.inc + SOC_FAMILY:append = ":j7200" # Default tiboot3.bin on J7200 is for GP diff --git a/meta-ti-bsp/conf/machine/include/j721e.inc b/meta-ti-bsp/conf/machine/include/j721e.inc index 62487aa9..1507234b 100644 --- a/meta-ti-bsp/conf/machine/include/j721e.inc +++ b/meta-ti-bsp/conf/machine/include/j721e.inc @@ -1,4 +1,6 @@ require conf/machine/include/k3.inc +require conf/machine/include/mc_k3r5.inc + SOC_FAMILY:append = ":j721e" MACHINE_FEATURES += "screen gpu" diff --git a/meta-ti-bsp/conf/machine/include/j721s2.inc b/meta-ti-bsp/conf/machine/include/j721s2.inc index 9cd88d9b..e6e4f162 100644 --- a/meta-ti-bsp/conf/machine/include/j721s2.inc +++ b/meta-ti-bsp/conf/machine/include/j721s2.inc @@ -1,4 +1,6 @@ require conf/machine/include/k3.inc +require conf/machine/include/mc_k3r5.inc + SOC_FAMILY:append = ":j721s2" MACHINE_FEATURES += "screen gpu" diff --git a/meta-ti-bsp/conf/machine/include/j722s.inc b/meta-ti-bsp/conf/machine/include/j722s.inc index ef35d83a..e0b77d96 100644 --- a/meta-ti-bsp/conf/machine/include/j722s.inc +++ b/meta-ti-bsp/conf/machine/include/j722s.inc @@ -1,4 +1,6 @@ require conf/machine/include/k3.inc +require conf/machine/include/mc_k3r5.inc + SOC_FAMILY:append = ":j722s" MACHINE_FEATURES += "screen gpu" diff --git a/meta-ti-bsp/conf/machine/include/j742s2.inc b/meta-ti-bsp/conf/machine/include/j742s2.inc index aad7a768..9a54e11e 100644 --- a/meta-ti-bsp/conf/machine/include/j742s2.inc +++ b/meta-ti-bsp/conf/machine/include/j742s2.inc @@ -1,4 +1,6 @@ require conf/machine/include/k3.inc +require conf/machine/include/mc_k3r5.inc + SOC_FAMILY:append = ":j742s2" MACHINE_FEATURES += "screen gpu" diff --git a/meta-ti-bsp/conf/machine/include/j784s4.inc b/meta-ti-bsp/conf/machine/include/j784s4.inc index 883c4a6e..fd3990a6 100644 --- a/meta-ti-bsp/conf/machine/include/j784s4.inc +++ b/meta-ti-bsp/conf/machine/include/j784s4.inc @@ -1,4 +1,6 @@ require conf/machine/include/k3.inc +require conf/machine/include/mc_k3r5.inc + SOC_FAMILY:append = ":j784s4" MACHINE_FEATURES += "screen gpu" 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" require conf/machine/include/arm/arch-arm64.inc -BBMULTICONFIG += "k3r5" - require conf/machine/include/ti-bsp.inc KERNEL_IMAGETYPE = "Image" @@ -57,6 +55,5 @@ MACHINE_FEATURES += "efi" WKS_FILE ?= "${@bb.utils.contains("MACHINE_FEATURES", "efi", "sdimage-2part-efi.wks.in", "sdimage-2part.wks", d)}" do_image_wic[depends] += "virtual/bootloader:do_deploy" -do_image[mcdepends] += "mc::k3r5:virtual/bootloader:do_deploy" SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS2" diff --git a/meta-ti-bsp/conf/machine/include/mc_k3r5.inc b/meta-ti-bsp/conf/machine/include/mc_k3r5.inc new file mode 100644 index 00000000..d5a530b8 --- /dev/null +++ b/meta-ti-bsp/conf/machine/include/mc_k3r5.inc @@ -0,0 +1,3 @@ +BBMULTICONFIG += "k3r5" + +do_image[mcdepends] += "mc::k3r5:virtual/bootloader:do_deploy"