]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
mvebu: Support Synology DS414
authorPhil Sutter <phil@nwl.cc>
Fri, 25 Dec 2015 13:41:25 +0000 (14:41 +0100)
committerStefan Roese <sr@denx.de>
Thu, 14 Jan 2016 13:08:59 +0000 (14:08 +0100)
This adds support for the MV78230 based DS414 NAS by Synology. The
relevant bits have been extracted from the 'synogpl-5004-armadaxp'
package Synology kindly published, garnished with a fair amount of
trial-and-error.

Sadly, support is far from perfect. The major parts I have failed in
are SATA and XHCI support. Details about these and some other things
follow:

Device Tree
-----------

The device tree file armada-xp-synology-ds414.dts has been copied from
Linux and enhanced by recent U-Boot specific changes to
armada-xp-gp.dts.

SATA Support
------------

There is a Marvell 88SX7042 controller attached to PCIe which is
supported by Linux's sata_mv driver but sadly not U-Boot's sata_mv.
I'm not sure if extending the latter to support PCI devices is worth the
effort at all. Porting sata_mv from Linux exceeded my brain's
capacities. :(

XHCI Support
------------

There is an EtronTech EJ168A XHCI controller attached to PCIe which
drives the two rear USB3 ports. After a bit of playing around I managed
to get it recognized by xhci-pci, but never was able to access any
devices attached to it. Enabling it in ds414 board config shows that it
does not respond to commands for whatever reason. The (somewhat) bright
side to it is that it is not even supported in Synology's customized
U-Boot, but that also means nowhere to steal the relevant bits from.

EHCI Support
------------

This seems functional after issuing 'usb start'. At least it detects USB
storage devices, and IIRC reading from them was OK. OTOH Linux fails to
register the controller if 'usb start' wasn't given before in U-Boot.

According to Synology sources, this board seems to support USB device
(gadget?) mode. Though I didn't play around with it.

PCIe Support
------------

This is fine, but trying to gate the clocks of unused lanes will hang
PCI enum. In addition to that, pci_mvebu seems not to support DM_PCI.

DDR3 Training
-------------

Marvell/Synology uses eight PUPs instead of four. Does not look like
this is meant to be customized in mainline U-Boot at all. OTOH I have
no idea what a "PUP" actually is.

PEX Init
--------

Synology uses different values than mainline U-Boot with this patch:
pex_max_unit_get returns 2, pex_max_if_get returns 7 and
max_serdes_lines is set to 7. Not changing this seems to not have an
impact, although I'm not entirely sure it does not cause issues I am not
aware of.

Static Environment
------------------

This allows to boot stock Synology firmware at least. In order to be a
little more flexible when it comes to booting custom kernels, do not
only load zImage partition, but also rd.gz into memory. This way it is
possible to use about 7MB for kernel with piggyback initramfs.

Signed-off-by: Phil Sutter <phil@nwl.cc>
Acked-by: Stefan Roese <sr@denx.de>
Reviewed-by: Tom Rini <trini@konsulko.com>
arch/arm/dts/Makefile
arch/arm/dts/armada-xp-synology-ds414.dts [new file with mode: 0644]
arch/arm/mach-mvebu/Kconfig
arch/arm/mach-mvebu/serdes/axp/board_env_spec.h
board/Synology/ds414/Makefile [new file with mode: 0644]
board/Synology/ds414/ds414.c [new file with mode: 0644]
board/Synology/ds414/kwbimage.cfg [new file with mode: 0644]
configs/ds414_defconfig [new file with mode: 0644]
include/configs/ds414.h [new file with mode: 0644]

index 084f11327d26f61cc264f480395f1961587f4581..64b837114121e362772df0b3feb6fd973d262095 100644 (file)
@@ -51,7 +51,8 @@ dtb-$(CONFIG_ARCH_MVEBU) +=                   \
        armada-388-clearfog.dtb                 \
        armada-388-gp.dtb                       \
        armada-xp-gp.dtb                        \
-       armada-xp-maxbcm.dtb
+       armada-xp-maxbcm.dtb                    \
+       armada-xp-synology-ds414.dtb
 
 dtb-$(CONFIG_ARCH_UNIPHIER) += \
        uniphier-ph1-ld4-ref.dtb \
diff --git a/arch/arm/dts/armada-xp-synology-ds414.dts b/arch/arm/dts/armada-xp-synology-ds414.dts
new file mode 100644 (file)
index 0000000..0a60ddf
--- /dev/null
@@ -0,0 +1,337 @@
+/*
+ * Device Tree file for Synology DS414
+ *
+ * Copyright (C) 2014, Arnaud EBALARD <arno@natisbad.org>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version
+ * 2 of the License, or (at your option) any later version.
+ *
+ * Note: this Device Tree assumes that the bootloader has remapped the
+ * internal registers to 0xf1000000 (instead of the old 0xd0000000).
+ * The 0xf1000000 is the default used by the recent, DT-capable, U-Boot
+ * bootloaders provided by Marvell. It is used in recent versions of
+ * DSM software provided by Synology. Nonetheless, some earlier boards
+ * were delivered with an older version of u-boot that left internal
+ * registers mapped at 0xd0000000. If you have such a device you will
+ * not be able to directly boot a kernel based on this Device Tree. In
+ * that case, the preferred solution is to update your bootloader (e.g.
+ * by upgrading to latest version of DSM, or building a new one and
+ * installing it from u-boot prompt) or adjust the Devive Tree
+ * (s/0xf1000000/0xd0000000/ in 'ranges' below).
+ */
+
+/dts-v1/;
+
+#include <dt-bindings/input/input.h>
+#include <dt-bindings/gpio/gpio.h>
+#include "armada-xp-mv78230.dtsi"
+
+/ {
+       model = "Synology DS414";
+       compatible = "synology,ds414", "marvell,armadaxp-mv78230",
+                    "marvell,armadaxp", "marvell,armada-370-xp";
+
+       chosen {
+               bootargs = "console=ttyS0,115200 earlyprintk";
+               stdout-path = &uart0;
+       };
+
+       aliases {
+               spi0 = &spi0;
+       };
+
+       memory {
+               device_type = "memory";
+               reg = <0 0x00000000 0 0x40000000>; /* 1GB */
+       };
+
+       soc {
+               ranges = <MBUS_ID(0xf0, 0x01) 0 0 0xf1000000 0x100000
+                         MBUS_ID(0x01, 0x1d) 0 0 0xfff00000 0x100000>;
+
+               pcie-controller {
+                       status = "okay";
+
+                       /*
+                        * Connected to Marvell 88SX7042 SATA-II controller
+                        * handling the four disks.
+                        */
+                       pcie@1,0 {
+                               /* Port 0, Lane 0 */
+                               status = "okay";
+                       };
+
+                       /*
+                        * Connected to EtronTech EJ168A XHCI controller
+                        * providing the two rear USB 3.0 ports.
+                        */
+                       pcie@5,0 {
+                               /* Port 1, Lane 0 */
+                               status = "okay";
+                       };
+               };
+
+               internal-regs {
+
+                       /* RTC is provided by Seiko S-35390A below */
+                       rtc@10300 {
+                               status = "disabled";
+                       };
+
+                       spi0: spi@10600 {
+                               status = "okay";
+                               u-boot,dm-pre-reloc;
+
+                               spi-flash@0 {
+                                       u-boot,dm-pre-reloc;
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+                                       compatible = "micron,n25q064";
+                                       reg = <0>; /* Chip select 0 */
+                                       spi-max-frequency = <20000000>;
+
+                                       /*
+                                        * Warning!
+                                        *
+                                        * Synology u-boot uses its compiled-in environment
+                                        * and it seems Synology did not care to change u-boot
+                                        * default configuration in order to allow saving a
+                                        * modified environment at a sensible location. So,
+                                        * if you do a 'saveenv' under u-boot, your modified
+                                        * environment will be saved at 1MB after the start
+                                        * of the flash, i.e. in the middle of the uImage.
+                                        * For that reason, it is strongly advised not to
+                                        * change the default environment, unless you know
+                                        * what you are doing.
+                                        */
+                                       partition@00000000 { /* u-boot */
+                                               label = "RedBoot";
+                                               reg = <0x00000000 0x000d0000>; /* 832KB */
+                                       };
+
+                                       partition@000c0000 { /* uImage */
+                                               label = "zImage";
+                                               reg = <0x000d0000 0x002d0000>; /* 2880KB */
+                                       };
+
+                                       partition@003a0000 { /* uInitramfs */
+                                               label = "rd.gz";
+                                               reg = <0x003a0000 0x00430000>; /* 4250KB */
+                                       };
+
+                                       partition@007d0000 { /* MAC address and serial number */
+                                               label = "vendor";
+                                               reg = <0x007d0000 0x00010000>; /* 64KB */
+                                       };
+
+                                       partition@007e0000 {
+                                               label = "RedBoot config";
+                                               reg = <0x007e0000 0x00010000>; /* 64KB */
+                                       };
+
+                                       partition@007f0000 {
+                                               label = "FIS directory";
+                                               reg = <0x007f0000 0x00010000>; /* 64KB */
+                                       };
+                               };
+                       };
+
+                       i2c@11000 {
+                               clock-frequency = <400000>;
+                               status = "okay";
+
+                               s35390a: s35390a@30 {
+                                        compatible = "sii,s35390a";
+                                        reg = <0x30>;
+                               };
+                       };
+
+                       /* Connected to a header on device's PCB. This
+                        * provides the main console for the device.
+                        *
+                        * Warning: the device may not boot with a 3.3V
+                        * USB-serial converter connected when the power
+                        * button is pressed. The converter needs to be
+                        * connected a few seconds after pressing the
+                        * power button. This is possibly due to UART0_TXD
+                        * pin being sampled at reset (bit 0 of SAR).
+                        */
+                       serial@12000 {
+                               status = "okay";
+                               u-boot,dm-pre-reloc;
+                       };
+
+                       /* Connected to a Microchip PIC16F883 for power control */
+                       serial@12100 {
+                               status = "okay";
+                       };
+
+                       poweroff@12100 {
+                               compatible = "synology,power-off";
+                               reg = <0x12100 0x100>;
+                               clocks = <&coreclk 0>;
+                       };
+
+                       /* Front USB 2.0 port */
+                       usb@50000 {
+                               status = "okay";
+                       };
+
+                       mdio {
+                               phy0: ethernet-phy@0 { /* Marvell 88E1512 */
+                                       reg = <0>;
+                               };
+
+                               phy1: ethernet-phy@1 { /* Marvell 88E1512 */
+                                       reg = <1>;
+                               };
+                       };
+
+                       ethernet@70000 {
+                               status = "okay";
+                               pinctrl-0 = <&ge0_rgmii_pins>;
+                               pinctrl-names = "default";
+                               phy = <&phy1>;
+                               phy-mode = "rgmii-id";
+                       };
+
+                       ethernet@74000 {
+                               pinctrl-0 = <&ge1_rgmii_pins>;
+                               pinctrl-names = "default";
+                               status = "okay";
+                               phy = <&phy0>;
+                               phy-mode = "rgmii-id";
+                       };
+               };
+       };
+
+       regulators {
+               compatible = "simple-bus";
+               #address-cells = <1>;
+               #size-cells = <0>;
+               pinctrl-0 = <&sata1_pwr_pin &sata2_pwr_pin
+                            &sata3_pwr_pin &sata4_pwr_pin>;
+               pinctrl-names = "default";
+
+               sata1_regulator: sata1-regulator {
+                       compatible = "regulator-fixed";
+                       reg = <1>;
+                       regulator-name = "SATA1 Power";
+                       regulator-min-microvolt = <5000000>;
+                       regulator-max-microvolt = <5000000>;
+                       startup-delay-us = <2000000>;
+                       enable-active-high;
+                       regulator-always-on;
+                       regulator-boot-on;
+                       gpio = <&gpio1 10 GPIO_ACTIVE_HIGH>;
+               };
+
+               sata2_regulator: sata2-regulator {
+                       compatible = "regulator-fixed";
+                       reg = <2>;
+                       regulator-name = "SATA2 Power";
+                       regulator-min-microvolt = <5000000>;
+                       regulator-max-microvolt = <5000000>;
+                       startup-delay-us = <4000000>;
+                       enable-active-high;
+                       regulator-always-on;
+                       regulator-boot-on;
+                       gpio = <&gpio1 12 GPIO_ACTIVE_HIGH>;
+               };
+
+               sata3_regulator: sata3-regulator {
+                       compatible = "regulator-fixed";
+                       reg = <3>;
+                       regulator-name = "SATA3 Power";
+                       regulator-min-microvolt = <5000000>;
+                       regulator-max-microvolt = <5000000>;
+                       startup-delay-us = <6000000>;
+                       enable-active-high;
+                       regulator-always-on;
+                       regulator-boot-on;
+                       gpio = <&gpio1 13 GPIO_ACTIVE_HIGH>;
+               };
+
+               sata4_regulator: sata4-regulator {
+                       compatible = "regulator-fixed";
+                       reg = <4>;
+                       regulator-name = "SATA4 Power";
+                       regulator-min-microvolt = <5000000>;
+                       regulator-max-microvolt = <5000000>;
+                       startup-delay-us = <8000000>;
+                       enable-active-high;
+                       regulator-always-on;
+                       regulator-boot-on;
+                       gpio = <&gpio1 14 GPIO_ACTIVE_HIGH>;
+               };
+       };
+};
+
+&pinctrl {
+       sata1_pwr_pin: sata1-pwr-pin {
+               marvell,pins = "mpp42";
+               marvell,function = "gpio";
+       };
+
+       sata2_pwr_pin: sata2-pwr-pin {
+               marvell,pins = "mpp44";
+               marvell,function = "gpio";
+       };
+
+       sata3_pwr_pin: sata3-pwr-pin {
+               marvell,pins = "mpp45";
+               marvell,function = "gpio";
+       };
+
+       sata4_pwr_pin: sata4-pwr-pin {
+               marvell,pins = "mpp46";
+               marvell,function = "gpio";
+       };
+
+       sata1_pres_pin: sata1-pres-pin {
+               marvell,pins = "mpp34";
+               marvell,function = "gpio";
+       };
+
+       sata2_pres_pin: sata2-pres-pin {
+               marvell,pins = "mpp35";
+               marvell,function = "gpio";
+       };
+
+       sata3_pres_pin: sata3-pres-pin {
+               marvell,pins = "mpp40";
+               marvell,function = "gpio";
+       };
+
+       sata4_pres_pin: sata4-pres-pin {
+               marvell,pins = "mpp41";
+               marvell,function = "gpio";
+       };
+
+       syno_id_bit0_pin: syno-id-bit0-pin {
+               marvell,pins = "mpp26";
+               marvell,function = "gpio";
+       };
+
+       syno_id_bit1_pin: syno-id-bit1-pin {
+               marvell,pins = "mpp28";
+               marvell,function = "gpio";
+       };
+
+       syno_id_bit2_pin: syno-id-bit2-pin {
+               marvell,pins = "mpp29";
+               marvell,function = "gpio";
+       };
+
+       fan1_alarm_pin: fan1-alarm-pin {
+               marvell,pins = "mpp33";
+               marvell,function = "gpio";
+       };
+
+       fan2_alarm_pin: fan2-alarm-pin {
+               marvell,pins = "mpp32";
+               marvell,function = "gpio";
+       };
+};
index 35d44f64ba8804ce0c0eae6e821719b3add4fe0c..b9628462eab890e19e8d3725a30967a7a2f2c407 100644 (file)
@@ -38,6 +38,10 @@ config TARGET_DB_MV784MP_GP
        bool "Support db-mv784mp-gp"
        select MV78460
 
+config TARGET_DS414
+       bool "Support Synology DS414"
+       select MV78230
+
 config TARGET_MAXBCM
        bool "Support maxbcm"
        select MV78460
@@ -48,18 +52,21 @@ config SYS_BOARD
        default "clearfog" if TARGET_CLEARFOG
        default "db-88f6820-gp" if TARGET_DB_88F6820_GP
        default "db-mv784mp-gp" if TARGET_DB_MV784MP_GP
+       default "ds414" if TARGET_DS414
        default "maxbcm" if TARGET_MAXBCM
 
 config SYS_CONFIG_NAME
        default "clearfog" if TARGET_CLEARFOG
        default "db-88f6820-gp" if TARGET_DB_88F6820_GP
        default "db-mv784mp-gp" if TARGET_DB_MV784MP_GP
+       default "ds414" if TARGET_DS414
        default "maxbcm" if TARGET_MAXBCM
 
 config SYS_VENDOR
        default "Marvell" if TARGET_DB_MV784MP_GP
        default "Marvell" if TARGET_DB_88F6820_GP
        default "solidrun" if TARGET_CLEARFOG
+       default "Synology" if TARGET_DS414
 
 config SYS_SOC
        default "mvebu"
index f00f32787c4fbdea2fbe328bcd1ae825c6da2e32..c8d9485b7bbba016250577f90d12aeae31f6d244 100644 (file)
@@ -44,7 +44,7 @@
 #define DB_784MP_GP_ID                 (RD_78460_SERVER_REV2_ID + 1)
 #define RD_78460_CUSTOMER_ID           (DB_784MP_GP_ID + 1)
 #define MV_MAX_BOARD_ID                        (RD_78460_CUSTOMER_ID + 1)
-#define INVALID_BAORD_ID               0xFFFFFFFF
+#define INVALID_BOARD_ID               0xFFFFFFFF
 
 /* Sample at Reset */
 #define MPP_SAMPLE_AT_RESET(id)                (0x18230 + (id * 4))
diff --git a/board/Synology/ds414/Makefile b/board/Synology/ds414/Makefile
new file mode 100644 (file)
index 0000000..0f4c32d
--- /dev/null
@@ -0,0 +1,7 @@
+#
+# Copyright (C) 2015 Phil Sutter <phil@nwl.cc>
+#
+# SPDX-License-Identifier:     GPL-2.0+
+#
+
+obj-y :=       ds414.o
diff --git a/board/Synology/ds414/ds414.c b/board/Synology/ds414/ds414.c
new file mode 100644 (file)
index 0000000..d563e89
--- /dev/null
@@ -0,0 +1,185 @@
+/*
+ *
+ * Copyright (C) 2015 Phil Sutter <phil@nwl.cc>
+ *
+ * SPDX-License-Identifier:    GPL-2.0+
+ */
+
+#include <common.h>
+#include <miiphy.h>
+#include <asm/io.h>
+#include <asm/arch/cpu.h>
+#include <asm/arch/soc.h>
+#include <linux/mbus.h>
+
+#include "../drivers/ddr/marvell/axp/ddr3_hw_training.h"
+#include "../arch/arm/mach-mvebu/serdes/axp/high_speed_env_spec.h"
+#include "../arch/arm/mach-mvebu/serdes/axp/board_env_spec.h"
+
+DECLARE_GLOBAL_DATA_PTR;
+
+/* GPP and MPP settings as found in mvBoardEnvSpec.c of Synology's U-Boot */
+
+#define DS414_GPP_OUT_VAL_LOW          (BIT(25) | BIT(30))
+#define DS414_GPP_OUT_VAL_MID          (BIT(10) | BIT(15))
+#define DS414_GPP_OUT_VAL_HIGH         (0)
+
+#define DS414_GPP_OUT_POL_LOW          (0)
+#define DS414_GPP_OUT_POL_MID          (0)
+#define DS414_GPP_OUT_POL_HIGH         (0)
+
+#define DS414_GPP_OUT_ENA_LOW          (~(BIT(25) | BIT(30)))
+#define DS414_GPP_OUT_ENA_MID          (~(BIT(10) | BIT(12) | \
+                                          BIT(13) | BIT(14) | BIT(15)))
+#define DS414_GPP_OUT_ENA_HIGH         (~0)
+
+static const u32 ds414_mpp_control[] = {
+       0x11111111,
+       0x22221111,
+       0x22222222,
+       0x00000000,
+       0x11110000,
+       0x00004000,
+       0x00000000,
+       0x00000000,
+       0x00000000
+};
+
+/* DDR3 static MC configuration */
+
+/* 1G_v1 (4x2Gbits) adapted by DS414 */
+MV_DRAM_MC_INIT syno_ddr3_b0_667_1g_v1[MV_MAX_DDR3_STATIC_SIZE] = {
+       {0x00001400, 0x73014A28},       /*DDR SDRAM Configuration Register */
+       {0x00001404, 0x30000800},       /*Dunit Control Low Register */
+       {0x00001408, 0x44148887},       /*DDR SDRAM Timing (Low) Register */
+       {0x0000140C, 0x3AD83FEA},       /*DDR SDRAM Timing (High) Register */
+
+       {0x00001410, 0x14000000},       /*DDR SDRAM Address Control Register */
+
+       {0x00001414, 0x00000000},       /*DDR SDRAM Open Pages Control Register */
+       {0x00001418, 0x00000e00},       /*DDR SDRAM Operation Register */
+       {0x00001420, 0x00000004},       /*DDR SDRAM Extended Mode Register */
+       {0x00001424, 0x0000F3FF},       /*Dunit Control High Register */
+       {0x00001428, 0x000F8830},       /*Dunit Control High Register */
+       {0x0000142C, 0x054C36F4},       /*Dunit Control High Register */
+       {0x0000147C, 0x0000C671},
+
+       {0x000014a0, 0x00000001},
+       {0x000014a8, 0x00000100},       /*2:1 */
+       {0x00020220, 0x00000006},
+
+       {0x00001494, 0x00010000},       /*DDR SDRAM ODT Control (Low) Register */
+       {0x00001498, 0x00000000},       /*DDR SDRAM ODT Control (High) Register */
+       {0x0000149C, 0x00000001},       /*DDR Dunit ODT Control Register */
+
+       {0x000014C0, 0x192424C9},       /* DRAM address and Control Driving Strenght  */
+       {0x000014C4, 0x0AAA24C9},       /* DRAM Data and DQS Driving Strenght  */
+
+       {0x000200e8, 0x3FFF0E01},       /* DO NOT Modify - Open Mbus Window - 2G - Mbus is required for the training sequence*/
+       {0x00020184, 0x3FFFFFE0},       /* DO NOT Modify - Close fast path Window to - 2G */
+
+       {0x0001504, 0x3FFFFFE1},        /* CS0 Size */
+       {0x000150C, 0x00000000},        /* CS1 Size */
+       {0x0001514, 0x00000000},        /* CS2 Size */
+       {0x000151C, 0x00000000},        /* CS3 Size */
+
+       {0x00001538, 0x00000009},       /*Read Data Sample Delays Register */
+       {0x0000153C, 0x00000009},       /*Read Data Ready Delay Register */
+
+       {0x000015D0, 0x00000650},       /*MR0 */
+       {0x000015D4, 0x00000044},       /*MR1 */
+       {0x000015D8, 0x00000010},       /*MR2 */
+       {0x000015DC, 0x00000000},       /*MR3 */
+
+       {0x000015E4, 0x00203c18},       /*ZQC Configuration Register */
+       {0x000015EC, 0xF800A225},       /*DDR PHY */
+
+       {0x0, 0x0}
+};
+
+MV_DRAM_MODES ds414_ddr_modes[MV_DDR3_MODES_NUMBER] = {
+       {"ds414_1333-667",   0x3, 0x5, 0x0, A0, syno_ddr3_b0_667_1g_v1,  NULL},
+};
+
+extern MV_SERDES_CHANGE_M_PHY serdes_change_m_phy[];
+
+MV_BIN_SERDES_CFG ds414_serdes_cfg[] = {
+       { MV_PEX_ROOT_COMPLEX, 0x02011111, 0x00000000,
+         { PEX_BUS_MODE_X4, PEX_BUS_MODE_X1, PEX_BUS_DISABLED,
+           PEX_BUS_DISABLED },
+         0x0040, serdes_change_m_phy
+       }
+};
+
+MV_DRAM_MODES *ddr3_get_static_ddr_mode(void)
+{
+       return &ds414_ddr_modes[0];
+}
+
+MV_BIN_SERDES_CFG *board_serdes_cfg_get(u8 pex_mode)
+{
+       return &ds414_serdes_cfg[0];
+}
+
+u8 board_sat_r_get(u8 dev_num, u8 reg)
+{
+       return (0x1 << 1 | 1);
+}
+
+int board_early_init_f(void)
+{
+       int i;
+
+       /* Set GPP Out value */
+       reg_write(GPP_DATA_OUT_REG(0), DS414_GPP_OUT_VAL_LOW);
+       reg_write(GPP_DATA_OUT_REG(1), DS414_GPP_OUT_VAL_MID);
+       reg_write(GPP_DATA_OUT_REG(2), DS414_GPP_OUT_VAL_HIGH);
+
+       /* set GPP polarity */
+       reg_write(GPP_DATA_IN_POL_REG(0), DS414_GPP_OUT_POL_LOW);
+       reg_write(GPP_DATA_IN_POL_REG(1), DS414_GPP_OUT_POL_MID);
+       reg_write(GPP_DATA_IN_POL_REG(2), DS414_GPP_OUT_POL_HIGH);
+
+       /* Set GPP Out Enable */
+       reg_write(GPP_DATA_OUT_EN_REG(0), DS414_GPP_OUT_ENA_LOW);
+       reg_write(GPP_DATA_OUT_EN_REG(1), DS414_GPP_OUT_ENA_MID);
+       reg_write(GPP_DATA_OUT_EN_REG(2), DS414_GPP_OUT_ENA_HIGH);
+
+       for (i = 0; i < ARRAY_SIZE(ds414_mpp_control); i++)
+               reg_write(MPP_CONTROL_REG(i), ds414_mpp_control[i]);
+
+       return 0;
+}
+
+int board_init(void)
+{
+       u32 pwr_mng_ctrl_reg;
+
+       /* Adress of boot parameters */
+       gd->bd->bi_boot_params = mvebu_sdram_bar(0) + 0x100;
+
+       /* Gate unused clocks
+        *
+        * Note: Disabling unused PCIe lanes will hang PCI bus scan.
+        *       Once this is resolved, bits 10-12, 26 and 27 can be
+        *       unset here as well.
+        */
+       pwr_mng_ctrl_reg = reg_read(POWER_MNG_CTRL_REG);
+       pwr_mng_ctrl_reg &= ~(BIT(0));                          /* Audio */
+       pwr_mng_ctrl_reg &= ~(BIT(1) | BIT(2));                 /* GE3, GE2 */
+       pwr_mng_ctrl_reg &= ~(BIT(14) | BIT(15));               /* SATA0 link and core */
+       pwr_mng_ctrl_reg &= ~(BIT(16));                         /* LCD */
+       pwr_mng_ctrl_reg &= ~(BIT(17));                         /* SDIO */
+       pwr_mng_ctrl_reg &= ~(BIT(19) | BIT(20));               /* USB1 and USB2 */
+       pwr_mng_ctrl_reg &= ~(BIT(29) | BIT(30));               /* SATA1 link and core */
+       reg_write(POWER_MNG_CTRL_REG, pwr_mng_ctrl_reg);
+
+       return 0;
+}
+
+int checkboard(void)
+{
+       puts("Board: DS414\n");
+
+       return 0;
+}
diff --git a/board/Synology/ds414/kwbimage.cfg b/board/Synology/ds414/kwbimage.cfg
new file mode 100644 (file)
index 0000000..1f748db
--- /dev/null
@@ -0,0 +1,12 @@
+#
+# Copyright (C) 2014 Stefan Roese <sr@denx.de>
+#
+
+# Armada XP uses version 1 image format
+VERSION                1
+
+# Boot Media configurations
+BOOT_FROM      spi
+
+# Binary Header (bin_hdr) with DDR3 training code
+BINARY spl/u-boot-spl-dtb.bin 0000005b 00000068
diff --git a/configs/ds414_defconfig b/configs/ds414_defconfig
new file mode 100644 (file)
index 0000000..4c3c1df
--- /dev/null
@@ -0,0 +1,18 @@
+CONFIG_ARM=y
+CONFIG_ARCH_MVEBU=y
+CONFIG_SYS_MALLOC_F_LEN=0x2000
+CONFIG_TARGET_DS414=y
+CONFIG_DEFAULT_DEVICE_TREE="armada-xp-synology-ds414"
+CONFIG_SPL=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set
+CONFIG_SPL_OF_TRANSLATE=y
+CONFIG_SPI_FLASH=y
+CONFIG_SPI_FLASH_BAR=y
+CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_DEBUG_UART=y
+CONFIG_DEBUG_UART_BASE=0xd0012000
+CONFIG_DEBUG_UART_CLOCK=250000000
+CONFIG_DEBUG_UART_SHIFT=2
+CONFIG_SYS_NS16550=y
diff --git a/include/configs/ds414.h b/include/configs/ds414.h
new file mode 100644 (file)
index 0000000..e3c7087
--- /dev/null
@@ -0,0 +1,162 @@
+/*
+ * Copyright (C) 2014 Stefan Roese <sr@denx.de>
+ *
+ * SPDX-License-Identifier:    GPL-2.0+
+ */
+
+#ifndef _CONFIG_SYNOLOGY_DS414_H
+#define _CONFIG_SYNOLOGY_DS414_H
+
+/*
+ * High Level Configuration Options (easy to change)
+ */
+#define CONFIG_DISPLAY_BOARDINFO_LATE
+
+/*
+ * TEXT_BASE needs to be below 16MiB, since this area is scrubbed
+ * for DDR ECC byte filling in the SPL before loading the main
+ * U-Boot into it.
+ */
+#define        CONFIG_SYS_TEXT_BASE    0x00800000
+#define CONFIG_SYS_TCLK                250000000       /* 250MHz */
+
+/*
+ * Commands configuration
+ */
+#define CONFIG_SYS_NO_FLASH            /* Declare no flash (NOR/SPI) */
+#define CONFIG_CMD_DHCP
+#define CONFIG_CMD_ENV
+#define CONFIG_CMD_I2C
+#define CONFIG_CMD_PING
+#define CONFIG_CMD_SF
+#define CONFIG_CMD_SPI
+#define CONFIG_CMD_TFTPPUT
+#define CONFIG_CMD_TIME
+#define CONFIG_CMD_USB
+
+/* I2C */
+#define CONFIG_SYS_I2C
+#define CONFIG_SYS_I2C_MVTWSI
+#define CONFIG_I2C_MVTWSI_BASE0                MVEBU_TWSI_BASE
+#define CONFIG_SYS_I2C_SLAVE           0x0
+#define CONFIG_SYS_I2C_SPEED           100000
+
+/* SPI NOR flash default params, used by sf commands */
+#define CONFIG_SF_DEFAULT_SPEED                1000000
+#define CONFIG_SF_DEFAULT_MODE         SPI_MODE_3
+
+/* Environment in SPI NOR flash */
+#define CONFIG_ENV_IS_IN_SPI_FLASH
+#define CONFIG_ENV_OFFSET              0x7E0000   /* RedBoot config partition in DTS */
+#define CONFIG_ENV_SIZE                        (64 << 10) /* 64KiB */
+#define CONFIG_ENV_SECT_SIZE           (64 << 10) /* 64KiB sectors */
+
+#define CONFIG_PHY_MARVELL             /* there is a marvell phy */
+#define CONFIG_PHY_ADDR                        { 0x1, 0x0 }
+#define CONFIG_SYS_NETA_INTERFACE_TYPE PHY_INTERFACE_MODE_RGMII
+
+#define CONFIG_SYS_ALT_MEMTEST
+
+/* PCIe support */
+#ifndef CONFIG_SPL_BUILD
+#define CONFIG_PCI
+#define CONFIG_CMD_PCI
+#define CONFIG_CMD_PCI_ENUM
+#define CONFIG_PCI_MVEBU
+#define CONFIG_PCI_SCAN_SHOW
+#endif
+
+/* USB/EHCI/XHCI configuration */
+
+#define CONFIG_DM_USB
+#define CONFIG_USB_MAX_CONTROLLER_COUNT 2
+
+/* FIXME: broken XHCI support
+ * Below defines should enable support for the two rear USB3 ports. Sadly, this
+ * does not work because:
+ * - xhci-pci seems to not support DM_USB, so with that enabled it is not
+ *   found.
+ * - USB init fails, controller does not respond in time */
+#if 0
+#undef CONFIG_DM_USB
+#define CONFIG_USB_XHCI
+#define CONFIG_USB_XHCI_PCI
+#define CONFIG_SYS_USB_XHCI_MAX_ROOT_PORTS 2
+#endif
+
+#if !defined(CONFIG_USB_XHCI)
+#define CONFIG_USB_EHCI
+#define CONFIG_USB_EHCI_MARVELL
+#define CONFIG_EHCI_IS_TDI
+#endif
+
+/* why is this only defined in mv-common.h if CONFIG_DM is undefined? */
+#define CONFIG_USB_STORAGE
+#define CONFIG_DOS_PARTITION
+#define CONFIG_ISO_PARTITION
+#define CONFIG_SUPPORT_VFAT
+#define CONFIG_SYS_MVFS
+
+/*
+ * mv-common.h should be defined after CMD configs since it used them
+ * to enable certain macros
+ */
+#include "mv-common.h"
+
+/*
+ * Memory layout while starting into the bin_hdr via the
+ * BootROM:
+ *
+ * 0x4000.4000 - 0x4003.4000   headers space (192KiB)
+ * 0x4000.4030                 bin_hdr start address
+ * 0x4003.4000 - 0x4004.7c00   BootROM memory allocations (15KiB)
+ * 0x4007.fffc                 BootROM stack top
+ *
+ * The address space between 0x4007.fffc and 0x400f.fff is not locked in
+ * L2 cache thus cannot be used.
+ */
+
+/* SPL */
+/* Defines for SPL */
+#define CONFIG_SPL_FRAMEWORK
+#define CONFIG_SPL_TEXT_BASE           0x40004030
+#define CONFIG_SPL_MAX_SIZE            ((128 << 10) - 0x4030)
+
+#define CONFIG_SPL_BSS_START_ADDR      (0x40000000 + (128 << 10))
+#define CONFIG_SPL_BSS_MAX_SIZE                (16 << 10)
+
+#ifdef CONFIG_SPL_BUILD
+#define CONFIG_SYS_MALLOC_SIMPLE
+#endif
+
+#define CONFIG_SPL_STACK               (0x40000000 + ((192 - 16) << 10))
+#define CONFIG_SPL_BOOTROM_SAVE                (CONFIG_SPL_STACK + 4)
+
+#define CONFIG_SPL_LIBCOMMON_SUPPORT
+#define CONFIG_SPL_LIBGENERIC_SUPPORT
+#define CONFIG_SPL_SERIAL_SUPPORT
+#define CONFIG_SPL_I2C_SUPPORT
+
+/* SPL related SPI defines */
+#define CONFIG_SPL_SPI_SUPPORT
+#define CONFIG_SPL_SPI_FLASH_SUPPORT
+#define CONFIG_SPL_SPI_LOAD
+#define CONFIG_SPL_SPI_BUS             0
+#define CONFIG_SPL_SPI_CS              0
+#define CONFIG_SYS_SPI_U_BOOT_OFFS     0x24000
+
+/* DS414 bus width is 32bits */
+#define CONFIG_DDR_32BIT
+
+/* Use random ethernet address if not configured */
+#define CONFIG_LIB_RAND
+#define CONFIG_NET_RANDOM_ETHADDR
+
+/* Default Environment */
+#define CONFIG_BOOTCOMMAND     "sf read ${loadaddr} 0xd0000 0x700000; bootm"
+#define CONFIG_BOOTARGS                "console=ttyS0,115200"
+#define CONFIG_LOADADDR                0x80000
+#undef CONFIG_PREBOOT          /* override preboot for USB and SPI flash init */
+#define CONFIG_PREBOOT         "usb start; sf probe"
+
+#endif /* _CONFIG_SYNOLOGY_DS414_H */