Please revert 98b86296e6 as it breaks several ipq806x devices

[Paweł Dembicki]

pt., 1 sty 2021 o 12:09 Hannu Nyman <hannu.nyman at iki.fi> napisał(a):
>
> Paweł Dembicki kirjoitti 31.12.2020 klo 23.42:
> >
> > 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
>
>
> I compiled a new version for R7800 with your two patches, and it worked ok:
> Serial console worked normally and sysupgrading from the build was possible.
>
> So, I think that you patches are ok.
> I can't verify that for the other affected devices, but I see no reason to
> believe that this would not fix them, too.
>

Thanks for tests and suggestions. I sent PR with fix:

https://github.com/openwrt/openwrt/pull/3740

>
> Patches used:
>
> https://github.com/CHKDSK88/openwrt-1/commit/5dc46ebfd98760c73480e9e9f37bc11c34f5dfb7
>
>
> https://github.com/CHKDSK88/openwrt-1/commit/acd06bbba9982430bd750682d83d892fae0dfd8a
>
>
> One style issue:
>
> Your added definition block in 5dc46ebf uses spaces for indentation, while
> the normal way is to use tab for the first level indentation and then add 2
> spaces for the help text. This leads to visible difference in Kconfig. No
> functional problem, but deviation from the expected style.
>
>
> Ps.
>
> As further proof that your patch is ok, here is a comparison of the failing
> kernel config to a working one (with your original changes but the override
> symbol disabled). Note that in addition to the override option, also
> CONFIG_ARM_ATAG_DTB_COMPAT_CMDLINE_MANGLE changes, which led to problems with
> other ipq806x devices:
>
> perus at ub2010:/Openwrt/r7800$ diff -u okbuild/.config wrongpatch/.config
> --- okbuild/.config    2021-01-01 11:48:20.064981146 +0200
> +++ wrongpatch/.config    2021-01-01 12:10:41.099499307 +0200
> @@ -460,8 +460,8 @@
>   CONFIG_ARM_ATAG_DTB_COMPAT=y
>   # CONFIG_ARM_ATAG_DTB_COMPAT_CMDLINE_FROM_BOOTLOADER is not set
>   # CONFIG_ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEND is not set
> -CONFIG_ARM_ATAG_DTB_COMPAT_CMDLINE_MANGLE=y
> -# CONFIG_CMDLINE_OVERRIDE is not set
> +# CONFIG_ARM_ATAG_DTB_COMPAT_CMDLINE_MANGLE is not set
> +CONFIG_CMDLINE_OVERRIDE=y
>   CONFIG_CMDLINE=""
>   CONFIG_CRASH_DUMP=y
>   # CONFIG_AUTO_ZRELADDR is not set
>
>
> After applying your new fixes only the override symbol gets toggled, but no
> ATAG option change any more:
>
> perus at ub2010:/Openwrt/r7800$ diff -u okbuild/.config testpatch/.config
> --- okbuild/.config    2021-01-01 11:48:20.064981146 +0200
> +++ testpatch/.config    2021-01-01 11:58:05.689147939 +0200
> @@ -461,7 +461,7 @@
>   # CONFIG_ARM_ATAG_DTB_COMPAT_CMDLINE_FROM_BOOTLOADER is not set
>   # CONFIG_ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEND is not set
>   CONFIG_ARM_ATAG_DTB_COMPAT_CMDLINE_MANGLE=y
> -# CONFIG_CMDLINE_OVERRIDE is not set
> +CONFIG_CMDLINE_OVERRIDE=y
>   CONFIG_CMDLINE=""
>   CONFIG_CRASH_DUMP=y
>   # CONFIG_AUTO_ZRELADDR is not set
>
>

Best Regards,
Pawel Dembicki