Hi Petr, > -----Original Message----- > From: openwrt-devel [mailto:openwrt-devel-boun...@lists.openwrt.org] > On Behalf Of Petr Štetiar > Sent: Mittwoch, 4. November 2020 13:11 > To: openwrt-devel@lists.openwrt.org > Cc: Petr Štetiar <yn...@true.cz> > Subject: [PATCH 2/3] rtl838x: d-link_dgs-1210: refactor common family bits > > So it can be easily shared with other boards in the family and while at it add > missing SPDX license identifiers into the DTS files.
Acked-by: Adrian Schmutzler <freif...@adrianschmutzler.de>
for the patchset.
One comment on this patch below.
>
> Signed-off-by: Petr Štetiar <yn...@true.cz>
> ---
> .../dts/rtl8382_d-link_dgs-1210-16.dts | 81 +-----------------
> .../rtl838x/dts/rtl8382_d-link_dgs-1210.dtsi | 84 +++++++++++++++++++
> target/linux/rtl838x/image/Makefile | 14 ++--
> 3 files changed, 94 insertions(+), 85 deletions(-) create mode 100644
> target/linux/rtl838x/dts/rtl8382_d-link_dgs-1210.dtsi
>
> 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 3fb3cfb35346..3843af1371a7 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>;
> - };
> - };
> - };
> };
>
> ðernet0 {
> 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 000000000000..74043c097af8
> --- /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 f490fa7ffe92..448f0b472606 100644
> --- a/target/linux/rtl838x/image/Makefile
> +++ b/target/linux/rtl838x/image/Makefile
> @@ -41,21 +41,23 @@ 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
> +
> +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
>
> define Device/d-link_dgs-1210-10p
If you touch this anyway, consider fixing the alphabetic sorting, i.e. put 10p
block before 16.
Best
Adrian
> - 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
>
>
> _______________________________________________
> openwrt-devel mailing list
> openwrt-devel@lists.openwrt.org
> https://lists.openwrt.org/mailman/listinfo/openwrt-devel
openpgp-digital-signature.asc
Description: PGP signature
_______________________________________________ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
