Re: [U-Boot] [PATCH 08/11] imx: mx7 dm thermal driver support

Hi Adrian,

On Wed, Jul 15, 2015 at 7:49 PM, Adrian Alonso aalonso@freescale.com wrote:

diff --git a/include/configs/mx6cuboxi.h b/include/configs/mx6cuboxi.h index 3d5bba7..d42b7f0 100644 --- a/include/configs/mx6cuboxi.h +++ b/include/configs/mx6cuboxi.h @@ -14,7 +14,7 @@ #define CONFIG_SPL_MMC_SUPPORT #include "imx6_spl.h"

-#define CONFIG_IMX6_THERMAL +#define CONFIG_IMX_THERMAL

This would cause a conflict with Peter Robinson's series that centralizas CONFIG_IMX6_THERMAL