diff options
author | Tom Rini <trini@konsulko.com> | 2018-01-17 13:48:35 -0500 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2018-01-17 13:48:35 -0500 |
commit | 086ebcd40e9bf8efc520f1b177fd8e3cc0e506fa (patch) | |
tree | e25d93fda4ce7cd672e7340f60015ec6fe2de27f /board/freescale/common | |
parent | 3759df0c0810636b31fe64c56868aa831514e509 (diff) | |
parent | 2eb2dbd4577898bf289e911b2286df3f2363af6e (diff) | |
download | u-boot-086ebcd40e9bf8efc520f1b177fd8e3cc0e506fa.zip u-boot-086ebcd40e9bf8efc520f1b177fd8e3cc0e506fa.tar.gz u-boot-086ebcd40e9bf8efc520f1b177fd8e3cc0e506fa.tar.bz2 |
Merge git://git.denx.de/u-boot-fsl-qoriq
Diffstat (limited to 'board/freescale/common')
-rw-r--r-- | board/freescale/common/Kconfig | 2 | ||||
-rw-r--r-- | board/freescale/common/cmd_esbc_validate.c | 2 | ||||
-rw-r--r-- | board/freescale/common/qixis.c | 14 |
3 files changed, 11 insertions, 7 deletions
diff --git a/board/freescale/common/Kconfig b/board/freescale/common/Kconfig index 8a5c456..280f7d4 100644 --- a/board/freescale/common/Kconfig +++ b/board/freescale/common/Kconfig @@ -7,6 +7,8 @@ config CHAIN_OF_TRUST select SHA_HW_ACCEL select SHA_PROG_HW_ACCEL select ENV_IS_NOWHERE + select CMD_EXT4 if ARM + select CMD_EXT4_WRITE if ARM bool default y diff --git a/board/freescale/common/cmd_esbc_validate.c b/board/freescale/common/cmd_esbc_validate.c index b3e5f01..f45e224 100644 --- a/board/freescale/common/cmd_esbc_validate.c +++ b/board/freescale/common/cmd_esbc_validate.c @@ -23,6 +23,7 @@ loop: return 0; } +#ifndef CONFIG_SPL_BUILD static int do_esbc_validate(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) { @@ -82,3 +83,4 @@ U_BOOT_CMD( "Put the core in spin loop (Secure Boot Only)", "" ); +#endif diff --git a/board/freescale/common/qixis.c b/board/freescale/common/qixis.c index 0db0ed6..24459f8 100644 --- a/board/freescale/common/qixis.c +++ b/board/freescale/common/qixis.c @@ -10,6 +10,7 @@ #include <common.h> #include <command.h> #include <asm/io.h> +#include <linux/compiler.h> #include <linux/time.h> #include <i2c.h> #include "qixis.h" @@ -136,12 +137,13 @@ void board_deassert_mem_reset(void) } #endif -void qixis_reset(void) +#ifndef CONFIG_SPL_BUILD +static void qixis_reset(void) { 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_START); @@ -196,15 +198,12 @@ static void qixis_dump_regs(void) 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"); } -void qixis_dump_switch(void) - __attribute__((weak, alias("__qixis_dump_switch"))); - -int qixis_reset_cmd(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +static int qixis_reset_cmd(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) { int i; @@ -305,3 +304,4 @@ U_BOOT_CMD( "qixis_reset dump - display the QIXIS registers\n" "qixis_reset switch - display switch\n" ); +#endif |