Bug fixes and minor code cleanups

[chris-laplante]

The two main things I wanted to fix were:

1. Stop suppressing metavars in the --help for gen-machineconf. Now it's clear which flags actually take a value. For example:

options:
  --soc-family {microblaze,zynq,zynqmp,versal}
                        SOC family type from choice list (usually auto detected).
  --soc-variant SOC_VARIANT
                        SOC Variant: Ex: cg, dr, eg, ev, ai-prime, premium (usually auto detected).
  --machine-name MACHINE
                        Provide a name to generate machine configuration

2. The SoC variant was not propagated to the Yocto MACHINE conf files. So for zynqmp, for example, you'd always end up with 'require conf/machine/zynqmp-generic.conf' even when it should be 'require conf/machine/zynqmp-eg-generic.conf'

I also noticed a few minor bugs along the way.

[Rajukumar45]

Hi @chris-laplante
Thanks for the fixes.
The patches looks good except 'yocto_machine.py: fix not propogating soc variant to resulting MACHINE'
(c2b6b6e)

The only difference between soc-machine and soc-family machine files are 'MACHINE_FEATURES'
https://github.com/Xilinx/meta-xilinx/blob/master/meta-xilinx-core/conf/machine/zynqmp-dr-generic.conf#L7
These can be auto detected and generated using 'gen-machine-conf' based on the xsa/SDT user provided.- so, we removed including the soc-family specific machine file.

a52ed50

We will merge these patches internally and will be rolled out as part of our next release.

Regards,
Rajukumar P.

[chris-laplante]

Hi Rajukumar,

Hi @chris-laplante Thanks for the fixes. The patches looks good except 'yocto_machine.py: fix not propogating soc variant to resulting MACHINE' (c2b6b6e)

The only difference between soc-machine and soc-family machine files are 'MACHINE_FEATURES' https://github.com/Xilinx/meta-xilinx/blob/master/meta-xilinx-core/conf/machine/zynqmp-dr-generic.conf#L7 These can be auto detected and generated using 'gen-machine-conf' based on the xsa/SDT user provided.- so, we removed including the soc-family specific machine file.

Sounds good, thanks! Just to check my own understanding - it sounds like zynqmp-eg-generic.conf (for example) just exists for backwards compatibility then?

Thanks,
Chris

[Rajukumar45]

Hi Rajukumar,

Hi @chris-laplante Thanks for the fixes. The patches looks good except 'yocto_machine.py: fix not propogating soc variant to resulting MACHINE' (c2b6b6e)
The only difference between soc-machine and soc-family machine files are 'MACHINE_FEATURES' https://github.com/Xilinx/meta-xilinx/blob/master/meta-xilinx-core/conf/machine/zynqmp-dr-generic.conf#L7 These can be auto detected and generated using 'gen-machine-conf' based on the xsa/SDT user provided.- so, we removed including the soc-family specific machine file.

Sounds good, thanks! Just to check my own understanding - it sounds like zynqmp-eg-generic.conf (for example) just exists for backwards compatibility then?

Thanks, Chris

Yes, these soc-variant specific machine conf files are for backward compatibility.

[Rajukumar45]

Change merged