summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Krummenacher <max.krummenacher@toradex.com>2015-11-02 11:00:21 +0100
committerMax Krummenacher <max.krummenacher@toradex.com>2016-02-17 10:54:06 +0100
commit963dfa7a510e62d246a62a346b8cec4817bb4428 (patch)
treed4e4247ed6f0ce2c6e7c3a2f042adefd6cef7e56
parentf014b2a58e2cb15b157cc51bf90ff07553830836 (diff)
soc.c: allow get_board_serial() be provided by trdx cfg block
-rw-r--r--arch/arm/cpu/armv7/mx6/soc.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/cpu/armv7/mx6/soc.c b/arch/arm/cpu/armv7/mx6/soc.c
index 79b99b253c..9ce42c972d 100644
--- a/arch/arm/cpu/armv7/mx6/soc.c
+++ b/arch/arm/cpu/armv7/mx6/soc.c
@@ -521,6 +521,7 @@ int board_postclk_init(void)
}
#ifdef CONFIG_SERIAL_TAG
+#if CONFIG_TRDX_CFG_BLOCK!=1
void get_board_serial(struct tag_serialnr *serialnr)
{
struct ocotp_regs *ocotp = (struct ocotp_regs *)OCOTP_BASE_ADDR;
@@ -532,6 +533,7 @@ void get_board_serial(struct tag_serialnr *serialnr)
serialnr->high = fuse->uid_high;
}
#endif
+#endif
#ifndef CONFIG_SYS_DCACHE_OFF
void enable_caches(void)