diff options
| -rw-r--r-- | arch/arm/cpu/armv7/mx6/soc.c | 13 | ||||
| -rw-r--r-- | arch/arm/include/asm/arch-mx6/sys_proto.h | 1 | ||||
| -rw-r--r-- | common/cmd_bootaux.c | 18 |
3 files changed, 31 insertions, 1 deletions
diff --git a/arch/arm/cpu/armv7/mx6/soc.c b/arch/arm/cpu/armv7/mx6/soc.c index c809711..1e72212 100644 --- a/arch/arm/cpu/armv7/mx6/soc.c +++ b/arch/arm/cpu/armv7/mx6/soc.c @@ -565,6 +565,19 @@ int arch_auxiliary_core_up(u32 core_id, u32 boot_private_data) return 0; } + +int arch_auxiliary_core_check_up(u32 core_id) +{ + struct src *src_reg = (struct src *)SRC_BASE_ADDR; + unsigned val; + + val = readl(&src_reg->scr); + + if (val & 0x00000010) + return 0; /* assert in reset */ + + return 1; +} #endif void boot_mode_apply(unsigned cfg_val) diff --git a/arch/arm/include/asm/arch-mx6/sys_proto.h b/arch/arm/include/asm/arch-mx6/sys_proto.h index b89faca..2fcdd63 100644 --- a/arch/arm/include/asm/arch-mx6/sys_proto.h +++ b/arch/arm/include/asm/arch-mx6/sys_proto.h @@ -40,6 +40,7 @@ void finish_anatop_bypass(void); #ifdef CONFIG_MX6SX int arch_auxiliary_core_up(u32 core_id, u32 boot_private_data); +int arch_auxiliary_core_check_up(u32 core_id); #endif /* diff --git a/common/cmd_bootaux.c b/common/cmd_bootaux.c index 188cb73..b15de0e 100644 --- a/common/cmd_bootaux.c +++ b/common/cmd_bootaux.c @@ -16,14 +16,30 @@ static int __arch_auxiliary_core_up(u32 core_id, u32 boot_private_data) int arch_auxiliary_core_up(u32 core_id, u32 boot_private_data) __attribute__((weak, alias("__arch_auxiliary_core_up"))); +/* Allow for arch specific config before we boot */ +static int __arch_auxiliary_core_check_up(u32 core_id) +{ + /* please define platform specific arch_auxiliary_core_check_up() */ + return 0; +} + +int arch_auxiliary_core_check_up(u32 core_id) + __attribute__((weak, alias("__arch_auxiliary_core_check_up"))); + int do_bootaux(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) { ulong addr; - int ret; + int ret, up; if (argc < 2) return CMD_RET_USAGE; + up = arch_auxiliary_core_check_up(0); + if (up) { + printf("## Auxiliary core is already up\n"); + return CMD_RET_SUCCESS; + } + addr = simple_strtoul(argv[1], NULL, 16); printf("## Starting auxiliary core at 0x%08lX ...\n", addr); |