aboutsummaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorPetr Štetiar <ynezz@true.cz>2020-11-04 10:39:42 +0100
committerPetr Štetiar <ynezz@true.cz>2020-11-09 09:14:02 +0100
commitaeb26f8434bdc9d4263328a0b7493fae5d74b334 (patch)
treeaebf05ed5842512f4f5b22eefa4f996620277883 /target
parentb1b8abaf588e7ec269e924828bcd40a0a9738b0d (diff)
downloadupstream-aeb26f8434bdc9d4263328a0b7493fae5d74b334.tar.gz
upstream-aeb26f8434bdc9d4263328a0b7493fae5d74b334.tar.bz2
upstream-aeb26f8434bdc9d4263328a0b7493fae5d74b334.zip
rtl838x: d-link_dgs-1210: refactor common family bits
So the common bits can be easily shared with other boards in the family and while at it add missing SPDX license identifiers into the DTS files and fixed alphabetic sorting of the devices in the images. Signed-off-by: Petr Štetiar <ynezz@true.cz>
Diffstat (limited to 'target')
-rw-r--r--target/linux/rtl838x/dts/rtl8382_d-link_dgs-1210-10p.dts2
-rw-r--r--target/linux/rtl838x/dts/rtl8382_d-link_dgs-1210-16.dts81
-rw-r--r--target/linux/rtl838x/dts/rtl8382_d-link_dgs-1210.dtsi84
-rw-r--r--target/linux/rtl838x/image/Makefile16
4 files changed, 97 insertions, 86 deletions
diff --git a/target/linux/rtl838x/dts/rtl8382_d-link_dgs-1210-10p.dts b/target/linux/rtl838x/dts/rtl8382_d-link_dgs-1210-10p.dts
index d7c6cbfc7c..89e3746ad5 100644
--- a/target/linux/rtl838x/dts/rtl8382_d-link_dgs-1210-10p.dts
+++ b/target/linux/rtl838x/dts/rtl8382_d-link_dgs-1210-10p.dts
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
+
#include "rtl838x.dtsi"
#include <dt-bindings/input/input.h>
diff --git a/target/linux/rtl838x/dts/rtl8382_d-link_dgs-1210-16.dts b/target/linux/rtl838x/dts/rtl8382_d-link_dgs-1210-16.dts
index 3fb3cfb353..3843af1371 100644
--- a/target/linux/rtl838x/dts/rtl8382_d-link_dgs-1210-16.dts
+++ b/target/linux/rtl838x/dts/rtl8382_d-link_dgs-1210-16.dts
@@ -1,87 +1,10 @@
-#include "rtl838x.dtsi"
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
-#include <dt-bindings/input/input.h>
-#include <dt-bindings/gpio/gpio.h>
+#include "rtl8382_d-link_dgs-1210.dtsi"
/ {
compatible = "d-link,dgs-1210-16", "realtek,rtl838x-soc";
model = "D-Link DGS-1210-16";
-
- aliases {
- led-boot = &led_power;
- led-failsafe = &led_power;
- led-running = &led_power;
- led-upgrade = &led_power;
- };
-
- chosen {
- bootargs = "console=ttyS0,115200";
- };
-
- leds {
- compatible = "gpio-leds";
-
- led_power: power {
- label = "green:power";
- gpios = <&gpio0 24 GPIO_ACTIVE_LOW>;
- };
- };
-};
-
-&gpio0 {
- indirect-access-bus-id = <0>;
-};
-
-&spi0 {
- status = "okay";
- flash@0 {
- compatible = "jedec,spi-nor";
- reg = <0>;
- spi-max-frequency = <10000000>;
-
- partitions {
- compatible = "fixed-partitions";
- #address-cells = <1>;
- #size-cells = <1>;
-
- partition@0 {
- label = "u-boot";
- reg = <0x00000000 0x80000>;
- read-only;
- };
- partition@80000 {
- label = "u-boot-env";
- reg = <0x00080000 0x40000>;
- read-only;
- };
- partition@c0000 {
- label = "u-boot-env2";
- reg = <0x000c0000 0x40000>;
- read-only;
- };
- partition@280000 {
- label = "firmware";
- compatible = "denx,uimage";
- reg = <0x00100000 0xd80000>;
- };
- partition@be80000 {
- label = "kernel2";
- reg = <0x00e80000 0x180000>;
- };
- partition@1000000 {
- label = "sysinfo";
- reg = <0x01000000 0x40000>;
- };
- partition@1040000 {
- label = "rootfs2";
- reg = <0x01040000 0xc00000>;
- };
- partition@1c40000 {
- label = "jffs2";
- reg = <0x01c40000 0x3c0000>;
- };
- };
- };
};
&ethernet0 {
diff --git a/target/linux/rtl838x/dts/rtl8382_d-link_dgs-1210.dtsi b/target/linux/rtl838x/dts/rtl8382_d-link_dgs-1210.dtsi
new file mode 100644
index 0000000000..74043c097a
--- /dev/null
+++ b/target/linux/rtl838x/dts/rtl8382_d-link_dgs-1210.dtsi
@@ -0,0 +1,84 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
+
+#include "rtl838x.dtsi"
+
+#include <dt-bindings/input/input.h>
+#include <dt-bindings/gpio/gpio.h>
+
+/ {
+ aliases {
+ led-boot = &led_power;
+ led-failsafe = &led_power;
+ led-running = &led_power;
+ led-upgrade = &led_power;
+ };
+
+ chosen {
+ bootargs = "console=ttyS0,115200";
+ };
+
+ leds {
+ compatible = "gpio-leds";
+
+ led_power: power {
+ label = "green:power";
+ gpios = <&gpio0 24 GPIO_ACTIVE_LOW>;
+ };
+ };
+};
+
+&gpio0 {
+ indirect-access-bus-id = <0>;
+};
+
+&spi0 {
+ status = "okay";
+ flash@0 {
+ compatible = "jedec,spi-nor";
+ reg = <0>;
+ spi-max-frequency = <10000000>;
+
+ partitions {
+ compatible = "fixed-partitions";
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ partition@0 {
+ label = "u-boot";
+ reg = <0x00000000 0x80000>;
+ read-only;
+ };
+ partition@80000 {
+ label = "u-boot-env";
+ reg = <0x00080000 0x40000>;
+ read-only;
+ };
+ partition@c0000 {
+ label = "u-boot-env2";
+ reg = <0x000c0000 0x40000>;
+ read-only;
+ };
+ partition@280000 {
+ label = "firmware";
+ compatible = "denx,uimage";
+ reg = <0x00100000 0xd80000>;
+ };
+ partition@be80000 {
+ label = "kernel2";
+ reg = <0x00e80000 0x180000>;
+ };
+ partition@1000000 {
+ label = "sysinfo";
+ reg = <0x01000000 0x40000>;
+ };
+ partition@1040000 {
+ label = "rootfs2";
+ reg = <0x01040000 0xc00000>;
+ };
+ partition@1c40000 {
+ label = "jffs2";
+ reg = <0x01c40000 0x3c0000>;
+ };
+ };
+ };
+};
diff --git a/target/linux/rtl838x/image/Makefile b/target/linux/rtl838x/image/Makefile
index f490fa7ffe..cd384c5345 100644
--- a/target/linux/rtl838x/image/Makefile
+++ b/target/linux/rtl838x/image/Makefile
@@ -41,22 +41,24 @@ define Device/allnet_all-sg8208m
endef
TARGET_DEVICES += allnet_all-sg8208m
-define Device/d-link_dgs-1210-16
+define Device/d-link_dgs-1210
SOC := rtl8382
IMAGE_SIZE := 13824k
DEVICE_VENDOR := D-Link
- DEVICE_MODEL := DGS-1210-16
DEVICE_PACKAGES := ip-full ip-bridge ethtool tc
endef
-TARGET_DEVICES += d-link_dgs-1210-16
define Device/d-link_dgs-1210-10p
- SOC := rtl8382
- IMAGE_SIZE := 13824k
- DEVICE_VENDOR := D-Link
+ $(Device/d-link_dgs-1210)
DEVICE_MODEL := DGS-1210-10P
- DEVICE_PACKAGES := ip-full ip-bridge ethtool tc lua-rs232
+ DEVICE_PACKAGES += lua-rs232
endef
TARGET_DEVICES += d-link_dgs-1210-10p
+define Device/d-link_dgs-1210-16
+ $(Device/d-link_dgs-1210)
+ DEVICE_MODEL := DGS-1210-16
+endef
+TARGET_DEVICES += d-link_dgs-1210-16
+
$(eval $(call BuildImage))