apm821xx: NETGEAR WNDR4700: Fix compat version

[hauke]

The definition for the netgear_wndr4700 had two different DEVICE_COMPAT_VERSION definitions.
First it was moved to version 3.0 in commit 5815884 ("apm821xx: migrate to DSA"), the it was later changed to version 2.0 by an additional definition at the end of the board definition in commit 82c8c38 ("apm821xx: prepare WNDR4700 for 6.6 - add preliminary u-boot-env access").

Move it to version 4.0 now.

Fixes: 82c8c38 ("apm821xx: prepare WNDR4700 for 6.6 - add preliminary u-boot-env access")

This was reported in the forum: https://forum.openwrt.org/t/openwrt-24-10-0-rc6-sixth-release-candidate/222466/43

[hauke]

@chunkeey and @neheb Please have a look.
@chunkeey If you think it is fine feel free to merge it and backport it to 24.10.

[chunkeey]

So the issue is that there are two conflicting DEVICE_COMPAT_VERSION* for the WNDR4700 .

First it was moved to version 3.0 in commit 5815884 ("apm821xx: migrate to DSA"), the it was later changed to version 2.0 by an additional definition at the end of the board definition in commit 82c8c38 ("apm821xx: prepare WNDR4700 for 6.6 - add preliminary u-boot-env access").

I think the timeline/order is reversed?! My understanding is:

commit 82c8c38 ("apm821xx: prepare WNDR4700 for 6.6 - add preliminary u-boot-env access") is from April 2024.
commit 5815884 ("apm821xx: migrate to DSA") is from September 2024.

commit 82c8c38 ("apm821xx: prepare WNDR4700 for 6.6 - add preliminary u-boot-env access") added the DEVICE_COMPAT_VERSION at the end with the value 2.0 . 5815884 ("apm821xx: migrate to DSA") added the second one at the top with value 3.0 instead of updating the existing DEVICE_COMPAT_VERSION definitions... Now there are two DEVICE_COMPAT_VERSION and the one at the bottom with the value 2.0 just overwrites the first.

Ideally, 5815884 ("apm821xx: migrate to DSA") would have just updated the the 2.0 value for the WNDR4700 with 3.0 in the same way as it did for the MX60, no?

In any case: Yeah, I can see that setting DEVICE_COMPAT_VERSION to 4.0 and removing the second DEVICE_COMPAT_VERSION will resolve the issue. +1

[hauke]

So the issue is that there are two conflicting DEVICE_COMPAT_VERSION* for the WNDR4700 .

I think the timeline/order is reversed?! My understanding is:

commit 82c8c38 ("apm821xx: prepare WNDR4700 for 6.6 - add preliminary u-boot-env access") is from April 2024. commit 5815884 ("apm821xx: migrate to DSA") is from September 2024.

commit 82c8c38 ("apm821xx: prepare WNDR4700 for 6.6 - add preliminary u-boot-env access") added the DEVICE_COMPAT_VERSION at the end with the value 2.0 . 5815884 ("apm821xx: migrate to DSA") added the second one at the top with value 3.0 instead of updating the existing DEVICE_COMPAT_VERSION definitions... Now there are two DEVICE_COMPAT_VERSION and the one at the bottom with the value 2.0 just overwrites the first.

Ideally, 5815884 ("apm821xx: migrate to DSA") would have just updated the the 2.0 value for the WNDR4700 with 3.0 in the same way as it did for the MX60, no?

In any case: Yeah, I can see that setting DEVICE_COMPAT_VERSION to 4.0 and removing the second DEVICE_COMPAT_VERSION will resolve the issue. +1

Yes you are right, I mixed up the order of commits. I updated the PR to update the DEVICE_COMPAT_VERSION to 3.0 like it was done for the MX60.