From 963dfa7a510e62d246a62a346b8cec4817bb4428 Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Mon, 2 Nov 2015 11:00:21 +0100 Subject: soc.c: allow get_board_serial() be provided by trdx cfg block --- arch/arm/cpu/armv7/mx6/soc.c | 2 ++ 1 file changed, 2 insertions(+) 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) -- cgit v1.2.3