summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/cpu/armv7/mx6/soc.c2
-rw-r--r--arch/arm/cpu/armv7/mx7/soc.c2
2 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/cpu/armv7/mx6/soc.c b/arch/arm/cpu/armv7/mx6/soc.c
index 79b99b253c..0728385439 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
+#ifndef CONFIG_SERIAL_TAG_BOARD
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)
diff --git a/arch/arm/cpu/armv7/mx7/soc.c b/arch/arm/cpu/armv7/mx7/soc.c
index e30493e2d4..4fd8b2b6f6 100644
--- a/arch/arm/cpu/armv7/mx7/soc.c
+++ b/arch/arm/cpu/armv7/mx7/soc.c
@@ -182,6 +182,7 @@ int board_postclk_init(void)
#endif
#ifdef CONFIG_SERIAL_TAG
+#ifndef CONFIG_SERIAL_TAG_BOARD
void get_board_serial(struct tag_serialnr *serialnr)
{
struct ocotp_regs *ocotp = (struct ocotp_regs *)OCOTP_BASE_ADDR;
@@ -193,6 +194,7 @@ void get_board_serial(struct tag_serialnr *serialnr)
serialnr->high = fuse->tester1;
}
#endif
+#endif
#ifndef CONFIG_SYS_DCACHE_OFF
void enable_caches(void)