Difuse/difos
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

mvebu: tidy up support for GL.iNet GL-MV1000

Browse source 
This fixes a bunch of cosmetic issues with GL.iNet GL-MV1000:

- apply alphabetic sorting in multiple files
- use armada-3720 prefix for DTS like for other devices
- fix vendor capitalization for model in DTSes
- remove trivial comment in DTS files
- use DEVICE_VENDOR/DEVICE_MODEL
- remove redundant SUPPORTED_DEVICES
- use SOC instead of DEVICE_DTS
- remove empty line at EOF

Fixes: 050c24f05c ("mvebu: add support for GL.iNet GL-MV1000")

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
This commit is contained in:
Adrian Schmutzler 2020-04-27 00:17:07 +02:00
parent ad697aabc3
commit 3fdb08681b
5 changed files with 15 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
package/boot/uboot-envtools/files/mvebu
View file

@ -17,6 +17,9 @@ case "$board" in
cznic,turris-omnia) cznic,turris-omnia)
ubootenv_add_uci_config "/dev/mtd0" "0xC0000" "0x10000" "0x40000" ubootenv_add_uci_config "/dev/mtd0" "0xC0000" "0x10000" "0x40000"
;; ;;
glinet,gl-mv1000)
ubootenv_add_uci_config "/dev/mtd1" "0x0" "0x8000" "0x8000" "1"
;;
globalscale,espressobin|\ globalscale,espressobin|\
globalscale,espressobin-emmc|\ globalscale,espressobin-emmc|\
globalscale,espressobin-v7|\ globalscale,espressobin-v7|\
@ -24,9 +27,6 @@ globalscale,espressobin-v7-emmc|\
marvell,armada8040-mcbin) marvell,armada8040-mcbin)
ubootenv_add_uci_config "/dev/mtd0" "0x3f0000" "0x10000" "0x10000" "1" ubootenv_add_uci_config "/dev/mtd0" "0x3f0000" "0x10000" "0x10000" "1"
;; ;;
glinet,gl-mv1000)
ubootenv_add_uci_config "/dev/mtd1" "0x0" "0x8000" "0x8000" "1"
;;
linksys,caiman|\ linksys,caiman|\
linksys,cobra|\ linksys,cobra|\
linksys,shelby) linksys,shelby)

4
target/linux/mvebu/cortexa53/base-files/etc/board.d/02_network
View file

@ -11,11 +11,11 @@ board_config_update
board=$(board_name) board=$(board_name)
case "$board" in case "$board" in
glinet,gl-mv1000|\
globalscale,espressobin|\ globalscale,espressobin|\
globalscale,espressobin-emmc|\ globalscale,espressobin-emmc|\
globalscale,espressobin-v7|\ globalscale,espressobin-v7|\
globalscale,espressobin-v7-emmc|\ globalscale,espressobin-v7-emmc)
glinet,gl-mv1000)
ucidef_set_interfaces_lan_wan "lan0 lan1" "wan" ucidef_set_interfaces_lan_wan "lan0 lan1" "wan"
;; ;;
marvell,armada-3720-db|\ marvell,armada-3720-db|\

5
target/linux/mvebu/files-4.19/arch/arm64/boot/dts/marvell/armada-gl-mv1000.dts → target/linux/mvebu/files-4.19/arch/arm64/boot/dts/marvell/armada-3720-gl-mv1000.dts
View file

@ -1,14 +1,11 @@
// SPDX-License-Identifier: (GPL-2.0+ OR MIT) // SPDX-License-Identifier: (GPL-2.0+ OR MIT)
/*
* Device Tree file for GL.iNet GL-MV1000
*/
/dts-v1/; /dts-v1/;
#include <dt-bindings/gpio/gpio.h> #include <dt-bindings/gpio/gpio.h>
#include "armada-372x.dtsi" #include "armada-372x.dtsi"
/ { / {
model = "GL.inet GL-MV1000"; model = "GL.iNet GL-MV1000";
compatible = "glinet,gl-mv1000", "marvell,armada3720"; compatible = "glinet,gl-mv1000", "marvell,armada3720";
chosen { chosen {

5
target/linux/mvebu/files-5.4/arch/arm64/boot/dts/marvell/armada-gl-mv1000.dts → target/linux/mvebu/files-5.4/arch/arm64/boot/dts/marvell/armada-3720-gl-mv1000.dts
View file

@ -1,14 +1,11 @@
// SPDX-License-Identifier: (GPL-2.0+ OR MIT) // SPDX-License-Identifier: (GPL-2.0+ OR MIT)
/*
* Device Tree file for GL.iNet GL-MV1000
*/
/dts-v1/; /dts-v1/;
#include <dt-bindings/gpio/gpio.h> #include <dt-bindings/gpio/gpio.h>
#include "armada-372x.dtsi" #include "armada-372x.dtsi"
/ { / {
model = "GL.inet GL-MV1000"; model = "GL.iNet GL-MV1000";
compatible = "glinet,gl-mv1000", "marvell,armada3720"; compatible = "glinet,gl-mv1000", "marvell,armada3720";
chosen { chosen {

17
target/linux/mvebu/image/cortexa53.mk
View file

@ -1,3 +1,11 @@
define Device/glinet_gl-mv1000
$(call Device/Default-arm64)
DEVICE_VENDOR := GL.iNet
DEVICE_MODEL := GL-MV1000
SOC := armada-3720
endef
TARGET_DEVICES += glinet_gl-mv1000
define Device/globalscale_espressobin define Device/globalscale_espressobin
$(call Device/Default-arm64) $(call Device/Default-arm64)
DEVICE_VENDOR := Marvell DEVICE_VENDOR := Marvell
@ -69,12 +77,3 @@ define Device/methode_udpu
BOOT_SCRIPT := udpu BOOT_SCRIPT := udpu
endef endef
TARGET_DEVICES += methode_udpu TARGET_DEVICES += methode_udpu
define Device/glinet_gl-mv1000
$(call Device/Default-arm64)
DEVICE_TITLE := GL.iNet GL-MV1000
DEVICE_DTS := armada-gl-mv1000
SUPPORTED_DEVICES := glinet,gl-mv1000
endef
TARGET_DEVICES += glinet_gl-mv1000