diff mbox series

[U-Boot,4/5] Kconfig: mx6ull: Deselect MX6UL from CONFIG_MX6ULL

Message ID 1511824060-21323-1-git-send-email-brenomatheus@gmail.com
State Accepted
Commit 051ba9e082f71f4709c32a69378192ca8964ca50
Delegated to: Stefano Babic
Headers show
Series [U-Boot,1/5] mx6slevk: imximage.cfg: Handle the CONFIG_SECURE_BOOT case | expand

Commit Message

Breno Matheus Lima Nov. 27, 2017, 11:07 p.m. UTC
From: Breno Lima <breno.lima@nxp.com>

MX6UL contains features that MX6ULL doesn't support.
Deselect CONFIG_MX6UL and select SYS_L2CACHE_OFF and ROM_UNIFIED_SECTIONS.

The motivation for doing this change is that MX6UL supports CAAM and
MX6ULL does not.

Signed-off-by: Breno Lima <breno.lima@nxp.com>
---
 arch/arm/mach-imx/mx6/Kconfig | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

Fabio Estevam Nov. 28, 2017, 12:03 a.m. UTC | #1
On Mon, Nov 27, 2017 at 9:07 PM, Breno Lima <brenomatheus@gmail.com> wrote:
> From: Breno Lima <breno.lima@nxp.com>
>
> MX6UL contains features that MX6ULL doesn't support.
> Deselect CONFIG_MX6UL and select SYS_L2CACHE_OFF and ROM_UNIFIED_SECTIONS.
>
> The motivation for doing this change is that MX6UL supports CAAM and
> MX6ULL does not.
>
> Signed-off-by: Breno Lima <breno.lima@nxp.com>

Reviewed-by: Fabio Estevam <fabio.estevam@nxp.com>
Stefano Babic Dec. 17, 2017, 10:31 a.m. UTC | #2
On 28/11/2017 00:07, Breno Lima wrote:
> From: Breno Lima <breno.lima@nxp.com>
> 
> MX6UL contains features that MX6ULL doesn't support.
> Deselect CONFIG_MX6UL and select SYS_L2CACHE_OFF and ROM_UNIFIED_SECTIONS.
> 
> The motivation for doing this change is that MX6UL supports CAAM and
> MX6ULL does not.
> 
> Signed-off-by: Breno Lima <breno.lima@nxp.com>
> ---
>  arch/arm/mach-imx/mx6/Kconfig | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/arch/arm/mach-imx/mx6/Kconfig b/arch/arm/mach-imx/mx6/Kconfig
> index 4f8bb8f..279f088 100644
> --- a/arch/arm/mach-imx/mx6/Kconfig
> +++ b/arch/arm/mach-imx/mx6/Kconfig
> @@ -66,8 +66,9 @@ config MX6UL_OPOS6UL
>  	select SUPPORT_SPL
>  
>  config MX6ULL
> +	select SYS_L2CACHE_OFF
> +	select ROM_UNIFIED_SECTIONS
>  	bool
> -	select MX6UL
>  
>  config MX6_DDRCAL
>  	bool "Include dynamic DDR calibration routines"
> 
Applied to u-boot-imx, thanks !

Best regards,
Stefano Babic
Stefan Agner Jan. 1, 2018, 9:53 p.m. UTC | #3
On 2017-11-28 00:07, Breno Lima wrote:
> From: Breno Lima <breno.lima@nxp.com>
> 
> MX6UL contains features that MX6ULL doesn't support.
> Deselect CONFIG_MX6UL and select SYS_L2CACHE_OFF and ROM_UNIFIED_SECTIONS.
> 
> The motivation for doing this change is that MX6UL supports CAAM and
> MX6ULL does not.

While I agree with the idea of the change in general, it must be done
more carefully! There are several places where we rely that
CONFIG_MX6ULL selects CONFIG_MX6ULL, e.g.
include/configs/mx6_common.h
arch/arm/include/asm/arch-mx6/imx-regs.h
arch/arm/include/asm/mach-imx/regs-lcdif.h

I see that this patch already got merged... So I guess we either fix all
those places before the release, or we revert this patch...

--
Stefan


> 
> Signed-off-by: Breno Lima <breno.lima@nxp.com>
> ---
>  arch/arm/mach-imx/mx6/Kconfig | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/arch/arm/mach-imx/mx6/Kconfig b/arch/arm/mach-imx/mx6/Kconfig
> index 4f8bb8f..279f088 100644
> --- a/arch/arm/mach-imx/mx6/Kconfig
> +++ b/arch/arm/mach-imx/mx6/Kconfig
> @@ -66,8 +66,9 @@ config MX6UL_OPOS6UL
>  	select SUPPORT_SPL
>  
>  config MX6ULL
> +	select SYS_L2CACHE_OFF
> +	select ROM_UNIFIED_SECTIONS
>  	bool
> -	select MX6UL
>  
>  config MX6_DDRCAL
>  	bool "Include dynamic DDR calibration routines"
Fabio Estevam Jan. 1, 2018, 10:30 p.m. UTC | #4
Hi Stefan,

