projects
/
oweals
/
u-boot.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d449701
)
imx-common: wrap boot_mode_apply with CONFIG_CMD_BMODE
author
Peng Fan
<Peng.Fan@freescale.com>
Tue, 15 Sep 2015 06:05:06 +0000
(14:05 +0800)
committer
Stefano Babic
<sbabic@denx.de>
Thu, 24 Sep 2015 09:31:58 +0000
(11:31 +0200)
boot_mode_apply should be applied only with CONFIG_CMD_BMODE enabled.
Signed-off-by: Peng Fan <Peng.Fan@freescale.com>
Cc: Stefano Babic <sbabic@denx.de>
arch/arm/imx-common/init.c
patch
|
blob
|
history
diff --git
a/arch/arm/imx-common/init.c
b/arch/arm/imx-common/init.c
index 56d501044991626fc7eb9a04cac0dab1f0d37a92..058cf79744633107b2091c0188049140609403d7 100644
(file)
--- a/
arch/arm/imx-common/init.c
+++ b/
arch/arm/imx-common/init.c
@@
-103,6
+103,7
@@
void init_src(void)
writel(val, &src_regs->scr);
}
+#ifdef CONFIG_CMD_BMODE
void boot_mode_apply(unsigned cfg_val)
{
unsigned reg;
@@
-115,3
+116,4
@@
void boot_mode_apply(unsigned cfg_val)
reg &= ~(1 << 28);
writel(reg, &psrc->gpr10);
}
+#endif