From 90bb670a129723c77bc3dbfe60fc81d0a8d3b625 Mon Sep 17 00:00:00 2001 From: Peng Fan Date: Wed, 6 May 2015 18:13:04 +0800 Subject: MLK-10829-2 imx:mx6 support thermal for all mx6 Move CONFIG_IMX_THERMAL to mx6_common.h Make CONFIG_MXC_OCOTP only depends on CONFIG_CMD_FUSE, since when THERMAL is not implemented, we may use fuse. Signed-off-by: Peng Fan --- include/configs/mx6slevk.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'include/configs/mx6slevk.h') diff --git a/include/configs/mx6slevk.h b/include/configs/mx6slevk.h index 05e6f47..5afcaea 100644 --- a/include/configs/mx6slevk.h +++ b/include/configs/mx6slevk.h @@ -280,10 +280,8 @@ #define CONFIG_SYS_MMC_ENV_DEV 1 /* SDHC2*/ #endif -#define CONFIG_IMX6_THERMAL - #define CONFIG_CMD_FUSE -#if defined(CONFIG_CMD_FUSE) || defined(CONFIG_IMX6_THERMAL) +#if defined(CONFIG_CMD_FUSE) #define CONFIG_MXC_OCOTP #endif -- cgit v1.1