leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

arm: imx: Rework i.MX specific commands to be excluded from SPL

Browse Source 
The "clocks" and "bootaux" commands are only usable in full U-Boot, not
SPL, so do not link them inside of SPL.  Rework a little of the bootaux
related code to make use of __weak and declare parts of it static as
it's local to the file.

Cc: Stefano Babic <sbabic@denx.de>
Cc: Fabio Estevam <fabio.estevam@nxp.com>
Signed-off-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Fabio Estevam <fabio.estevam@nxp.com>
This commit is contained in:
Tom Rini 2018-01-03 08:52:39 -05:00 committed by Stefano Babic
parent e7528a3d74
commit 20b9f2eaf5
5 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/mach-imx/Makefile
View File

@ -28,7 +28,9 @@ obj-y += cache.o init.o
obj-$(CONFIG_SATA) += sata.o obj-$(CONFIG_SATA) += sata.o
obj-$(CONFIG_IMX_VIDEO_SKIP) += video.o obj-$(CONFIG_IMX_VIDEO_SKIP) += video.o
obj-$(CONFIG_IMX_RDC) += rdc-sema.o obj-$(CONFIG_IMX_RDC) += rdc-sema.o
ifneq ($(CONFIG_SPL_BUILD),y)
obj-$(CONFIG_IMX_BOOTAUX) += imx_bootaux.o obj-$(CONFIG_IMX_BOOTAUX) += imx_bootaux.o
endif
obj-$(CONFIG_SECURE_BOOT) += hab.o obj-$(CONFIG_SECURE_BOOT) += hab.o
obj-$(CONFIG_SYSCOUNTER_TIMER) += syscounter.o obj-$(CONFIG_SYSCOUNTER_TIMER) += syscounter.o
endif endif

13
arch/arm/mach-imx/imx_bootaux.c
View File

@ -6,27 +6,22 @@
#include <common.h> #include <common.h>
#include <command.h> #include <command.h>
#include <linux/compiler.h>
/* Allow for arch specific config before we boot */ /* Allow for arch specific config before we boot */
static int __arch_auxiliary_core_up(u32 core_id, u32 boot_private_data) int __weak arch_auxiliary_core_up(u32 core_id, u32 boot_private_data)
{ {
/* please define platform specific arch_auxiliary_core_up() */ /* please define platform specific arch_auxiliary_core_up() */
return CMD_RET_FAILURE; return CMD_RET_FAILURE;
} }
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 */ /* Allow for arch specific config before we boot */
static int __arch_auxiliary_core_check_up(u32 core_id) int __weak arch_auxiliary_core_check_up(u32 core_id)
{ {
/* please define platform specific arch_auxiliary_core_check_up() */ /* please define platform specific arch_auxiliary_core_check_up() */
return 0; return 0;
} }
int arch_auxiliary_core_check_up(u32 core_id)
__attribute__((weak, alias("__arch_auxiliary_core_check_up")));
/* /*
* To i.MX6SX and i.MX7D, the image supported by bootaux needs * 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 * the reset vector at the head for the image, with SP and PC
@ -40,7 +35,7 @@ int arch_auxiliary_core_check_up(u32 core_id)
* The TCMUL is mapped to (M4_BOOTROM_BASE_ADDR) at A core side for * The TCMUL is mapped to (M4_BOOTROM_BASE_ADDR) at A core side for
* accessing the M4 TCMUL. * accessing the M4 TCMUL.
*/ */
int do_bootaux(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) static int do_bootaux(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
{ {
ulong addr; ulong addr;
int ret, up; int ret, up;

4
arch/arm/mach-imx/mx5/clock.c
View File

@ -911,10 +911,11 @@ void mxc_set_sata_internal_clock(void)
} }
#endif #endif
#ifndef CONFIG_SPL_BUILD
/* /*
* Dump some core clockes. * Dump some core clockes.
*/ */
int do_mx5_showclocks(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) static int do_mx5_showclocks(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
{ {
u32 freq; u32 freq;
@ -947,3 +948,4 @@ U_BOOT_CMD(
"display clocks", "display clocks",
"" ""
); );
#endif

2
arch/arm/mach-imx/mx7/clock.c
View File

@ -1096,6 +1096,7 @@ void epdc_clock_disable(void)
} }
#endif #endif
#ifndef CONFIG_SPL_BUILD
/* /*
* Dump some core clockes. * Dump some core clockes.
*/ */
@ -1131,3 +1132,4 @@ U_BOOT_CMD(
"display clocks", "display clocks",
"" ""
); );
#endif

2
arch/arm/mach-imx/mx7ulp/clock.c
View File

@ -323,6 +323,7 @@ void hab_caam_clock_enable(unsigned char enable)
} }
#endif #endif
#ifndef CONFIG_SPL_BUILD
/* /*
* Dump some core clockes. * Dump some core clockes.
*/ */
@ -363,3 +364,4 @@ U_BOOT_CMD(
"display clocks", "display clocks",
"" ""
); );
#endif