kirkwood: add support for Check Point L-50
authorPawel Dembicki <paweldembicki@gmail.com>
Sun, 26 Jan 2020 16:22:28 +0000 (17:22 +0100)
committerPetr Štetiar <ynezz@true.cz>
Sat, 11 Jul 2020 11:33:28 +0000 (13:33 +0200)
This patch adds support for the Check Point L-50 from 600/1100 series
routers.

Specification:
-CPU: Marvell Kirkwood 88F6281 1200MHz
-RAM: 512MB
-Flash: NAND 512MB
-WiFi: mPCIe card based on Atheros AR9287 b/g/n
-WAN: 1 Gigabit Port (Marvell 88E1116R PHY)
-LAN: 9 Gigabit Ports (2x Marvell 88E6171(5+4))
-USB: 2x USB2.0
-Express card slot
-SD card slot
-Serial console: RJ-45 115200 8n1
-Unsupported DSL

Known issues:
-DSL not supported
-Expresscard not tested

Installation:

Step one -> backup:
make backup u-boot and env for revert stock posibility
make backup dsl_mac_addr, dmz_mac_addr, eth1addr, ethaddr and all lanX_mac_addr

Step two -> Use kwboot tool to upload openwrt u-boot to RAM:

run kwboot: "kwboot -B 115200 /dev/ttyUSB0 -b u-boot.kwb -p -t"
end start u-boot

Step three -> Restore macs (e.g. below):
setenv eth1addr 00:1C:XX:XX:XX:6C
setenv ethaddr 00:1C:XX:XX:XX:6B
setenv lan1_mac_addr 00:1C:XX:XX:XX:6C
setenv lan2_mac_addr 00:1C:XX:XX:XX:6D
setenv lan3_mac_addr 00:1C:XX:XX:XX:6E
setenv lan4_mac_addr 00:1C:XX:XX:XX:6F
setenv lan5_mac_addr 00:1C:XX:XX:XX:70
setenv lan6_mac_addr 00:1C:XX:XX:XX:71
setenv lan7_mac_addr 00:1C:XX:XX:XX:72
setenv lan8_mac_addr 00:1C:XX:XX:XX:73
setenv dmz_mac_addr 00:1C:XX:XX:XX:74
setenv dsl_mac_addr 00:1C:XX:XX:XX:75

Step four -> flash u-boot:
mw 0x0800000 0xffff 0x100000
nand erase 0x0 100000
tftp 0x0800000 openwrt-kirkwood-l50-u-boot.kwb
nand write 0x0800000 0x0 0x100000
saveenv

Step five -> run initramfs image:

tftpboot 0x02000000 openwrt.bin; bootm 0x02000000;

Step six -> install sysupgrade OpenWrt image:

copy to /tmp/ sysupgrade image
run sysupgrade

Back to stock:
Restore original u-boot end env.
Install factory image via stock u-boot.

Signed-off-by: Pawel Dembicki <paweldembicki@gmail.com>
package/boot/uboot-envtools/files/kirkwood
target/linux/kirkwood/base-files/etc/board.d/02_network
target/linux/kirkwood/base-files/etc/board.d/03_gpio_switches [new file with mode: 0755]
target/linux/kirkwood/base-files/lib/preinit/07_set_iface_mac [new file with mode: 0644]
target/linux/kirkwood/config-5.4
target/linux/kirkwood/image/Makefile
target/linux/kirkwood/patches-5.4/001-ARM-dts-kirkwood-Add-Check-Point-L-50-board.patch [new file with mode: 0644]
target/linux/kirkwood/patches-5.4/111-l-50.patch [new file with mode: 0644]

index 5e87dd1d62e6d96caa6c2180df908ca2b92da6b2..a099c925ea2d6c3d32c86640d1efd25163da12ba 100644 (file)
@@ -13,6 +13,7 @@ touch /etc/config/ubootenv
 board=$(board_name)
 
 case "$board" in
+checkpoint,l-50|\
 cloudengines,pogoe02|\
 cloudengines,pogoplugv4|\
 iom,ix2-200|\
