diff mbox series

arm/scp-firmware: Add support for components other than SCP, MCP

Message ID 20230419163052.473096-1-peter.hoyes@arm.com
State New
Headers show
Series arm/scp-firmware: Add support for components other than SCP, MCP | expand

Commit Message

Peter Hoyes April 19, 2023, 4:30 p.m. UTC 
From: Peter Hoyes <Peter.Hoyes@arm.com>

SCP-firmware may build components other than the SCP and MCP. Make the
MCP branch of the do_install task more generic to suport this.

Signed-off-by: Peter Hoyes <Peter.Hoyes@arm.com>
---
 .../recipes-bsp/scp-firmware/scp-firmware_2.11.0.bb  | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

Comments

Jon Mason April 19, 2023, 11:39 p.m. UTC | #1 
On Wed, 19 Apr 2023 17:30:52 +0100, Peter Hoyes wrote:
> SCP-firmware may build components other than the SCP and MCP. Make the
> MCP branch of the do_install task more generic to suport this.

Applied, thanks!

[1/1] arm/scp-firmware: Add support for components other than SCP, MCP
      commit: 0b528b731aef8acb4bd67664d2c31315151e798d

Best regards,
diff mbox series

Patch

diff --git a/meta-arm/recipes-bsp/scp-firmware/scp-firmware_2.11.0.bb b/meta-arm/recipes-bsp/scp-firmware/scp-firmware_2.11.0.bb
index d67e25d3..30705f6e 100644
--- a/meta-arm/recipes-bsp/scp-firmware/scp-firmware_2.11.0.bb
+++ b/meta-arm/recipes-bsp/scp-firmware/scp-firmware_2.11.0.bb
@@ -78,17 +78,17 @@  do_install() {
                if [ "$FW" = "scp" ]; then
                    install -D "${B}/${TYPE}/${FW}/bin/${SCP_PLATFORM}-bl1.bin" "${D}/firmware/${FW}_${TYPE}.bin"
                    install -D "${B}/${TYPE}/${FW}/bin/${SCP_PLATFORM}-bl1.elf" "${D}/firmware/${FW}_${TYPE}.elf"
-               elif [ "$FW" = "mcp" ]; then
-                   install -D "${B}/${TYPE}/${FW}/bin/${SCP_PLATFORM}-mcp-bl1.bin" "${D}/firmware/${FW}_${TYPE}.bin"
-                   install -D "${B}/${TYPE}/${FW}/bin/${SCP_PLATFORM}-mcp-bl1.elf" "${D}/firmware/${FW}_${TYPE}.elf"
+               else
+                   install -D "${B}/${TYPE}/${FW}/bin/${SCP_PLATFORM}-${FW}-bl1.bin" "${D}/firmware/${FW}_${TYPE}.bin"
+                   install -D "${B}/${TYPE}/${FW}/bin/${SCP_PLATFORM}-${FW}-bl1.elf" "${D}/firmware/${FW}_${TYPE}.elf"
                fi
            elif [ "$TYPE" = "ramfw" ]; then
                if [ "$FW" = "scp" ]; then
                    install -D "${B}/${TYPE}/${FW}/bin/${SCP_PLATFORM}-bl2.bin" "${D}/firmware/${FW}_${TYPE}.bin"
                    install -D "${B}/${TYPE}/${FW}/bin/${SCP_PLATFORM}-bl2.elf" "${D}/firmware/${FW}_${TYPE}.elf"
-               elif [ "$FW" = "mcp" ]; then
-                   install -D "${B}/${TYPE}/${FW}/bin/${SCP_PLATFORM}-mcp-bl2.bin" "${D}/firmware/${FW}_${TYPE}.bin"
-                   install -D "${B}/${TYPE}/${FW}/bin/${SCP_PLATFORM}-mcp-bl2.elf" "${D}/firmware/${FW}_${TYPE}.elf"
+               else
+                   install -D "${B}/${TYPE}/${FW}/bin/${SCP_PLATFORM}-${FW}-bl2.bin" "${D}/firmware/${FW}_${TYPE}.bin"
+                   install -D "${B}/${TYPE}/${FW}/bin/${SCP_PLATFORM}-${FW}-bl2.elf" "${D}/firmware/${FW}_${TYPE}.elf"
                fi
            fi
        done