[PATCH] microblaze: Rework TARGET_MICROBLAZE_GENERIC implementation

[Michal Simek]

On 3/17/26 16:41, Tom Rini wrote:
> On Tue, Mar 17, 2026 at 04:35:30PM +0100, Michal Simek wrote:
>>
>>
>> On 3/17/26 15:49, Tom Rini wrote:
>>> On Tue, Mar 17, 2026 at 01:06:15PM +0100, Michal Simek wrote:
>>>>
>>>>
>>>> On 3/17/26 02:24, Tom Rini wrote:
>>>>> As exposed by "make randconfig", some symbols such as
>>>>> XILINX_MICROBLAZE0_PVR can be set without TARGET_MICROBLAZE_GENERIC but
>>>>> have a transitive dependency on it. The easiest path of resolution here
>>>>> is that since there is only one valid microblaze "board", rework that
>>>>> symbol to be non-optional.
>>>>>
>>>>> Signed-off-by: Tom Rini <trini at konsulko.com>
>>>>> ---
>>>>> Cc: Michal Simek <michal.simek at amd.com>
>>>>> ---
>>>>>     arch/microblaze/Kconfig | 10 +++-------
>>>>>     1 file changed, 3 insertions(+), 7 deletions(-)
>>>>>
>>>>> diff --git a/arch/microblaze/Kconfig b/arch/microblaze/Kconfig
>>>>> index 4261e5009fdc..16c55ddfd95c 100644
>>>>> --- a/arch/microblaze/Kconfig
>>>>> +++ b/arch/microblaze/Kconfig
>>>>> @@ -7,12 +7,8 @@ config SYS_ARCH
>>>>>     config STATIC_RELA
>>>>>     	def_bool y
>>>>> -choice
>>>>> -	prompt "Target select"
>>>>> -	optional
>>>>> -
>>>>>     config TARGET_MICROBLAZE_GENERIC
>>>>> -	bool "Support microblaze-generic"
>>>>> +	def_bool y
>>>>>     	select BOARD_LATE_INIT
>>>>>     	select DM
>>>>>     	select DM_SERIAL
>>>>> @@ -26,8 +22,8 @@ config TARGET_MICROBLAZE_GENERIC
>>>>>     	select MTD
>>>>>     	select SPI
>>>>>     	imply CMD_DM
>>>>> -
>>>>> -endchoice
>>>>> +	help
>>>>> +	  Support microblaze-generic
>>>>>     source "board/xilinx/Kconfig"
>>>>>     source "board/xilinx/microblaze-generic/Kconfig"
>>>>
>>>> Applied.
>>>
>>> Please drop this for now, I need to do a v2 and I've found another
>>> randconfig that gives me:
>>> WARNING: unmet direct dependencies detected for XILINX_MICROBLAZE0_PVR
>>>     Depends on [n]: MICROBLAZE [=y] && TARGET_MICROBLAZE_GENERIC [=n]
>>>     Selected by [y]:
>>>     - CPU_MICROBLAZE [=y] && CPU [=y] && MICROBLAZE [=y]
>>>
>>
>> I expect this is from cpuinfo driver.
> 
> Yes, it is. But it's one of the problems randconfig exposes since it
> does funny things when generating a valid .config, and seeing what blows
> up. What I have in progress now is removing TARGET_MICROBLAZE_GENERIC
> entirely and using MICROBLAZE in the few tests.
> 

it should be fine to mark it as dependency.

M

diff --git a/drivers/cpu/Kconfig b/drivers/cpu/Kconfig
index 6a96be94de49..c805c0bbfa19 100644
--- a/drivers/cpu/Kconfig
+++ b/drivers/cpu/Kconfig
@@ -35,9 +35,8 @@ config CPU_ARMV8

  config CPU_MICROBLAZE
         bool "Enable Microblaze CPU driver"
-       depends on CPU && MICROBLAZE
+       depends on CPU && MICROBLAZE && XILINX_MICROBLAZE0_PVR
         select DM_EVENT
-       select XILINX_MICROBLAZE0_PVR
         help
           Support CPU cores for Microblaze architecture.