Prepare v2023.10

[platform/kernel/u-boot.git] / arch / arm / mach-imx / imx_bootaux.c

diff --git a/arch/arm/mach-imx/imx_bootaux.c b/arch/arm/mach-imx/imx_bootaux.c
index 2b97aae..f7b14ca 100644 (file)
--- a/arch/arm/mach-imx/imx_bootaux.c
+++ b/arch/arm/mach-imx/imx_bootaux.c
@@ -14,6 +14,7 @@
 #include <linux/compiler.h>
 #include <cpu_func.h>
 
+#ifndef CONFIG_IMX8
 /* Just to avoid build error */
 #if IS_ENABLED(CONFIG_IMX8M)
 #define SRC_M4C_NON_SCLR_RST_MASK      BIT(0)
@@ -45,7 +46,7 @@ static const struct rproc_att *get_host_mapping(unsigned long auxcore)
  * is valid, returns the entry point address.
  * Translates load addresses in the elf file to the U-Boot address space.
  */
-static unsigned long load_elf_image_m_core_phdr(unsigned long addr, ulong *stack)
+static u32 load_elf_image_m_core_phdr(unsigned long addr, u32 *stack)
 {
        Elf32_Ehdr *ehdr; /* ELF header structure pointer */
        Elf32_Phdr *phdr; /* Program header structure pointer */
@@ -95,7 +96,7 @@ static unsigned long load_elf_image_m_core_phdr(unsigned long addr, ulong *stack
 
 int arch_auxiliary_core_up(u32 core_id, ulong addr)
 {
-       ulong stack, pc;
+       u32 stack, pc;
 
        if (!addr)
                return -EINVAL;
@@ -121,7 +122,7 @@ int arch_auxiliary_core_up(u32 core_id, ulong addr)
                pc = *(u32 *)(addr + 4);
        }
 
-       printf("## Starting auxiliary core stack = 0x%08lX, pc = 0x%08lX...\n",
+       printf("## Starting auxiliary core stack = 0x%08X, pc = 0x%08X...\n",
               stack, pc);
 
        /* Set the stack and pc to MCU bootROM */
@@ -158,7 +159,7 @@ int arch_auxiliary_core_check_up(u32 core_id)
 
        return 1;
 }
-
+#endif
 /*
  * To i.MX6SX and i.MX7D, the image supported by bootaux needs
  * the reset vector at the head for the image, with SP and PC
@@ -177,11 +178,15 @@ static int do_bootaux(struct cmd_tbl *cmdtp, int flag, int argc,
 {
        ulong addr;
        int ret, up;
+       u32 core = 0;
 
        if (argc < 2)
                return CMD_RET_USAGE;
 
-       up = arch_auxiliary_core_check_up(0);
+       if (argc > 2)
+               core = simple_strtoul(argv[2], NULL, 10);
+
+       up = arch_auxiliary_core_check_up(core);
        if (up) {
                printf("## Auxiliary core is already up\n");
                return CMD_RET_SUCCESS;
@@ -192,7 +197,7 @@ static int do_bootaux(struct cmd_tbl *cmdtp, int flag, int argc,
        if (!addr)
                return CMD_RET_FAILURE;
 
-       ret = arch_auxiliary_core_up(0, addr);
+       ret = arch_auxiliary_core_up(core, addr);
        if (ret)
                return CMD_RET_FAILURE;
 
@@ -202,5 +207,7 @@ static int do_bootaux(struct cmd_tbl *cmdtp, int flag, int argc,
 U_BOOT_CMD(
        bootaux, CONFIG_SYS_MAXARGS, 1, do_bootaux,
        "Start auxiliary core",
-       ""
+       "<address> [<core>]\n"
+       "   - start auxiliary core [<core>] (default 0),\n"
+       "     at address <address>\n"
 );