Hi Tomasz, thanks for the comments.
El vie., 27 mar. 2020 a las 16:27, Tomasz Maciej Nowak
(<tome...@o2.pl>) escribió:
>
> Hi Daniel.
>
> Comments inline.
>
> W dniu 26.03.2020 o 02:00, Daniel Gonzalez Cabanelas pisze:
> > Buffalo LinkStation LS421DE is a dual bay NAS, based on Marvell Armada 370
> >
> > Hardware:
> > SoC: Marvell 88F6707-A1
> > CPU: Cortex-A9 1200 MHz, 1 core
> > Flash: SPI-NOR 1 MiB, NAND 512 MiB
>
> > RAM: DDR3 512 MiB
> > Ethernet: 1x 10/100/1000 Mbps
> > USB: 1x 2.0, 1x 3.0
> > SATA: 2x 3.0 Gbps
> > LEDs/Input : 5x / 2x (1x button, 1x slide-switch)
> > RTC: Ricoh RS5C372A, I2C, no battery
> >
> > Flash instruction (UART+TFTP):
> > 1. Downgrade the OEM firmware to 1.34 (BUFFALO_BOOTVER=0.13)
> > 2. Boot the Openwrt initramfs image using the serial console:
> > tftpboot buffalo_ls421de-initramfs-kernel.bin;bootm
> > 3. Flash the sysupgrade image using the Openwrt console:
> > sysupgrade -n buffalo_ls421de-squashfs-sysupgrade.bin
> > 5. Wait until it finish, the device will reboot with Openwrt installed
> > on the NAND flash.
> >
> > Note:
> > - Device shuting down doesn't work, even if the power slide switch is
> > used. We must first, via MDIO, set the unused LED2 at the ethernet
> > phy0 to off state.
> >
> > Signed-off-by: Daniel González Cabanelas <dgcb...@gmail.com>
> > ---
> > .../base-files/lib/preinit/06_set_iface_mac | 4 +
> > .../base-files/lib/upgrade/platform.sh | 3 +
> > .../boot/dts/armada-370-buffalo-ls421de.dts | 364 ++++++++++++++++++
> > target/linux/mvebu/image/Makefile | 14 +
> > target/linux/mvebu/image/cortexa9.mk | 21 +
> > .../250-buffalo_ls421de-build_dtb.patch | 10 +
> > 6 files changed, 416 insertions(+)
> > create mode 100644
> > target/linux/mvebu/files-4.19/arch/arm/boot/dts/armada-370-buffalo-ls421de.dts
> > create mode 100644
> > target/linux/mvebu/patches-4.19/250-buffalo_ls421de-build_dtb.patch
> >
> > diff --git
> > a/target/linux/mvebu/cortexa9/base-files/lib/preinit/06_set_iface_mac
> > b/target/linux/mvebu/cortexa9/base-files/lib/preinit/06_set_iface_mac
> > index fd41836c8d..62ce2653a0 100644
> > --- a/target/linux/mvebu/cortexa9/base-files/lib/preinit/06_set_iface_mac
> > +++ b/target/linux/mvebu/cortexa9/base-files/lib/preinit/06_set_iface_mac
> > @@ -9,6 +9,10 @@ preinit_set_mac_address() {
> > . /lib/functions.sh
> >
> > case $(board_name) in
> > + buffalo,ls421de)
> > + mac=$(mtd_get_mac_ascii u-boot-env eth1addr)
> > + ip link set dev eth0 address $mac 2>/dev/null
> > + ;;
> >
> > linksys,caiman|linksys,cobra|linksys,rango|linksys,shelby|linksys,venom)
> > # rename interfaces back to the way they were with 4.4
> > case "$(readlink /sys/class/net/eth0)" in
> > diff --git a/target/linux/mvebu/cortexa9/base-files/lib/upgrade/platform.sh
> > b/target/linux/mvebu/cortexa9/base-files/lib/upgrade/platform.sh
> > index 8baed969a3..63042b1535 100755
> > --- a/target/linux/mvebu/cortexa9/base-files/lib/upgrade/platform.sh
> > +++ b/target/linux/mvebu/cortexa9/base-files/lib/upgrade/platform.sh
> > @@ -22,6 +22,9 @@ platform_check_image() {
> >
> > platform_do_upgrade() {
> > case "$(board_name)" in
> > + buffalo,ls421de)
> > + nand_do_upgrade "$1"
> > + ;;
> > cznic,turris-omnia|\
> > solidrun,clearfog-base-a1|\
> > solidrun,clearfog-pro-a1)
> > diff --git
> > a/target/linux/mvebu/files-4.19/arch/arm/boot/dts/armada-370-buffalo-ls421de.dts
> >
> > b/target/linux/mvebu/files-4.19/arch/arm/boot/dts/armada-370-buffalo-ls421de.dts
> > new file mode 100644
> > index 0000000000..ca161964a4
> > --- /dev/null
> > +++
> > b/target/linux/mvebu/files-4.19/arch/arm/boot/dts/armada-370-buffalo-ls421de.dts
> > @@ -0,0 +1,364 @@
> > +// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
> > +/*
> > + * Device Tree file for Buffalo LinkStation LS421DE
> > + *
> > + * Copyright (C) 2020 Daniel González Cabanelas <dgcb...@gmail.com>
> > + */
> > +
> > +/dts-v1/;
> > +#include <dt-bindings/gpio/gpio.h>
> > +#include <dt-bindings/input/input.h>
> > +#include "armada-370.dtsi"
> > +#include "mvebu-linkstation-fan.dtsi"
> > +
> > +/ {
> > + model = "Buffalo LinkStation LS421DE";
> > + compatible = "buffalo,ls421de", "marvell,armada370",
> > "marvell,armada-370-xp";
> > +
> > + aliases {
> > + led-boot = &led_boot;
> > + led-failsafe = &led_failsafe;
> > + led-running = &led_power;
> > + led-upgrade = &led_upgrade;
>
> Can You test if adding here "ethernet1 = ð0;" would set the MAC address
> (also
> add eth0 label to ethernet node), if yes we won't need to add it in
> 06_set_iface_mac.
>
It doesn't work. So I'll leave the preinit script to do the work.
However when using the initramfs image loaded via TFTP, it catchs the
MAC address out of the box.
>
> > + };
> > +
> > + chosen {
> > + bootargs = "console=ttyS0,115200 earlyprintk noinitrd
> > rootfstype=squashfs";
> > + append-rootblock = "nullparameter="; /* override the
> > bootloader args */
> > + };
> > +
> > + memory {
> > + device_type = "memory";
> > + reg = <0x00000000 0x20000000>; /* 512 MB */
> > + };
> > +
> > + soc {
> > + ranges = <MBUS_ID(0xf0, 0x01) 0 0xd0000000 0x100000
> > + MBUS_ID(0x01, 0xe0) 0 0xfff00000 0x100000
> > + MBUS_ID(0x09, 0x01) 0 0xf1100000 0x10000>;
> > +
> > + internal-regs {
> > + rtc@10300 {
> > + status = "disabled";
> > + };
>
> Small stylistic note. Usually if we include dtsi with already specified nodes,
> we don't alter them here, instead operate on labels set in dtsi. For example
> this node would be: "&rtc { status = "disabled"; };" outside of the root node.
>
Ok
> > +
> > + serial@12000 {
> > + status = "okay";
> > + };
> > +
> > + sata@a0000 {
> > + nr-ports = <2>;
> > + status = "okay";
> > + };
> > +
> > + ethernet@74000 {
> > + pinctrl-0 = <&ge1_rgmii_pins>;
> > + pinctrl-names = "default";
> > + status = "okay";
> > + phy = <&phy0>;
> > + phy-mode = "rgmii-id";
> > + };
> > +
> > + mvsdio@d4000 {
> > + pinctrl-0 = <&sdio_pins2>;
> > + pinctrl-names = "default";
> > + status = "okay";
> > + /* No CD or WP GPIOs */
> > + broken-cd;
> > + };
> > +
> > + usb@50000 {
> > + vcc-supply = <&usb_v5_regulator>;
> > + status = "okay";
> > + };
> > +
> > + i2c@11000 {
> > + compatible = "marvell,mv64xxx-i2c";
> > + clock-frequency = <100000>;
> > + status = "okay";
> > +
> > + rs5c372a: rs5c372a@32 {
> > + compatible = "ricoh,rs5c372a";
> > + reg = <0x32>;
> > + };
> > + };
> > + };
> > + };
> > +
> > + regulators {
> > + compatible = "simple-bus";
> > + #address-cells = <1>;
> > + #size-cells = <0>;
> > + pinctrl-0 = <&pmx_power_usb &pmx_power_hdd1 &pmx_power_hdd2>;
> > +
> > + pinctrl-names = "default";
> > +
> > + usb_v5_regulator: usb-v5-regulator {
> > + compatible = "regulator-fixed";
> > + regulator-name = "USB";
> > + regulator-min-microvolt = <5000000>;
> > + regulator-max-microvolt = <5000000>;
> > + startup-delay-us = <4000000>;
> > + enable-active-high;
> > + regulator-always-on;
> > + regulator-boot-on;
> > + gpio = <&gpio0 5 GPIO_ACTIVE_HIGH>;
> > + };
> > +
> > + ata1_regulator: ata1-regulator {
> > + compatible = "regulator-fixed";
> > + reg = <1>;
> > + regulator-name = "HDD1";
> > + regulator-min-microvolt = <12000000>;
> > + regulator-max-microvolt = <12000000>;
> > + startup-delay-us = <2000000>;
> > + enable-active-high;
> > + regulator-always-on;
> > + regulator-boot-on;
> > + gpio = <&gpio0 8 GPIO_ACTIVE_HIGH>;
> > + };
> > +
> > + ata2_regulator: ata2-regulator {
> > + compatible = "regulator-fixed";
> > + reg = <2>;
> > + regulator-name = "HDD2";
> > + regulator-min-microvolt = <12000000>;
> > + regulator-max-microvolt = <12000000>;
> > + startup-delay-us = <4000000>;
> > + enable-active-high;
> > + regulator-always-on;
> > + regulator-boot-on;
> > + gpio = <&gpio0 9 GPIO_ACTIVE_HIGH>;
> > + };
> > + };
> > +
> > + gpio_keys {
> > + compatible = "gpio-keys";
> > + #address-cells = <1>;
> > + #size-cells = <0>;
> > + pinctrl-0 = <&pmx_hdd_present &pmx_buttons>;
> > + pinctrl-names = "default";
> > +
> > + hdd1-present {
> > + label = "HDD1 Present";
> > + linux,code = <KEY_PROG1>;
> > + gpios = <&gpio0 11 GPIO_ACTIVE_LOW>;
> > + };
> > +
> > + hdd2-present {
> > + label = "HDD2 Present";
> > + linux,code = <KEY_PROG2>;
> > + gpios = <&gpio0 12 GPIO_ACTIVE_LOW>;
> > +
> > + };
> > +
> > + power {
> > + label = "Power Switch";
> > + linux,code = <KEY_POWER>;
> > + linux,input-type = <EV_SW>;
> > + gpios = <&gpio0 15 GPIO_ACTIVE_LOW>;
> > + };
> > +
> > + function {
> > + label = "Function Button";
> > + linux,code = <KEY_OPTION>;
> > + gpios = <&gpio0 16 GPIO_ACTIVE_LOW>;
> > + };
> > + };
> > +
> > + gpio_leds {
> > + compatible = "gpio-leds";
> > + pinctrl-names = "default";
> > + pinctrl-0 = <&pmx_leds1 &pmx_leds2>;
> > +
> > + system_red {
> > + label = "ls421de:red:system";
> > + gpios = <&gpio0 7 GPIO_ACTIVE_HIGH>;
> > + };
> > +
> > + led_power: power_white {
> > + label = "ls421de:white:power";
> > + gpios = <&gpio1 22 GPIO_ACTIVE_HIGH>;
> > + default-state = "on";
> > + };
> > +
> > + led_failsafe: power_red {
> > + label = "ls421de:red:power";
> > + gpios = <&gpio1 23 GPIO_ACTIVE_HIGH>;
> > + };
> > +
> > + led_upgrade: power_orange {
> > + label = "ls421de:orange:power";
> > + gpios = <&gpio1 25 GPIO_ACTIVE_HIGH>;
> > + };
> > +
> > + led_boot: system_white {
> > + label = "ls421de:white:system";
> > + gpios = <&gpio1 27 GPIO_ACTIVE_HIGH>;
> > + };
> > +
> > + hdd1_red {
> > + label = "ls421de:red:hdd1";
> > + gpios = <&gpio1 29 GPIO_ACTIVE_HIGH>;
> > + default-state = "off";
> > + linux,default-trigger = "disk-activity";
> > + };
> > +
> > + hdd2_red {
> > + label = "ls421de:red:hdd2";
> > + gpios = <&gpio1 30 GPIO_ACTIVE_HIGH>;
> > + default-state = "off";
> > + linux,default-trigger = "disk-activity";
> > + };
> > + };
> > +
> > + /* FIXME: this driver needs to be aware of the LED2 eth phy use,
> > + which must be set to off state before shutting down the machine */
> > + restart_poweroff {
> > + compatible = "restart-poweroff";
> > + };
> > +
> > + gpio_fan {
> > + gpios = <&gpio0 13 GPIO_ACTIVE_HIGH
> > + &gpio0 14 GPIO_ACTIVE_HIGH>;
> > +
> > + alarm-gpios = <&gpio0 10 GPIO_ACTIVE_HIGH>;
> > + };
> > +};
> > +
> > +&pinctrl {
> > + pmx_power_usb: pmx-power-usb {
> > + marvell,pins = "mpp5";
> > + marvell,function = "gpo";
> > + };
> > + pmx_power_hdd1: pmx-power-hdd1 {
> > + marvell,pins = "mpp8";
> > + marvell,function = "gpio";
> > + };
> > + pmx_power_hdd2: pmx-power-hdd2 {
> > + marvell,pins = "mpp9";
> > + marvell,function = "gpo";
> > + };
> > + pmx_fan_lock: pmx-fan-lock {
> > + marvell,pins = "mpp10";
> > + marvell,function = "gpio";
> > + };
> > + pmx_hdd_present: pmx-hdd-present {
> > + marvell,pins = "mpp11", "mpp12";
> > + marvell,function = "gpio";
> > + };
> > + pmx_fan_high: pmx-fan-high {
> > + marvell,pins = "mpp13";
> > + marvell,function = "gpio";
> > + };
> > + pmx_fan_low: pmx-fan-low {
> > + marvell,pins = "mpp14";
> > + marvell,function = "gpio";
> > + };
> > + pmx_buttons: pmx-buttons {
> > + marvell,pins = "mpp15", "mpp16";
> > + marvell,function = "gpio";
> > + };
> > + pmx_leds1: pmx-leds {
> > + marvell,pins = "mpp7", "mpp54", "mpp59", "mpp61";
> > + marvell,function = "gpo";
> > + };
> > + pmx_leds2: pmx-leds {
> > + marvell,pins = "mpp55", "mpp57", "mpp62";
> > + marvell,function = "gpio";
> > + };
> > +};
> > +
> > +&pciec {
> > + status = "okay";
> > + /* Connected to uPD720202 USB 3.0 Host */
> > + pcie@1,0 {
> > + status = "okay";
> > + };
> > + /* Unpopulated miniPCIe slot */
> > + pcie@2,0 {
> > + status = "disabled";
> > + };
> > +};
> > +
> > +&mdio {
> > + pinctrl-0 = <&mdio_pins>;
> > + pinctrl-names = "default";
> > +
> > + phy0: ethernet-phy@0 { /* Marvell 88E1518 */
> > + reg = <0>;
> > + /* LED2 is used to inform uBoot if the power-switch was
> > slided to
> > + the "off" position, and then shutdown the machine.
> > + Page 0x3, Register 0x10, bit 8:
> > + 0x800: LED2 off, shutdown the machine
> > + 0x900: LED2 on, boot the machine
> > */
> > + marvell,reg-init = <0x3 0x10 0x1 0x1991>, /* LED Function */
> > + <0x3 0x11 0x1 0x4401>, /* LED
> > polarity */
> > + <0x3 0x12 0x1 0x4905>; /* LED Timer */
> > + };
> > +};
> > +
> > +&nand_controller {
> > + status = "okay";
> > +
> > + nand@0 {
> > + reg = <0>;
> > + label = "pxa3xx_nand-0";
> > + nand-rb = <0>;
> > + marvell,nand-keep-config;
> > + nand-on-flash-bbt;
> > + nand-ecc-strength = <4>;
> > + nand-ecc-step-size = <512>;
> > +
> > + partitions {
> > + compatible = "fixed-partitions";
> > + #address-cells = <1>;
> > + #size-cells = <1>;
> > +
> > + partition@0 {
> > + label = "kernel";
> > + reg = <0x00000000 0x02000000>; /* 32 MiB */
> > + };
> > +
> > + partition@2000000 {
> > + label = "ubi";
> > + reg = <0x02000000 0x1e000000>; /* 480 MiB */
> > + };
> > +
> > + nand_flash@0 {
> > + label = "nand_all";
> > + reg = <0 0>; /* full flash */
>
> Since the partitions are defined, why exporting the full flash,
> is that useful/used for something?
>
It was comfortable for making a flash backup, but not really needed,
I''ll delete it.
> > + };
> > + };
> > + };
> > +};
> > +
> > +&spi0 {
> > + status = "okay";
> > + pinctrl-0 = <&spi0_pins2>;
> > + pinctrl-names = "default";
> > +
> > + spi-flash@0 {
> > + #address-cells = <1>;
> > + #size-cells = <1>;
> > + compatible = "mxicy,mx25l8005", "jedec,spi-nor";
> > + reg = <0>; /* Chip select 0 */
> > + spi-max-frequency = <50000000>;
> > +
> > + partitions {
> > + compatible = "fixed-partitions";
> > + #address-cells = <1>;
> > + #size-cells = <1>;
> > +
> > + partition@0 {
> > + reg = <0x00000 0xf0000>; /* 960 KiB*/
> > + label = "u-boot";
> > + read-only;
> > + };
> > + partition@f0000 {
> > + reg = <0xf0000 0x10000>; /* 64 KiB */
> > + label = "u-boot-env";
> > + };
> > + };
> > + };
> > +};
> > diff --git a/target/linux/mvebu/image/Makefile
> > b/target/linux/mvebu/image/Makefile
> > index ef9274866d..3a47878069 100644
> > --- a/target/linux/mvebu/image/Makefile
> > +++ b/target/linux/mvebu/image/Makefile
> > @@ -40,6 +40,20 @@ define Build/boot-img-ext4
> > make_ext4fs -J -L kernel -l $(CONFIG_TARGET_KERNEL_PARTSIZE)M
> > $@.bootimg $@.boot
> > endef
> >
> > +define Build/buffalo-kernel-jffs2
> > + rm -rf $(KDIR)/kernel_jffs2 $@.fakerd
> > + mkdir -p $(KDIR)/kernel_jffs2
> > + dd if=/dev/zero of=$@.fakerd bs=131008 count=1 conv=sync
> > + $(STAGING_DIR_HOST)/bin/mkimage \
> > + -T ramdisk -A $(LINUX_KARCH) -O linux -C gzip -n 'fake
> > initrd' \
> > + -d $@.fakerd $(KDIR)/kernel_jffs2/initrd.buffalo
> > + cp $@ $(KDIR)/kernel_jffs2/uImage.buffalo
> > + $(STAGING_DIR_HOST)/bin/mkfs.jffs2 \
> > + --little-endian -v --squash-uids -q -f -n -x lzma -x rtime -m
> > none \
> > + --eraseblock=128KiB --pad=$(KERNEL_SIZE) -d
> > $(KDIR)/kernel_jffs2 -o $@
> > + rm -rf $(KDIR)/kernel_jffs2 $@.fakerd
> > +endef
> > +
> > define Build/sdcard-img
> > SIGNATURE="$(IMG_PART_SIGNATURE)" \
> > ./gen_mvebu_sdcard_img.sh $@ \
> > diff --git a/target/linux/mvebu/image/cortexa9.mk
> > b/target/linux/mvebu/image/cortexa9.mk
> > index 85bfa94dbd..aa8e31dbdf 100644
> > --- a/target/linux/mvebu/image/cortexa9.mk
> > +++ b/target/linux/mvebu/image/cortexa9.mk
> > @@ -6,6 +6,27 @@
> > # See /LICENSE for more information.
> > #
> >
> > +define Device/buffalo_ls421de
> > + $(Device/NAND-128K)
> > + DEVICE_VENDOR := Buffalo
> > + DEVICE_MODEL := LinkStation LS421DE
> > + UBINIZE_OPTS := -E 5
> > + SUBPAGESIZE :=
> > + KERNEL_SIZE := 33554432
> > + FILESYSTEMS := squashfs ubifs
> > + KERNEL := kernel-bin | append-dtb | uImage none | buffalo-kernel-jffs2
> > + KERNEL_INITRAMFS := kernel-bin | append-dtb | uImage none
> > + IMAGES := factory.bin sysupgrade.bin
> > + IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata
> > + DEVICE_DTS := armada-370-buffalo-ls421de
> > + SUPPORTED_DEVICES += ls421de
> > + DEVICE_PACKAGES := \
> > + kmod-rtc-rs5c372a kmod-hwmon-gpiofan kmod-usb2 kmod-usb3
> > kmod-usb-storage \
> > + kmod-ata-core kmod-ata-marvell-sata kmod-fs-f2fs kmod-fs-ext4
> > kmod-fs-vfat \
> > + kmod-fs-xfs kmod-nls-cp437 kmod-nls-iso8859-1 mkf2fs e2fsprogs
> > partx-utils
>
> You can remove: kmod-usb2, kmod-usb3, kmod-usb-storage, kmod-ata-core,
> kmod-ata-marvell-sata, kmod-fs-f2fs, kmod-fs-ext4 - all are already enabled in
> kernel config.
> Does this NAS in factory firmware use XFS of VFAT for formatting HDDs? If no
> please
> remove.
>
XFS is used by the factory firmware for formating external HDDs. I''ll
keep this modules.
> > +endef
> > + TARGET_DEVICES += buffalo_ls421de
> > +
> > define Device/cznic_turris-omnia
> > DEVICE_VENDOR := CZ.NIC
> > DEVICE_MODEL := Turris Omnia
> > diff --git
> > a/target/linux/mvebu/patches-4.19/250-buffalo_ls421de-build_dtb.patch
> > b/target/linux/mvebu/patches-4.19/250-buffalo_ls421de-build_dtb.patch
> > new file mode 100644
> > index 0000000000..b0f883035d
> > --- /dev/null
> > +++ b/target/linux/mvebu/patches-4.19/250-buffalo_ls421de-build_dtb.patch
>
> This patch is not needed, please remove.
>
Ok
> > @@ -0,0 +1,10 @@
> > +--- a/arch/arm/boot/dts/Makefile
> > ++++ b/arch/arm/boot/dts/Makefile
> > +@@ -1135,6 +1135,7 @@
> > + zynq-zybo.dtb \
> > + zynq-zybo-z7.dtb
> > + dtb-$(CONFIG_MACH_ARMADA_370) += \
> > ++ armada-370-buffalo-ls421de.dtb \
> > + armada-370-db.dtb \
> > + armada-370-dlink-dns327l.dtb \
> > + armada-370-mirabox.dtb \
> >
>
> Regards, Tomasz.
>
> --
> TMN
I'll send another patch in next hours if there are no more objetions:
Regards
Daniel
_______________________________________________
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
