ARM: at91: force CPU selection

arch/arm/mach-at91/Kconfig config SOC_AT91SAM9 · line 125

Quoted 13 lines · On Monday 09 March 2015 23:59:58 Brian Norris wrote:

arch/arm/mach-at91/Kconfig +6 -0

@@ -114,6 +114,12 @@ config SOC_AT91SAM9
            AT91SAM9XE
 endif # SOC_SAM_V4_V5
 
+config MACH_AT91_AUTO
+       def_bool y
+       depends on !SOC_AT91SAM9 && !SOC_SAMA5D4
+       select SOC_SAMA5D3 if SOC_SAM_V7
+       select SOC_AT91RM9200 if SOC_SAM_V4_V5
+
 comment "AT91 Feature Selections"
 
 config AT91_SLOW_CLOCK

Hi Brian,

I actually added a bunch of these in other places, but have stopped doing so because Russell didn't like them, and I tend to follow his argument now that it's actually pretty confusing.

In case of at91, we can do better now, once we have multiplatform enabled, and we can simply remove the SOC_SAM_V7 and SOC_SAM_V4_V5 symbols entirely (if Alexandre's patch doesn't already do that).

With multiplatform enabled, you no longer have to select a particular SoC, because we always get the default selection and the kernel will build without any one of them being enabled.

Quoted 9 lines

I actually added a bunch of these in other places, but have stopped doing so because Russell didn't like them, and I tend to follow his argument now that it's actually pretty confusing.

In case of at91, we can do better now, once we have multiplatform enabled, and we can simply remove the SOC_SAM_V7 and SOC_SAM_V4_V5 symbols entirely (if Alexandre's patch doesn't already do that).

I didn't remove it to keep the sub menus SOC_SAM_V7 -> SOC_SAMA5D4 and SOC_SAMA5D3, SOC_SAM_V4_V5 -> SOC_AT91SAM9 and SOC_AT91RM9200. But I can also expose SOC_AT91RM9200, SOC_AT91SAM9, SOC_SAMA5D3 and SOC_SAMA5D4 instead of SOC_SAM_V7 and SOC_SAM_V4_V5 and remove them.

Quoted 10 lines · On Tuesday 10 March 2015 10:42:09 Alexandre Belloni wrote:

Quoted 9 lines

I actually added a bunch of these in other places, but have stopped doing so because Russell didn't like them, and I tend to follow his argument now that it's actually pretty confusing.

In case of at91, we can do better now, once we have multiplatform enabled, and we can simply remove the SOC_SAM_V7 and SOC_SAM_V4_V5 symbols entirely (if Alexandre's patch doesn't already do that).

Quoted 4 lines

I didn't remove it to keep the sub menus SOC_SAM_V7 -> SOC_SAMA5D4 and SOC_SAMA5D3, SOC_SAM_V4_V5 -> SOC_AT91SAM9 and SOC_AT91RM9200. But I can also expose SOC_AT91RM9200, SOC_AT91SAM9, SOC_SAMA5D3 and SOC_SAMA5D4 instead of SOC_SAM_V7 and SOC_SAM_V4_V5 and remove them.

Exposing multiple levels won't help here since you can never enable both v4/v5 and v7 at the same time in multiplatform.

Just use one level for a 'menuconfig ARCH_AT91' entry and put the four options below that.

Quoted 16 lines · Arnd Bergmann

Quoted 10 lines · On Tuesday 10 March 2015 10:42:09 Alexandre Belloni wrote:

Quoted 9 lines

I actually added a bunch of these in other places, but have stopped doing so because Russell didn't like them, and I tend to follow his argument now that it's actually pretty confusing.

In case of at91, we can do better now, once we have multiplatform enabled, and we can simply remove the SOC_SAM_V7 and SOC_SAM_V4_V5 symbols entirely (if Alexandre's patch doesn't already do that).

Quoted 4 lines

I didn't remove it to keep the sub menus SOC_SAM_V7 -> SOC_SAMA5D4 and SOC_SAMA5D3, SOC_SAM_V4_V5 -> SOC_AT91SAM9 and SOC_AT91RM9200. But I can also expose SOC_AT91RM9200, SOC_AT91SAM9, SOC_SAMA5D3 and SOC_SAMA5D4 instead of SOC_SAM_V7 and SOC_SAM_V4_V5 and remove them.

Quoted 6 lines

Exposing multiple levels won't help here since you can never enable both v4/v5 and v7 at the same time in multiplatform.

Just use one level for a 'menuconfig ARCH_AT91' entry and put the four options below that.

Actually, I had a closer look today and there is already just one level in my current version of patches.

I can put everything under menuconfig ARCH_AT91 but I can't remove SOC_SAM_V7 and SOC_SAM_V4_V5 because that is what is used to select which dtb should be compiled.

This would also break sama5_defconfig. This is a simple fix but that means that it makes it difficult to migrate an existing .config.

I'd say let's keep it that way as this is not broken, unless you really want to see SOC_SAM_V7 and SOC_SAM_V4_V5 being removed.

Quoted 11 lines

Actually, I had a closer look today and there is already just one level in my current version of patches.

I can put everything under menuconfig ARCH_AT91 but I can't remove SOC_SAM_V7 and SOC_SAM_V4_V5 because that is what is used to select which dtb should be compiled.

This would also break sama5_defconfig. This is a simple fix but that means that it makes it difficult to migrate an existing .config.

Quoted 3 lines

I'd say let's keep it that way as this is not broken, unless you really want to see SOC_SAM_V7 and SOC_SAM_V4_V5 being removed.

I'm not sure what the latest version looks like, but I think it's fine to have SOC_SAM_V4_V5 automatically selected when CONFIG_AT91 and CONFIG_MULTI_V4 || CONFIG_MULTI_V5 are turned on, or selected by AT91SAM9 and AT91RM9200.

I actually added a bunch of these in other places, but have stopped doing so because Russell didn't like them, and I tend to follow his argument now that it's actually pretty confusing.

Quoted 3 lines · Arnd Bergmann

I actually added a bunch of these in other places, but have stopped doing so because Russell didn't like them, and I tend to follow his argument now that it's actually pretty confusing.

I'm not a big fan of my patch, but it did at least solve the problem. Thanks for the info, and I'm happy to drop my patch. At least I've fixed my compile-test setups to avoid bad combinations, now.

To be clear, multiplatform support is in progress, but not merged yet, right?