index a86c57117dd7eed715041005be5c31cfed780346..658ce1334672210939092f2c5013d265b95b6a97 100755 (executable)
@@ -11,6 +11,9 @@ board_config_update
 board=$(board_name)
 
 case "$board" in
+"checkpoint,l-50")
+       ucidef_set_interfaces_lan_wan "lan1 lan2 lan3 lan4 lan5 lan6 lan7 lan8 dmz" "eth0"
+       ;;
 "cisco,on100")
        ucidef_set_interface_lan "eth0 eth1"
        ;;
diff --git a/target/linux/kirkwood/base-files/etc/board.d/03_gpio_switches b/target/linux/kirkwood/base-files/etc/board.d/03_gpio_switches
new file mode 100755 (executable)
index 0000000..046f8d4
--- /dev/null
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+. /lib/functions/uci-defaults.sh
+
+board_config_update
+
+board=$(board_name)
+
+case "$board" in
+checkpoint,l-50)
+       ucidef_add_gpio_switch "mpcie-rst" "mPCIE Card reset" "502" "1"
+       ucidef_add_gpio_switch "exp-card-rst" "Express Card reset" "497" "1"
+       ;;
+esac
+
+board_config_flush
+
+exit 0
diff --git a/target/linux/kirkwood/base-files/lib/preinit/07_set_iface_mac b/target/linux/kirkwood/base-files/lib/preinit/07_set_iface_mac
new file mode 100644 (file)
index 0000000..75e9e88
--- /dev/null
@@ -0,0 +1,25 @@
+. /lib/functions.sh
+. /lib/functions/system.sh
+
+preinit_set_mac_address() {
+       local mac
+
+       case $(board_name) in
+       checkpoint,l-50)
+               mac=$(mtd_get_mac_ascii bootldr-env lan1_mac_addr)
+
+               ip link set dev lan1 address $mac 2>/dev/null
+               ip link set dev lan2 address $(macaddr_add $mac 1) 2>/dev/null
+               ip link set dev lan3 address $(macaddr_add $mac 2) 2>/dev/null
+               ip link set dev lan4 address $(macaddr_add $mac 3) 2>/dev/null
+               ip link set dev lan5 address $(macaddr_add $mac 4) 2>/dev/null
+               ip link set dev lan6 address $(macaddr_add $mac 5) 2>/dev/null
+               ip link set dev lan7 address $(macaddr_add $mac 6) 2>/dev/null
+               ip link set dev lan8 address $(macaddr_add $mac 7) 2>/dev/null
+               ip link set dev dmz address $(macaddr_add $mac 8) 2>/dev/null
+               ip link set dev dsl address $(macaddr_add $mac 9) 2>/dev/null
+               ;;
+       esac
+}
+
+boot_hook_add preinit_main preinit_set_mac_address
index 5529bf89df87a65f1b67c5e02bfa2ddd9fac3e47..61efa07d91caf861f9f1f91316140a32ee89d47e 100644 (file)
@@ -282,6 +282,7 @@ CONFIG_PINCTRL=y
 CONFIG_PINCTRL_KIRKWOOD=y
 CONFIG_PINCTRL_MVEBU=y
 # CONFIG_PINCTRL_SINGLE is not set
+CONFIG_PINCTRL_SX150X=y
 CONFIG_PLAT_ORION=y
 CONFIG_POWER_RESET=y
 CONFIG_POWER_RESET_GPIO=y
index 8cc69195b446b534f3a2fc35136be7a4313ba9aa..ba93fffeb216040f47a76e26314012b071e31bcf 100644 (file)
@@ -28,6 +28,16 @@ define Device/Default
   SUPPORTED_DEVICES = $(subst _,$(comma),$(1)) $$(BOARD_NAME)
 endef
 
+define Device/checkpoint_l-50
+  DEVICE_VENDOR := Check Point
+  DEVICE_MODEL := L-50
+  DEVICE_DTS := kirkwood-l-50
+  DEVICE_PACKAGES := kmod-ath9k kmod-gpio-button-hotplug kmod-mvsdio \
+       kmod-rtc-s35390a kmod-usb-ledtrig-usbport wpad-basic
+  IMAGES := sysupgrade.bin
+endef
+TARGET_DEVICES += checkpoint_l-50
+
 define Device/cisco_on100
   DEVICE_VENDOR := Cisco Systems
   DEVICE_MODEL := ON100
