Re: [U-Boot] [PATCH 16/17] arm: mvebu: Add gdsys ControlCenter-Compact board
Hi Stefan, On Thu, Dec 1, 2016 at 10:57 AM, Stefan Roesewrote: > On 23.11.2016 16:12, Mario Six wrote: >> From: Dirk Eibach >> >> The gdsys ControlCenter Digital board is based on a Marvell Armada 38x >> SOC. >> >> It boots from SPI-Flash but can be configured to boot from SD-card for >> factory programming and testing. >> >> On board peripherals include: >> - 2 x GbE >> - Xilinx Kintex-7 FPGA connected via PCIe >> - mSATA >> - USB3 host >> - Atmel TPM >> >> Signed-off-by: Dirk Eibach >> Signed-off-by: Mario Six >> --- >> arch/arm/Kconfig | 1 + >> arch/arm/dts/Makefile | 3 +- >> arch/arm/dts/controlcenterdc.dts | 629 + > > Could you perhaps rename this file (and board name as well?) to > something like "armada-38x-controlcenterdc*" instead? Its much easier > to match the files to the architecture this way. And until now, all > Armada XP / 38x (etc) files match this rule. > Sure, I'll rename that file in v2. >> arch/arm/mach-mvebu/Kconfig | 4 + >> board/gdsys/38x/.gitignore| 1 + > > Perhaps better s/38x/a38x for "Armada"? > OK, will be fixed in v2. >> board/gdsys/38x/Kconfig | 42 +++ >> board/gdsys/38x/MAINTAINERS | 7 + >> board/gdsys/38x/Makefile | 30 ++ >> board/gdsys/38x/README| 18 + >> board/gdsys/38x/controlcenterdc.c | 717 >> ++ >> board/gdsys/38x/dt_helpers.c | 60 >> board/gdsys/38x/dt_helpers.h | 16 + >> board/gdsys/38x/hre.c | 517 +++ >> board/gdsys/38x/hre.h | 38 ++ >> board/gdsys/38x/keyprogram.c | 158 + >> board/gdsys/38x/keyprogram.h | 14 + >> board/gdsys/38x/kwbimage.cfg.in | 12 + >> board/gdsys/38x/spl.c | 21 ++ >> configs/controlcenterdc_defconfig | 54 +++ >> include/configs/controlcenterdc.h | 244 + >> 20 files changed, 2585 insertions(+), 1 deletion(-) >> create mode 100644 arch/arm/dts/controlcenterdc.dts >> create mode 100644 board/gdsys/38x/.gitignore >> create mode 100644 board/gdsys/38x/Kconfig >> create mode 100644 board/gdsys/38x/MAINTAINERS >> create mode 100644 board/gdsys/38x/Makefile >> create mode 100644 board/gdsys/38x/README >> create mode 100644 board/gdsys/38x/controlcenterdc.c >> create mode 100644 board/gdsys/38x/dt_helpers.c >> create mode 100644 board/gdsys/38x/dt_helpers.h >> create mode 100644 board/gdsys/38x/hre.c >> create mode 100644 board/gdsys/38x/hre.h >> create mode 100644 board/gdsys/38x/keyprogram.c >> create mode 100644 board/gdsys/38x/keyprogram.h >> create mode 100644 board/gdsys/38x/kwbimage.cfg.in >> create mode 100644 board/gdsys/38x/spl.c >> create mode 100644 configs/controlcenterdc_defconfig >> create mode 100644 include/configs/controlcenterdc.h >> >> diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig >> index acd689b..f4c236b 100644 >> --- a/arch/arm/Kconfig >> +++ b/arch/arm/Kconfig >> @@ -970,6 +970,7 @@ source "board/freescale/mx53loco/Kconfig" >> source "board/freescale/mx53smd/Kconfig" >> source "board/freescale/s32v234evb/Kconfig" >> source "board/freescale/vf610twr/Kconfig" >> +source "board/gdsys/38x/Kconfig" >> source "board/gumstix/pepper/Kconfig" >> source "board/h2200/Kconfig" >> source "board/hisilicon/hikey/Kconfig" >> diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile >> index 2c5b2f2..b0bd507 100644 >> --- a/arch/arm/dts/Makefile >> +++ b/arch/arm/dts/Makefile >> @@ -76,7 +76,8 @@ dtb-$(CONFIG_ARCH_MVEBU) += \ >> armada-xp-gp.dtb\ >> armada-xp-maxbcm.dtb\ >> armada-xp-synology-ds414.dtb\ >> - armada-xp-theadorable.dtb >> + armada-xp-theadorable.dtb \ >> + controlcenterdc.dtb >> >> dtb-$(CONFIG_ARCH_UNIPHIER) += \ >> uniphier-ld11-ref.dtb \ >> diff --git a/arch/arm/dts/controlcenterdc.dts >> b/arch/arm/dts/controlcenterdc.dts >> new file mode 100644 >> index 000..baf0171 >> --- /dev/null >> +++ b/arch/arm/dts/controlcenterdc.dts >> @@ -0,0 +1,629 @@ >> +/* >> + * Device Tree file for the Guntermann & Drunck ControlCenter-Compact board >> + * >> + * Copyright (C) 2016 Mario Six >> + * >> + * based on the Device Tree file for Marvell Armada 388 evaluation board >> + * (DB-88F6820), which is >> + * >> + * Copyright (C) 2014 Marvell >> + * >> + * Thomas Petazzoni >> + * >> + * SPDX-License-Identifier: GPL-2.0+ >> + */ >> + >> +/dts-v1/; >> + >> +#include "armada-388.dtsi" >> + >> + { >> + u-boot,dm-pre-reloc; >> +}; >> + >> + { >> + u-boot,dm-pre-reloc; >> +}; >> + >> +/ { >> + model = "Controlcenter Digital Compact"; >> + compatible = "marvell,a385-db", "marvell,armada388", >> + "marvell,armada385",
Re: [U-Boot] [PATCH 16/17] arm: mvebu: Add gdsys ControlCenter-Compact board
On 23.11.2016 16:12, Mario Six wrote: > From: Dirk Eibach> > The gdsys ControlCenter Digital board is based on a Marvell Armada 38x > SOC. > > It boots from SPI-Flash but can be configured to boot from SD-card for > factory programming and testing. > > On board peripherals include: > - 2 x GbE > - Xilinx Kintex-7 FPGA connected via PCIe > - mSATA > - USB3 host > - Atmel TPM > > Signed-off-by: Dirk Eibach > Signed-off-by: Mario Six > --- > arch/arm/Kconfig | 1 + > arch/arm/dts/Makefile | 3 +- > arch/arm/dts/controlcenterdc.dts | 629 + Could you perhaps rename this file (and board name as well?) to something like "armada-38x-controlcenterdc*" instead? Its much easier to match the files to the architecture this way. And until now, all Armada XP / 38x (etc) files match this rule. > arch/arm/mach-mvebu/Kconfig | 4 + > board/gdsys/38x/.gitignore| 1 + Perhaps better s/38x/a38x for "Armada"? > board/gdsys/38x/Kconfig | 42 +++ > board/gdsys/38x/MAINTAINERS | 7 + > board/gdsys/38x/Makefile | 30 ++ > board/gdsys/38x/README| 18 + > board/gdsys/38x/controlcenterdc.c | 717 > ++ > board/gdsys/38x/dt_helpers.c | 60 > board/gdsys/38x/dt_helpers.h | 16 + > board/gdsys/38x/hre.c | 517 +++ > board/gdsys/38x/hre.h | 38 ++ > board/gdsys/38x/keyprogram.c | 158 + > board/gdsys/38x/keyprogram.h | 14 + > board/gdsys/38x/kwbimage.cfg.in | 12 + > board/gdsys/38x/spl.c | 21 ++ > configs/controlcenterdc_defconfig | 54 +++ > include/configs/controlcenterdc.h | 244 + > 20 files changed, 2585 insertions(+), 1 deletion(-) > create mode 100644 arch/arm/dts/controlcenterdc.dts > create mode 100644 board/gdsys/38x/.gitignore > create mode 100644 board/gdsys/38x/Kconfig > create mode 100644 board/gdsys/38x/MAINTAINERS > create mode 100644 board/gdsys/38x/Makefile > create mode 100644 board/gdsys/38x/README > create mode 100644 board/gdsys/38x/controlcenterdc.c > create mode 100644 board/gdsys/38x/dt_helpers.c > create mode 100644 board/gdsys/38x/dt_helpers.h > create mode 100644 board/gdsys/38x/hre.c > create mode 100644 board/gdsys/38x/hre.h > create mode 100644 board/gdsys/38x/keyprogram.c > create mode 100644 board/gdsys/38x/keyprogram.h > create mode 100644 board/gdsys/38x/kwbimage.cfg.in > create mode 100644 board/gdsys/38x/spl.c > create mode 100644 configs/controlcenterdc_defconfig > create mode 100644 include/configs/controlcenterdc.h > > diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig > index acd689b..f4c236b 100644 > --- a/arch/arm/Kconfig > +++ b/arch/arm/Kconfig > @@ -970,6 +970,7 @@ source "board/freescale/mx53loco/Kconfig" > source "board/freescale/mx53smd/Kconfig" > source "board/freescale/s32v234evb/Kconfig" > source "board/freescale/vf610twr/Kconfig" > +source "board/gdsys/38x/Kconfig" > source "board/gumstix/pepper/Kconfig" > source "board/h2200/Kconfig" > source "board/hisilicon/hikey/Kconfig" > diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile > index 2c5b2f2..b0bd507 100644 > --- a/arch/arm/dts/Makefile > +++ b/arch/arm/dts/Makefile > @@ -76,7 +76,8 @@ dtb-$(CONFIG_ARCH_MVEBU) += \ > armada-xp-gp.dtb\ > armada-xp-maxbcm.dtb\ > armada-xp-synology-ds414.dtb\ > - armada-xp-theadorable.dtb > + armada-xp-theadorable.dtb \ > + controlcenterdc.dtb > > dtb-$(CONFIG_ARCH_UNIPHIER) += \ > uniphier-ld11-ref.dtb \ > diff --git a/arch/arm/dts/controlcenterdc.dts > b/arch/arm/dts/controlcenterdc.dts > new file mode 100644 > index 000..baf0171 > --- /dev/null > +++ b/arch/arm/dts/controlcenterdc.dts > @@ -0,0 +1,629 @@ > +/* > + * Device Tree file for the Guntermann & Drunck ControlCenter-Compact board > + * > + * Copyright (C) 2016 Mario Six > + * > + * based on the Device Tree file for Marvell Armada 388 evaluation board > + * (DB-88F6820), which is > + * > + * Copyright (C) 2014 Marvell > + * > + * Thomas Petazzoni > + * > + * SPDX-License-Identifier: GPL-2.0+ > + */ > + > +/dts-v1/; > + > +#include "armada-388.dtsi" > + > + { > + u-boot,dm-pre-reloc; > +}; > + > + { > + u-boot,dm-pre-reloc; > +}; > + > +/ { > + model = "Controlcenter Digital Compact"; > + compatible = "marvell,a385-db", "marvell,armada388", > + "marvell,armada385", "marvell,armada380"; > + > + chosen { > + bootargs = "console=ttyS1,115200 earlyprintk"; > + stdout-path = "/soc/internal-regs/serial@12100"; > + }; > + > + aliases { > + ethernet0 = > + ethernet2 = > + mdio-gpio0 =
[U-Boot] [PATCH 16/17] arm: mvebu: Add gdsys ControlCenter-Compact board
From: Dirk EibachThe gdsys ControlCenter Digital board is based on a Marvell Armada 38x SOC. It boots from SPI-Flash but can be configured to boot from SD-card for factory programming and testing. On board peripherals include: - 2 x GbE - Xilinx Kintex-7 FPGA connected via PCIe - mSATA - USB3 host - Atmel TPM Signed-off-by: Dirk Eibach Signed-off-by: Mario Six --- arch/arm/Kconfig | 1 + arch/arm/dts/Makefile | 3 +- arch/arm/dts/controlcenterdc.dts | 629 + arch/arm/mach-mvebu/Kconfig | 4 + board/gdsys/38x/.gitignore| 1 + board/gdsys/38x/Kconfig | 42 +++ board/gdsys/38x/MAINTAINERS | 7 + board/gdsys/38x/Makefile | 30 ++ board/gdsys/38x/README| 18 + board/gdsys/38x/controlcenterdc.c | 717 ++ board/gdsys/38x/dt_helpers.c | 60 board/gdsys/38x/dt_helpers.h | 16 + board/gdsys/38x/hre.c | 517 +++ board/gdsys/38x/hre.h | 38 ++ board/gdsys/38x/keyprogram.c | 158 + board/gdsys/38x/keyprogram.h | 14 + board/gdsys/38x/kwbimage.cfg.in | 12 + board/gdsys/38x/spl.c | 21 ++ configs/controlcenterdc_defconfig | 54 +++ include/configs/controlcenterdc.h | 244 + 20 files changed, 2585 insertions(+), 1 deletion(-) create mode 100644 arch/arm/dts/controlcenterdc.dts create mode 100644 board/gdsys/38x/.gitignore create mode 100644 board/gdsys/38x/Kconfig create mode 100644 board/gdsys/38x/MAINTAINERS create mode 100644 board/gdsys/38x/Makefile create mode 100644 board/gdsys/38x/README create mode 100644 board/gdsys/38x/controlcenterdc.c create mode 100644 board/gdsys/38x/dt_helpers.c create mode 100644 board/gdsys/38x/dt_helpers.h create mode 100644 board/gdsys/38x/hre.c create mode 100644 board/gdsys/38x/hre.h create mode 100644 board/gdsys/38x/keyprogram.c create mode 100644 board/gdsys/38x/keyprogram.h create mode 100644 board/gdsys/38x/kwbimage.cfg.in create mode 100644 board/gdsys/38x/spl.c create mode 100644 configs/controlcenterdc_defconfig create mode 100644 include/configs/controlcenterdc.h diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index acd689b..f4c236b 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -970,6 +970,7 @@ source "board/freescale/mx53loco/Kconfig" source "board/freescale/mx53smd/Kconfig" source "board/freescale/s32v234evb/Kconfig" source "board/freescale/vf610twr/Kconfig" +source "board/gdsys/38x/Kconfig" source "board/gumstix/pepper/Kconfig" source "board/h2200/Kconfig" source "board/hisilicon/hikey/Kconfig" diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index 2c5b2f2..b0bd507 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -76,7 +76,8 @@ dtb-$(CONFIG_ARCH_MVEBU) += \ armada-xp-gp.dtb\ armada-xp-maxbcm.dtb\ armada-xp-synology-ds414.dtb\ - armada-xp-theadorable.dtb + armada-xp-theadorable.dtb \ + controlcenterdc.dtb dtb-$(CONFIG_ARCH_UNIPHIER) += \ uniphier-ld11-ref.dtb \ diff --git a/arch/arm/dts/controlcenterdc.dts b/arch/arm/dts/controlcenterdc.dts new file mode 100644 index 000..baf0171 --- /dev/null +++ b/arch/arm/dts/controlcenterdc.dts @@ -0,0 +1,629 @@ +/* + * Device Tree file for the Guntermann & Drunck ControlCenter-Compact board + * + * Copyright (C) 2016 Mario Six + * + * based on the Device Tree file for Marvell Armada 388 evaluation board + * (DB-88F6820), which is + * + * Copyright (C) 2014 Marvell + * + * Thomas Petazzoni + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +/dts-v1/; + +#include "armada-388.dtsi" + + { + u-boot,dm-pre-reloc; +}; + + { + u-boot,dm-pre-reloc; +}; + +/ { + model = "Controlcenter Digital Compact"; + compatible = "marvell,a385-db", "marvell,armada388", + "marvell,armada385", "marvell,armada380"; + + chosen { + bootargs = "console=ttyS1,115200 earlyprintk"; + stdout-path = "/soc/internal-regs/serial@12100"; + }; + + aliases { + ethernet0 = + ethernet2 = + mdio-gpio0 = + mdio-gpio1 = + mdio-gpio2 = + spi0 = + spi1 = + i2c0 = + i2c1 = + }; + + memory { + device_type = "memory"; + reg = <0x 0x1000>; /* 256 MB */ + }; + + clocks { + sc16isclk: sc16isclk { + compatible = "fixed-clock"; + #clock-cells = <0>; + clock-frequency = <11059200>; + }; + }; + + soc {