[PATCH v2 1/4] arm: mach-imx6: use kconfig for field return

[Marco Felsch]

On 25-12-19, Ahmad Fatoum wrote:
> Hi,
> 
> On 12/19/25 10:06 AM, Fabian Pflug wrote:
> > There is a Kconfig option for the field return, that is also documented,
> > so using it here instead of providing a headerfile to patch.
> > 
> > Reviewed-by: Marco Felsch <m.felsch at pengutronix.de>
> > Signed-off-by: Fabian Pflug <f.pflug at pengutronix.de>
> > ---
> >  include/mach/imx/habv4-imx6-gencsf-template.h | 11 +++--------
> >  1 file changed, 3 insertions(+), 8 deletions(-)
> > 
> > diff --git a/include/mach/imx/habv4-imx6-gencsf-template.h b/include/mach/imx/habv4-imx6-gencsf-template.h
> > index 45da2981cb..c24bf84b85 100644
> > --- a/include/mach/imx/habv4-imx6-gencsf-template.h
> > +++ b/include/mach/imx/habv4-imx6-gencsf-template.h
> > @@ -39,17 +39,12 @@ hab Engine = SETUP_HABV4_ENGINE
> >  hab Features = SETUP_HABV4_FEATURES
> >  #endif
> >  
> > -/*
> > -// allow fusing FIELD_RETURN
> > -// # ocotp0.permanent_write_enable=1
> > -// # mw -l -d /dev/imx-ocotp 0xb8 0x1
> > +#if defined(CONFIG_HABV4_CSF_UNLOCK_FIELD_RETURN)
> >  hab [Unlock]
> >  hab Engine = OCOTP
> >  hab Features = FIELD RETURN
> > -// device-specific UID:
> > -// $ dd if=/sys/bus/nvmem/devices/imx-ocotp0/nvmem bs=4 skip=1 count=2 status=none | hexdump -ve '1/1 "0x%.2x, "' | sed 's/, $//'
> > -hab UID = 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08
> > -*/
> > +hab UID = HABV4_CSF_UNLOCK_UID
> 
> How can this work without a CONFIG_ in front of the option?

Good catch Ahmad! I think Fabian just copied the broken mainlined
version from the i.MX8M.

My v2
(https://lore.barebox.org/barebox/20240703-v2024-05-0-topic-hab-v2-8-17419aa5d3a3@pengutronix.de/)
used another abroach to set the define which didn't made it into
mainline :/

So mainline is broken for i.MX8M as well :/

@Fabian
Could you please include a patch which fixes this for the i.MX8M as
well?

Regards,
  Marco


> 
> Thanks,
> Ahmad
> 
> > +#endif
> >  
> >  hab [Install Key]
> >  /* verification key index in key store (0, 2...4) */
> > 
> 
> -- 
> Pengutronix e.K.                  |                             |
> Steuerwalder Str. 21              | http://www.pengutronix.de/  |
> 31137 Hildesheim, Germany         | Phone: +49-5121-206917-0    |
> Amtsgericht Hildesheim, HRA 2686  | Fax:   +49-5121-206917-5555 |
> 
> 

-- 
#gernperDu 
#CallMeByMyFirstName

Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | https://www.pengutronix.de/ |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-9    |