From 1adeecf0d3ab6ba4e485bd3ad0749711d8aabac8 Mon Sep 17 00:00:00 2001 From: Christian Lamparter Date: Sun, 17 Dec 2017 14:59:58 +0100 Subject: [PATCH] apm821xx: dts: rename devices dts files to include the manufacturer This patch rename all the DT source files in order to match upstream's "manufacturer-device.dts" format. Please note that the DEVICE_DTB isn't changed. This is because the u-boot of the MyBook Live defines the fdt_file variable to be "apollo3g/apollo3g.dtb". Signed-off-by: Christian Lamparter --- .../linux/apm821xx/dts/{MR24.dts => meraki-mr24.dts} | 0 .../linux/apm821xx/dts/{MX60.dts => meraki-mx60.dts} | 0 .../dts/{wndr4700.dts => netgear-wndr4700.dts} | 0 .../dts/{apollo3g-duo.dts => wd-mybooklive-duo.dts} | 0 .../apm821xx/dts/{apollo3g.dts => wd-mybooklive.dts} | 0 target/linux/apm821xx/image/Makefile | 10 +++++----- 6 files changed, 5 insertions(+), 5 deletions(-) rename target/linux/apm821xx/dts/{MR24.dts => meraki-mr24.dts} (100%) rename target/linux/apm821xx/dts/{MX60.dts => meraki-mx60.dts} (100%) rename target/linux/apm821xx/dts/{wndr4700.dts => netgear-wndr4700.dts} (100%) rename target/linux/apm821xx/dts/{apollo3g-duo.dts => wd-mybooklive-duo.dts} (100%) rename target/linux/apm821xx/dts/{apollo3g.dts => wd-mybooklive.dts} (100%) diff --git a/target/linux/apm821xx/dts/MR24.dts b/target/linux/apm821xx/dts/meraki-mr24.dts similarity index 100% rename from target/linux/apm821xx/dts/MR24.dts rename to target/linux/apm821xx/dts/meraki-mr24.dts diff --git a/target/linux/apm821xx/dts/MX60.dts b/target/linux/apm821xx/dts/meraki-mx60.dts similarity index 100% rename from target/linux/apm821xx/dts/MX60.dts rename to target/linux/apm821xx/dts/meraki-mx60.dts diff --git a/target/linux/apm821xx/dts/wndr4700.dts b/target/linux/apm821xx/dts/netgear-wndr4700.dts similarity index 100% rename from target/linux/apm821xx/dts/wndr4700.dts rename to target/linux/apm821xx/dts/netgear-wndr4700.dts diff --git a/target/linux/apm821xx/dts/apollo3g-duo.dts b/target/linux/apm821xx/dts/wd-mybooklive-duo.dts similarity index 100% rename from target/linux/apm821xx/dts/apollo3g-duo.dts rename to target/linux/apm821xx/dts/wd-mybooklive-duo.dts diff --git a/target/linux/apm821xx/dts/apollo3g.dts b/target/linux/apm821xx/dts/wd-mybooklive.dts similarity index 100% rename from target/linux/apm821xx/dts/apollo3g.dts rename to target/linux/apm821xx/dts/wd-mybooklive.dts diff --git a/target/linux/apm821xx/image/Makefile b/target/linux/apm821xx/image/Makefile index 217bff2c59..6efd3886d2 100644 --- a/target/linux/apm821xx/image/Makefile +++ b/target/linux/apm821xx/image/Makefile @@ -70,7 +70,7 @@ define Device/mr24 DEVICE_TITLE := Cisco Meraki MR24 DEVICE_PACKAGES := kmod-spi-gpio BOARD_NAME := mr24 - DEVICE_DTS := MR24 + DEVICE_DTS := meraki-mr24 BLOCKSIZE := 63k IMAGES := sysupgrade.tar DTB_SIZE := 64512 @@ -91,7 +91,7 @@ define Device/mx60 DEVICE_PACKAGES := kmod-spi-gpio kmod-usb-ledtrig-usbport kmod-usb-dwc2 \ kmod-usb-storage block-mount BOARD_NAME := mx60 - DEVICE_DTS := MX60 + DEVICE_DTS := meraki-mx60 BLOCKSIZE := 63k IMAGES := sysupgrade.tar DTB_SIZE := 64512 @@ -157,7 +157,7 @@ define Device/WNDR4700 kmod-nls-utf8 kmod-usb3 kmod-usb-dwc2 kmod-usb-storage \ partx-utils BOARD_NAME := wndr4700 - DEVICE_DTS := wndr4700 + DEVICE_DTS := netgear-wndr4700 PAGESIZE := 2048 SUBPAGESIZE := 512 BLOCKSIZE := 128k @@ -225,7 +225,7 @@ endef define Device/MyBookLiveSingle $(Device/MyBookLiveDefault) DEVICE_TITLE := Western Digital My Book Live - DEVICE_DTS := apollo3g + DEVICE_DTS := wd-mybooklive endef TARGET_DEVICES += MyBookLiveSingle @@ -234,7 +234,7 @@ define Device/MyBookLiveDuo $(Device/MyBookLiveDefault) DEVICE_TITLE := Western Digital My Book Live Duo DEVICE_PACKAGES := kmod-usb-dwc2 kmod-usb-ledtrig-usbport kmod-usb-storage kmod-fs-vfat wpad-mini - DEVICE_DTS := apollo3g-duo + DEVICE_DTS := wd-mybooklive-duo endef TARGET_DEVICES += MyBookLiveDuo