diff options
Diffstat (limited to 'target/linux')
| -rwxr-xr-x | target/linux/mvebu/cortexa53/base-files/etc/board.d/02_network | 4 | ||||
| -rw-r--r-- | target/linux/mvebu/files-4.19/arch/arm64/boot/dts/marvell/armada-3720-gl-mv1000.dts (renamed from target/linux/mvebu/files-4.19/arch/arm64/boot/dts/marvell/armada-gl-mv1000.dts) | 5 | ||||
| -rw-r--r-- | target/linux/mvebu/files-5.4/arch/arm64/boot/dts/marvell/armada-3720-gl-mv1000.dts (renamed from target/linux/mvebu/files-5.4/arch/arm64/boot/dts/marvell/armada-gl-mv1000.dts) | 5 | ||||
| -rw-r--r-- | target/linux/mvebu/image/cortexa53.mk | 17 |
4 files changed, 12 insertions, 19 deletions
diff --git a/target/linux/mvebu/cortexa53/base-files/etc/board.d/02_network b/target/linux/mvebu/cortexa53/base-files/etc/board.d/02_network index 9b1d97d921..0a2a2b144c 100755 --- a/target/linux/mvebu/cortexa53/base-files/etc/board.d/02_network +++ b/target/linux/mvebu/cortexa53/base-files/etc/board.d/02_network @@ -11,11 +11,11 @@ board_config_update board=$(board_name) case "$board" in +glinet,gl-mv1000|\ globalscale,espressobin|\ globalscale,espressobin-emmc|\ globalscale,espressobin-v7|\ -globalscale,espressobin-v7-emmc|\ -glinet,gl-mv1000) +globalscale,espressobin-v7-emmc) ucidef_set_interfaces_lan_wan "lan0 lan1" "wan" ;; marvell,armada-3720-db|\ diff --git a/target/linux/mvebu/files-4.19/arch/arm64/boot/dts/marvell/armada-gl-mv1000.dts b/target/linux/mvebu/files-4.19/arch/arm64/boot/dts/marvell/armada-3720-gl-mv1000.dts index 9d7963c5b7..d1a966f4f8 100644 --- a/target/linux/mvebu/files-4.19/arch/arm64/boot/dts/marvell/armada-gl-mv1000.dts +++ b/target/linux/mvebu/files-4.19/arch/arm64/boot/dts/marvell/armada-3720-gl-mv1000.dts @@ -1,14 +1,11 @@ // SPDX-License-Identifier: (GPL-2.0+ OR MIT) -/* - * Device Tree file for GL.iNet GL-MV1000 - */ /dts-v1/; #include <dt-bindings/gpio/gpio.h> #include "armada-372x.dtsi" / { - model = "GL.inet GL-MV1000"; + model = "GL.iNet GL-MV1000"; compatible = "glinet,gl-mv1000", "marvell,armada3720"; chosen { diff --git a/target/linux/mvebu/files-5.4/arch/arm64/boot/dts/marvell/armada-gl-mv1000.dts b/target/linux/mvebu/files-5.4/arch/arm64/boot/dts/marvell/armada-3720-gl-mv1000.dts index 9d7963c5b7..d1a966f4f8 100644 --- a/target/linux/mvebu/files-5.4/arch/arm64/boot/dts/marvell/armada-gl-mv1000.dts +++ b/target/linux/mvebu/files-5.4/arch/arm64/boot/dts/marvell/armada-3720-gl-mv1000.dts @@ -1,14 +1,11 @@ // SPDX-License-Identifier: (GPL-2.0+ OR MIT) -/* - * Device Tree file for GL.iNet GL-MV1000 - */ /dts-v1/; #include <dt-bindings/gpio/gpio.h> #include "armada-372x.dtsi" / { - model = "GL.inet GL-MV1000"; + model = "GL.iNet GL-MV1000"; compatible = "glinet,gl-mv1000", "marvell,armada3720"; chosen { diff --git a/target/linux/mvebu/image/cortexa53.mk b/target/linux/mvebu/image/cortexa53.mk index 1436c1bd23..ff8f2c0930 100644 --- a/target/linux/mvebu/image/cortexa53.mk +++ b/target/linux/mvebu/image/cortexa53.mk @@ -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 $(call Device/Default-arm64) DEVICE_VENDOR := Marvell @@ -69,12 +77,3 @@ define Device/methode_udpu BOOT_SCRIPT := udpu endef 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 - |