From patchwork Wed Mar 13 07:47:00 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Packham X-Patchwork-Id: 1055936 X-Patchwork-Delegate: sr@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="kUcLoou5"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 44K3qQ3Kx2z9s3l for ; Wed, 13 Mar 2019 18:48:18 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 2610FC21FD1; Wed, 13 Mar 2019 07:48:17 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=FREEMAIL_FROM, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 2A85DC21F0C; Wed, 13 Mar 2019 07:48:11 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 75EC2C21F0C; Wed, 13 Mar 2019 07:48:09 +0000 (UTC) Received: from mail-pf1-f193.google.com (mail-pf1-f193.google.com [209.85.210.193]) by lists.denx.de (Postfix) with ESMTPS id 25A2AC21C2C for ; Wed, 13 Mar 2019 07:47:31 +0000 (UTC) Received: by mail-pf1-f193.google.com with SMTP id v21so771615pfm.12 for ; Wed, 13 Mar 2019 00:47:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=pYUQY5FlblVEm6pRcJTODRlqFxZ/JqGdW9po3GBQRHM=; b=kUcLoou5ix3/BthWKZRrVqm5i3vMNQEEhocgrIYWRpAEJ0LR+Q2SXV+A67hTrg2jkh m1B3txU7xrhKysCY+wooSPO0wWWPNkLG6PeNzIz3wMFn6SGBctTvmDV1jzr4eOPPm8jI Y5TZ3MhVYQSGDZAi0WGkCB7rS45MYHmdzahv8eIv2l0STcXH8cLjtQi6OYcA08VPtK+M 20o7faE96zFARrLdOpPCfBZLrjVlUYUnL2HQpjzsN589OtOSjFzbFaMroanRQ7r7Wcxo N90iHHyk9/TRmlPOv2KB9+M44+/CtqssHsvRna1J7TIzAiEph/C86p2pVix5L7mYyrek I4ow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=pYUQY5FlblVEm6pRcJTODRlqFxZ/JqGdW9po3GBQRHM=; b=lPcuJ7gZZSqwwgPEDG7wgm4ejSeS61sXzxr6REouUalTdKJenkbFVHoZnb24yld3Z/ 3J4Qwe0J6yr8cOMvUq0ErKoDprgvwUvQNLpYopKTTeRkN7SwdNUNcvl+kafNKGSzJqW1 grUyYKI6Pdw7FeJR3yXFHRkjpyOBkg6F+qeCGBupkVN8pwQu/hm4+N16VrW0mdvl5nwl xkMNJKnNpl4RR9c/MWGBKvJ5c/Vu8VPIpmxIfmIPhlePoa6fSYhwu6onRS0Ugcf3eKrL uTjPGK1w+UilOYmlAPkI/Dp7D4CE2O3scEIRxIRhTmNAwPR1CXlcIhYeynWjWLww9K/M hrxg== X-Gm-Message-State: APjAAAUIjD1DBDPuflq92QmPa4ZJ/NImD4ZZVLKuXAr3Ou4y3ok3oYub m40JF7nLTO21gwZIBGBfucJs7W9ijMY= X-Google-Smtp-Source: APXvYqyyJng9z/g+irJOUJuQP7C7eUOU1FzKiD+UFnFspL9SsacbVyFZYM7AnW9x5fKfyOX+UCoFVQ== X-Received: by 2002:a17:902:7d84:: with SMTP id a4mr44776442plm.76.1552463249128; Wed, 13 Mar 2019 00:47:29 -0700 (PDT) Received: from chrisp-dl.ws.atlnz.lc ([2001:df5:b000:22:3a2c:4aff:fe70:2b02]) by smtp.gmail.com with ESMTPSA id l7sm39022389pfj.162.2019.03.13.00.47.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 13 Mar 2019 00:47:28 -0700 (PDT) From: Chris Packham To: u-boot@lists.denx.de Date: Wed, 13 Mar 2019 20:47:00 +1300 Message-Id: <20190313074711.27757-2-judge.packham@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190313074711.27757-1-judge.packham@gmail.com> References: <20190313074711.27757-1-judge.packham@gmail.com> MIME-Version: 1.0 Cc: Tom Rini , Prafulla Wadaskar , Vagrant Cascadian , Joe Hershberger , Luka Perkov , Stefan Roese , Chris Packham Subject: [U-Boot] [PATCH v3 01/12] ARM: kirkwood: add db-88f6281-bp board X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" This is Marvell's Kirkwood development board. It has the following features - 512M DDR2 - 2 PCI connectors - 1 x1 PCI-e interface - 1 Gigabit Ethernet Port - 2 SATA Ports - USB 2.0 Interface - SDIO - 128M NAND Flash - 16M SPI Flash It can be strapped to boot from SPI or NAND so there are two defconfigs (one per boot media). Signed-off-by: Chris Packham Reviewed-by: Stefan Roese --- Changes in v3: - incorporate review feedback (except for DM_SERIAL) from Stefan arch/arm/dts/kirkwood-db-88f6281-spi.dts | 48 +++++++++ arch/arm/dts/kirkwood-db-88f6281.dts | 26 +++++ arch/arm/dts/kirkwood-db.dtsi | 94 ++++++++++++++++++ arch/arm/mach-kirkwood/Kconfig | 4 + board/Marvell/db-88f6281-bp/Kconfig | 12 +++ board/Marvell/db-88f6281-bp/MAINTAINERS | 10 ++ board/Marvell/db-88f6281-bp/Makefile | 12 +++ board/Marvell/db-88f6281-bp/db-88f6281-bp.c | 103 ++++++++++++++++++++ board/Marvell/db-88f6281-bp/kwbimage.cfg.in | 36 +++++++ configs/db-88f6281-bp-nand_defconfig | 53 ++++++++++ configs/db-88f6281-bp-spi_defconfig | 55 +++++++++++ include/configs/db-88f6281-bp.h | 99 +++++++++++++++++++ 12 files changed, 552 insertions(+) create mode 100644 arch/arm/dts/kirkwood-db-88f6281-spi.dts create mode 100644 arch/arm/dts/kirkwood-db-88f6281.dts create mode 100644 arch/arm/dts/kirkwood-db.dtsi create mode 100644 board/Marvell/db-88f6281-bp/Kconfig create mode 100644 board/Marvell/db-88f6281-bp/MAINTAINERS create mode 100644 board/Marvell/db-88f6281-bp/Makefile create mode 100644 board/Marvell/db-88f6281-bp/db-88f6281-bp.c create mode 100644 board/Marvell/db-88f6281-bp/kwbimage.cfg.in create mode 100644 configs/db-88f6281-bp-nand_defconfig create mode 100644 configs/db-88f6281-bp-spi_defconfig create mode 100644 include/configs/db-88f6281-bp.h diff --git a/arch/arm/dts/kirkwood-db-88f6281-spi.dts b/arch/arm/dts/kirkwood-db-88f6281-spi.dts new file mode 100644 index 000000000000..50b1b0d4a535 --- /dev/null +++ b/arch/arm/dts/kirkwood-db-88f6281-spi.dts @@ -0,0 +1,48 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Marvell DB-88F6281-BP Development Board Setup + * + * Saeed Bishara + * Thomas Petazzoni + * + */ + +/dts-v1/; + +#include "kirkwood-db-88f6281.dts" + +/ { + aliases { + spi0 = &spi0; + }; +}; + +&spi0 { + status = "okay"; + + flash@0 { + #address-cells = <1>; + #size-cells = <1>; + compatible = "st,m25p128", "jedec,spi-nor", "spi-flash"; + reg = <0>; + spi-max-frequency = <50000000>; + mode = <0>; + + partition@u-boot { + reg = <0x00000000 0x00c00000>; + label = "u-boot"; + }; + partition@u-boot-env { + reg = <0x00c00000 0x00040000>; + label = "u-boot-env"; + }; + partition@unused { + reg = <0x00100000 0x00f00000>; + label = "unused"; + }; + }; +}; + +&nand { + status = "disabled"; +}; diff --git a/arch/arm/dts/kirkwood-db-88f6281.dts b/arch/arm/dts/kirkwood-db-88f6281.dts new file mode 100644 index 000000000000..2adb17c955aa --- /dev/null +++ b/arch/arm/dts/kirkwood-db-88f6281.dts @@ -0,0 +1,26 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Marvell DB-88F6281-BP Development Board Setup + * + * Saeed Bishara + * Thomas Petazzoni + * + */ + +/dts-v1/; + +#include "kirkwood-db.dtsi" +#include "kirkwood-6281.dtsi" + +/ { + model = "Marvell DB-88F6281-BP Development Board"; + compatible = "marvell,db-88f6281-bp", "marvell,kirkwood-88f6281", "marvell,kirkwood"; +}; + +&pciec { + status = "okay"; +}; + +&pcie0 { + status = "okay"; +}; diff --git a/arch/arm/dts/kirkwood-db.dtsi b/arch/arm/dts/kirkwood-db.dtsi new file mode 100644 index 000000000000..b81d8e8298a3 --- /dev/null +++ b/arch/arm/dts/kirkwood-db.dtsi @@ -0,0 +1,94 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Marvell DB-{88F6281,88F6282}-BP Development Board Setup + * + * Saeed Bishara + * Thomas Petazzoni + * + * This file contains the definitions that are common between the 6281 + * and 6282 variants of the Marvell Kirkwood Development Board. + */ + +#include "kirkwood.dtsi" + +/ { + memory { + device_type = "memory"; + reg = <0x00000000 0x20000000>; /* 512 MB */ + }; + + chosen { + bootargs = "console=ttyS0,115200n8 earlyprintk"; + stdout-path = &uart0; + }; + + aliases { + ethernet0 = ð0; + spi0 = &spi0; + }; + + ocp@f1000000 { + pin-controller@10000 { + pmx_sdio_gpios: pmx-sdio-gpios { + marvell,pins = "mpp37", "mpp38"; + marvell,function = "gpio"; + }; + }; + + serial@12000 { + status = "okay"; + }; + + sata@80000 { + nr-ports = <2>; + status = "okay"; + }; + + ehci@50000 { + status = "okay"; + }; + + mvsdio@90000 { + pinctrl-0 = <&pmx_sdio_gpios>; + pinctrl-names = "default"; + wp-gpios = <&gpio1 5 GPIO_ACTIVE_HIGH>; + cd-gpios = <&gpio1 6 GPIO_ACTIVE_HIGH>; + status = "okay"; + }; + }; +}; + +&nand { + chip-delay = <25>; + status = "okay"; + + partition@0 { + label = "uboot"; + reg = <0x0 0x100000>; + }; + + partition@100000 { + label = "uImage"; + reg = <0x100000 0x400000>; + }; + + partition@500000 { + label = "root"; + reg = <0x500000 0x1fb00000>; + }; +}; + +&mdio { + status = "okay"; + + ethphy0: ethernet-phy@8 { + reg = <8>; + }; +}; + +ð0 { + status = "okay"; + ethernet0-port@0 { + phy-handle = <ðphy0>; + }; +}; diff --git a/arch/arm/mach-kirkwood/Kconfig b/arch/arm/mach-kirkwood/Kconfig index 3b860c4f55fe..7c4170399afb 100644 --- a/arch/arm/mach-kirkwood/Kconfig +++ b/arch/arm/mach-kirkwood/Kconfig @@ -65,6 +65,9 @@ config TARGET_SBx81LIFKW config TARGET_SBx81LIFXCAT bool "Allied Telesis SBx81GP24/SBx81GT24" +config TARGET_DB_88F6281_BP + bool "Marvell DB-88F6281-BP" + endchoice config SYS_SOC @@ -89,5 +92,6 @@ source "board/Seagate/nas220/Kconfig" source "board/zyxel/nsa310s/Kconfig" source "board/alliedtelesis/SBx81LIFKW/Kconfig" source "board/alliedtelesis/SBx81LIFXCAT/Kconfig" +source "board/Marvell/db-88f6281-bp/Kconfig" endif diff --git a/board/Marvell/db-88f6281-bp/Kconfig b/board/Marvell/db-88f6281-bp/Kconfig new file mode 100644 index 000000000000..38467399e688 --- /dev/null +++ b/board/Marvell/db-88f6281-bp/Kconfig @@ -0,0 +1,12 @@ +if TARGET_DB_88F6281_BP + +config SYS_BOARD + default "db-88f6281-bp" + +config SYS_VENDOR + default "Marvell" + +config SYS_CONFIG_NAME + default "db-88f6281-bp" + +endif diff --git a/board/Marvell/db-88f6281-bp/MAINTAINERS b/board/Marvell/db-88f6281-bp/MAINTAINERS new file mode 100644 index 000000000000..f31d3be70bae --- /dev/null +++ b/board/Marvell/db-88f6281-bp/MAINTAINERS @@ -0,0 +1,10 @@ +DB_88F6820_AMC BOARD +M: Chris Packham +S: Maintained +F: arch/arm/dts/kirkwood-db-88f6281.dts +F: arch/arm/dts/kirkwood-db-88f6281-spi.dts +F: arch/arm/dts/kirkwood-db.dtsi +F: board/Marvell/db-88f6281-bp/ +F: include/configs/db-88f6281-bp.h +F: configs/db-88f6281-bp_defconfig +F: configs/db-88f6281-bp-spi_defconfig diff --git a/board/Marvell/db-88f6281-bp/Makefile b/board/Marvell/db-88f6281-bp/Makefile new file mode 100644 index 000000000000..60c01b1762a0 --- /dev/null +++ b/board/Marvell/db-88f6281-bp/Makefile @@ -0,0 +1,12 @@ +# SPDX-License-Identifier: GPL-2.0+ + +quiet_cmd_sed = SED $@ +cmd_sed = sed $(SEDFLAGS_$(@F)) $< >$@ + +SEDFLAGS_kwbimage.cfg = -e "s/^\#@BOOT_FROM.*/BOOT_FROM $(if $(CONFIG_CMD_NAND),nand,spi)/" +$(src)/kwbimage.cfg: $(src)/kwbimage.cfg.in include/autoconf.mk \ + include/config/auto.conf + $(call if_changed,sed) + +obj-y += db-88f6281-bp.o +extra-y += kwbimage.cfg diff --git a/board/Marvell/db-88f6281-bp/db-88f6281-bp.c b/board/Marvell/db-88f6281-bp/db-88f6281-bp.c new file mode 100644 index 000000000000..b68f2f3c895b --- /dev/null +++ b/board/Marvell/db-88f6281-bp/db-88f6281-bp.c @@ -0,0 +1,103 @@ +// SPDX-License-Identifier: GPL-2.0+ + +#include +#include +#include +#include +#include +#include +#include +#include + +#define DB_88F6281_OE_LOW ~(BIT(7)) +#define DB_88F6281_OE_HIGH ~(BIT(15) | BIT(14) | BIT(13) | BIT(4)) +#define DB_88F6281_OE_VAL_LOW BIT(7) +#define DB_88F6281_OE_VAL_HIGH 0 + +DECLARE_GLOBAL_DATA_PTR; + +int board_early_init_f(void) +{ + mvebu_config_gpio(DB_88F6281_OE_VAL_LOW, + DB_88F6281_OE_VAL_HIGH, + DB_88F6281_OE_LOW, DB_88F6281_OE_HIGH); + + /* Multi-Purpose Pins Functionality configuration */ + static const u32 kwmpp_config[] = { +#ifdef CONFIG_CMD_NAND + MPP0_NF_IO2, + MPP1_NF_IO3, + MPP2_NF_IO4, + MPP3_NF_IO5, +#else + MPP0_SPI_SCn, + MPP1_SPI_MOSI, + MPP2_SPI_SCK, + MPP3_SPI_MISO, +#endif + MPP4_NF_IO6, + MPP5_NF_IO7, + MPP6_SYSRST_OUTn, + MPP7_GPO, + MPP8_TW_SDA, + MPP9_TW_SCK, + MPP10_UART0_TXD, + MPP11_UART0_RXD, + MPP12_SD_CLK, + MPP13_SD_CMD, + MPP14_SD_D0, + MPP15_SD_D1, + MPP16_SD_D2, + MPP17_SD_D3, + MPP18_NF_IO0, + MPP19_NF_IO1, + MPP20_SATA1_ACTn, + MPP21_SATA0_ACTn, + MPP22_GPIO, + MPP23_GPIO, + MPP24_GPIO, + MPP25_GPIO, + MPP26_GPIO, + MPP27_GPIO, + MPP28_GPIO, + MPP29_GPIO, + MPP30_GPIO, + MPP31_GPIO, + MPP32_GPIO, + MPP33_GPIO, + MPP34_GPIO, + MPP35_GPIO, + MPP36_GPIO, + MPP37_GPIO, + MPP38_GPIO, + MPP39_GPIO, + MPP40_GPIO, + MPP41_GPIO, + MPP42_GPIO, + MPP43_GPIO, + MPP44_GPIO, + MPP45_GPIO, + MPP46_GPIO, + MPP47_GPIO, + MPP48_GPIO, + MPP49_GPIO, + 0 + }; + kirkwood_mpp_conf(kwmpp_config, NULL); + + return 0; +} + +int board_init(void) +{ + gd->bd->bi_boot_params = mvebu_sdram_bar(0) + 0x100; + + return 0; +} + +#ifdef CONFIG_RESET_PHY_R +/* automatically defined by kirkwood config.h */ +void reset_phy(void) +{ +} +#endif diff --git a/board/Marvell/db-88f6281-bp/kwbimage.cfg.in b/board/Marvell/db-88f6281-bp/kwbimage.cfg.in new file mode 100644 index 000000000000..05f8b275f607 --- /dev/null +++ b/board/Marvell/db-88f6281-bp/kwbimage.cfg.in @@ -0,0 +1,36 @@ +# SPDX-License-Identifier: GPL-2.0+ + +# Boot Media configurations +#@BOOT_FROM + +DATA 0xd00100e0 0x1b1b1b9b +DATA 0xd0020134 0xbbbbbbbb +DATA 0xd0020138 0x00bbbbbb +DATA 0xd0020154 0x00000200 +DATA 0xd002014c 0x00001c00 +DATA 0xd0020148 0x00000001 + +DATA 0xd0001400 0x43000c30 +DATA 0xd0001404 0x39543000 +DATA 0xd0001408 0x22125451 +DATA 0xd000140c 0x00000833 +DATA 0xd0001410 0x000000cc +DATA 0xd0001414 0x00000000 +DATA 0xd0001418 0x00000000 +DATA 0xd000141c 0x00000c52 +DATA 0xd0001420 0x00000044 +DATA 0xd0001424 0x0000f1ff +DATA 0xd0001428 0x00085520 +DATA 0xd000147c 0x00008552 +DATA 0xd0001504 0x0ffffff1 +DATA 0xd0001508 0x10000000 +DATA 0xd000150c 0x0ffffff5 +DATA 0xd0001514 0x00000000 +DATA 0xd000151c 0x00000000 +DATA 0xd0001494 0x84210000 +DATA 0xd0001498 0x00000000 +DATA 0xd000149c 0x0000f40f +DATA 0xd0001480 0x00000001 + +# End of Header extension +DATA 0x0 0x0 diff --git a/configs/db-88f6281-bp-nand_defconfig b/configs/db-88f6281-bp-nand_defconfig new file mode 100644 index 000000000000..6360ef5e8280 --- /dev/null +++ b/configs/db-88f6281-bp-nand_defconfig @@ -0,0 +1,53 @@ +CONFIG_ARM=y +CONFIG_SYS_THUMB_BUILD=y +CONFIG_KIRKWOOD=y +CONFIG_SYS_TEXT_BASE=0x600000 +CONFIG_TARGET_DB_88F6281_BP=y +CONFIG_IDENT_STRING="\nMarvell DB-88F6281-BP" +CONFIG_NR_DRAM_BANKS=2 +# CONFIG_SYS_MALLOC_F is not set +CONFIG_BOOTDELAY=3 +# CONFIG_DISPLAY_BOARDINFO is not set +CONFIG_HUSH_PARSER=y +CONFIG_CMD_BOOTZ=y +CONFIG_CMD_DM=y +# CONFIG_CMD_FLASH is not set +CONFIG_CMD_IDE=y +CONFIG_CMD_MMC=y +CONFIG_CMD_NAND=y +CONFIG_CMD_SF=y +CONFIG_CMD_USB=y +# CONFIG_CMD_SETEXPR is not set +CONFIG_CMD_DHCP=y +CONFIG_CMD_MII=y +CONFIG_CMD_PING=y +CONFIG_CMD_EXT2=y +CONFIG_CMD_EXT4=y +CONFIG_CMD_FAT=y +CONFIG_CMD_JFFS2=y +CONFIG_CMD_MTDPARTS=y +CONFIG_MTDIDS_DEFAULT="nand0=orion_nand" +CONFIG_MTDPARTS_DEFAULT="mtdparts=orion_nand:512K(uboot),512K(env),4M(kernel),-(rootfs)" +CONFIG_ISO_PARTITION=y +CONFIG_OF_CONTROL=y +CONFIG_DEFAULT_DEVICE_TREE="kirkwood-db-88f6281" +CONFIG_ENV_IS_IN_SPI_FLASH=y +CONFIG_NET_RANDOM_ETHADDR=y +CONFIG_DM=y +CONFIG_MVSATA_IDE=y +CONFIG_SPI_FLASH=y +CONFIG_SPI_FLASH_STMICRO=y +CONFIG_PHY_MARVELL=y +CONFIG_DM_ETH=y +CONFIG_MVGBE=y +CONFIG_MII=y +CONFIG_DM_RTC=y +CONFIG_RTC_MV=y +CONFIG_SYS_NS16550=y +CONFIG_SPI=y +CONFIG_KIRKWOOD_SPI=y +CONFIG_USB=y +CONFIG_USB_EHCI_HCD=y +CONFIG_USB_STORAGE=y +CONFIG_LZMA=y +CONFIG_LZO=y diff --git a/configs/db-88f6281-bp-spi_defconfig b/configs/db-88f6281-bp-spi_defconfig new file mode 100644 index 000000000000..54d476727996 --- /dev/null +++ b/configs/db-88f6281-bp-spi_defconfig @@ -0,0 +1,55 @@ +CONFIG_ARM=y +CONFIG_SYS_THUMB_BUILD=y +CONFIG_KIRKWOOD=y +CONFIG_SYS_TEXT_BASE=0x600000 +CONFIG_TARGET_DB_88F6281_BP=y +CONFIG_IDENT_STRING="\nMarvell DB-88F6281-BP" +CONFIG_NR_DRAM_BANKS=2 +# CONFIG_SYS_MALLOC_F is not set +CONFIG_FIT=y +CONFIG_BOOTDELAY=3 +# CONFIG_DISPLAY_BOARDINFO is not set +CONFIG_HUSH_PARSER=y +CONFIG_CMD_BOOTZ=y +CONFIG_CMD_DM=y +# CONFIG_CMD_FLASH is not set +CONFIG_CMD_IDE=y +CONFIG_CMD_MMC=y +CONFIG_CMD_SF=y +CONFIG_CMD_USB=y +# CONFIG_CMD_SETEXPR is not set +CONFIG_CMD_DHCP=y +CONFIG_CMD_MII=y +CONFIG_CMD_PING=y +CONFIG_CMD_EXT2=y +CONFIG_CMD_EXT4=y +CONFIG_CMD_FAT=y +CONFIG_CMD_JFFS2=y +CONFIG_CMD_MTDPARTS=y +CONFIG_MTDIDS_DEFAULT="nand0=orion_nand" +CONFIG_MTDPARTS_DEFAULT="mtdparts=orion_nand:512K(uboot),512K(env),4M(kernel),-(rootfs)" +CONFIG_ISO_PARTITION=y +CONFIG_OF_CONTROL=y +CONFIG_DEFAULT_DEVICE_TREE="kirkwood-db-88f6281-spi" +CONFIG_ENV_IS_IN_SPI_FLASH=y +CONFIG_NET_RANDOM_ETHADDR=y +CONFIG_DM=y +CONFIG_MVSATA_IDE=y +CONFIG_DM_SPI_FLASH=y +CONFIG_SPI_FLASH=y +CONFIG_SPI_FLASH_STMICRO=y +CONFIG_PHY_MARVELL=y +CONFIG_DM_ETH=y +CONFIG_MVGBE=y +CONFIG_MII=y +CONFIG_DM_RTC=y +CONFIG_RTC_MV=y +CONFIG_SYS_NS16550=y +CONFIG_SPI=y +CONFIG_DM_SPI=y +CONFIG_KIRKWOOD_SPI=y +CONFIG_USB=y +CONFIG_USB_EHCI_HCD=y +CONFIG_USB_STORAGE=y +CONFIG_LZMA=y +CONFIG_LZO=y diff --git a/include/configs/db-88f6281-bp.h b/include/configs/db-88f6281-bp.h new file mode 100644 index 000000000000..680de8f29422 --- /dev/null +++ b/include/configs/db-88f6281-bp.h @@ -0,0 +1,99 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ + +#ifndef _CONFIG_DB_88F6281_BP_H +#define _CONFIG_DB_88F6281_BP_H + +/* + * High Level Configuration Options (easy to change) + */ +#define CONFIG_FEROCEON_88FR131 1 /* CPU Core subversion */ +#define CONFIG_KW88F6281 1 /* SOC Name */ +#define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */ +#define CONFIG_SYS_TCLK 166666667 +#define CONFIG_SYS_KWD_CONFIG $(CONFIG_BOARDDIR)/kwbimage.cfg +#define CONFIG_BUILD_TARGET "u-boot.kwb" + +/* additions for new ARM relocation support */ +#define CONFIG_SYS_SDRAM_BASE 0x00000000 + +#define CONFIG_KIRKWOOD_EGIGA_INIT /* Enable GbePort0/1 for kernel */ +#define CONFIG_KIRKWOOD_PCIE_INIT /* Enable PCIE Port0 */ +#define CONFIG_KIRKWOOD_RGMII_PAD_1V8 /* Set RGMII Pad voltage to 1.8V */ +#define CONFIG_KIRKWOOD_GPIO 1 + +/* + * NS16550 Configuration + */ +#define CONFIG_SYS_NS16550_SERIAL +#define CONFIG_SYS_NS16550_REG_SIZE (-4) +#define CONFIG_SYS_NS16550_CLK CONFIG_SYS_TCLK +#define CONFIG_SYS_NS16550_COM1 KW_UART0_BASE + +#define CONFIG_SYS_MAX_NAND_DEVICE 1 +/* + * Serial Port configuration + * The following definitions let you select what serial you want to use + * for your console driver. + */ + +#define CONFIG_CONS_INDEX 1 /* Console on UART0 */ + +/* + * Environment variables configurations + */ +#define CONFIG_ENV_SPI_BUS 0 +#define CONFIG_ENV_SPI_CS 0 +#define CONFIG_ENV_SPI_MAX_HZ 20000000 /* 20Mhz */ +#define CONFIG_ENV_SPI_MODE CONFIG_SF_DEFAULT_MODE +#define CONFIG_ENV_SECT_SIZE 0x40000 /* 256K */ +#define CONFIG_ENV_SIZE 0x01000 +#define CONFIG_ENV_OFFSET 0xC0000 + +/* + * U-Boot bootcode configuration + */ + +#define CONFIG_SYS_MONITOR_LEN (256 << 10) /* Reserve 256 kB for monitor */ +#define CONFIG_SYS_MALLOC_LEN (4 << 20) /* Reserve 4.0 MB for malloc */ + +/* + * For booting Linux, the board info and command line data + * have to be in the first 8 MB of memory, since this is + * the maximum mapped by the Linux kernel during initialization. + */ +#define CONFIG_SYS_BOOTMAPSZ (8 << 20) /* Initial Mem map for Linux*/ + +/* size in bytes reserved for initial data */ + +#include +/* There is no PHY directly connected so don't ask it for link status */ +#undef CONFIG_SYS_FAULT_ECHO_LINK_DOWN + +/* + * Other required minimal configurations + */ +#define CONFIG_ARCH_CPU_INIT /* call arch_cpu_init() */ +#define CONFIG_SYS_MEMTEST_START 0x00400000 /* 4M */ +#define CONFIG_SYS_MEMTEST_END 0x007fffff /* (_8M - 1) */ +#define CONFIG_SYS_RESET_ADDRESS 0xffff0000 /* Rst Vector Adr */ + +/* + * SDIO/MMC Card Configuration + */ +#ifdef CONFIG_CMD_MMC +#define CONFIG_MVEBU_MMC +#define CONFIG_SYS_MMC_BASE KW_SDIO_BASE +#endif /* CONFIG_CMD_MMC */ + +/* + * SATA Driver configuration + */ +#ifdef CONFIG_MVSATA_IDE +#define CONFIG_SYS_ATA_IDE0_OFFSET MV_SATA_PORT0_OFFSET +#endif /*CONFIG_MVSATA_IDE*/ + +#define CONFIG_SYS_LOAD_ADDR 0x1000000 /* default location for tftp and bootm */ + +#define CONFIG_SYS_DCACHE_OFF + +#endif /* _CONFIG_DB_88F6281_BP_H */ From patchwork Wed Mar 13 07:47:01 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Packham X-Patchwork-Id: 1055938 X-Patchwork-Delegate: sr@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Bw5JcSBq"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 44K3rf3pYnz9s55 for ; Wed, 13 Mar 2019 18:49:22 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 2B831C21FAA; Wed, 13 Mar 2019 07:49:05 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=FREEMAIL_FROM, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 4A60FC21F97; Wed, 13 Mar 2019 07:48:12 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id A4DDFC21C2C; Wed, 13 Mar 2019 07:48:09 +0000 (UTC) Received: from mail-pg1-f195.google.com (mail-pg1-f195.google.com [209.85.215.195]) by lists.denx.de (Postfix) with ESMTPS id 90A0BC21F7D for ; Wed, 13 Mar 2019 07:47:34 +0000 (UTC) Received: by mail-pg1-f195.google.com with SMTP id e17so936239pgd.2 for ; Wed, 13 Mar 2019 00:47:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=EKuPEeC03sGyIuC0D2SCjkiQE2DJd9S46zkZQVvLab4=; b=Bw5JcSBqmT519hOgf80sKa8DaWhMatG/KIfTrL6f53EKk36PZXX9/YZYVlywUZES0C 06YX+kKSKCsDApDGx0sq3ZHh8ayRmbGPhccfO+omoQLrxG8+btsRGjR2chp9UAG6E7be aVrvjna4nROsJsfRhhkubEfl3VpUs/sv/rRGrImhI+MXUYO2lkE5rWfBft+pY7bp0PZd cIr/DfC7Wp0HIIEO8PoSsthstwgERFnJx+vTHKV/411qypebh8yNpLkujV+EzuTmG+e2 XJOtD0jr0AwLseYjfA4EaPjnZEihNJgmR5M+w9pN/hhsRCKz+CzThli+JIilDDSQScGj pw5g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=EKuPEeC03sGyIuC0D2SCjkiQE2DJd9S46zkZQVvLab4=; b=EUoITdHVEY+2AM4QfTfRvQTbffHbBgOAk7svuVC+3sW2JsX09d8t5qfM/ldyGillgF bd2hj8CLC9Imu+UP7X/ViRgdj3TdKk0X9qCbdneI7arZHKOeXuxZm08YFWDkU+3Sf61/ Wz452HH3gK29zAq9J8spN3DK7RbKmk0yGsIfKi1R2qmL2NAxfFHJXzpHkjLY4qGiHVFP TJfwM0OJF0plIeFvP7X4XwFkjivObzc4BKhbDE4t8rP+BkR69PIH2Io9jg32aFC9Pfn8 LX1GW7MMvOeQKfk0MPZX1IMapLPIAyyS3H0FCXbt1znFYOGMAKHiRW7BWTkdoZGDRVBA gxLQ== X-Gm-Message-State: APjAAAUSUkck5O4vZvhGlWnDpGwAaqsIoc0jOEnZF03btW7r9I+GFEHM 98f4E2MoobmHp2G9cEveUhHfxexOL0U= X-Google-Smtp-Source: APXvYqxtavJGOPOAaxrPpX7oceyaCkT2q+kf6gPcfusJk5PfEiSDtFURBMlXHa1qRZKC0QGTcMX0tQ== X-Received: by 2002:aa7:87cf:: with SMTP id i15mr7366073pfo.41.1552463252928; Wed, 13 Mar 2019 00:47:32 -0700 (PDT) Received: from chrisp-dl.ws.atlnz.lc ([2001:df5:b000:22:3a2c:4aff:fe70:2b02]) by smtp.gmail.com with ESMTPSA id l7sm39022389pfj.162.2019.03.13.00.47.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 13 Mar 2019 00:47:32 -0700 (PDT) From: Chris Packham To: u-boot@lists.denx.de Date: Wed, 13 Mar 2019 20:47:01 +1300 Message-Id: <20190313074711.27757-3-judge.packham@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190313074711.27757-1-judge.packham@gmail.com> References: <20190313074711.27757-1-judge.packham@gmail.com> MIME-Version: 1.0 Cc: Tom Rini , Prafulla Wadaskar , Luka Perkov , Stefan Roese , Chris Packham Subject: [U-Boot] [PATCH v3 02/12] ARM: kirkwood: rename KW_CPU_WIN_BASE to MVEBU_CPU_WIN_BASE X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" This will allow the kirkwood platforms to use more common code with the other mvebu SoCs. Signed-off-by: Chris Packham Reviewed-by: Stefan Roese --- Changes in v3: None arch/arm/mach-kirkwood/cpu.c | 2 +- arch/arm/mach-kirkwood/include/mach/soc.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-kirkwood/cpu.c b/arch/arm/mach-kirkwood/cpu.c index d54de53f31dc..1e733dc5fbc1 100644 --- a/arch/arm/mach-kirkwood/cpu.c +++ b/arch/arm/mach-kirkwood/cpu.c @@ -62,7 +62,7 @@ unsigned int kw_winctrl_calcsize(unsigned int sizeval) int kw_config_adr_windows(void) { struct kwwin_registers *winregs = - (struct kwwin_registers *)KW_CPU_WIN_BASE; + (struct kwwin_registers *)MVEBU_CPU_WIN_BASE; /* Window 0: PCIE MEM address space */ writel(KWCPU_WIN_CTRL_DATA(1024 * 1024 * 256, KWCPU_TARGET_PCIE, diff --git a/arch/arm/mach-kirkwood/include/mach/soc.h b/arch/arm/mach-kirkwood/include/mach/soc.h index 227707ae4c95..1d7f2828cd38 100644 --- a/arch/arm/mach-kirkwood/include/mach/soc.h +++ b/arch/arm/mach-kirkwood/include/mach/soc.h @@ -31,7 +31,7 @@ #define KW_RTC_BASE (KW_REGISTER(0x10300)) #define KW_NANDF_BASE (KW_REGISTER(0x10418)) #define MVEBU_SPI_BASE (KW_REGISTER(0x10600)) -#define KW_CPU_WIN_BASE (KW_REGISTER(0x20000)) +#define MVEBU_CPU_WIN_BASE (KW_REGISTER(0x20000)) #define KW_CPU_REG_BASE (KW_REGISTER(0x20100)) #define MVEBU_TIMER_BASE (KW_REGISTER(0x20300)) #define KW_REG_PCIE_BASE (KW_REGISTER(0x40000)) From patchwork Wed Mar 13 07:47:02 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Packham X-Patchwork-Id: 1055939 X-Patchwork-Delegate: sr@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Xo2ek+jx"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 44K3rt5h7wz9s3l for ; Wed, 13 Mar 2019 18:49:34 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 83B16C21E07; Wed, 13 Mar 2019 07:49:23 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=FREEMAIL_FROM, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id E255EC21FAE; Wed, 13 Mar 2019 07:48:12 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id C03D2C21F19; Wed, 13 Mar 2019 07:48:09 +0000 (UTC) Received: from mail-pg1-f195.google.com (mail-pg1-f195.google.com [209.85.215.195]) by lists.denx.de (Postfix) with ESMTPS id 3472AC21F4D for ; Wed, 13 Mar 2019 07:47:38 +0000 (UTC) Received: by mail-pg1-f195.google.com with SMTP id u9so921296pgo.7 for ; Wed, 13 Mar 2019 00:47:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=pioLtiKywBFxTxbfQ0zoVdB28zUn+wAlJ20WAb37Qxo=; b=Xo2ek+jxv5z4HGNX0Er98Xr+syAgWWWQWm36gfMTwTxCB+yKUVY3SomNRrOxXxxynf Q30qiQfYRZvymFF1K708gjOVbQ2e7m8TK2G6aSjePLUuvFaVmZIrfLYt56JNOgAT2dzb Wcai3lyqPhtixGGqOqu7zF40kuky2SE6xCm39JZQKa152mZh061W2Kky9I6wpMVw57kd DLufmPN9Fc1dVvpvXZGaiIds7pz07EZZnsZk9DhGgOo9XBEBuq+cDXlzRcGLZtGJo3KY uYlzqkEPrkKrJafV1usGPXe8Cr0uUPPQMFM5ISs0rTfwFX0C5nMjd+ePNbM1CXmtiiVy uCDQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=pioLtiKywBFxTxbfQ0zoVdB28zUn+wAlJ20WAb37Qxo=; b=eFRDpfYK4z2P1LGkBstKSMUkSuVwT3EqAl9d8xVe6FLyEwjRcdmxsM13cgZ/48vb7h /mgZXpfeoTJ/jRXKJnPywvllA8w9tMYtXOM7DEpYKYPyobw1OCYBF0Md6pFLP7PuEQ3c mq3ZvnuYIcyCx8pI5mJOUVsHEkLmaeIXCAThmO+HACCHRzTbrPvh9684uu7b29ILd7W2 JFsd8S49g1/7q0OwKexicNZb9zY2kpNyYztjfbwQBw+E4VQJ0ZQPIqRTv6z3yFcjyH1N 87d7efeUMHdyWPknXptrbIRn6ZQmYD+loYqqE0E6Kz5XVlwEdq0SWY/zRJuE1dT1VkY4 32qQ== X-Gm-Message-State: APjAAAVyyF5CIeIfjeI4EEjC0N0FscUIMfBhwGdf8Gg1kcNijwGOW8Bs SPi5tOlK1nD73bl7wf0FSOnm9FPJtxs= X-Google-Smtp-Source: APXvYqxQsx2RpYpUr160mfZI+Hjg2r0ndSfftWfGSCQ1PHDLOFb7lFGJ/NyK8o+mRSJYU/OJmwwVAw== X-Received: by 2002:aa7:83ca:: with SMTP id j10mr42822403pfn.50.1552463256608; Wed, 13 Mar 2019 00:47:36 -0700 (PDT) Received: from chrisp-dl.ws.atlnz.lc ([2001:df5:b000:22:3a2c:4aff:fe70:2b02]) by smtp.gmail.com with ESMTPSA id l7sm39022389pfj.162.2019.03.13.00.47.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 13 Mar 2019 00:47:36 -0700 (PDT) From: Chris Packham To: u-boot@lists.denx.de Date: Wed, 13 Mar 2019 20:47:02 +1300 Message-Id: <20190313074711.27757-4-judge.packham@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190313074711.27757-1-judge.packham@gmail.com> References: <20190313074711.27757-1-judge.packham@gmail.com> MIME-Version: 1.0 Cc: Tom Rini , Prafulla Wadaskar , Luka Perkov , Stefan Roese , Chris Packham Subject: [U-Boot] [PATCH v3 03/12] ARM: kirkwood: remove KW_DEFADR_PCI_IO_REMAP X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" KW_DEFADR_PCI_IO_REMAP has the same value as KW_DEFADR_PCI_IO and is only used to set up a 1:1 mapping. Remove it and update the mapping to use KW_DEFADR_PCI_IO. Signed-off-by: Chris Packham Reviewed-by: Stefan Roese --- Changes in v3: None arch/arm/mach-kirkwood/cpu.c | 2 +- arch/arm/mach-kirkwood/include/mach/cpu.h | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/arch/arm/mach-kirkwood/cpu.c b/arch/arm/mach-kirkwood/cpu.c index 1e733dc5fbc1..95dd07f840ca 100644 --- a/arch/arm/mach-kirkwood/cpu.c +++ b/arch/arm/mach-kirkwood/cpu.c @@ -76,7 +76,7 @@ int kw_config_adr_windows(void) writel(KWCPU_WIN_CTRL_DATA(1024 * 64, KWCPU_TARGET_PCIE, KWCPU_ATTR_PCIE_IO, KWCPU_WIN_ENABLE), &winregs[1].ctrl); writel(KW_DEFADR_PCI_IO, &winregs[1].base); - writel(KW_DEFADR_PCI_IO_REMAP, &winregs[1].remap_lo); + writel(KW_DEFADR_PCI_IO, &winregs[1].remap_lo); writel(0x0, &winregs[1].remap_hi); /* Window 2: NAND Flash address space */ diff --git a/arch/arm/mach-kirkwood/include/mach/cpu.h b/arch/arm/mach-kirkwood/include/mach/cpu.h index 91d21518d852..c35cace844ae 100644 --- a/arch/arm/mach-kirkwood/include/mach/cpu.h +++ b/arch/arm/mach-kirkwood/include/mach/cpu.h @@ -63,7 +63,6 @@ enum kwcpu_attrib { */ #define KW_DEFADR_PCI_MEM 0x90000000 #define KW_DEFADR_PCI_IO 0xC0000000 -#define KW_DEFADR_PCI_IO_REMAP 0xC0000000 #define KW_DEFADR_SASRAM 0xC8010000 #define KW_DEFADR_NANDF 0xD8000000 #define KW_DEFADR_SPIF 0xE8000000 From patchwork Wed Mar 13 07:47:03 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Packham X-Patchwork-Id: 1055940 X-Patchwork-Delegate: sr@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="cqCJCoA+"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 44K3tH39m7z9s3l for ; Wed, 13 Mar 2019 18:50:47 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 2DB08C21F7D; Wed, 13 Mar 2019 07:49:37 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=FREEMAIL_FROM, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 5F697C21FB2; Wed, 13 Mar 2019 07:48:13 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id D089BC21EE7; Wed, 13 Mar 2019 07:48:09 +0000 (UTC) Received: from mail-pf1-f193.google.com (mail-pf1-f193.google.com [209.85.210.193]) by lists.denx.de (Postfix) with ESMTPS id E5558C21F9C for ; Wed, 13 Mar 2019 07:47:41 +0000 (UTC) Received: by mail-pf1-f193.google.com with SMTP id y124so784914pfy.7 for ; Wed, 13 Mar 2019 00:47:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=RNZLfRx6kL3CF/8VHgcYLLpzBM2YWVRQPXAapcces1A=; b=cqCJCoA+aSOmoVw4hV9QPudUgvUsBgdkvsyRnL2xGOBvG+EK5Z4rlSlTuVm65iZcDP RgL/z0Mb2PR5gVI/9ypW0pr44HVh7yfnA1eqa43lYTpxiak4hqBZTDgl2DCjWAF4z1T0 /OJ62ClINau2zQ3OpkhjizfWp6I/y4gbNJaum7S3QrWC2oBpL11qyVEkplhZsxDh9zkn uFw9Ak2YWC74qy7TJSeKQiUsX2vaER8MPeJnXK18Un9WgGGgm8vA3R0kAtSBaFCoPyM8 ECHNKI1AuB3BdyT8N8Dqa9KA6TrcWLCITQckBDUfIc934WdoRJ1+VcDq//r1iyo0b5P7 ZMUg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=RNZLfRx6kL3CF/8VHgcYLLpzBM2YWVRQPXAapcces1A=; b=eMlEoCJ1fLSErSgK5BNFNUToQHtUWil9FyUUtlCEo/4LT1o/hjJBg7Q2xWs1A+JRgb edydlCKdd2tPlroSltjzGYige+TKPMacp+kD0bl1Ou2XdbDxxRWvYHhp9neX4JxSujGG EIsFdGPHYHlgDE6qBJaMyMCtJSJ3X5/HEXYR05kvnAFDCj7l8M2aYw39QFE5Ae7g7B1n V7ZcZhh/05uY+Q9IL8LQ5b/beyHSvUw4MjgC56Ld2ZWOzJer8Gm6fTA+lAol8zdfNvar yrXH64TfizzupL43sh4Qr3k++AxEwO422Uah5WPY9ak+ox2Wp3kZO5Z461RZ2UwUudZQ dNyA== X-Gm-Message-State: APjAAAWWcCZPZSKQs9vvuyl6iONmHiChW6Q1AAaIUzTDF6ZQhSRDwkWf AKBWIfba4Mnmib5CgiaMwLm/yNb5RKY= X-Google-Smtp-Source: APXvYqxMuaM+9Ucx+uYTEkVB/peQLGZkEebDsAjDcRJ0t3WpNerDbahbo8Rc8HjuCugXgeJlomL0rw== X-Received: by 2002:aa7:8b93:: with SMTP id r19mr4640923pfd.163.1552463260281; Wed, 13 Mar 2019 00:47:40 -0700 (PDT) Received: from chrisp-dl.ws.atlnz.lc ([2001:df5:b000:22:3a2c:4aff:fe70:2b02]) by smtp.gmail.com with ESMTPSA id l7sm39022389pfj.162.2019.03.13.00.47.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 13 Mar 2019 00:47:39 -0700 (PDT) From: Chris Packham To: u-boot@lists.denx.de Date: Wed, 13 Mar 2019 20:47:03 +1300 Message-Id: <20190313074711.27757-5-judge.packham@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190313074711.27757-1-judge.packham@gmail.com> References: <20190313074711.27757-1-judge.packham@gmail.com> MIME-Version: 1.0 Cc: Tom Rini , Prafulla Wadaskar , Luka Perkov , Stefan Roese , Chris Packham Subject: [U-Boot] [PATCH v3 04/12] ARM: kirkwood: switch to using mvebu mbus X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" The mvebu mbus code already had most of the support required for kirkwood. The only difference is that unlike the other mvebu targets kirkwood doesn't have a bridge control block so the code related to managing that needs to be compiled out. Signed-off-by: Chris Packham Reviewed-by: Stefan Roese --- Changes in v3: - merge adjacent #ifndefs arch/arm/mach-kirkwood/cpu.c | 33 ++++++++++++++++++++--- arch/arm/mach-kirkwood/include/mach/cpu.h | 11 ++++++++ arch/arm/mach-mvebu/Makefile | 1 + arch/arm/mach-mvebu/mbus.c | 4 +++ 4 files changed, 46 insertions(+), 3 deletions(-) diff --git a/arch/arm/mach-kirkwood/cpu.c b/arch/arm/mach-kirkwood/cpu.c index 95dd07f840ca..009b49287b7f 100644 --- a/arch/arm/mach-kirkwood/cpu.c +++ b/arch/arm/mach-kirkwood/cpu.c @@ -110,6 +110,32 @@ int kw_config_adr_windows(void) return 0; } +static struct mbus_win windows[] = { + /* Window 0: PCIE MEM address space */ + { KW_DEFADR_PCI_MEM, 1024 * 1024 * 256, + KWCPU_TARGET_PCIE, KWCPU_ATTR_PCIE_MEM }, + + /* Window 1: PCIE IO address space */ + { KW_DEFADR_PCI_IO, 1024 * 64, + KWCPU_TARGET_PCIE, KWCPU_ATTR_PCIE_IO }, + + /* Window 2: NAND Flash address space */ + { KW_DEFADR_NANDF, 1024 * 1024 * 128, + KWCPU_TARGET_MEMORY, KWCPU_ATTR_NANDFLASH }, + + /* Window 3: SPI Flash address space */ + { KW_DEFADR_SPIF, 1024 * 1024 * 128, + KWCPU_TARGET_MEMORY, KWCPU_ATTR_SPIFLASH }, + + /* Window 4: BOOT Memory address space */ + { KW_DEFADR_BOOTROM, 1024 * 1024 * 128, + KWCPU_TARGET_MEMORY, KWCPU_ATTR_BOOTROM }, + + /* Window 5: Security SRAM address space */ + { KW_DEFADR_SASRAM, 1024 * 64, + KWCPU_TARGET_SASRAM, KWCPU_ATTR_SASRAM }, +}; + /* * SYSRSTn Duration Counter Support * @@ -221,15 +247,13 @@ int arch_cpu_init(void) struct kwcpu_registers *cpureg = (struct kwcpu_registers *)KW_CPU_REG_BASE; - /* Linux expects` the internal registers to be at 0xf1000000 */ + /* Linux expects the internal registers to be at 0xf1000000 */ writel(KW_REGS_PHY_BASE, KW_OFFSET_REG); /* Enable and invalidate L2 cache in write through mode */ writel(readl(&cpureg->l2_cfg) | 0x18, &cpureg->l2_cfg); invalidate_l2_cache(); - kw_config_adr_windows(); - #ifdef CONFIG_KIRKWOOD_RGMII_PAD_1V8 /* * Configures the I/O voltage of the pads connected to Egigabit @@ -296,6 +320,9 @@ int arch_misc_init(void) temp = get_cr(); set_cr(temp & ~CR_V); + /* Configure mbus windows */ + mvebu_mbus_probe(windows, ARRAY_SIZE(windows)); + /* checks and execute resset to factory event */ kw_sysrst_check(); diff --git a/arch/arm/mach-kirkwood/include/mach/cpu.h b/arch/arm/mach-kirkwood/include/mach/cpu.h index c35cace844ae..3d6b15568a8a 100644 --- a/arch/arm/mach-kirkwood/include/mach/cpu.h +++ b/arch/arm/mach-kirkwood/include/mach/cpu.h @@ -68,6 +68,13 @@ enum kwcpu_attrib { #define KW_DEFADR_SPIF 0xE8000000 #define KW_DEFADR_BOOTROM 0xF8000000 +struct mbus_win { + u32 base; + u32 size; + u8 target; + u8 attr; +}; + /* * read feroceon/sheeva core extra feature register * using co-proc instruction @@ -134,6 +141,9 @@ struct kwgpio_registers { u32 irq_level; }; +/* Needed for dynamic (board-specific) mbus configuration */ +extern struct mvebu_mbus_state mbus_state; + /* * functions */ @@ -141,6 +151,7 @@ unsigned int mvebu_sdram_bar(enum memory_bank bank); unsigned int mvebu_sdram_bs(enum memory_bank bank); void mvebu_sdram_size_adjust(enum memory_bank bank); int kw_config_adr_windows(void); +int mvebu_mbus_probe(struct mbus_win windows[], int count); void mvebu_config_gpio(unsigned int gpp0_oe_val, unsigned int gpp1_oe_val, unsigned int gpp0_oe, unsigned int gpp1_oe); int kw_config_mpp(unsigned int mpp0_7, unsigned int mpp8_15, diff --git a/arch/arm/mach-mvebu/Makefile b/arch/arm/mach-mvebu/Makefile index ee2eca913484..c0274a6f09aa 100644 --- a/arch/arm/mach-mvebu/Makefile +++ b/arch/arm/mach-mvebu/Makefile @@ -14,6 +14,7 @@ ifdef CONFIG_KIRKWOOD obj-y = dram.o obj-y += gpio.o +obj-y += mbus.o obj-y += timer.o else # CONFIG_KIRKWOOD diff --git a/arch/arm/mach-mvebu/mbus.c b/arch/arm/mach-mvebu/mbus.c index df4c5cb2d718..7be67b7d4990 100644 --- a/arch/arm/mach-mvebu/mbus.c +++ b/arch/arm/mach-mvebu/mbus.c @@ -405,6 +405,7 @@ int mvebu_mbus_del_window(phys_addr_t base, size_t size) return 0; } +#ifndef CONFIG_KIRKWOOD static void mvebu_mbus_get_lowest_base(struct mvebu_mbus_state *mbus, phys_addr_t *base) { @@ -451,6 +452,7 @@ static void mvebu_config_mbus_bridge(struct mvebu_mbus_state *mbus) val = (size / (64 << 10)) - 1; writel((val << 16) | 0x1, MBUS_BRIDGE_WIN_CTRL_REG); } +#endif int mbus_dt_setup_win(struct mvebu_mbus_state *mbus, u32 base, u32 size, u8 target, u8 attr) @@ -471,12 +473,14 @@ int mbus_dt_setup_win(struct mvebu_mbus_state *mbus, return -ENOMEM; } +#ifndef CONFIG_KIRKWOOD /* * Re-configure the mbus bridge registers each time this function * is called. Since it may get called from the board code in * later boot stages as well. */ mvebu_config_mbus_bridge(mbus); +#endif return 0; } From patchwork Wed Mar 13 07:47:04 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Packham X-Patchwork-Id: 1055943 X-Patchwork-Delegate: sr@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="VC6ZSurk"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 44K3vw5D85z9s3q for ; Wed, 13 Mar 2019 18:52:12 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 6860EC21FAC; Wed, 13 Mar 2019 07:49:53 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=FREEMAIL_FROM, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id C1246C21F98; Wed, 13 Mar 2019 07:48:13 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id E9217C21E07; Wed, 13 Mar 2019 07:48:09 +0000 (UTC) Received: from mail-pf1-f196.google.com (mail-pf1-f196.google.com [209.85.210.196]) by lists.denx.de (Postfix) with ESMTPS id B81ABC21F98 for ; Wed, 13 Mar 2019 07:47:45 +0000 (UTC) Received: by mail-pf1-f196.google.com with SMTP id y124so784999pfy.7 for ; Wed, 13 Mar 2019 00:47:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=3Fa3mNN3vJJJMZgp1B1gQJ8X0pLLPvFtyqrEMf0knGo=; b=VC6ZSurkaf11HX6IWr8/X2GcGgqvf5YT9IUy975VnUkqUoIYGV+dAlrQ3Jq0C9V0Fo EbZO3BsiK3mfG2nI72UscynVmbEQZMZkOVvvbUR2oQ+9H9RVePr8fgQiVVkiPWZm5GRn dFLblSI1jvUTJHteEp9tOjXTgcwMgdsN+owNaMkrty/jobjmDFA8687VBVh08MFxcVRQ d3fIFUfBIvl8ySywn3AU6lNrRNJx3bk+PH2cEgtnidvQTb9SiuyC9YHXeh1YiLdcofIO YD09YUutYS7Vx9Ov+EyPpK0SHaR9ZReUBfwA2GfwLx72vPCM/YXiCZgX08U0iaRy5W5n dV4Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=3Fa3mNN3vJJJMZgp1B1gQJ8X0pLLPvFtyqrEMf0knGo=; b=NfS7h/BYgkx4qAQLUKZTXsLjqes9+3XVDREFwiIL+n4EqmSaaK+SB8k2c100oGvk9q g3zEreN7WHRBWD7x3tqyGfO5UhEY/rRf6lbxkR+eAWufqUFY1C7IATkPJ1cYPywC21o0 +Wuxy9gn839BfCEG44HlA0jbg43KHPvdET1rsDRKTcSsByZT1gaVOBlNeG6+ENC7njG3 viw2xh/0NIssCJgK5D5Ni8UtDWQEo2f2OjoBeHRtBvLgrRKiZnbGkSyeOWE6LTbGAtZD 0gRYIUOIAP6JzbtP2EatOrL135lfTNzeQRJddA+5VGREKmXaFQXgkI39Iz4F853TcGk2 tXiw== X-Gm-Message-State: APjAAAWf8jOfp4PzmILeKvwyj9dQKyw/gjgR71pE2mC0vrSwAECoUNQP LK/mr6YalcwW0wzQu/BsxFjKG5xheY0= X-Google-Smtp-Source: APXvYqwdd2FComEGatjr7DX6w55CcI8RAEW7H84ynK7V/vr8eSOK3QQL2ZWD0DAZQ6hkvEguDQE2PA== X-Received: by 2002:a65:60c1:: with SMTP id r1mr25459906pgv.137.1552463263913; Wed, 13 Mar 2019 00:47:43 -0700 (PDT) Received: from chrisp-dl.ws.atlnz.lc ([2001:df5:b000:22:3a2c:4aff:fe70:2b02]) by smtp.gmail.com with ESMTPSA id l7sm39022389pfj.162.2019.03.13.00.47.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 13 Mar 2019 00:47:43 -0700 (PDT) From: Chris Packham To: u-boot@lists.denx.de Date: Wed, 13 Mar 2019 20:47:04 +1300 Message-Id: <20190313074711.27757-6-judge.packham@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190313074711.27757-1-judge.packham@gmail.com> References: <20190313074711.27757-1-judge.packham@gmail.com> MIME-Version: 1.0 Cc: Tom Rini , Prafulla Wadaskar , Luka Perkov , Stefan Roese , Chris Packham Subject: [U-Boot] [PATCH v3 05/12] ARM: kirkwood: remove kw_config_adr_windows X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Now that kirkwood is using the mvebu mbus this function is no longer needed. Signed-off-by: Chris Packham Reviewed-by: Stefan Roese --- Changes in v3: None arch/arm/mach-kirkwood/cpu.c | 64 ----------------------- arch/arm/mach-kirkwood/include/mach/cpu.h | 1 - 2 files changed, 65 deletions(-) diff --git a/arch/arm/mach-kirkwood/cpu.c b/arch/arm/mach-kirkwood/cpu.c index 009b49287b7f..8b21db107153 100644 --- a/arch/arm/mach-kirkwood/cpu.c +++ b/arch/arm/mach-kirkwood/cpu.c @@ -46,70 +46,6 @@ unsigned int kw_winctrl_calcsize(unsigned int sizeval) return (0x0000ffff & j); } -/* - * kw_config_adr_windows - Configure address Windows - * - * There are 8 address windows supported by Kirkwood Soc to addess different - * devices. Each window can be configured for size, BAR and remap addr - * Below configuration is standard for most of the cases - * - * If remap function not used, remap_lo must be set as base - * - * Reference Documentation: - * Mbus-L to Mbus Bridge Registers Configuration. - * (Sec 25.1 and 25.3 of Datasheet) - */ -int kw_config_adr_windows(void) -{ - struct kwwin_registers *winregs = - (struct kwwin_registers *)MVEBU_CPU_WIN_BASE; - - /* Window 0: PCIE MEM address space */ - writel(KWCPU_WIN_CTRL_DATA(1024 * 1024 * 256, KWCPU_TARGET_PCIE, - KWCPU_ATTR_PCIE_MEM, KWCPU_WIN_ENABLE), &winregs[0].ctrl); - - writel(KW_DEFADR_PCI_MEM, &winregs[0].base); - writel(KW_DEFADR_PCI_MEM, &winregs[0].remap_lo); - writel(0x0, &winregs[0].remap_hi); - - /* Window 1: PCIE IO address space */ - writel(KWCPU_WIN_CTRL_DATA(1024 * 64, KWCPU_TARGET_PCIE, - KWCPU_ATTR_PCIE_IO, KWCPU_WIN_ENABLE), &winregs[1].ctrl); - writel(KW_DEFADR_PCI_IO, &winregs[1].base); - writel(KW_DEFADR_PCI_IO, &winregs[1].remap_lo); - writel(0x0, &winregs[1].remap_hi); - - /* Window 2: NAND Flash address space */ - writel(KWCPU_WIN_CTRL_DATA(1024 * 1024 * 128, KWCPU_TARGET_MEMORY, - KWCPU_ATTR_NANDFLASH, KWCPU_WIN_ENABLE), &winregs[2].ctrl); - writel(KW_DEFADR_NANDF, &winregs[2].base); - writel(KW_DEFADR_NANDF, &winregs[2].remap_lo); - writel(0x0, &winregs[2].remap_hi); - - /* Window 3: SPI Flash address space */ - writel(KWCPU_WIN_CTRL_DATA(1024 * 1024 * 128, KWCPU_TARGET_MEMORY, - KWCPU_ATTR_SPIFLASH, KWCPU_WIN_ENABLE), &winregs[3].ctrl); - writel(KW_DEFADR_SPIF, &winregs[3].base); - writel(KW_DEFADR_SPIF, &winregs[3].remap_lo); - writel(0x0, &winregs[3].remap_hi); - - /* Window 4: BOOT Memory address space */ - writel(KWCPU_WIN_CTRL_DATA(1024 * 1024 * 128, KWCPU_TARGET_MEMORY, - KWCPU_ATTR_BOOTROM, KWCPU_WIN_ENABLE), &winregs[4].ctrl); - writel(KW_DEFADR_BOOTROM, &winregs[4].base); - - /* Window 5: Security SRAM address space */ - writel(KWCPU_WIN_CTRL_DATA(1024 * 64, KWCPU_TARGET_SASRAM, - KWCPU_ATTR_SASRAM, KWCPU_WIN_ENABLE), &winregs[5].ctrl); - writel(KW_DEFADR_SASRAM, &winregs[5].base); - - /* Window 6-7: Disabled */ - writel(KWCPU_WIN_DISABLE, &winregs[6].ctrl); - writel(KWCPU_WIN_DISABLE, &winregs[7].ctrl); - - return 0; -} - static struct mbus_win windows[] = { /* Window 0: PCIE MEM address space */ { KW_DEFADR_PCI_MEM, 1024 * 1024 * 256, diff --git a/arch/arm/mach-kirkwood/include/mach/cpu.h b/arch/arm/mach-kirkwood/include/mach/cpu.h index 3d6b15568a8a..ea42182cf9c6 100644 --- a/arch/arm/mach-kirkwood/include/mach/cpu.h +++ b/arch/arm/mach-kirkwood/include/mach/cpu.h @@ -150,7 +150,6 @@ extern struct mvebu_mbus_state mbus_state; unsigned int mvebu_sdram_bar(enum memory_bank bank); unsigned int mvebu_sdram_bs(enum memory_bank bank); void mvebu_sdram_size_adjust(enum memory_bank bank); -int kw_config_adr_windows(void); int mvebu_mbus_probe(struct mbus_win windows[], int count); void mvebu_config_gpio(unsigned int gpp0_oe_val, unsigned int gpp1_oe_val, unsigned int gpp0_oe, unsigned int gpp1_oe); From patchwork Wed Mar 13 07:47:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Packham X-Patchwork-Id: 1055941 X-Patchwork-Delegate: sr@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="QT4izKOr"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 44K3vH7101z9s55 for ; Wed, 13 Mar 2019 18:51:39 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id A8D11C21FB4; Wed, 13 Mar 2019 07:50:09 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=FREEMAIL_FROM, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 42970C21FC0; Wed, 13 Mar 2019 07:48:14 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 28B4AC21EE7; Wed, 13 Mar 2019 07:48:10 +0000 (UTC) Received: from mail-pf1-f194.google.com (mail-pf1-f194.google.com [209.85.210.194]) by lists.denx.de (Postfix) with ESMTPS id 5172FC21FA1 for ; Wed, 13 Mar 2019 07:47:50 +0000 (UTC) Received: by mail-pf1-f194.google.com with SMTP id n74so782875pfi.9 for ; Wed, 13 Mar 2019 00:47:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=oWa7L2bHDcor7bzQGI0pjq4NWzXYqHPaSN2OlDFeJ2M=; b=QT4izKOr3M83CPArDp0dGgJtW4v32M7T2us2YhHvKVRy/ab1sizKKuZcs6NK9nSmum BmZ/eNaeWO60+Hhn599+AQVHSF/l58sWqQQxg1ZTZoXHYvG3OwG38ecd0B/nKrZ/y+L0 0b03sU6AE+NOP9W5rsIYe5l1jmtJ2mxIjqJUrb2w0ie/q3Rg0sgK4QAiWX46AUEbUnUz CQlUchaa5sc2d/bkF0YCFuFH0RdPMqRf8yZu1fyc+gn0rBU4Lgmc+UxTLs9yWmemg6Ep 4fMo2GcWujG7QgFFUzKHQdZ3igmPhCJl2b2451cm1r1ilEHFgToJevWDjFCiQgH/+925 T25g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=oWa7L2bHDcor7bzQGI0pjq4NWzXYqHPaSN2OlDFeJ2M=; b=ig7kbC3s4etHH3Fpvdn91a+JTUuKT3mH33/Fp8d0BVc9A4oIORoyOKK3JcVxBV6J63 7/CLymtbvTLI6lb4UVoh05g4EOu7ZAs/BUIP9tZn/N9SnWXPKXvBmWu2UlkRDMNywFnh 4pFVFVXPUme3PBi+gfKHpN2wd04thAA9yAiPKF/Rg1WePkIDOsfJOCR+V27sH2OSShs4 QruP54L50R+bMmxcNZY6jU0JMRY01YhSO1F/KsplheWeOxQFZiKveNT6m3NiDXDxsHG/ N0zonEcPJmoZIWIt1plOgL0Ic+Iq6T0jRlhpm1ToNDKWnuXWy1D3Ldlw8jDcVf/Hxzcr 9dpA== X-Gm-Message-State: APjAAAXHCvLc80FbnhAoLjepSx9t1gYbiWWEM4bpb0CdNYLkgQy7eOn5 s6KZ/WPg4TgeT8883JwPslXCUX1MygU= X-Google-Smtp-Source: APXvYqy73ArU6TXFBJmMbllT2e/MM1aTVUgfsLbRsydCnBuAVWxPTeIhpuAIDUhKSEttBvBCCEcIAQ== X-Received: by 2002:a63:1766:: with SMTP id 38mr39087355pgx.204.1552463268741; Wed, 13 Mar 2019 00:47:48 -0700 (PDT) Received: from chrisp-dl.ws.atlnz.lc ([2001:df5:b000:22:3a2c:4aff:fe70:2b02]) by smtp.gmail.com with ESMTPSA id l7sm39022389pfj.162.2019.03.13.00.47.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 13 Mar 2019 00:47:48 -0700 (PDT) From: Chris Packham To: u-boot@lists.denx.de Date: Wed, 13 Mar 2019 20:47:05 +1300 Message-Id: <20190313074711.27757-7-judge.packham@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190313074711.27757-1-judge.packham@gmail.com> References: <20190313074711.27757-1-judge.packham@gmail.com> MIME-Version: 1.0 Cc: Tom Rini , Prafulla Wadaskar , Vagrant Cascadian , Joe Hershberger , Luka Perkov , Stefan Roese , Chris Packham Subject: [U-Boot] [PATCH v3 06/12] ARM: kirkwood: enable CONFIG_DM_USB on db-88f6281-bp X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Switch to the driver model for USB on the db-88f6281-bp board. CONFIG_BLK can't be enabled yet because mvebu_mmc.c needs converting. Signed-off-by: Chris Packham Reviewed-by: Stefan Roese --- Changes in v3: None configs/db-88f6281-bp-nand_defconfig | 1 + configs/db-88f6281-bp-spi_defconfig | 1 + 2 files changed, 2 insertions(+) diff --git a/configs/db-88f6281-bp-nand_defconfig b/configs/db-88f6281-bp-nand_defconfig index 6360ef5e8280..a7a65df7ee7b 100644 --- a/configs/db-88f6281-bp-nand_defconfig +++ b/configs/db-88f6281-bp-nand_defconfig @@ -47,6 +47,7 @@ CONFIG_SYS_NS16550=y CONFIG_SPI=y CONFIG_KIRKWOOD_SPI=y CONFIG_USB=y +CONFIG_DM_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_STORAGE=y CONFIG_LZMA=y diff --git a/configs/db-88f6281-bp-spi_defconfig b/configs/db-88f6281-bp-spi_defconfig index 54d476727996..bafbdd3ef075 100644 --- a/configs/db-88f6281-bp-spi_defconfig +++ b/configs/db-88f6281-bp-spi_defconfig @@ -49,6 +49,7 @@ CONFIG_SPI=y CONFIG_DM_SPI=y CONFIG_KIRKWOOD_SPI=y CONFIG_USB=y +CONFIG_DM_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_STORAGE=y CONFIG_LZMA=y From patchwork Wed Mar 13 07:47:06 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Packham X-Patchwork-Id: 1055945 X-Patchwork-Delegate: sr@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="u0ZWU35h"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 44K3x32ddNz9s3q for ; Wed, 13 Mar 2019 18:53:11 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 0FF7CC21F93; Wed, 13 Mar 2019 07:50:40 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=FREEMAIL_FROM, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 45BC1C21FB3; Wed, 13 Mar 2019 07:48:15 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 5E21DC21F19; Wed, 13 Mar 2019 07:48:10 +0000 (UTC) Received: from mail-pf1-f193.google.com (mail-pf1-f193.google.com [209.85.210.193]) by lists.denx.de (Postfix) with ESMTPS id C99CFC21F9D for ; Wed, 13 Mar 2019 07:47:54 +0000 (UTC) Received: by mail-pf1-f193.google.com with SMTP id i19so811668pfd.0 for ; Wed, 13 Mar 2019 00:47:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=OMYiTqxVhbCW7giVqDmqadWQ1gDHwgYK+8hf4GEakwI=; b=u0ZWU35hJG0m2mEmeNk3HeyOh+4RIpUm3BJIrNSFHP/X4Nu6tIENrvesjJ06WZNhVO BbIoCe9L1jIbYVVu0z7OPN2IjUzHvhY3VwJwIzZftecBctCkH+kyrP/Y7fMzjO3Xgqt8 8paUDD9CzHHUaDtI9UlLDVI7zBpXr6mjV15mbWE272vaDDfxWCNkwJ8eTq+ZySW3GyWB Wh1Sq00wbLwYUNK2ZDLfI6X0UeB+pqh7VBFkpVV+BwxdEKGELf1vpF4KR7KbEZ+TBhFu VEF8iefJppgPhOMSa563UoikpA7tOF2kDWfCckcc+ONNfXeC89T6YjQcfmA8wseaV6v8 9T2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=OMYiTqxVhbCW7giVqDmqadWQ1gDHwgYK+8hf4GEakwI=; b=dTgHUJ7UO3w+wpOfs+USPwZ8ONoU+IewS0623OdGoGb3R2X52D4YN0o74hh6+rkOnr jsUe8+RQYxxHgAvfE36JZfB4YS2hB/0VeFA0ZIbbkWMBC2cBrHux0YSY52h9Oq8iqgUs WjAx43iSdblIMP6Mw8Wg8N4Wa5MPhQhWTXfB6kmI4t7kaUFyM2ynWztWOmbuF6TAx85x HAHIpQ/hz3I/h9HoWxr+uJNM3kM5WnDtLh5XoAeYhjycK/T0uFbsaJMeQhPOuESYRUy/ BgyKoG/CLspRCjZEX6U8+MZhiZV3exWqzmiJBALMyHqQY3/sLO11dqPHTyfN0LW5BvUR i4hw== X-Gm-Message-State: APjAAAWCwTSxHK8JF6OEdSfE6NTL1p1J082ROpqcnkKc9HThSGwvAhQr s5rqBsW1ZhLqMmq8OPXl/GOG/AqsT8U= X-Google-Smtp-Source: APXvYqx6m60mGZGjMTeuucSbyQ7MLb6XGIl8oXQGygG+DDzIWrnw8LFhRbWhIniNwxjfi+GPp3cIyw== X-Received: by 2002:a17:902:822:: with SMTP id 31mr44183300plk.290.1552463273062; Wed, 13 Mar 2019 00:47:53 -0700 (PDT) Received: from chrisp-dl.ws.atlnz.lc ([2001:df5:b000:22:3a2c:4aff:fe70:2b02]) by smtp.gmail.com with ESMTPSA id l7sm39022389pfj.162.2019.03.13.00.47.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 13 Mar 2019 00:47:52 -0700 (PDT) From: Chris Packham To: u-boot@lists.denx.de Date: Wed, 13 Mar 2019 20:47:06 +1300 Message-Id: <20190313074711.27757-8-judge.packham@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190313074711.27757-1-judge.packham@gmail.com> References: <20190313074711.27757-1-judge.packham@gmail.com> MIME-Version: 1.0 Cc: Tom Rini , Prafulla Wadaskar , Siddarth Gore , Jason Cooper , Luka Perkov , Stefan Roese , Chris Packham Subject: [U-Boot] [PATCH v3 07/12] ARM: kirkwood: enable CONFIG_DM_USB for {dream, guru, sheeva}plug X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Enable CONFIG_DM_USB and where possible CONFIG_BLK. Signed-off-by: Chris Packham Reviewed-by: Stefan Roese Tested-by: Leigh Brown --- mvebu_mmc.c hasn't been converted to DM so it's not possible to use CONFIG_BLK when CONFIG_MMC is enabled. Changes in v3: None configs/dreamplug_defconfig | 2 ++ configs/guruplug_defconfig | 2 ++ configs/sheevaplug_defconfig | 1 + 3 files changed, 5 insertions(+) diff --git a/configs/dreamplug_defconfig b/configs/dreamplug_defconfig index d3263cf9cd3f..fc99fbda5674 100644 --- a/configs/dreamplug_defconfig +++ b/configs/dreamplug_defconfig @@ -25,6 +25,7 @@ CONFIG_DEFAULT_DEVICE_TREE="kirkwood-dreamplug" CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_DM=y CONFIG_MVSATA_IDE=y +CONFIG_BLK=y # CONFIG_MMC is not set CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y @@ -38,5 +39,6 @@ CONFIG_SPI=y CONFIG_DM_SPI=y CONFIG_KIRKWOOD_SPI=y CONFIG_USB=y +CONFIG_DM_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_STORAGE=y diff --git a/configs/guruplug_defconfig b/configs/guruplug_defconfig index 9998e48ab9c2..8ae7e20bafd9 100644 --- a/configs/guruplug_defconfig +++ b/configs/guruplug_defconfig @@ -31,6 +31,7 @@ CONFIG_DEFAULT_DEVICE_TREE="kirkwood-guruplug-server-plus" CONFIG_ENV_IS_IN_NAND=y CONFIG_DM=y CONFIG_MVSATA_IDE=y +CONFIG_BLK=y # CONFIG_MMC is not set CONFIG_MVGBE=y CONFIG_MII=y @@ -38,6 +39,7 @@ CONFIG_DM_RTC=y CONFIG_RTC_MV=y CONFIG_SYS_NS16550=y CONFIG_USB=y +CONFIG_DM_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_STORAGE=y CONFIG_LZMA=y diff --git a/configs/sheevaplug_defconfig b/configs/sheevaplug_defconfig index 04b00cdea9d4..ec527fceb6f5 100644 --- a/configs/sheevaplug_defconfig +++ b/configs/sheevaplug_defconfig @@ -39,6 +39,7 @@ CONFIG_DM_RTC=y CONFIG_RTC_MV=y CONFIG_SYS_NS16550=y CONFIG_USB=y +CONFIG_DM_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_STORAGE=y CONFIG_LZMA=y From patchwork Wed Mar 13 07:47:07 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Packham X-Patchwork-Id: 1055946 X-Patchwork-Delegate: sr@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="k3aALVi4"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 44K3x45MQ3z9s55 for ; Wed, 13 Mar 2019 18:53:12 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 7B3E7C21E07; Wed, 13 Mar 2019 07:50:24 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=FREEMAIL_FROM, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id BD502C21FC2; Wed, 13 Mar 2019 07:48:14 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 4BC9CC21E07; Wed, 13 Mar 2019 07:48:10 +0000 (UTC) Received: from mail-pg1-f175.google.com (mail-pg1-f175.google.com [209.85.215.175]) by lists.denx.de (Postfix) with ESMTPS id B8181C21FA6 for ; Wed, 13 Mar 2019 07:47:58 +0000 (UTC) Received: by mail-pg1-f175.google.com with SMTP id e17so936805pgd.2 for ; Wed, 13 Mar 2019 00:47:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=R8quDIL3JbiH/+SJrj5g34WjyPO6SmJGMz9vpmKTUzM=; b=k3aALVi43XkK32vKmUgXOvjP89owcdrShGHorpdVBffD0z5JjoO/8M5ybzLj+3vowt eRneHK/gkE4WDnSoWKUM5XL39kqSGVa/JJkPJjMUDN78G/lk4Vs5v8Ipz1ftfyEG68kP fhYfUm3gKInRZNGDAb+fS6uPH5mhCvF/Em0/LhD70sF+P1rgwU9d3PCBoait4Ux7z2aN uBT17lObA+itOj1zmcqvlHr3U4qu8Px9R+WF2ThpT4I5WK4Ze28umEOzQ9irA/qC2l79 qNiBa1ruCH48RjEpwrRQqbE95NQtxuyVaM//FTBcUIiqT+qIgrl0m9n2gaZvhyApHjLR 44Xw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=R8quDIL3JbiH/+SJrj5g34WjyPO6SmJGMz9vpmKTUzM=; b=kVfEKqn+U/3RzYT3xaZvZQqZcFY3suXPkrI4SEr57zWkXWBpBHLRU4d5+et73J6p2N QUv7HE4uN6PtU1yNzbn5oeZ9FzIKsGqicX2hwZ40UyyiHM1aFQs2mzN0V/Sw9a0qsxEV u3C2DtV1wh1cBw1qecoIQFhQN5HAxOsg/W65J/Fm7tJIzL6WhEBCPzGHOunbMfGvZCij lrWBan1whzNUvEIjRWEYRGEbKh3NzsAJlXV7N51hwQwf2VjcKtDAhNCdO9wS7Y0VazBk 0hmRhdk9fb5ekJRitTA5V5OXiKP5G5DN+4fOeYLUkbhFlZd4otjCWCr346ONUMXdrDrn KADw== X-Gm-Message-State: APjAAAVRViqEgo6XzaFMNuZuAKPv8MBBRaJdxRxu0gaMA/IyBHin7kya 6YjnNcY5ZQQRPUBRlKdOBx7rmG+BhHc= X-Google-Smtp-Source: APXvYqzuIo6jL/dcPVOSJHShv9XR4f/gnqpRfzMVubUB44N04rNVbORLmtQW/7oYk3Hmy4HJ0N5FRw== X-Received: by 2002:a17:902:9893:: with SMTP id s19mr44568893plp.165.1552463277059; Wed, 13 Mar 2019 00:47:57 -0700 (PDT) Received: from chrisp-dl.ws.atlnz.lc ([2001:df5:b000:22:3a2c:4aff:fe70:2b02]) by smtp.gmail.com with ESMTPSA id l7sm39022389pfj.162.2019.03.13.00.47.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 13 Mar 2019 00:47:56 -0700 (PDT) From: Chris Packham To: u-boot@lists.denx.de Date: Wed, 13 Mar 2019 20:47:07 +1300 Message-Id: <20190313074711.27757-9-judge.packham@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190313074711.27757-1-judge.packham@gmail.com> References: <20190313074711.27757-1-judge.packham@gmail.com> MIME-Version: 1.0 Cc: Tom Rini , Prafulla Wadaskar , Luka Perkov , Stefan Roese , Chris Packham Subject: [U-Boot] [PATCH v3 08/12] ARM: kirkwood: enable CONFIG_DM_USB for dns325 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Enable CONFIG_DM_USB and CONFIG_BLK. Signed-off-by: Chris Packham Reviewed-by: Stefan Roese --- Changes in v3: None configs/dns325_defconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configs/dns325_defconfig b/configs/dns325_defconfig index 5a766981603a..ba8b053680b9 100644 --- a/configs/dns325_defconfig +++ b/configs/dns325_defconfig @@ -30,6 +30,7 @@ CONFIG_DEFAULT_DEVICE_TREE="kirkwood-dns325" CONFIG_ENV_IS_IN_NAND=y CONFIG_DM=y CONFIG_MVSATA_IDE=y +CONFIG_BLK=y # CONFIG_MMC is not set CONFIG_MVGBE=y CONFIG_MII=y @@ -37,5 +38,6 @@ CONFIG_DM_RTC=y CONFIG_RTC_MV=y CONFIG_SYS_NS16550=y CONFIG_USB=y +CONFIG_DM_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_STORAGE=y From patchwork Wed Mar 13 07:47:08 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Packham X-Patchwork-Id: 1055944 X-Patchwork-Delegate: sr@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="uzV9gUFY"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 44K3w350Htz9s3q for ; Wed, 13 Mar 2019 18:52:19 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 306D7C21FAC; Wed, 13 Mar 2019 07:51:12 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=FREEMAIL_FROM, RCVD_IN_MSPIKE_H2, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 7C246C21FC8; Wed, 13 Mar 2019 07:48:16 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id A6DF4C21F0C; Wed, 13 Mar 2019 07:48:10 +0000 (UTC) Received: from mail-pg1-f173.google.com (mail-pg1-f173.google.com [209.85.215.173]) by lists.denx.de (Postfix) with ESMTPS id B1E9CC21FA5 for ; Wed, 13 Mar 2019 07:48:02 +0000 (UTC) Received: by mail-pg1-f173.google.com with SMTP id a22so900208pgg.13 for ; Wed, 13 Mar 2019 00:48:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Pda8I/E9proeWUyv/p9xmQDL+TbI2cUd6g+QE2EyWOc=; b=uzV9gUFYfJBkCmgYfSXPDjZEGiEkzbx11Kg+hJV/Rm3ZS+OGwh+zkA+Ya9XAcypg/u 8+9O2addCsdQMN1GWIAH2SjnKlpV6f9NCo+IkEQiRq2XwLISs2+eL+4JsH5AIV600iBo +H84WCXZ03TVj7NqvRBzvwAhH2nFYk9HVoHY2M8OdJ3AVo10Cn/Amf8yXvWJxPDRqHPV PlQZFzl9klwPU96hxlDAaI5EURtePy0OpmC19Rmuh++P3RHPenpZLnjK+BM5irLNDHRh l2DUxojitenHkeREeKuzA4vZf9ER3vnPbv2wQ7K/OT/Ca1dPL18nf9eOPujIytrWZWWz R7RA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Pda8I/E9proeWUyv/p9xmQDL+TbI2cUd6g+QE2EyWOc=; b=EueEi15FJ5VXcf1q6L2z+vsfFmBpguB20D5ufshaAYOLTXyJP8+HMdm3UsDBUGPyCV g5DluOh0ISSPAsCFMzXiE0dFNPgjt+76dx525oFXgohgadj347KBGVrZRWlcRxLfa7Ig Teci6k7lJmrBLwaXZeOiJIIPgNVfM6CX3K/bHU/utEU75DhB8B8BCoBk1/iXFsdRGzbt FhorT+c8M1nSuFZH1URSkE8oH1nTvkWRnb3PlWwx1X3T1u+ounIvEe98dFW2EG1q3Ms3 VTLj1E0iaXwUXpiKsWNSzw2YtvwPwF+0WDU5E/U1SrYb0AKS5OSfH+xiGrTzr5lwJXTF kQrQ== X-Gm-Message-State: APjAAAWdkxwXnnbytVSCDoaP/3QWlr0oSvQ6j2PzqrH1doKt93w7Ino6 SQGNAETq8K92TmWAU+/Nk8CmQRRjuSk= X-Google-Smtp-Source: APXvYqzLQ8D98x+2ZSgkbxyhq4Ao+VuqZjzVNQ5v33BPNoyl+WBFfEtx5e7qa0Vo3JguEZgloEO9gg== X-Received: by 2002:a17:902:56a:: with SMTP id 97mr43816886plf.320.1552463281089; Wed, 13 Mar 2019 00:48:01 -0700 (PDT) Received: from chrisp-dl.ws.atlnz.lc ([2001:df5:b000:22:3a2c:4aff:fe70:2b02]) by smtp.gmail.com with ESMTPSA id l7sm39022389pfj.162.2019.03.13.00.47.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 13 Mar 2019 00:48:00 -0700 (PDT) From: Chris Packham To: u-boot@lists.denx.de Date: Wed, 13 Mar 2019 20:47:08 +1300 Message-Id: <20190313074711.27757-10-judge.packham@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190313074711.27757-1-judge.packham@gmail.com> References: <20190313074711.27757-1-judge.packham@gmail.com> MIME-Version: 1.0 Cc: Tom Rini , Prafulla Wadaskar , Walter Schweizer , Luka Perkov , Stefan Roese , Chris Packham Subject: [U-Boot] [PATCH v3 09/12] ARM: kirkwood: enable CONFIG_DM_USB for ds109 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Enable CONFIG_DM_USB and CONFIG_BLK. Signed-off-by: Chris Packham Reviewed-by: Stefan Roese --- Changes in v3: None configs/ds109_defconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configs/ds109_defconfig b/configs/ds109_defconfig index 3e4e71bcbf4e..ce055f6f1608 100644 --- a/configs/ds109_defconfig +++ b/configs/ds109_defconfig @@ -20,6 +20,7 @@ CONFIG_DEFAULT_DEVICE_TREE="kirkwood-ds109" CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_DM=y CONFIG_MVSATA_IDE=y +CONFIG_BLK=y CONFIG_DM_I2C=y CONFIG_SYS_I2C_MVTWSI=y # CONFIG_MMC is not set @@ -35,5 +36,6 @@ CONFIG_SPI=y CONFIG_DM_SPI=y CONFIG_KIRKWOOD_SPI=y CONFIG_USB=y +CONFIG_DM_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_FS_EXT4=y From patchwork Wed Mar 13 07:47:09 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Packham X-Patchwork-Id: 1055947 X-Patchwork-Delegate: sr@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="kw8phjID"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 44K3xH4R5Hz9s3l for ; Wed, 13 Mar 2019 18:53:23 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 48BB2C21FC5; Wed, 13 Mar 2019 07:50:55 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=FREEMAIL_FROM, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id CFE02C21F3C; Wed, 13 Mar 2019 07:48:15 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 7F2B9C21EE7; Wed, 13 Mar 2019 07:48:10 +0000 (UTC) Received: from mail-pg1-f180.google.com (mail-pg1-f180.google.com [209.85.215.180]) by lists.denx.de (Postfix) with ESMTPS id 9058FC21F47 for ; Wed, 13 Mar 2019 07:48:06 +0000 (UTC) Received: by mail-pg1-f180.google.com with SMTP id l11so910154pgq.10 for ; Wed, 13 Mar 2019 00:48:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=2ddxl42VG0+IsTYsgsrrobDs+zDCQ26/ww2ht/WqOG4=; b=kw8phjIDM1G2mFU/JUAEodg89qYjwOXXP+5afC1Yhw6e/F0lcIXerti9Q7SsFvNRII vFlyay8OabdBluwNAlvLKI+frp9+iBBe2T4p2w1Znb14DfWnye3vY5VGhBz07ELmRNlM Q5n6SSjq2YtFo96Jtvfk4T0XgxB88E89vPqY26sq+2Ofx0ztPj+BsTl09nrrVifmucRp oaacN3wBnJTPPm5khHOfpQHIc4YmrJnSuQI/lTZC+6eadSZNN5w5fsyCsQplLQVhrSLS iTkW7ztp2OOfjN7RxVO5rPtzvRBW4PSrS5IK92vQdJK/RG6zt+pKy6JKTYek3Vv9bluN vOUw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=2ddxl42VG0+IsTYsgsrrobDs+zDCQ26/ww2ht/WqOG4=; b=lGnHbFtP9uljstjoPFHCtRNOzG1MP30qtILW0nCqPluaE6pVoGw77KYgqWFkLivZ9F 442nEsgdAMEMkPTrB5rWnMZdG+zbY1ZbNU4sX7726k87cSN3PO+Wayh6V0unjvkheAqc gxRbUfuBl9dsrOeuQgd9WKeJD+O10IkvyqvVcgMe0gPoLRk1ywkt3FVcYLKPQYjeyEJC 3a9U5244PFZ4c/tJ0WS4r8cT+k0qs6d8xQ7gVAAP4b1kfDiTUbcrpVb8wVwtYPkm5fr0 DYxbmpGWWMOTUzxUC9ewaQ1Kr1sWrev8hqfBjfq3N5wx4jsDsCVE+7vT/TjTm0KcDwPp UIWw== X-Gm-Message-State: APjAAAW4JZCcNdftdt8FA/YMjE2vXrxs/XQXUinR96GMAdY9v/hDImuB u1RCxh1kw+7eNqZ5DsaUPfHiXat3SeI= X-Google-Smtp-Source: APXvYqycuO1MKU4TCIaK7l18tFtZLbk10A/25uoVVHksWk+m7cokFxuRsWgtKTCOXX7ba5EJmhVNZw== X-Received: by 2002:aa7:8249:: with SMTP id e9mr42231142pfn.6.1552463285007; Wed, 13 Mar 2019 00:48:05 -0700 (PDT) Received: from chrisp-dl.ws.atlnz.lc ([2001:df5:b000:22:3a2c:4aff:fe70:2b02]) by smtp.gmail.com with ESMTPSA id l7sm39022389pfj.162.2019.03.13.00.48.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 13 Mar 2019 00:48:04 -0700 (PDT) From: Chris Packham To: u-boot@lists.denx.de Date: Wed, 13 Mar 2019 20:47:09 +1300 Message-Id: <20190313074711.27757-11-judge.packham@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190313074711.27757-1-judge.packham@gmail.com> References: <20190313074711.27757-1-judge.packham@gmail.com> MIME-Version: 1.0 Cc: Tom Rini , Prafulla Wadaskar , Suriyan Ramasami , Luka Perkov , Stefan Roese , Chris Packham Subject: [U-Boot] [PATCH v3 10/12] ARM: kirkwood: enable CONFIG_DM_USB for goflexhome X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Enable CONFIG_DM_USB and CONFIG_BLK. Signed-off-by: Chris Packham Reviewed-by: Stefan Roese --- Changes in v3: None configs/goflexhome_defconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configs/goflexhome_defconfig b/configs/goflexhome_defconfig index c04bf0ea5742..568b74fd8306 100644 --- a/configs/goflexhome_defconfig +++ b/configs/goflexhome_defconfig @@ -31,6 +31,7 @@ CONFIG_DEFAULT_DEVICE_TREE="kirkwood-goflexnet" CONFIG_ENV_IS_IN_NAND=y CONFIG_DM=y CONFIG_MVSATA_IDE=y +CONFIG_BLK=y # CONFIG_MMC is not set CONFIG_MVGBE=y CONFIG_MII=y @@ -38,5 +39,6 @@ CONFIG_DM_RTC=y CONFIG_RTC_MV=y CONFIG_SYS_NS16550=y CONFIG_USB=y +CONFIG_DM_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_STORAGE=y From patchwork Wed Mar 13 07:47:10 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Packham X-Patchwork-Id: 1055948 X-Patchwork-Delegate: sr@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="KcWnpvoj"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 44K3xg0ygPz9s3l for ; Wed, 13 Mar 2019 18:53:42 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 92EEDC21F98; Wed, 13 Mar 2019 07:51:27 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=FREEMAIL_FROM, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 366E8C21FD2; Wed, 13 Mar 2019 07:48:17 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 488B9C21F47; Wed, 13 Mar 2019 07:48:11 +0000 (UTC) Received: from mail-pf1-f179.google.com (mail-pf1-f179.google.com [209.85.210.179]) by lists.denx.de (Postfix) with ESMTPS id 8587EC21E07 for ; Wed, 13 Mar 2019 07:48:10 +0000 (UTC) Received: by mail-pf1-f179.google.com with SMTP id y124so785642pfy.7 for ; Wed, 13 Mar 2019 00:48:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=//lv3OEX9noeZqzIwN6h+rcIvMqt+u+QEF2dIUHvlg4=; b=KcWnpvojxZAi5lq7ys23RQ6auLRmGu7yOO748RH88uvlyJhktHrUuluwJ2YAW6tYgR cSTWSNSgCe4cihx5UqcRAQzpj8tNt8c1RjFH/LdMrMxmzrkfpJE1oqxJ9gZzjLw9U+Le 9TuQahSN2aTG+wH+TwANgyG9CmydKKm7pQCpiuOkc2s3rbHUS/LlSZK8+g1E1OmtWJez hamzffeNAAm3yz7YBt8JoVkDm0DuxDV2akRR2PzY3lJV+Q5zKxtFY8zZu6PExcidJxy8 9nF5ze55JYOEcMwIRPYtrCBDXL+yjPQNNnqn1F13BTLS2lrvFvNxEbq7s/mkcC7JA0qg D+Mw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=//lv3OEX9noeZqzIwN6h+rcIvMqt+u+QEF2dIUHvlg4=; b=RnPiWhZNckOB/fBuszsR//SJDbGre/lO3x7nsLAcg9VNCdxFC5txM6IGFFmlO1DmYS KA+UqT5PGtngB9a4Fw7MvHYAwBCEgF75g+4MMWZkPKYRmIzzmj9nRrUCXlk2Jz4fX+rw rTGIJxEteIr7RQqYmnyv5fOc4hS75Bmosz8AG4/qw5jt5XZv1oemszmBQkEn8gOwTYhs hC5bQOU526QKwSKUDCXxuQ1mnd0SEUaMg3pFZ5mTulqCwrZWvdTp3oPa78ofBwK2VOtP hjI/+KVdDw/2cvT7WAXl5iwzGsmDT6RNfB8vMdfWCB8+6AWiL0BaG6KPA8fbCKplDwuP 0a6Q== X-Gm-Message-State: APjAAAXSkKus6eupuCmJeTEfm/xCoTD335r7vOqN9rohub35qA1HX2PF EvObjd178XhYiBqq6CwX/LF6ApaOC1k= X-Google-Smtp-Source: APXvYqyV2YhCrbSmIp4QW5Gz4buepM3Qf19/yec0Tig08AJtMk7frJTGjmPAXHu/KmEj9cbaeylV5Q== X-Received: by 2002:a17:902:1c9:: with SMTP id b67mr43106573plb.176.1552463288899; Wed, 13 Mar 2019 00:48:08 -0700 (PDT) Received: from chrisp-dl.ws.atlnz.lc ([2001:df5:b000:22:3a2c:4aff:fe70:2b02]) by smtp.gmail.com with ESMTPSA id l7sm39022389pfj.162.2019.03.13.00.48.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 13 Mar 2019 00:48:08 -0700 (PDT) From: Chris Packham To: u-boot@lists.denx.de Date: Wed, 13 Mar 2019 20:47:10 +1300 Message-Id: <20190313074711.27757-12-judge.packham@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190313074711.27757-1-judge.packham@gmail.com> References: <20190313074711.27757-1-judge.packham@gmail.com> MIME-Version: 1.0 Cc: Tom Rini , Prafulla Wadaskar , Luka Perkov , Stefan Roese , Chris Packham Subject: [U-Boot] [PATCH v3 11/12] ARM: kirkwood: enable CONFIG_DM_USB for lschlv2 and lsxhl X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Enable CONFIG_DM_USB and CONFIG_BLK. Signed-off-by: Chris Packham Reviewed-by: Stefan Roese Tested-by: Michael Walle --- Changes in v3: None configs/lschlv2_defconfig | 2 ++ configs/lsxhl_defconfig | 2 ++ 2 files changed, 4 insertions(+) diff --git a/configs/lschlv2_defconfig b/configs/lschlv2_defconfig index 8563abc1356b..7dadc3984efb 100644 --- a/configs/lschlv2_defconfig +++ b/configs/lschlv2_defconfig @@ -27,6 +27,7 @@ CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_NET_RANDOM_ETHADDR=y CONFIG_DM=y CONFIG_MVSATA_IDE=y +CONFIG_BLK=y # CONFIG_MMC is not set CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y @@ -38,4 +39,5 @@ CONFIG_SPI=y CONFIG_DM_SPI=y CONFIG_KIRKWOOD_SPI=y CONFIG_USB=y +CONFIG_DM_USB=y CONFIG_USB_EHCI_HCD=y diff --git a/configs/lsxhl_defconfig b/configs/lsxhl_defconfig index c3636060a75c..56379d2668a2 100644 --- a/configs/lsxhl_defconfig +++ b/configs/lsxhl_defconfig @@ -27,6 +27,7 @@ CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_NET_RANDOM_ETHADDR=y CONFIG_DM=y CONFIG_MVSATA_IDE=y +CONFIG_BLK=y # CONFIG_MMC is not set CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y @@ -38,4 +39,5 @@ CONFIG_SPI=y CONFIG_DM_SPI=y CONFIG_KIRKWOOD_SPI=y CONFIG_USB=y +CONFIG_DM_USB=y CONFIG_USB_EHCI_HCD=y From patchwork Wed Mar 13 07:47:11 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Packham X-Patchwork-Id: 1055942 X-Patchwork-Delegate: sr@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="laZO6V6k"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 44K3vs1TcRz9s3q for ; Wed, 13 Mar 2019 18:52:09 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id E81E7C21FB9; Wed, 13 Mar 2019 07:51:42 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=FREEMAIL_FROM, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 2BDB3C21FBE; Wed, 13 Mar 2019 07:48:28 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id B3406C21FA8; Wed, 13 Mar 2019 07:48:24 +0000 (UTC) Received: from mail-pg1-f170.google.com (mail-pg1-f170.google.com [209.85.215.170]) by lists.denx.de (Postfix) with ESMTPS id 81C20C21FC4 for ; Wed, 13 Mar 2019 07:48:14 +0000 (UTC) Received: by mail-pg1-f170.google.com with SMTP id h11so947659pgl.0 for ; Wed, 13 Mar 2019 00:48:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=UsRSsRj2nOOF3bBH4sCfYXkDVayO5emcfiw+bXg2KFk=; b=laZO6V6kBVGIbfea1UpRp5Ta3FqeyuI/AHPQK4CI5qrvWye9iDqUspeKKLM1VX5ZJg choHJoD5wtEztA15L0x7eDCwVVqwUuQAQgS9pSGxcoFUyDHuPnzzDB6nGhDl6DHZvBrr y/iijRtCINQ7TKapYBbLH/ddFF4DpfYiQbs34LqhDwKc68uxObXJKFppD76SOk1POpH0 MnIQoOuNnJFkS0g7BBil4seJc3K0QUjHgMkGvXYJE0TSiDRPgGu6EeJRt0WpHwQ7/qR9 YMniMTSZxwQ67EI5JkgMHPvE0OUpwbj4YNFdLGaVi/uJ4SX3QFXR0GqU2DfAlv7BMzlg xAdA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=UsRSsRj2nOOF3bBH4sCfYXkDVayO5emcfiw+bXg2KFk=; b=h+q3sLCPRazwnp4AUcJUOSuscmh0RfEim37iUgMt5+GnTMkVgxKO3VtyqE1nIFR57p ZmAp1Cf5dASHT3DXZSYFvAT1eAvwp+RTFtV2pejd3enhcGVmVDCxySF8DfYU0ekrx+Ii MhmADLNF7dCJwt3+wixzmCPG0eZehZxf053yxtyfzmoA+eGAVXCgM0Y1NG7PqW2FGunq tt3YIS/iEVNq5jWzYJk1HLoBVP1XKyDCRwEQeTsD6Ta839q7wduyTS/+/y3eNB3yOuL9 qiVIHzGVAZBUAoboNmg8dmWhwD6YrG90tfWmb9AWyoErhMXxdqtkbpGOvk2r5GDQYqzd UB9w== X-Gm-Message-State: APjAAAUeqan1/yIiJWwNr3BLAZs47DxzLy4GgYwrFVDsQzQIj7QgZEbv Lqr6r60lYv/UTrQ7uJZBMPzx5yvi1/c= X-Google-Smtp-Source: APXvYqxjTgkgFhBtMPAF2L90H8UTHp2NTzt94uvBgV+1ddADrAl5CISJQO0C+t5RpJopd5ETXUdaGQ== X-Received: by 2002:a17:902:9893:: with SMTP id s19mr44569755plp.165.1552463292922; Wed, 13 Mar 2019 00:48:12 -0700 (PDT) Received: from chrisp-dl.ws.atlnz.lc ([2001:df5:b000:22:3a2c:4aff:fe70:2b02]) by smtp.gmail.com with ESMTPSA id l7sm39022389pfj.162.2019.03.13.00.48.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 13 Mar 2019 00:48:12 -0700 (PDT) From: Chris Packham To: u-boot@lists.denx.de Date: Wed, 13 Mar 2019 20:47:11 +1300 Message-Id: <20190313074711.27757-13-judge.packham@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190313074711.27757-1-judge.packham@gmail.com> References: <20190313074711.27757-1-judge.packham@gmail.com> MIME-Version: 1.0 Cc: Tom Rini , Prafulla Wadaskar , Luka Perkov , Stefan Roese , Chris Packham Subject: [U-Boot] [PATCH v3 12/12] ARM: kirkwood: enable CONFIG_DM_USB for nas220 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Enable CONFIG_DM_USB and CONFIG_BLK. Signed-off-by: Chris Packham Reviewed-by: Stefan Roese --- Changes in v3: None configs/nas220_defconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configs/nas220_defconfig b/configs/nas220_defconfig index 6bd308bb8264..a244b8d69168 100644 --- a/configs/nas220_defconfig +++ b/configs/nas220_defconfig @@ -31,6 +31,7 @@ CONFIG_DEFAULT_DEVICE_TREE="kirkwood-blackarmor-nas220" CONFIG_ENV_IS_IN_NAND=y CONFIG_DM=y CONFIG_MVSATA_IDE=y +CONFIG_BLK=y # CONFIG_MMC is not set CONFIG_MVGBE=y CONFIG_MII=y @@ -38,5 +39,6 @@ CONFIG_DM_RTC=y CONFIG_RTC_MV=y CONFIG_SYS_NS16550=y CONFIG_USB=y +CONFIG_DM_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_STORAGE=y