diff options
| author | Max Krummenacher <max.krummenacher@toradex.com> | 2015-11-12 18:11:33 +0100 |
|---|---|---|
| committer | Max Krummenacher <max.krummenacher@toradex.com> | 2016-02-17 10:54:07 +0100 |
| commit | fb3e1f6ba44ebbbe06a4fc0813728f4f38f8e80d (patch) | |
| tree | 48de5a27d59f7ea5735f11d99501192e9de62815 | |
| parent | 3794e7cb5d29de16da65514439313417fd3271ae (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.
| -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, 5 insertions, 1 deletions
diff --git a/arch/arm/cpu/armv7/mx6/soc.c b/arch/arm/cpu/armv7/mx6/soc.c index 9ce42c972d..0728385439 100644 --- a/arch/arm/cpu/armv7/mx6/soc.c +++ b/arch/arm/cpu/armv7/mx6/soc.c @@ -521,7 +521,7 @@ int board_postclk_init(void) } #ifdef CONFIG_SERIAL_TAG -#if CONFIG_TRDX_CFG_BLOCK!=1 +#ifndef CONFIG_SERIAL_TAG_BOARD void get_board_serial(struct tag_serialnr *serialnr) { struct ocotp_regs *ocotp = (struct ocotp_regs *)OCOTP_BASE_ADDR; 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) |