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

board:ls2080ardb: Update execution of config_board_mux

Browse source 
Function config_board_mux() reads env variable 'hwconfig' which is
only available after relocation for QSPI boot. Move calling
config_board_mux() to misc_init_r().

Signed-off-by: Santan Kumar <santan.kumar@nxp.com>
[YS: Revise commit message]
Reviewed-by: York Sun <york.sun@nxp.com>
This commit is contained in:
Santan Kumar 2017-06-15 17:07:01 +05:30 • committed by York Sun
parent 6cc914efd2
commit 263536a693
1 changed files with 14 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
board/freescale/ls2080ardb/ls2080ardb.c
View file

@ -204,25 +204,12 @@ int config_board_mux(int ctrl_type)
int board_init(void) int board_init(void)
{ {
char *env_hwconfig;
u32 __iomem *dcfg_ccsr = (u32 __iomem *)DCFG_BASE;
#ifdef CONFIG_FSL_MC_ENET #ifdef CONFIG_FSL_MC_ENET
u32 __iomem *irq_ccsr = (u32 __iomem *)ISC_BASE; u32 __iomem *irq_ccsr = (u32 __iomem *)ISC_BASE;
#endif #endif
u32 val;
init_final_memctl_regs(); init_final_memctl_regs();
val = in_le32(dcfg_ccsr + DCFG_RCWSR13 / 4);
env_hwconfig = getenv("hwconfig");
if (hwconfig_f("dspi", env_hwconfig) &&
DCFG_RCWSR13_DSPI == (val & (u32)(0xf << 8)))
config_board_mux(MUX_TYPE_DSPI);
else
config_board_mux(MUX_TYPE_SDHC);
#ifdef CONFIG_ENV_IS_NOWHERE #ifdef CONFIG_ENV_IS_NOWHERE
gd->env_addr = (ulong)&default_environment[0]; gd->env_addr = (ulong)&default_environment[0];
#endif #endif
@ -257,6 +244,20 @@ int board_early_init_f(void)
int misc_init_r(void) int misc_init_r(void)
{ {
char *env_hwconfig;
u32 __iomem *dcfg_ccsr = (u32 __iomem *)DCFG_BASE;
u32 val;
val = in_le32(dcfg_ccsr + DCFG_RCWSR13 / 4);
env_hwconfig = getenv("hwconfig");
if (hwconfig_f("dspi", env_hwconfig) &&
DCFG_RCWSR13_DSPI == (val & (u32)(0xf << 8)))
config_board_mux(MUX_TYPE_DSPI);
else
config_board_mux(MUX_TYPE_SDHC);
/* /*
* LS2081ARDB RevF board has smart voltage translator * LS2081ARDB RevF board has smart voltage translator
* which needs to be programmed to enable high speed SD interface * which needs to be programmed to enable high speed SD interface