Please revert 98b86296e6 as it breaks several ipq806x devices

[Paweł Dembicki]

czw., 31 gru 2020 o 16:51 Adrian Schmutzler <mail at adrianschmutzler.de>
napisał(a):
>
> Hi,
>

Hi all,

> Pawel hasn't been in the recipients list, so I added him:
>
> @Pawel: If you haven't followed the thread via openwrt-devel anyway, you should definitely have a look, particularly at the latest findings by Hannu (below; thanks!).
>
> http://lists.openwrt.org/pipermail/openwrt-devel/2020-December/032960.html
>
> Best
>
> Adrian
>
> > -----Original Message-----
> > From: Hannu Nyman [mailto:hannu.nyman at iki.fi]
> > Sent: Donnerstag, 31. Dezember 2020 13:49
> > To: Christian Lamparter <chunkeey at gmail.com>; Adrian Schmutzler
> > <mail at adrianschmutzler.de>; 'OpenWrt Development List' <openwrt-
> > devel at lists.openwrt.org>
> > Cc: 'Petr Štetiar' <ynezz at true.cz>
> > Subject: Re: Please revert 98b86296e6 as it breaks several ipq806x devices
> >
> > Hannu Nyman kirjoitti 31.12.2020 klo 14.32:
> > > ...
> > >
> > > I did some further debugging, and noticed something.
> > >
> > > In short: Possibly the definition of CONFIG_CMDLINE_OVERRIDE has been
> > > placed into a slightly wrong place in arch/arm/Kconfig.
> > >
> > >
> > > I compared the kernel build log with the working code (without
> > > CONFIG_CMDLINE_OVERRIDE=y) to log with the faulty code, and there is
> > > only a small difference:
> > >
> > > In the faulty version, there is a one-line warning:
> > >   warning: override: CMDLINE_OVERRIDE changes choice state
> > >
> > > context:
> > > <code>
> > >   HOSTCC  scripts/kconfig/symbol.o
> > >   HOSTLD  scripts/kconfig/conf
> > > scripts/kconfig/conf  --syncconfig Kconfig
> > > net/sched/Kconfig:45: warning: menuconfig statement without prompt
> > > .config:987:warning: override: CMDLINE_OVERRIDE changes choice state
> > >   HOSTCC  scripts/dtc/dtc.o
> > > </code>
> > >
> > > So, the new option changes something else.
> > >
> > > I looked at
> > > build_dir/target-arm_cortex-a15+neon-vfpv4_musl_eabi/linux-
> > ipq806x_gen
> > > eric/linux-5.4.85/arch/arm/Kconfig
> > > and noticed that the new definition of CONFIG_CMDLINE_OVERRIDE has
> > > been placed into end of a multi-option choice block. Enabling this
> > > option may now change the selected value of the choice of
> > > ARM_ATAG_DTB_COMPAT_CMDLINE... options.
> > > ...
> > >
> > > Possibly the new definition should be after the "endchoice" line, so
> > > that ARM_ATAG_DTB_COMPAT_CMDLINE things do not change.
> > >
> > > Or possibly it should be inside the next choice block about CMDLINE
> >
> >
> > One more observation: The faulty Asrock commit's commit messages says:
> >
> >   - 900-arm-add-cmdline-override.patch was copied from 102-powerpc-add-
> > cmdline-override.patch from powerpc target.
> >
> > But looking at
> >
> > https://github.com/openwrt/openwrt/blob/master/target/linux/mpc85xx/p
> > atches-5.4/102-powerpc-add-cmdline-override.patch
> >
> > shows that there the code there is apparently placed outside any choice
> > block, just before "config EXTRA_TARGETS"
> >
> >
> > So, looks like the author has accidentally placed the block into inside a
> > choice block and it has worked for him.

Thanks Hannu for the inspection. It was a great job. Kconfig entry was
misplaced after rebase
in the early stage of my work.

I moved it to the proper place. Patches are placed on my github fork:
https://github.com/CHKDSK88/openwrt-1/tree/asrock_g10

Could You check if everything is ok?

Best regards,
Pawel Dembicki