diff options
| author | Max Krummenacher <max.krummenacher@toradex.com> | 2015-11-02 11:00:21 +0100 |
|---|---|---|
| committer | Max Krummenacher <max.krummenacher@toradex.com> | 2016-03-09 14:44:27 +0100 |
| commit | 8578a5c1758c805f276a2df1575f10884edf4958 (patch) | |
| tree | b2c02ba1cc3c8f50974be6542e62ca924dde23f9 | |
| parent | 2b6931e762195f62310b6583ba69bbd8a936202f (diff) | |
iMX6/7 soc.c: allow for board supplied serial
Introduce CONFIG_SERIAL_TAG_BOARD which removes the definition of
void get_board_serial(struct tag_serialnr *serialnr)
in order to allow its definition in board specific code.
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
| -rw-r--r-- | arch/arm/cpu/armv7/mx6/soc.c | 2 | ||||
| -rw-r--r-- | arch/arm/cpu/armv7/mx7/soc.c | 2 | ||||
| -rw-r--r-- | include/configs/apalis_imx6.h | 1 | ||||
| -rw-r--r-- | include/configs/colibri_imx6.h | 1 |
4 files changed, 6 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) diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h index e7d0d2087e..3769709394 100644 --- a/include/configs/apalis_imx6.h +++ b/include/configs/apalis_imx6.h @@ -36,6 +36,7 @@ #define CONFIG_INITRD_TAG #define CONFIG_REVISION_TAG #define CONFIG_SERIAL_TAG +#define CONFIG_SERIAL_TAG_BOARD /* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN (32 * 1024 * 1024) diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h index c545334275..baeaf1f859 100644 --- a/include/configs/colibri_imx6.h +++ b/include/configs/colibri_imx6.h @@ -29,6 +29,7 @@ #define CONFIG_INITRD_TAG #define CONFIG_REVISION_TAG #define CONFIG_SERIAL_TAG +#define CONFIG_SERIAL_TAG_BOARD /* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN (32 * 1024 * 1024) |