From 3c73b0a49a5c974bb313f8087dd0cfc54ea90ad2 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Wed, 24 Jun 2015 17:09:46 +0100 Subject: imx6: standardise OCOTP and fuse config to mx6_common According to README.mxc_ocotp the OCOTP is a stanard i.MX6 SoC feature so centralise the config in mx6_common.h so functionality is standard across all boards Signed-off-by: Peter Robinson Acked-by: Stefano Babic --- include/configs/mx6_common.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'include/configs/mx6_common.h') diff --git a/include/configs/mx6_common.h b/include/configs/mx6_common.h index 86d7b16..54ab890 100644 --- a/include/configs/mx6_common.h +++ b/include/configs/mx6_common.h @@ -111,4 +111,8 @@ #define CONFIG_FSL_ESDHC #define CONFIG_FSL_USDHC +/* Fuses */ +#define CONFIG_CMD_FUSE +#define CONFIG_MXC_OCOTP + #endif -- cgit v1.1 From 436cf40f05209c36cee78ab8760798840f7474b4 Mon Sep 17 00:00:00 2001 From: Peng Fan Date: Mon, 20 Jul 2015 19:28:26 +0800 Subject: imx: mx6ul remove errata for i.MX6UL Since i.MX6UL use A7 core, but not A9 core, we do not need the erratas for i.MX6UL. Signed-off-by: Ye.Li Signed-off-by: Peng Fan --- include/configs/mx6_common.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'include/configs/mx6_common.h') diff --git a/include/configs/mx6_common.h b/include/configs/mx6_common.h index 54ab890..ce43bd7 100644 --- a/include/configs/mx6_common.h +++ b/include/configs/mx6_common.h @@ -17,11 +17,11 @@ #ifndef __MX6_COMMON_H #define __MX6_COMMON_H +#ifndef CONFIG_MX6UL #define CONFIG_ARM_ERRATA_743622 #define CONFIG_ARM_ERRATA_751472 #define CONFIG_ARM_ERRATA_794072 #define CONFIG_ARM_ERRATA_761320 -#define CONFIG_BOARD_POSTCLK_INIT #ifndef CONFIG_SYS_L2CACHE_OFF #define CONFIG_SYS_L2_PL310 @@ -29,6 +29,8 @@ #endif #define CONFIG_MP +#endif +#define CONFIG_BOARD_POSTCLK_INIT #define CONFIG_MXC_GPT_HCLK #define CONFIG_SYS_NO_FLASH -- cgit v1.1 From 94bd1d143056c1a68d118d151bd54c73828abca1 Mon Sep 17 00:00:00 2001 From: Peng Fan Date: Mon, 20 Jul 2015 19:28:32 +0800 Subject: mx6_common: Fix LOADADDR and SYS_TEXT_BASE for i.MX6UL DRAM space starts from 0x80000000 for i.MX6UL, so need to fix LOADADDR, SYS_TEXT_BASE. Signed-off-by: Peng Fan --- include/configs/mx6_common.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/configs/mx6_common.h') diff --git a/include/configs/mx6_common.h b/include/configs/mx6_common.h index ce43bd7..ef4cb68 100644 --- a/include/configs/mx6_common.h +++ b/include/configs/mx6_common.h @@ -54,7 +54,7 @@ #define CONFIG_REVISION_TAG /* Boot options */ -#if (defined(CONFIG_MX6SX) || defined(CONFIG_MX6SL)) +#if (defined(CONFIG_MX6SX) || defined(CONFIG_MX6SL) || defined(CONFIG_MX6UL)) #define CONFIG_LOADADDR 0x82000000 #ifndef CONFIG_SYS_TEXT_BASE #define CONFIG_SYS_TEXT_BASE 0x87800000 -- cgit v1.1