On Mon, Jan 1, 2018 at 7:53 PM, Stefan Agner <stefan@agner.ch> wrote:
>
> While I agree with the idea of the change in general, it must be done
> more carefully! There are several places where we rely that
> CONFIG_MX6ULL selects CONFIG_MX6ULL, e.g.
> include/configs/mx6_common.h
> arch/arm/include/asm/arch-mx6/imx-regs.h
> arch/arm/include/asm/mach-imx/regs-lcdif.h
>
> I see that this patch already got merged... So I guess we either fix all
> those places before the release, or we revert this patch...

You are right.

I have just sent a patch for this issue.

Thanks
Stefano Babic Jan. 3, 2018, 1:13 p.m. UTC | #5
Hi Stefan, Breno,

On 01/01/2018 22:53, Stefan Agner wrote:
> On 2017-11-28 00:07, Breno Lima wrote:
>> From: Breno Lima <breno.lima@nxp.com>
>>
>> MX6UL contains features that MX6ULL doesn't support.
>> Deselect CONFIG_MX6UL and select SYS_L2CACHE_OFF and ROM_UNIFIED_SECTIONS.
>>
>> The motivation for doing this change is that MX6UL supports CAAM and
>> MX6ULL does not.
> 
> While I agree with the idea of the change in general, it must be done
> more carefully! There are several places where we rely that
> CONFIG_MX6ULL selects CONFIG_MX6ULL, e.g.
> include/configs/mx6_common.h
> arch/arm/include/asm/arch-mx6/imx-regs.h
> arch/arm/include/asm/mach-imx/regs-lcdif.h

Ouch...

It is much more as the initial goal of the patch. This breaks MX6ULL.

The idea to add features instead of global SOC define is good, rather we
suffer from previous development, when we bound bunches of features
simply to the SOC type.

> 
> I see that this patch already got merged... So I guess we either fix all
> those places before the release, or we revert this patch...

Agree - I am waiting for Breno's answer, but if we have a generally
agreement I tend to revert this until this change will be properly handled.

Best regards,
Stefano

> 
> --
> Stefan
> 
> 
>>
>> Signed-off-by: Breno Lima <breno.lima@nxp.com>
>> ---
>>  arch/arm/mach-imx/mx6/Kconfig | 3 ++-
>>  1 file changed, 2 insertions(+), 1 deletion(-)
>>
>> diff --git a/arch/arm/mach-imx/mx6/Kconfig b/arch/arm/mach-imx/mx6/Kconfig
>> index 4f8bb8f..279f088 100644
>> --- a/arch/arm/mach-imx/mx6/Kconfig
>> +++ b/arch/arm/mach-imx/mx6/Kconfig
>> @@ -66,8 +66,9 @@ config MX6UL_OPOS6UL
>>  	select SUPPORT_SPL
>>  
>>  config MX6ULL
>> +	select SYS_L2CACHE_OFF
>> +	select ROM_UNIFIED_SECTIONS
>>  	bool
>> -	select MX6UL
>>  
>>  config MX6_DDRCAL
>>  	bool "Include dynamic DDR calibration routines"
Fabio Estevam Jan. 3, 2018, 1:17 p.m. UTC | #6
Hi Stefano,

On Wed, Jan 3, 2018 at 11:13 AM, Stefano Babic <sbabic@denx.de> wrote:

> Agree - I am waiting for Breno's answer, but if we have a generally
> agreement I tend to revert this until this change will be properly handled.

I have already sent a fix for this problem:
https://patchwork.ozlabs.org/patch/854371/

It has been successfully tested by Breno and Peng.

Regards,

Fabio Estevam
diff mbox series

Patch

diff --git a/arch/arm/mach-imx/mx6/Kconfig b/arch/arm/mach-imx/mx6/Kconfig
index 4f8bb8f..279f088 100644
--- a/arch/arm/mach-imx/mx6/Kconfig
+++ b/arch/arm/mach-imx/mx6/Kconfig
@@ -66,8 +66,9 @@  config MX6UL_OPOS6UL
 	select SUPPORT_SPL
 
 config MX6ULL
+	select SYS_L2CACHE_OFF
+	select ROM_UNIFIED_SECTIONS
 	bool
-	select MX6UL
 
 config MX6_DDRCAL
 	bool "Include dynamic DDR calibration routines"