mirror of
https://git.openwrt.org/openwrt/openwrt.git
synced 2026-02-16 10:49:07 +01:00
Revert "apm821xx: rename pciex to pcie"
This reverts commit66a7e04e9e. Doing so makes the u-boot unable to find the node for this pcie controller and disable it on mx60, resulting boot failure, as reported in https://github.com/openwrt/openwrt/issues/21649 . If we keep on treating mx60 and mx60w the same target, we might have to endure the warning which66a7e04wants to eliminate. Signed-off-by: Edward Chow <equu@openmail.cc> Link: https://github.com/openwrt/openwrt/pull/21941 Signed-off-by: Robert Marko <robert.marko@sartura.hr>
This commit is contained in:
parent
08ab732b25
commit
3b450b23fe
2 changed files with 2 additions and 48 deletions
|
|
@ -1,47 +0,0 @@
|
|||
#!/bin/sh
|
||||
|
||||
# This must run before 10-wifi-detect
|
||||
|
||||
[ "${ACTION}" = "add" ] || return
|
||||
|
||||
. /lib/functions.sh
|
||||
. /lib/functions/system.sh
|
||||
|
||||
do_migrate_radio()
|
||||
{
|
||||
local config="$1"
|
||||
|
||||
config_get from "$config" path
|
||||
|
||||
to=${from/pciex\//pcie\/}
|
||||
|
||||
# Checks if kernel version is less than 6.12.0, if it is and the path is
|
||||
# using the new format, then path should be migrated to the old format.
|
||||
[ "$(get_linux_version)" -lt "612000" ] && to=${from/pcie\//pciex\/}
|
||||
|
||||
[ "$from" = "$to" ] && return
|
||||
|
||||
uci set "wireless.${config}.path=${to}"
|
||||
WIRELESS_CHANGED=true
|
||||
|
||||
logger -t wifi-migrate "Updated path of wireless.${config} from '${from}' to '${to}'"
|
||||
}
|
||||
|
||||
migrate_radio()
|
||||
{
|
||||
config_load wireless
|
||||
|
||||
config_foreach do_migrate_radio wifi-device
|
||||
}
|
||||
|
||||
WIRELESS_CHANGED=false
|
||||
|
||||
case "$(board_name)" in
|
||||
*)
|
||||
migrate_radio
|
||||
;;
|
||||
esac
|
||||
|
||||
$WIRELESS_CHANGED && uci commit wireless
|
||||
|
||||
exit 0
|
||||
|
|
@ -418,7 +418,8 @@
|
|||
#size-cells = <0>;
|
||||
};
|
||||
|
||||
PCIE0: pcie@d00000000 {
|
||||
/* u-boot of meraki mx60 match the node name to disable it. Please keep. */
|
||||
PCIE0: pciex@d00000000 {
|
||||
device_type = "pci"; /* see ppc4xx_pci_find_bridge */
|
||||
#interrupt-cells = <1>;
|
||||
#size-cells = <2>;
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue