GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-22 15:11:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

freescale: Ensure common commands are not included in SPL binary

Browse source 
Both the "qixis_reset" and esbc_validate" commands can only be used in
full U-Boot so do not build them in SPL.  As part of this rework the
qixis code to declare things as static and make use of __weak for
function aliases.

Cc; York Sun <york.sun@nxp.com>
Signed-off-by: Tom Rini <trini@konsulko.com>
Reviewed-by: York Sun <york.sun@nxp.com>
This commit is contained in:
Tom Rini 2018-01-03 08:57:50 -05:00 • committed by York Sun
parent 68ae7772af
commit 1f0ce3259e
2 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
board/freescale/common/cmd_esbc_validate.c
View file

@ -23,6 +23,7 @@ loop:
return 0; return 0;
} }
#ifndef CONFIG_SPL_BUILD
static int do_esbc_validate(cmd_tbl_t *cmdtp, int flag, int argc, static int do_esbc_validate(cmd_tbl_t *cmdtp, int flag, int argc,
char * const argv[]) char * const argv[])
{ {
@ -82,3 +83,4 @@ U_BOOT_CMD(
"Put the core in spin loop (Secure Boot Only)", "Put the core in spin loop (Secure Boot Only)",
"" ""
); );
#endif

14
board/freescale/common/qixis.c
View file

@ -10,6 +10,7 @@
#include <common.h> #include <common.h>
#include <command.h> #include <command.h>
#include <asm/io.h> #include <asm/io.h>
#include <linux/compiler.h>
#include <linux/time.h> #include <linux/time.h>
#include <i2c.h> #include <i2c.h>
#include "qixis.h" #include "qixis.h"
@ -136,12 +137,13 @@ void board_deassert_mem_reset(void)
} }
#endif #endif
void qixis_reset(void) #ifndef CONFIG_SPL_BUILD
static void qixis_reset(void)
{ {
QIXIS_WRITE(rst_ctl, QIXIS_RST_CTL_RESET); QIXIS_WRITE(rst_ctl, QIXIS_RST_CTL_RESET);
} }
void qixis_bank_reset(void) static void qixis_bank_reset(void)
{ {
QIXIS_WRITE(rcfg_ctl, QIXIS_RCFG_CTL_RECONFIG_IDLE); QIXIS_WRITE(rcfg_ctl, QIXIS_RCFG_CTL_RECONFIG_IDLE);
QIXIS_WRITE(rcfg_ctl, QIXIS_RCFG_CTL_RECONFIG_START); QIXIS_WRITE(rcfg_ctl, QIXIS_RCFG_CTL_RECONFIG_START);
@ -196,15 +198,12 @@ static void qixis_dump_regs(void)
printf("stat_alrm = %02x\n", QIXIS_READ(stat_alrm)); printf("stat_alrm = %02x\n", QIXIS_READ(stat_alrm));
} }
static void __qixis_dump_switch(void) void __weak qixis_dump_switch(void)
{ {
puts("Reverse engineering switch is not implemented for this board\n"); puts("Reverse engineering switch is not implemented for this board\n");
} }
void qixis_dump_switch(void) static int qixis_reset_cmd(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
__attribute__((weak, alias("__qixis_dump_switch")));
int qixis_reset_cmd(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
{ {
int i; int i;
@ -305,3 +304,4 @@ U_BOOT_CMD(
"qixis_reset dump - display the QIXIS registers\n" "qixis_reset dump - display the QIXIS registers\n"
"qixis_reset switch - display switch\n" "qixis_reset switch - display switch\n"
); );
#endif