diff --git a/target/linux/kirkwood/patches-5.4/001-ARM-dts-kirkwood-Add-Check-Point-L-50-board.patch b/target/linux/kirkwood/patches-5.4/001-ARM-dts-kirkwood-Add-Check-Point-L-50-board.patch
new file mode 100644 (file)
index 0000000..52caee7
--- /dev/null
@@ -0,0 +1,485 @@
+From efa968c18abab78c5e0c40a853caf286c3629a59 Mon Sep 17 00:00:00 2001
+From: Pawel Dembicki <paweldembicki@gmail.com>
+Date: Tue, 17 Mar 2020 21:28:01 +0100
+Subject: [PATCH v3] ARM: dts: kirkwood: Add Check Point L-50 board
+
+This patch adds dts for the Check Point L-50 from 600/1100 series
+routers.
+
+Specification:
+-CPU: Marvell Kirkwood 88F6821 1200MHz
+-RAM: 512MB
+-Flash: NAND 512MB
+-WiFi: mPCIe card based on Atheros AR9287 b/g/n
+-WAN: 1 Gigabit Port (Marvell 88E1116R PHY)
+-LAN: 9 Gigabit Ports (2x Marvell 88E6171(5+3))
+-USB: 2x USB2.0
+-Express card slot
+-SD card slot
+-Serial console: RJ-45 115200 8n1
+-Unsupported DSL
+
+Reviewed-by: Andrew Lunn <andrew@lunn.ch>
+Signed-off-by: Pawel Dembicki <paweldembicki@gmail.com>
+---
+Changes in v3:
+- fix typo and code style issues pointed by OpenWrt guys
+Changes in v2:
+- none
+
+ arch/arm/boot/dts/Makefile          |   1 +
+ arch/arm/boot/dts/kirkwood-l-50.dts | 438 ++++++++++++++++++++++++++++
+ 2 files changed, 439 insertions(+)
+ create mode 100644 arch/arm/boot/dts/kirkwood-l-50.dts
+
+--- a/arch/arm/boot/dts/Makefile
++++ b/arch/arm/boot/dts/Makefile
+@@ -270,6 +270,7 @@ dtb-$(CONFIG_MACH_KIRKWOOD) += \
+       kirkwood-iomega_ix2_200.dtb \
+       kirkwood-is2.dtb \
+       kirkwood-km_kirkwood.dtb \
++      kirkwood-l-50.dtb \
+       kirkwood-laplug.dtb \
+       kirkwood-linkstation-lsqvl.dtb \
+       kirkwood-linkstation-lsvl.dtb \
+--- /dev/null
++++ b/arch/arm/boot/dts/kirkwood-l-50.dts
+@@ -0,0 +1,438 @@
++// SPDX-License-Identifier: GPL-2.0
++/*
++ * Check Point L-50 Board Description
++ * Copyright 2020 Pawel Dembicki <paweldembicki@gmail.com>
++ */
++
++/dts-v1/;
++
++#include "kirkwood.dtsi"
++#include "kirkwood-6281.dtsi"
++
++/ {
++      model = "Check Point L-50";
++      compatible = "checkpoint,l-50", "marvell,kirkwood-88f6281", "marvell,kirkwood";
++
++      memory {
++              device_type = "memory";
++              reg = <0x00000000 0x20000000>;
++      };
++
++      chosen {
++              bootargs = "console=ttyS0,115200n8";
++              stdout-path = &uart0;
++      };
++
++      ocp@f1000000 {
++              pinctrl: pin-controller@10000 {
++                      pinctrl-0 = <&pmx_led38 &pmx_sysrst &pmx_button29>;
++                      pinctrl-names = "default";
++
++                      pmx_sysrst: pmx-sysrst {
++                              marvell,pins = "mpp6";
++                              marvell,function = "sysrst";
++                      };
++
++                      pmx_button29: pmx_button29 {
++                              marvell,pins = "mpp29";
++                              marvell,function = "gpio";
++                      };
++
++                      pmx_led38: pmx_led38 {
++                              marvell,pins = "mpp38";
++                              marvell,function = "gpio";
++                      };
++
++                      pmx_sdio_cd: pmx-sdio-cd {
++                              marvell,pins = "mpp46";
++                              marvell,function = "gpio";
++                      };
++              };
++
++              serial@12000 {
++                      status = "okay";
++              };
++
++              mvsdio@90000 {
++                      status = "okay";
++                      cd-gpios = <&gpio1 14 9>;
++              };
++
++              i2c@11000 {
++                      status = "okay";
++                      clock-frequency = <400000>;
++
++                      gpio2: gpio-expander@20{
++                              #gpio-cells = <2>;
++                              #interrupt-cells = <2>;
++                              compatible = "semtech,sx1505q";
++                              reg = <0x20>;
++
++                              gpio-controller;
++                      };
++
++                      /* Three GPIOs from 0x21 exp. are undescribed in dts:
++                       * 1: DSL module reset (active low)
++                       * 5: mPCIE reset (active low)
++                       * 6: Express card reset (active low)
++                       */
++                      gpio3: gpio-expander@21{
++                              #gpio-cells = <2>;
++                              #interrupt-cells = <2>;
++                              compatible = "semtech,sx1505q";
++                              reg = <0x21>;
++
++                              gpio-controller;
++                      };
++
++                      rtc@30 {
++                              compatible = "s35390a";
++                              reg = <0x30>;
++                      };
++              };
++      };
++
++      leds {
++              compatible = "gpio-leds";
++
++              status_green {
++                      label = "l-50:green:status";
++                      gpios = <&gpio1 6 GPIO_ACTIVE_LOW>;
++              };
++
++              status_red {
++                      label = "l-50:red:status";
++                      gpios = <&gpio3 2 GPIO_ACTIVE_LOW>;
++              };
++
++              wifi {
++                      label = "l-50:green:wifi";
++                      gpios = <&gpio2 7 GPIO_ACTIVE_LOW>;
++                      linux,default-trigger = "phy0tpt";
++              };
++
++              internet_green {
++                      label = "l-50:green:internet";
++                      gpios = <&gpio2 3 GPIO_ACTIVE_LOW>;
++              };
++
++              internet_red {
++                      label = "l-50:red:internet";
++                      gpios = <&gpio2 1 GPIO_ACTIVE_LOW>;
++              };
++
++              usb1_green {
++                      label = "l-50:green:usb1";
++                      gpios = <&gpio2 0 GPIO_ACTIVE_LOW>;
++                      linux,default-trigger = "usbport";
++                      trigger-sources = <&hub_port3>;
++              };
++
++              usb1_red {
++                      label = "l-50:red:usb1";
++                      gpios = <&gpio2 4 GPIO_ACTIVE_LOW>;
++              };
++
++              usb2_green {
++                      label = "l-50:green:usb2";
++                      gpios = <&gpio2 2 GPIO_ACTIVE_LOW>;
++                      linux,default-trigger = "usbport";
++                      trigger-sources = <&hub_port1>;
++              };
++
++              usb2_red {
++                      label = "l-50:red:usb2";
++                      gpios = <&gpio2 5 GPIO_ACTIVE_LOW>;
++              };
++      };
++
++      usb2_pwr {
++              compatible = "regulator-fixed";
++              regulator-name = "usb2_pwr";
++
++              regulator-min-microvolt = <5000000>;
++              regulator-max-microvolt = <5000000>;
++              gpio = <&gpio3 3 GPIO_ACTIVE_LOW>;
++              regulator-always-on;
++      };
++
++      usb1_pwr {
++              compatible = "regulator-fixed";
++              regulator-name = "usb1_pwr";
++
++              regulator-min-microvolt = <5000000>;
++              regulator-max-microvolt = <5000000>;
++              gpio = <&gpio3 4 GPIO_ACTIVE_LOW>;
++              regulator-always-on;
++      };
++
++      mpcie_pwr {
++              compatible = "regulator-fixed";
++              regulator-name = "mpcie_pwr";
++
++              regulator-min-microvolt = <3300000>;
++              regulator-max-microvolt = <3300000>;
++              gpio = <&gpio3 5 GPIO_ACTIVE_HIGH>;
++              enable-active-high;
++              regulator-always-on;
++      };
++
++      express_card_pwr {
++              compatible = "regulator-fixed";
++              regulator-name = "express_card_pwr";
++
++              regulator-min-microvolt = <3300000>;
++              regulator-max-microvolt = <3300000>;
++              gpio = <&gpio3 7 GPIO_ACTIVE_HIGH>;
++              enable-active-high;
++              regulator-always-on;
++      };
++
++      keys {
++              compatible = "gpio-keys";
++
++              factory_defaults {
++                      label = "factory_defaults";
++                      gpios = <&gpio0 29 GPIO_ACTIVE_LOW>;
++                      linux,code = <KEY_RESTART>;
++              };
++      };
++};
++
++&mdio {
++      status = "okay";
++
++      ethphy8: ethernet-phy@8 {
++              reg = <0x08>;
++      };
++
++      switch0: switch@10 {
++              compatible = "marvell,mv88e6085";
++              #address-cells = <1>;
++              #size-cells = <0>;
++              reg = <0x10>;
++              dsa,member = <0 0>;
++
++              ports {
++                      #address-cells = <1>;
++                      #size-cells = <0>;
++
++                      port@0 {
++                              reg = <0>;
++                              label = "lan5";
++                      };
++
++                      port@1 {
++                             reg = <1>;
++                             label = "lan1";
++                      };
++
++                      port@2 {
++                             reg = <2>;
++                             label = "lan6";
++                      };
++
++                      port@3 {
++                             reg = <3>;
++                             label = "lan2";
++                      };
++
++                      port@4 {
++                              reg = <4>;
++                              label = "lan7";
++                      };
++
++                      switch0port5: port@5 {
++                              reg = <5>;
++                              phy-mode = "rgmii-txid";
++                              link = <&switch1port5>;
++                              fixed-link {
++                                      speed = <1000>;
++                                      full-duplex;
++                              };
++                      };
++
++                      port@6 {
++                              reg = <6>;
++                              label = "cpu";
++                              phy-mode = "rgmii-id";
++                              ethernet = <&eth1port>;
++                              fixed-link {
++                                      speed = <1000>;
++                                      full-duplex;
++                              };
++                      };
++              };
++      };
++
++      switch@11 {
++              compatible = "marvell,mv88e6085";
++              #address-cells = <1>;
++              #size-cells = <0>;
++              reg = <0x11>;
++              dsa,member = <0 1>;
++
++              ports {
++                      #address-cells = <1>;
++                      #size-cells = <0>;
++
++                      port@0 {
++                              reg = <0>;
++                              label = "lan3";
++                      };
++
++                      port@1 {
++                             reg = <1>;
++                             label = "lan8";
++                      };
++
++                      port@2 {
++                             reg = <2>;
++                             label = "lan4";
++                      };
++
++                      port@3 {
++                             reg = <3>;
++                             label = "dmz";
++                      };
++
++                      switch1port5: port@5 {
++                              reg = <5>;
++                              phy-mode = "rgmii-txid";
++                              link = <&switch0port5>;
++                              fixed-link {
++                                      speed = <1000>;
++                                      full-duplex;
++                              };
++                      };
++
++                      port@6 {
++                              reg = <6>;
++                              label = "dsl";
++                              fixed-link {
++                                      speed = <100>;
++                                      full-duplex;
++                              };
++                      };
++              };
++      };
++};
++
++&eth0 {
++      status = "okay";
++      ethernet0-port@0 {
++              phy-handle = <&ethphy8>;
++      };
++};
++
++&eth1 {
++      status = "okay";
++      ethernet1-port@0 {
++              speed = <1000>;
++              duplex = <1>;
++      };
++};
++
++&nand {
++      status = "okay";
++      pinctrl-0 = <&pmx_nand>;
++      pinctrl-names = "default";
++
++      partition@0 {
++              label = "u-boot";
++              reg = <0x00000000 0x000c0000>;
++      };
++
++      partition@a0000 {
++              label = "bootldr-env";
++              reg = <0x000c0000 0x00040000>;
++      };
++
++      partition@100000 {
++              label = "kernel-1";
++              reg = <0x00100000 0x00800000>;
++      };
++
++      partition@900000 {
++              label = "rootfs-1";
++              reg = <0x00900000 0x07100000>;
++      };
++
++      partition@7a00000 {
++              label = "kernel-2";
++              reg = <0x07a00000 0x00800000>;
++      };
++
++      partition@8200000 {
++              label = "rootfs-2";
++              reg = <0x08200000 0x07100000>;
++      };
++
++      partition@f300000 {
++              label = "default_sw";
++              reg = <0x0f300000 0x07900000>;
++      };
++
++      partition@16c00000 {
++              label = "logs";
++              reg = <0x16c00000 0x01800000>;
++      };
++
++      partition@18400000 {
++              label = "preset_cfg";
++              reg = <0x18400000 0x00100000>;
++      };
++
++      partition@18500000 {
++              label = "adsl";
++              reg = <0x18500000 0x00100000>;
++      };
++
++      partition@18600000 {
++              label = "storage";
++              reg = <0x18600000 0x07a00000>;
++      };
++};
++
++&rtc {
++      status = "disabled";
++};
++
++&pciec {
++      status = "okay";
++};
++
++&pcie0 {
++      status = "okay";
++};
++
++&sata_phy0 {
++      status = "disabled";
++};
++
++&sata_phy1 {
++      status = "disabled";
++};
++
++&usb0 {
++      #address-cells = <1>;
++      #size-cells = <0>;
++      status = "okay";
++
++      port@1 {
++              #address-cells = <1>;
++              #size-cells = <0>;
++              reg = <1>;
++              #trigger-source-cells = <0>;
++
++              hub_port1: port@1 {
++                      reg = <1>;
++                      #trigger-source-cells = <0>;
++              };
++
++              hub_port3: port@3 {
++                      reg = <3>;
++                      #trigger-source-cells = <0>;
++              };
++      };
++};
diff --git a/target/linux/kirkwood/patches-5.4/111-l-50.patch b/target/linux/kirkwood/patches-5.4/111-l-50.patch
new file mode 100644 (file)
index 0000000..b167988
--- /dev/null
@@ -0,0 +1,47 @@
+--- a/arch/arm/boot/dts/kirkwood-l-50.dts
++++ b/arch/arm/boot/dts/kirkwood-l-50.dts
+@@ -18,6 +18,13 @@
+               reg = <0x00000000 0x20000000>;
+       };
+
++      aliases {
++              led-boot = &led_status_green;
++              led-failsafe = &led_status_red;
++              led-running = &led_status_green;
++              led-upgrade = &led_status_red;
++      };
++
+       chosen {
+               bootargs = "console=ttyS0,115200n8";
+               stdout-path = &uart0;
+@@ -95,12 +102,12 @@
+       leds {
+               compatible = "gpio-leds";
+
+-              status_green {
++              led_status_green: status_green {
+                       label = "l-50:green:status";
+                       gpios = <&gpio1 6 GPIO_ACTIVE_LOW>;
+               };
+
+-              status_red {
++              led_status_red: status_red {
+                       label = "l-50:red:status";
+                       gpios = <&gpio3 2 GPIO_ACTIVE_LOW>;
+               };
+@@ -349,13 +356,8 @@
+       };
+
+       partition@100000 {
+-              label = "kernel-1";
+-              reg = <0x00100000 0x00800000>;
+-      };
+-
+-      partition@900000 {
+-              label = "rootfs-1";
+-              reg = <0x00900000 0x07100000>;
++              label = "ubi";
++              reg = <0x00100000 0x07900000>;
+       };
+
+       partition@7a00000 {