ti-rtos-firmware: Deploy secure firmware unconditionally

Having signed firmware is needed for the HS platforms, but does not
cause any issues for non-HS. To keep things simple, let's deploy
both sets unconditionally. This prevents mistakes when adding HS
support and further reduces the image delta between the two types.

Signed-off-by: Andrew Davis <afd@ti.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>

1 files changed, 4 insertions, 34 deletions

diff --git a/meta-ti-bsp/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb b/meta-ti-bsp/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb
index 5de7c7b3..ddfa07be 100644
--- a/meta-ti-bsp/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb
+++ b/meta-ti-bsp/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb
@@ -183,7 +183,7 @@ ALTERNATIVE:${PN}:am62xx = "\
                     am62-main-r5f0_0-fw \
                     "
 
-ALTERNATIVE:${PN}:j721e-hs-evm = "\
+ALTERNATIVE:${PN}:j721e = "\
                     j7-mcu-r5f0_0-fw \
                     j7-mcu-r5f0_1-fw \
                     j7-main-r5f0_0-fw \
@@ -202,26 +202,7 @@ ALTERNATIVE:${PN}:j721e-hs-evm = "\
                     j7-c71_0-fw-sec \
                     "
 
-ALTERNATIVE:${PN}:j721e-evm = "\
-                    j7-mcu-r5f0_0-fw \
-                    j7-mcu-r5f0_1-fw \
-                    j7-main-r5f0_0-fw \
-                    j7-main-r5f0_1-fw \
-                    j7-main-r5f1_0-fw \
-                    j7-main-r5f1_1-fw \
-                    j7-c66_0-fw \
-                    j7-c66_1-fw \
-                    j7-c71_0-fw\
-                    "
-
-ALTERNATIVE:${PN}:j7200-evm = "\
-                    j7200-mcu-r5f0_0-fw \
-                    j7200-mcu-r5f0_1-fw \
-                    j7200-main-r5f0_0-fw \
-                    j7200-main-r5f0_1-fw \
-                    "
-
-ALTERNATIVE:${PN}:j7200-hs-evm = "\
+ALTERNATIVE:${PN}:j7200 = "\
                     j7200-mcu-r5f0_0-fw \
                     j7200-mcu-r5f0_1-fw \
                     j7200-main-r5f0_0-fw \
@@ -230,18 +211,7 @@ ALTERNATIVE:${PN}:j7200-hs-evm = "\
                     j7200-main-r5f0_1-fw-sec \
                     "
 
-ALTERNATIVE_${PN}:j721s2-evm = "\
-                    j721s2-mcu-r5f0_0-fw \
-                    j721s2-mcu-r5f0_1-fw \
-                    j721s2-main-r5f0_0-fw \
-                    j721s2-main-r5f0_1-fw \
-                    j721s2-main-r5f1_0-fw \
-                    j721s2-main-r5f1_1-fw \
-                    j721s2-c71_0-fw \
-                    j721s2-c71_1-fw \
-                    "
-
-ALTERNATIVE:${PN}:j721s2-hs-evm = "\
+ALTERNATIVE:${PN}:j721s2 = "\
                     j721s2-mcu-r5f0_0-fw \
                     j721s2-mcu-r5f0_1-fw \
                     j721s2-main-r5f0_0-fw \
@@ -258,7 +228,7 @@ ALTERNATIVE:${PN}:j721s2-hs-evm = "\
                     j721s2-c71_1-fw-sec \
                     "
 
-ALTERNATIVE:${PN}:j784s4-evm = "\
+ALTERNATIVE:${PN}:j784s4 = "\
                     j784s4-mcu-r5f0_0-fw \
                     j784s4-mcu-r5f0_1-fw \
                     j784s4-main-r5f0_0-fw \