From patchwork Thu Jul 23 08:56:36 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luka Kovacic X-Patchwork-Id: 1334633 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=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=sartura.hr Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=sartura-hr.20150623.gappssmtp.com header.i=@sartura-hr.20150623.gappssmtp.com header.a=rsa-sha256 header.s=20150623 header.b=j01YZky9; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4BC5p00tq5z9sRR for ; Thu, 23 Jul 2020 18:58:00 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 7C40481F2D; Thu, 23 Jul 2020 10:57:57 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=sartura.hr Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=sartura-hr.20150623.gappssmtp.com header.i=@sartura-hr.20150623.gappssmtp.com header.b="j01YZky9"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id DDB4981E3C; Thu, 23 Jul 2020 10:57:55 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-wm1-x344.google.com (mail-wm1-x344.google.com [IPv6:2a00:1450:4864:20::344]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id A157781F47 for ; Thu, 23 Jul 2020 10:57:52 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=sartura.hr Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=luka.kovacic@sartura.hr Received: by mail-wm1-x344.google.com with SMTP id w3so4444865wmi.4 for ; Thu, 23 Jul 2020 01:57:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sartura-hr.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=sYmqxrnta5t+58msnvHxhR00fLUcxFklCzTSd9Gc2Ps=; b=j01YZky9dZFMOKsDeK6uDs4eUeMh2r9aJE2MfIBSjx2gW2QfzskCYMbp92l9XmLSC+ qXX4UJYqeWjZW1+i5zBVab+iUv3rrglp7TKoysrLOQflwXCqRtdU2tdcVutPIC/gnYLr C3zcHbnCfYcURpFrT2tQU1zYfKtaO67cdDeNrKDhhxt8Jfnrkou3nMFFlqeSV26bIkTc YmigGBJKfkIXOjQBnalXU84o54jb4w/xpaAKDncHRYWd5ocdPwyMZkk/ASXJO/N9WDi4 AMyfHX7kT799vDez13Hw66Ei2SPyNnPUlHPVDC+UHvBFO7KSN7cgMJZkW+Va1C50XCN4 IAiQ== 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=sYmqxrnta5t+58msnvHxhR00fLUcxFklCzTSd9Gc2Ps=; b=WzMp1R0Fk4Okv6eRrKSZmSur78jPI0LomYPaI7RDGbc75esx5wl1ySAXlqZP29tyjN U3hZ5bTLSZaIvIZ6In20HdzruvhSNykMRsM7nrFbyiQc4/CbFEloG1/PGTBVzLo6+vwf Lr6VQCE/h0suwp4HrBZKzKHvkOuvlDwTudWyXf15DZ3XMQiSQIJ3t818y5RfxMTfUed9 wTzztfOdraHnnEMTQ7+SsunurzCb1gXM3ym9h2JWU0wUX0RD7eSrhbn7unngTPZAgqzw evEtf+YvNMsFO9e08+aXQ0G0C2e8cj5vdjmQ8aoDvtMCcl748ZvOLpiV1u85ogAzn6t+ oQ7w== X-Gm-Message-State: AOAM533iQXMWKfIbkJToSKvy+GsiWhXVb1v/1OE4pef179WSyenIYtvA qoYKs4mXvTk6pOCbSlBdX0SE2/Zrv/LfkYDnA1x1XxjcTGB9VmsBHQbsxffXv8Yq4yVSNR1KilG 0mOJ+TB2cGu3MQDltMdcFSg8s3MtXiUyb3r5vDuk1oLuy98PYHOYrFl60Yn6BDcWI/hsN4FKP X-Google-Smtp-Source: ABdhPJxcY2BaDhgcFvYYWXsShKPv8UgeqDHD/5WVrmwWEEIXHhs+WueUicNp2xtdDoY988eLfXLBHg== X-Received: by 2002:a7b:c755:: with SMTP id w21mr3167203wmk.26.1595494671849; Thu, 23 Jul 2020 01:57:51 -0700 (PDT) Received: from lukakovacicapc.local ([2a00:ee2:4b0d:3001:fbc5:498b:ed6d:cfac]) by smtp.gmail.com with ESMTPSA id 78sm2711132wma.31.2020.07.23.01.57.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Jul 2020 01:57:51 -0700 (PDT) From: Luka Kovacic To: u-boot@lists.denx.de Cc: sr@denx.de, luka.perkov@sartura.hr, jakov.petrina@sartura.hr, Luka Kovacic Subject: [PATCH 1/5] arm: mvebu: Add CRS305-1G-4S Bit board Date: Thu, 23 Jul 2020 10:56:36 +0200 Message-Id: <20200723085640.12232-2-luka.kovacic@sartura.hr> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200723085640.12232-1-luka.kovacic@sartura.hr> References: <20200723085640.12232-1-luka.kovacic@sartura.hr> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 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" X-Virus-Scanned: clamav-milter 0.102.3 at phobos.denx.de X-Virus-Status: Clean MikroTik CRS305-1G-4S Bit board has a switch chip with an integrated Marvell Prestera 98DX3236 CPU. The Bit board variant is added, which has a bigger Macronix flash. Add basic U-Boot, UART and Winbond SPI flash support. Signed-off-by: Luka Kovacic Cc: Luka Perkov Cc: Jakov Petrina Reviewed-by: Stefan Roese --- arch/arm/dts/Makefile | 1 + arch/arm/dts/armada-xp-crs305-1g-4s-bit.dts | 43 ++++++++++++++++ board/mikrotik/crs3xx-98dx3236/MAINTAINERS | 3 ++ configs/crs305-1g-4s-bit_defconfig | 54 +++++++++++++++++++++ 4 files changed, 101 insertions(+) create mode 100644 arch/arm/dts/armada-xp-crs305-1g-4s-bit.dts create mode 100644 configs/crs305-1g-4s-bit_defconfig diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index cee10f533f..72e1f4fa20 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -213,6 +213,7 @@ dtb-$(CONFIG_ARCH_MVEBU) += \ armada-8040-db.dtb \ armada-8040-mcbin.dtb \ armada-xp-crs305-1g-4s.dtb \ + armada-xp-crs305-1g-4s-bit.dtb \ armada-xp-db-xc3-24g4xg.dtb \ armada-xp-gp.dtb \ armada-xp-maxbcm.dtb \ diff --git a/arch/arm/dts/armada-xp-crs305-1g-4s-bit.dts b/arch/arm/dts/armada-xp-crs305-1g-4s-bit.dts new file mode 100644 index 0000000000..059bf48aeb --- /dev/null +++ b/arch/arm/dts/armada-xp-crs305-1g-4s-bit.dts @@ -0,0 +1,43 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Device Tree file for MikroTik CRS305-1G-4S+ Bit board + * + * Copyright (C) 2020 Sartura Ltd. + * Author: Luka Kovacic + */ + +#include "armada-xp-crs305-1g-4s.dtsi" + +/ { + model = "MikroTik CRS305-1G-4S+ Bit"; +}; + +&spi0 { + status = "okay"; + + spi-flash@0 { + #address-cells = <1>; + #size-cells = <1>; + compatible = "spi-flash", "jedec,spi-nor"; + reg = <0>; /* Chip select 0 */ + spi-max-frequency = <108000000>; + m25p,fast-read; + + partition@u-boot { + reg = <0x00000000 0x001f0000>; + label = "u-boot"; + }; + partition@u-boot-env { + reg = <0x001f0000 0x00010000>; + label = "u-boot-env"; + }; + partition@ubi1 { + reg = <0x00200000 0x03f00000>; + label = "ubi1"; + }; + partition@ubi2 { + reg = <0x04100000 0x03f00000>; + label = "ubi2"; + }; + }; +}; diff --git a/board/mikrotik/crs3xx-98dx3236/MAINTAINERS b/board/mikrotik/crs3xx-98dx3236/MAINTAINERS index 127e0eac60..d02584bb1d 100644 --- a/board/mikrotik/crs3xx-98dx3236/MAINTAINERS +++ b/board/mikrotik/crs3xx-98dx3236/MAINTAINERS @@ -6,6 +6,9 @@ F: include/configs/crs3xx-98dx3236.h CRS305-1G-4S BOARD M: Luka Kovacic +M: Luka Perkov S: Maintained F: configs/crs305-1g-4s_defconfig +F: configs/crs305-1g-4s-bit_defconfig F: arch/arm/dts/armada-xp-crs305-1g-4s.dts +F: arch/arm/dts/armada-xp-crs305-1g-4s-bit.dts diff --git a/configs/crs305-1g-4s-bit_defconfig b/configs/crs305-1g-4s-bit_defconfig new file mode 100644 index 0000000000..0ecf11acb2 --- /dev/null +++ b/configs/crs305-1g-4s-bit_defconfig @@ -0,0 +1,54 @@ +CONFIG_ARM=y +CONFIG_ARCH_CPU_INIT=y +CONFIG_ARCH_MVEBU=y +CONFIG_SYS_TEXT_BASE=0x00800000 +CONFIG_SYS_MALLOC_F_LEN=0x2000 +CONFIG_TARGET_CRS3XX_98DX3236=y +CONFIG_ENV_SIZE=0x10000 +CONFIG_ENV_SECT_SIZE=0x10000 +CONFIG_ENV_OFFSET=0x1F0000 +CONFIG_BOOTCOUNT_BOOTLIMIT=3 +# CONFIG_EFI_LOADER is not set +CONFIG_BUILD_TARGET="u-boot.kwb" +CONFIG_USE_PREBOOT=y +CONFIG_SYS_CONSOLE_INFO_QUIET=y +CONFIG_HUSH_PARSER=y +CONFIG_AUTOBOOT_KEYED=y +CONFIG_AUTOBOOT_PROMPT="Autoboot in %d seconds, to stop use 's' key\n" +CONFIG_AUTOBOOT_STOP_STR="s" +CONFIG_AUTOBOOT_KEYED_CTRLC=y +CONFIG_CMD_BOOTZ=y +# CONFIG_CMD_FLASH is not set +# CONFIG_CMD_I2C is not set +CONFIG_CMD_SPI=y +CONFIG_CMD_CACHE=y +CONFIG_CMD_UBI=y +CONFIG_CMD_FS_GENERIC=y +CONFIG_CMD_MTD=y +CONFIG_CMD_MTDPARTS=y +CONFIG_DEFAULT_DEVICE_TREE="armada-xp-crs305-1g-4s-bit" +CONFIG_ENV_IS_IN_SPI_FLASH=y +CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_BLK=y +CONFIG_BOOTCOUNT_LIMIT=y +CONFIG_BOOTCOUNT_ENV=y +# CONFIG_DM_I2C is not set +# CONFIG_SYS_I2C_MVTWSI is not set +# CONFIG_MMC is not set +CONFIG_MTD=y +CONFIG_MTD_PARTITIONS=y +CONFIG_DM_MTD=y +CONFIG_DM_SPI_FLASH=y +CONFIG_SPI_FLASH_MTD=y +CONFIG_SPI_FLASH_SFDP_SUPPORT=y +CONFIG_SPI_FLASH_BAR=y +CONFIG_SPI_FLASH_MACRONIX=y +# CONFIG_SPI_FLASH_USE_4K_SECTORS is not set +CONFIG_FIT=y +CONFIG_FIT_ENABLE_SHA256_SUPPORT=y +CONFIG_FIT_VERBOSE=y +CONFIG_FIT_BEST_MATCH=y +CONFIG_PCI=y +CONFIG_PCI_MVEBU=y +CONFIG_SYS_NS16550=y +CONFIG_KIRKWOOD_SPI=y From patchwork Thu Jul 23 08:56:37 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luka Kovacic X-Patchwork-Id: 1334634 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=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=sartura.hr Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=sartura-hr.20150623.gappssmtp.com header.i=@sartura-hr.20150623.gappssmtp.com header.a=rsa-sha256 header.s=20150623 header.b=Py4poleV; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4BC5pB01DTz9sRR for ; Thu, 23 Jul 2020 18:58:09 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id CA54382159; Thu, 23 Jul 2020 10:58:01 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=sartura.hr Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=sartura-hr.20150623.gappssmtp.com header.i=@sartura-hr.20150623.gappssmtp.com header.b="Py4poleV"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 727A582055; Thu, 23 Jul 2020 10:58:00 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-wr1-x443.google.com (mail-wr1-x443.google.com [IPv6:2a00:1450:4864:20::443]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 7802281E3C for ; Thu, 23 Jul 2020 10:57:57 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=sartura.hr Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=luka.kovacic@sartura.hr Received: by mail-wr1-x443.google.com with SMTP id f7so4393471wrw.1 for ; Thu, 23 Jul 2020 01:57:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sartura-hr.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=3D7ZjuYfLk3cIAD7d/EjCnfVm/PnBKQNT4O2pJYIJsU=; b=Py4poleV8XKXMtE2289J8u2jDtFVwbGESkwGT0ZfwsazGALqdSr9WNTw2/6JsF0NsI 7VB/E3N6aSZQHOyEU1YYM9cOl0hEXUEg9guQB5m0+KkqXNeOOCikOkx+StQI9G/nAMBU f19s2JbF7Etyc0etji/o0HSSdO/vol5/T9EZbz0nd3qPPCkZTr1LQDEAclvID6xJCeUz n+Xb8/Rgr8yq80H8Wodg6EV89THSRFa70Ri4CYO8B/7mGiTnRxMeynaHWdgF3xI39ScI A8pNkwVGvipaHPApEr5yCgJfKzzmSuikHOJnyumGELX+oRV3wru0w9S6UVrx+BT0jELy jJPQ== 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=3D7ZjuYfLk3cIAD7d/EjCnfVm/PnBKQNT4O2pJYIJsU=; b=Okce8pN3qPKQr1L37KUHL+1Nv+p2eGg0uNUT7qQfgQQUYEmJMDaNb0VkV4aS8SXn5Q eA+ZrgtSsE8NZlcekDSsuv3mp0Zc8vIAJpZwVlJWTo+SbrnbMHxIQgqp8H772OKIkacJ VVFG+PEAQuJK2FCC/1nXXiF2bSSR93qJgAJulocBImDkyJHPfht5Ml1bEAESrE5SrtWC rTICHIQKB9HnldEglxtWsjnlR/nWGnWlo+P1MdZIauN9Jb0uDEptucCKyzhlM1RPRWiZ BpBQ2nU6gb8pRAvCOFaJQklJrbFUp6darzgqhn1VIlHz63CBPM+FuWaDr21mi4nMYLLZ KrNQ== X-Gm-Message-State: AOAM531dgoEfDCAS/eR1+QSM2kKvkqOfOYc5g/+NlV/eM6UaKV+GsYXz BiQ+E4Ma3HA5YC6DPppzhsP6g09R8wNCOnEDBw52WzXScw+6cmyi8mgFWm1Nz50KVH88RD3GUQ/ C13KN3rGyFm5gSc1YfDmPa6Q682nJ/VnoTXOe9VS7GFT415pmEONYJHytwtoDgPH0ufAEinwf X-Google-Smtp-Source: ABdhPJzAMILhmAAWp6pgYJChY+rkZn9K7uzKPj6KUnplze+yRYMW2l82KQ821n1dq5f5KDCrll6bkw== X-Received: by 2002:a5d:4ad1:: with SMTP id y17mr3328044wrs.132.1595494676443; Thu, 23 Jul 2020 01:57:56 -0700 (PDT) Received: from lukakovacicapc.local ([2a00:ee2:4b0d:3001:fbc5:498b:ed6d:cfac]) by smtp.gmail.com with ESMTPSA id 78sm2711132wma.31.2020.07.23.01.57.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Jul 2020 01:57:55 -0700 (PDT) From: Luka Kovacic To: u-boot@lists.denx.de Cc: sr@denx.de, luka.perkov@sartura.hr, jakov.petrina@sartura.hr, Luka Kovacic Subject: [PATCH 2/5] arm: mvebu: Add CRS326-24G-2S board Date: Thu, 23 Jul 2020 10:56:37 +0200 Message-Id: <20200723085640.12232-3-luka.kovacic@sartura.hr> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200723085640.12232-1-luka.kovacic@sartura.hr> References: <20200723085640.12232-1-luka.kovacic@sartura.hr> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 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" X-Virus-Scanned: clamav-milter 0.102.3 at phobos.denx.de X-Virus-Status: Clean MikroTik CRS326-24G-2S board has a switch chip with an integrated Marvell Prestera 98DX3236 CPU. This commit includes two board variants, namely the factory default one and a Bit variant. The Bit board variant has a bigger Macronix flash. Add basic U-Boot, UART and SPI flash support. Signed-off-by: Luka Kovacic Cc: Luka Perkov Cc: Jakov Petrina Reviewed-by: Stefan Roese --- arch/arm/dts/Makefile | 2 + arch/arm/dts/armada-xp-crs326-24g-2s-bit.dts | 43 +++++++ .../dts/armada-xp-crs326-24g-2s-u-boot.dtsi | 13 +++ arch/arm/dts/armada-xp-crs326-24g-2s.dts | 17 +++ arch/arm/dts/armada-xp-crs326-24g-2s.dtsi | 110 ++++++++++++++++++ board/mikrotik/crs3xx-98dx3236/MAINTAINERS | 9 ++ configs/crs326-24g-2s-bit_defconfig | 54 +++++++++ configs/crs326-24g-2s_defconfig | 54 +++++++++ 8 files changed, 302 insertions(+) create mode 100644 arch/arm/dts/armada-xp-crs326-24g-2s-bit.dts create mode 100644 arch/arm/dts/armada-xp-crs326-24g-2s-u-boot.dtsi create mode 100644 arch/arm/dts/armada-xp-crs326-24g-2s.dts create mode 100644 arch/arm/dts/armada-xp-crs326-24g-2s.dtsi create mode 100644 configs/crs326-24g-2s-bit_defconfig create mode 100644 configs/crs326-24g-2s_defconfig diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index 72e1f4fa20..9f8ca61f28 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -214,6 +214,8 @@ dtb-$(CONFIG_ARCH_MVEBU) += \ armada-8040-mcbin.dtb \ armada-xp-crs305-1g-4s.dtb \ armada-xp-crs305-1g-4s-bit.dtb \ + armada-xp-crs326-24g-2s.dtb \ + armada-xp-crs326-24g-2s-bit.dtb \ armada-xp-db-xc3-24g4xg.dtb \ armada-xp-gp.dtb \ armada-xp-maxbcm.dtb \ diff --git a/arch/arm/dts/armada-xp-crs326-24g-2s-bit.dts b/arch/arm/dts/armada-xp-crs326-24g-2s-bit.dts new file mode 100644 index 0000000000..b340eedf71 --- /dev/null +++ b/arch/arm/dts/armada-xp-crs326-24g-2s-bit.dts @@ -0,0 +1,43 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Device Tree file for MikroTik CRS326-24G-2S+ Bit board + * + * Copyright (C) 2020 Sartura Ltd. + * Author: Luka Kovacic + */ + +#include "armada-xp-crs326-24g-2s.dtsi" + +/ { + model = "MikroTik CRS326-24G-2S+ Bit"; +}; + +&spi0 { + status = "okay"; + + spi-flash@0 { + #address-cells = <1>; + #size-cells = <1>; + compatible = "spi-flash", "jedec,spi-nor"; + reg = <0>; /* Chip select 0 */ + spi-max-frequency = <108000000>; + m25p,fast-read; + + partition@u-boot { + reg = <0x00000000 0x001f0000>; + label = "u-boot"; + }; + partition@u-boot-env { + reg = <0x001f0000 0x00010000>; + label = "u-boot-env"; + }; + partition@ubi1 { + reg = <0x00200000 0x03f00000>; + label = "ubi1"; + }; + partition@ubi2 { + reg = <0x04100000 0x03f00000>; + label = "ubi2"; + }; + }; +}; diff --git a/arch/arm/dts/armada-xp-crs326-24g-2s-u-boot.dtsi b/arch/arm/dts/armada-xp-crs326-24g-2s-u-boot.dtsi new file mode 100644 index 0000000000..8576a02730 --- /dev/null +++ b/arch/arm/dts/armada-xp-crs326-24g-2s-u-boot.dtsi @@ -0,0 +1,13 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) + +&uart0 { + u-boot,dm-pre-reloc; +}; + +&spi0 { + u-boot,dm-pre-reloc; + + spi-flash@0 { + u-boot,dm-pre-reloc; + }; +}; diff --git a/arch/arm/dts/armada-xp-crs326-24g-2s.dts b/arch/arm/dts/armada-xp-crs326-24g-2s.dts new file mode 100644 index 0000000000..83aef43f66 --- /dev/null +++ b/arch/arm/dts/armada-xp-crs326-24g-2s.dts @@ -0,0 +1,17 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Device Tree file for MikroTik CRS326-24G-2S+ board + * + * Copyright (C) 2020 Sartura Ltd. + * Author: Luka Kovacic + */ + +#include "armada-xp-crs326-24g-2s.dtsi" + +/ { + model = "MikroTik CRS326-24G-2S+"; +}; + +&spi0 { + status = "okay"; +}; diff --git a/arch/arm/dts/armada-xp-crs326-24g-2s.dtsi b/arch/arm/dts/armada-xp-crs326-24g-2s.dtsi new file mode 100644 index 0000000000..e50f3ead13 --- /dev/null +++ b/arch/arm/dts/armada-xp-crs326-24g-2s.dtsi @@ -0,0 +1,110 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Device Tree file for CRS326-24G-2S board + * + * Copyright (C) 2016 Allied Telesis Labs + * Copyright (C) 2020 Sartura Ltd. + * + * Based on armada-xp-db.dts + * + * Note: this Device Tree assumes that the bootloader has remapped the + * internal registers to 0xf1000000 (instead of the default + * 0xd0000000). The 0xf1000000 is the default used by the recent, + * DT-capable, U-Boot bootloaders provided by Marvell. Some earlier + * boards were delivered with an older version of the bootloader that + * left internal registers mapped at 0xd0000000. If you are in this + * situation, you should either update your bootloader (preferred + * solution) or the below Device Tree should be adjusted. + */ + +/dts-v1/; +#include "armada-xp-98dx3236.dtsi" +#include "armada-xp-crs326-24g-2s-u-boot.dtsi" + +/ { + model = "CRS326-24G-2S+"; + compatible = "marvell,armadaxp-98dx3236", "marvell,armadaxp-mv78260", "marvell,armadaxp", "marvell,armada-370-xp"; + + chosen { + stdout-path = "serial0:115200n8"; + bootargs = "console=ttyS0,115200 earlyprintk"; + }; + + aliases { + spi0 = &spi0; + }; + + memory { + device_type = "memory"; + reg = <0 0x00000000 0 0x20000000>; /* 512 MB */ + }; +}; + +&L2 { + arm,parity-enable; + marvell,ecc-enable; +}; + +&devbus_bootcs { + status = "okay"; + + /* Device Bus parameters are required */ + + /* Read parameters */ + devbus,bus-width = <16>; + devbus,turn-off-ps = <60000>; + devbus,badr-skew-ps = <0>; + devbus,acc-first-ps = <124000>; + devbus,acc-next-ps = <248000>; + devbus,rd-setup-ps = <0>; + devbus,rd-hold-ps = <0>; + + /* Write parameters */ + devbus,sync-enable = <0>; + devbus,wr-high-ps = <60000>; + devbus,wr-low-ps = <60000>; + devbus,ale-wr-ps = <60000>; +}; + +&uart0 { + status = "okay"; +}; + +&uart1 { + status = "okay"; +}; + +&i2c0 { + clock-frequency = <100000>; + status = "okay"; +}; + +&usb0 { + status = "okay"; +}; + +&spi0 { + status = "okay"; + + spi-flash@0 { + #address-cells = <1>; + #size-cells = <1>; + compatible = "spi-flash", "jedec,spi-nor"; + reg = <0>; /* Chip select 0 */ + spi-max-frequency = <108000000>; + m25p,fast-read; + + partition@u-boot { + reg = <0x00000000 0x001f0000>; + label = "u-boot"; + }; + partition@u-boot-env { + reg = <0x001f0000 0x00010000>; + label = "u-boot-env"; + }; + partition@ubi1 { + reg = <0x00200000 0x00e00000>; + label = "ubi1"; + }; + }; +}; diff --git a/board/mikrotik/crs3xx-98dx3236/MAINTAINERS b/board/mikrotik/crs3xx-98dx3236/MAINTAINERS index d02584bb1d..7f01f4318e 100644 --- a/board/mikrotik/crs3xx-98dx3236/MAINTAINERS +++ b/board/mikrotik/crs3xx-98dx3236/MAINTAINERS @@ -12,3 +12,12 @@ F: configs/crs305-1g-4s_defconfig F: configs/crs305-1g-4s-bit_defconfig F: arch/arm/dts/armada-xp-crs305-1g-4s.dts F: arch/arm/dts/armada-xp-crs305-1g-4s-bit.dts + +CRS326-24G-2S BOARD +M: Luka Kovacic +M: Luka Perkov +S: Maintained +F: configs/crs326-24g-2s_defconfig +F: configs/crs326-24g-2s-bit_defconfig +F: arch/arm/dts/armada-xp-crs326-24g-2s.dts +F: arch/arm/dts/armada-xp-crs326-24g-2s-bit.dts diff --git a/configs/crs326-24g-2s-bit_defconfig b/configs/crs326-24g-2s-bit_defconfig new file mode 100644 index 0000000000..18f2d34453 --- /dev/null +++ b/configs/crs326-24g-2s-bit_defconfig @@ -0,0 +1,54 @@ +CONFIG_ARM=y +CONFIG_ARCH_CPU_INIT=y +CONFIG_ARCH_MVEBU=y +CONFIG_SYS_TEXT_BASE=0x00800000 +CONFIG_SYS_MALLOC_F_LEN=0x2000 +CONFIG_TARGET_CRS3XX_98DX3236=y +CONFIG_ENV_SIZE=0x10000 +CONFIG_ENV_SECT_SIZE=0x10000 +CONFIG_ENV_OFFSET=0x1F0000 +CONFIG_BOOTCOUNT_BOOTLIMIT=3 +# CONFIG_EFI_LOADER is not set +CONFIG_BUILD_TARGET="u-boot.kwb" +CONFIG_USE_PREBOOT=y +CONFIG_SYS_CONSOLE_INFO_QUIET=y +CONFIG_HUSH_PARSER=y +CONFIG_AUTOBOOT_KEYED=y +CONFIG_AUTOBOOT_PROMPT="Autoboot in %d seconds, to stop use 's' key\n" +CONFIG_AUTOBOOT_STOP_STR="s" +CONFIG_AUTOBOOT_KEYED_CTRLC=y +CONFIG_CMD_BOOTZ=y +# CONFIG_CMD_FLASH is not set +# CONFIG_CMD_I2C is not set +CONFIG_CMD_SPI=y +CONFIG_CMD_CACHE=y +CONFIG_CMD_UBI=y +CONFIG_CMD_FS_GENERIC=y +CONFIG_CMD_MTD=y +CONFIG_CMD_MTDPARTS=y +CONFIG_DEFAULT_DEVICE_TREE="armada-xp-crs326-24g-2s-bit" +CONFIG_ENV_IS_IN_SPI_FLASH=y +CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_BLK=y +CONFIG_BOOTCOUNT_LIMIT=y +CONFIG_BOOTCOUNT_ENV=y +# CONFIG_DM_I2C is not set +# CONFIG_SYS_I2C_MVTWSI is not set +# CONFIG_MMC is not set +CONFIG_MTD=y +CONFIG_MTD_PARTITIONS=y +CONFIG_DM_MTD=y +CONFIG_DM_SPI_FLASH=y +CONFIG_SPI_FLASH_MTD=y +CONFIG_SPI_FLASH_SFDP_SUPPORT=y +CONFIG_SPI_FLASH_BAR=y +CONFIG_SPI_FLASH_MACRONIX=y +# CONFIG_SPI_FLASH_USE_4K_SECTORS is not set +CONFIG_FIT=y +CONFIG_FIT_ENABLE_SHA256_SUPPORT=y +CONFIG_FIT_VERBOSE=y +CONFIG_FIT_BEST_MATCH=y +CONFIG_PCI=y +CONFIG_PCI_MVEBU=y +CONFIG_SYS_NS16550=y +CONFIG_KIRKWOOD_SPI=y diff --git a/configs/crs326-24g-2s_defconfig b/configs/crs326-24g-2s_defconfig new file mode 100644 index 0000000000..fec7922f4c --- /dev/null +++ b/configs/crs326-24g-2s_defconfig @@ -0,0 +1,54 @@ +CONFIG_ARM=y +CONFIG_ARCH_CPU_INIT=y +CONFIG_ARCH_MVEBU=y +CONFIG_SYS_TEXT_BASE=0x00800000 +CONFIG_SYS_MALLOC_F_LEN=0x2000 +CONFIG_TARGET_CRS3XX_98DX3236=y +CONFIG_ENV_SIZE=0x10000 +CONFIG_ENV_SECT_SIZE=0x10000 +CONFIG_ENV_OFFSET=0x1F0000 +CONFIG_BOOTCOUNT_BOOTLIMIT=3 +# CONFIG_EFI_LOADER is not set +CONFIG_BUILD_TARGET="u-boot.kwb" +CONFIG_USE_PREBOOT=y +CONFIG_SYS_CONSOLE_INFO_QUIET=y +CONFIG_HUSH_PARSER=y +CONFIG_AUTOBOOT_KEYED=y +CONFIG_AUTOBOOT_PROMPT="Autoboot in %d seconds, to stop use 's' key\n" +CONFIG_AUTOBOOT_STOP_STR="s" +CONFIG_AUTOBOOT_KEYED_CTRLC=y +CONFIG_CMD_BOOTZ=y +# CONFIG_CMD_FLASH is not set +# CONFIG_CMD_I2C is not set +CONFIG_CMD_SPI=y +CONFIG_CMD_CACHE=y +CONFIG_CMD_UBI=y +CONFIG_CMD_FS_GENERIC=y +CONFIG_CMD_MTD=y +CONFIG_CMD_MTDPARTS=y +CONFIG_DEFAULT_DEVICE_TREE="armada-xp-crs326-24g-2s" +CONFIG_ENV_IS_IN_SPI_FLASH=y +CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_BLK=y +CONFIG_BOOTCOUNT_LIMIT=y +CONFIG_BOOTCOUNT_ENV=y +# CONFIG_DM_I2C is not set +# CONFIG_SYS_I2C_MVTWSI is not set +# CONFIG_MMC is not set +CONFIG_MTD=y +CONFIG_MTD_PARTITIONS=y +CONFIG_DM_MTD=y +CONFIG_DM_SPI_FLASH=y +CONFIG_SPI_FLASH_MTD=y +CONFIG_SPI_FLASH_SFDP_SUPPORT=y +CONFIG_SPI_FLASH_BAR=y +CONFIG_SPI_FLASH_WINBOND=y +# CONFIG_SPI_FLASH_USE_4K_SECTORS is not set +CONFIG_FIT=y +CONFIG_FIT_ENABLE_SHA256_SUPPORT=y +CONFIG_FIT_VERBOSE=y +CONFIG_FIT_BEST_MATCH=y +CONFIG_PCI=y +CONFIG_PCI_MVEBU=y +CONFIG_SYS_NS16550=y +CONFIG_KIRKWOOD_SPI=y From patchwork Thu Jul 23 08:56:38 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luka Kovacic X-Patchwork-Id: 1334635 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=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=sartura.hr Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=sartura-hr.20150623.gappssmtp.com header.i=@sartura-hr.20150623.gappssmtp.com header.a=rsa-sha256 header.s=20150623 header.b=r82V5mRq; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4BC5pN3vSqz9sRW for ; Thu, 23 Jul 2020 18:58:20 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id DF3A281F41; Thu, 23 Jul 2020 10:58:08 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=sartura.hr Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=sartura-hr.20150623.gappssmtp.com header.i=@sartura-hr.20150623.gappssmtp.com header.b="r82V5mRq"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 7A47D82055; Thu, 23 Jul 2020 10:58:07 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-wr1-x441.google.com (mail-wr1-x441.google.com [IPv6:2a00:1450:4864:20::441]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 64AD382181 for ; Thu, 23 Jul 2020 10:58:03 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=sartura.hr Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=luka.kovacic@sartura.hr Received: by mail-wr1-x441.google.com with SMTP id a14so4376957wra.5 for ; Thu, 23 Jul 2020 01:58:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sartura-hr.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=y9k1mY3pUdp/SI+FlS8P8Gc93GWgaz3uMsNnC+4WBLw=; b=r82V5mRqxo0RLsCRFZgSWj7Ip4o6g14rnSFQkmjR1BIByq8f2TwpVmDgyEGPwlAGfB Kd4qfrKPzTY3xQWxEjUyEYQ0gb+fR2yZW2GFf4aMQP3T7d4/o9ZTXBdZWhsvE57ep5sb 63fG/4mC2p8rF4IPQ5y8RMsUo98y4imIBo6oWicImreZWgmU8OvI4J8qE9FWUIfvD9Eq zTFypuATVGWjCGnTy2SNwmeNPqF+zgcWhFHlOwM5qhoFtH9WOScVNEJAN1Y4KkzREA3T JB67FXEWiFF0I+WHtPvHoyJzK6FIqDhrfMTyDmE8nt1MHIlAGHRygVISeYZKLczRAmmr 5f1g== 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=y9k1mY3pUdp/SI+FlS8P8Gc93GWgaz3uMsNnC+4WBLw=; b=tX3Qsnd4hTgFRSTGyg3KFXL81KrwqVyPRMyddMPz05D1QvV4SkdDS1W/BUEVZVbDLU pR6+Huwl+HsZBYN+d4Yix4rIvqdkyCutrnY4P7rcCP4IY415HUL2tuOvX8sbOPBwsf/b VG83xVgQMvb+FIeRqJoFNfDDllBziNyTmCG+1jDKZ4iy9CUY/j0AUTbBzxzgOls+1hT4 9me+aOD/+VThlahDvloBfE4giXPaAimIyg5qfSA+Fn+yyuWKwy5MnFklP9p9elYRATTg Lr1uiQQfgr7PSl7Va7DWNE9SO3iynKQQUHH27cD5La4AbnLjU0+gBseCJME20VbWumY7 yWlA== X-Gm-Message-State: AOAM530X/pPzvKPz2NQ5rh2IFjeqGscP8xKr9KLRqSF2tHaeVKy2+3Bb yhm8ao6ewhug50IKeeb/u17til83bGYfyxE/WpMy2Q0CdkxTEfxXkN6yppYxd6d957O5Zgq8jtX SUWeG3n8rtjxsccq6+L4XvA0ccq2H6GI2Otmb+dca9BsZDMQVym30mbw7Vb8SiSfDdKzqZWtY X-Google-Smtp-Source: ABdhPJwjaFQ1VTh+FE2TmHwzjLxBOMUW+L/V0W/ThOgDIfyAizaDi6egPQCVgLiz0weRJTKL6rtUzQ== X-Received: by 2002:adf:f2c5:: with SMTP id d5mr3215535wrp.96.1595494682215; Thu, 23 Jul 2020 01:58:02 -0700 (PDT) Received: from lukakovacicapc.local ([2a00:ee2:4b0d:3001:fbc5:498b:ed6d:cfac]) by smtp.gmail.com with ESMTPSA id 78sm2711132wma.31.2020.07.23.01.58.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Jul 2020 01:58:01 -0700 (PDT) From: Luka Kovacic To: u-boot@lists.denx.de Cc: sr@denx.de, luka.perkov@sartura.hr, jakov.petrina@sartura.hr, Luka Kovacic Subject: [PATCH 3/5] arm: mvebu: Add CRS328-4C-20S-4S board Date: Thu, 23 Jul 2020 10:56:38 +0200 Message-Id: <20200723085640.12232-4-luka.kovacic@sartura.hr> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200723085640.12232-1-luka.kovacic@sartura.hr> References: <20200723085640.12232-1-luka.kovacic@sartura.hr> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 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" X-Virus-Scanned: clamav-milter 0.102.3 at phobos.denx.de X-Virus-Status: Clean MikroTik CRS328-4C-20S-4S board has a switch chip with an integrated Marvell Prestera 98DX3236 CPU. This commit includes two board variants, namely the factory default one and a Bit variant. The Bit board variant has a bigger Macronix flash. Add basic U-Boot, UART and SPI flash support. Signed-off-by: Luka Kovacic Cc: Luka Perkov Cc: Jakov Petrina Reviewed-by: Stefan Roese --- arch/arm/dts/Makefile | 2 + .../dts/armada-xp-crs328-4c-20s-4s-bit.dts | 43 +++++++ .../armada-xp-crs328-4c-20s-4s-u-boot.dtsi | 13 +++ arch/arm/dts/armada-xp-crs328-4c-20s-4s.dts | 17 +++ arch/arm/dts/armada-xp-crs328-4c-20s-4s.dtsi | 110 ++++++++++++++++++ board/mikrotik/crs3xx-98dx3236/MAINTAINERS | 9 ++ configs/crs328-4c-20s-4s-bit_defconfig | 54 +++++++++ configs/crs328-4c-20s-4s_defconfig | 54 +++++++++ 8 files changed, 302 insertions(+) create mode 100644 arch/arm/dts/armada-xp-crs328-4c-20s-4s-bit.dts create mode 100644 arch/arm/dts/armada-xp-crs328-4c-20s-4s-u-boot.dtsi create mode 100644 arch/arm/dts/armada-xp-crs328-4c-20s-4s.dts create mode 100644 arch/arm/dts/armada-xp-crs328-4c-20s-4s.dtsi create mode 100644 configs/crs328-4c-20s-4s-bit_defconfig create mode 100644 configs/crs328-4c-20s-4s_defconfig diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index 9f8ca61f28..deced1ad7d 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -216,6 +216,8 @@ dtb-$(CONFIG_ARCH_MVEBU) += \ armada-xp-crs305-1g-4s-bit.dtb \ armada-xp-crs326-24g-2s.dtb \ armada-xp-crs326-24g-2s-bit.dtb \ + armada-xp-crs328-4c-20s-4s.dtb \ + armada-xp-crs328-4c-20s-4s-bit.dtb \ armada-xp-db-xc3-24g4xg.dtb \ armada-xp-gp.dtb \ armada-xp-maxbcm.dtb \ diff --git a/arch/arm/dts/armada-xp-crs328-4c-20s-4s-bit.dts b/arch/arm/dts/armada-xp-crs328-4c-20s-4s-bit.dts new file mode 100644 index 0000000000..d684c895ff --- /dev/null +++ b/arch/arm/dts/armada-xp-crs328-4c-20s-4s-bit.dts @@ -0,0 +1,43 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Device Tree file for MikroTik CRS328-4C-20S-4S+ Bit board + * + * Copyright (C) 2020 Sartura Ltd. + * Author: Luka Kovacic + */ + +#include "armada-xp-crs328-4c-20s-4s.dtsi" + +/ { + model = "MikroTik CRS328-4C-20S-4S+ Bit"; +}; + +&spi0 { + status = "okay"; + + spi-flash@0 { + #address-cells = <1>; + #size-cells = <1>; + compatible = "spi-flash", "jedec,spi-nor"; + reg = <0>; /* Chip select 0 */ + spi-max-frequency = <108000000>; + m25p,fast-read; + + partition@u-boot { + reg = <0x00000000 0x001f0000>; + label = "u-boot"; + }; + partition@u-boot-env { + reg = <0x001f0000 0x00010000>; + label = "u-boot-env"; + }; + partition@ubi1 { + reg = <0x00200000 0x03f00000>; + label = "ubi1"; + }; + partition@ubi2 { + reg = <0x04100000 0x03f00000>; + label = "ubi2"; + }; + }; +}; diff --git a/arch/arm/dts/armada-xp-crs328-4c-20s-4s-u-boot.dtsi b/arch/arm/dts/armada-xp-crs328-4c-20s-4s-u-boot.dtsi new file mode 100644 index 0000000000..8576a02730 --- /dev/null +++ b/arch/arm/dts/armada-xp-crs328-4c-20s-4s-u-boot.dtsi @@ -0,0 +1,13 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) + +&uart0 { + u-boot,dm-pre-reloc; +}; + +&spi0 { + u-boot,dm-pre-reloc; + + spi-flash@0 { + u-boot,dm-pre-reloc; + }; +}; diff --git a/arch/arm/dts/armada-xp-crs328-4c-20s-4s.dts b/arch/arm/dts/armada-xp-crs328-4c-20s-4s.dts new file mode 100644 index 0000000000..665757f6e1 --- /dev/null +++ b/arch/arm/dts/armada-xp-crs328-4c-20s-4s.dts @@ -0,0 +1,17 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Device Tree file for MikroTik CRS328-4C-20S-4S+ board + * + * Copyright (C) 2020 Sartura Ltd. + * Author: Luka Kovacic + */ + +#include "armada-xp-crs328-4c-20s-4s.dtsi" + +/ { + model = "MikroTik CRS328-4C-20S-4S+"; +}; + +&spi0 { + status = "okay"; +}; diff --git a/arch/arm/dts/armada-xp-crs328-4c-20s-4s.dtsi b/arch/arm/dts/armada-xp-crs328-4c-20s-4s.dtsi new file mode 100644 index 0000000000..daff1af2a2 --- /dev/null +++ b/arch/arm/dts/armada-xp-crs328-4c-20s-4s.dtsi @@ -0,0 +1,110 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Device Tree file for CRS328-4C-20S-4S+ board + * + * Copyright (C) 2016 Allied Telesis Labs + * Copyright (C) 2020 Sartura Ltd. + * + * Based on armada-xp-db.dts + * + * Note: this Device Tree assumes that the bootloader has remapped the + * internal registers to 0xf1000000 (instead of the default + * 0xd0000000). The 0xf1000000 is the default used by the recent, + * DT-capable, U-Boot bootloaders provided by Marvell. Some earlier + * boards were delivered with an older version of the bootloader that + * left internal registers mapped at 0xd0000000. If you are in this + * situation, you should either update your bootloader (preferred + * solution) or the below Device Tree should be adjusted. + */ + +/dts-v1/; +#include "armada-xp-98dx3236.dtsi" +#include "armada-xp-crs328-4c-20s-4s-u-boot.dtsi" + +/ { + model = "CRS328-4C-20S-4S+"; + compatible = "marvell,armadaxp-98dx3236", "marvell,armadaxp-mv78260", "marvell,armadaxp", "marvell,armada-370-xp"; + + chosen { + stdout-path = "serial0:115200n8"; + bootargs = "console=ttyS0,115200 earlyprintk"; + }; + + aliases { + spi0 = &spi0; + }; + + memory { + device_type = "memory"; + reg = <0 0x00000000 0 0x20000000>; /* 512 MB */ + }; +}; + +&L2 { + arm,parity-enable; + marvell,ecc-enable; +}; + +&devbus_bootcs { + status = "okay"; + + /* Device Bus parameters are required */ + + /* Read parameters */ + devbus,bus-width = <16>; + devbus,turn-off-ps = <60000>; + devbus,badr-skew-ps = <0>; + devbus,acc-first-ps = <124000>; + devbus,acc-next-ps = <248000>; + devbus,rd-setup-ps = <0>; + devbus,rd-hold-ps = <0>; + + /* Write parameters */ + devbus,sync-enable = <0>; + devbus,wr-high-ps = <60000>; + devbus,wr-low-ps = <60000>; + devbus,ale-wr-ps = <60000>; +}; + +&uart0 { + status = "okay"; +}; + +&uart1 { + status = "okay"; +}; + +&i2c0 { + clock-frequency = <100000>; + status = "okay"; +}; + +&usb0 { + status = "okay"; +}; + +&spi0 { + status = "okay"; + + spi-flash@0 { + #address-cells = <1>; + #size-cells = <1>; + compatible = "spi-flash", "jedec,spi-nor"; + reg = <0>; /* Chip select 0 */ + spi-max-frequency = <108000000>; + m25p,fast-read; + + partition@u-boot { + reg = <0x00000000 0x001f0000>; + label = "u-boot"; + }; + partition@u-boot-env { + reg = <0x001f0000 0x00010000>; + label = "u-boot-env"; + }; + partition@ubi1 { + reg = <0x00200000 0x00e00000>; + label = "ubi1"; + }; + }; +}; diff --git a/board/mikrotik/crs3xx-98dx3236/MAINTAINERS b/board/mikrotik/crs3xx-98dx3236/MAINTAINERS index 7f01f4318e..e6fbf3db1c 100644 --- a/board/mikrotik/crs3xx-98dx3236/MAINTAINERS +++ b/board/mikrotik/crs3xx-98dx3236/MAINTAINERS @@ -21,3 +21,12 @@ F: configs/crs326-24g-2s_defconfig F: configs/crs326-24g-2s-bit_defconfig F: arch/arm/dts/armada-xp-crs326-24g-2s.dts F: arch/arm/dts/armada-xp-crs326-24g-2s-bit.dts + +CRS328-4C-20S-4S BOARD +M: Luka Kovacic +M: Luka Perkov +S: Maintained +F: configs/crs328-4c-20s-4s_defconfig +F: configs/crs328-4c-20s-4s-bit_defconfig +F: arch/arm/dts/armada-xp-crs328-4c-20s-4s.dts +F: arch/arm/dts/armada-xp-crs328-4c-20s-4s-bit.dts diff --git a/configs/crs328-4c-20s-4s-bit_defconfig b/configs/crs328-4c-20s-4s-bit_defconfig new file mode 100644 index 0000000000..9b949e63da --- /dev/null +++ b/configs/crs328-4c-20s-4s-bit_defconfig @@ -0,0 +1,54 @@ +CONFIG_ARM=y +CONFIG_ARCH_CPU_INIT=y +CONFIG_ARCH_MVEBU=y +CONFIG_SYS_TEXT_BASE=0x00800000 +CONFIG_SYS_MALLOC_F_LEN=0x2000 +CONFIG_TARGET_CRS3XX_98DX3236=y +CONFIG_ENV_SIZE=0x10000 +CONFIG_ENV_SECT_SIZE=0x10000 +CONFIG_ENV_OFFSET=0x1F0000 +CONFIG_BOOTCOUNT_BOOTLIMIT=3 +# CONFIG_EFI_LOADER is not set +CONFIG_BUILD_TARGET="u-boot.kwb" +CONFIG_USE_PREBOOT=y +CONFIG_SYS_CONSOLE_INFO_QUIET=y +CONFIG_HUSH_PARSER=y +CONFIG_AUTOBOOT_KEYED=y +CONFIG_AUTOBOOT_PROMPT="Autoboot in %d seconds, to stop use 's' key\n" +CONFIG_AUTOBOOT_STOP_STR="s" +CONFIG_AUTOBOOT_KEYED_CTRLC=y +CONFIG_CMD_BOOTZ=y +# CONFIG_CMD_FLASH is not set +# CONFIG_CMD_I2C is not set +CONFIG_CMD_SPI=y +CONFIG_CMD_CACHE=y +CONFIG_CMD_UBI=y +CONFIG_CMD_FS_GENERIC=y +CONFIG_CMD_MTD=y +CONFIG_CMD_MTDPARTS=y +CONFIG_DEFAULT_DEVICE_TREE="armada-xp-crs328-4c-20s-4s-bit" +CONFIG_ENV_IS_IN_SPI_FLASH=y +CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_BLK=y +CONFIG_BOOTCOUNT_LIMIT=y +CONFIG_BOOTCOUNT_ENV=y +# CONFIG_DM_I2C is not set +# CONFIG_SYS_I2C_MVTWSI is not set +# CONFIG_MMC is not set +CONFIG_MTD=y +CONFIG_MTD_PARTITIONS=y +CONFIG_DM_MTD=y +CONFIG_DM_SPI_FLASH=y +CONFIG_SPI_FLASH_MTD=y +CONFIG_SPI_FLASH_SFDP_SUPPORT=y +CONFIG_SPI_FLASH_BAR=y +CONFIG_SPI_FLASH_MACRONIX=y +# CONFIG_SPI_FLASH_USE_4K_SECTORS is not set +CONFIG_FIT=y +CONFIG_FIT_ENABLE_SHA256_SUPPORT=y +CONFIG_FIT_VERBOSE=y +CONFIG_FIT_BEST_MATCH=y +CONFIG_PCI=y +CONFIG_PCI_MVEBU=y +CONFIG_SYS_NS16550=y +CONFIG_KIRKWOOD_SPI=y diff --git a/configs/crs328-4c-20s-4s_defconfig b/configs/crs328-4c-20s-4s_defconfig new file mode 100644 index 0000000000..33eefbd475 --- /dev/null +++ b/configs/crs328-4c-20s-4s_defconfig @@ -0,0 +1,54 @@ +CONFIG_ARM=y +CONFIG_ARCH_CPU_INIT=y +CONFIG_ARCH_MVEBU=y +CONFIG_SYS_TEXT_BASE=0x00800000 +CONFIG_SYS_MALLOC_F_LEN=0x2000 +CONFIG_TARGET_CRS3XX_98DX3236=y +CONFIG_ENV_SIZE=0x10000 +CONFIG_ENV_SECT_SIZE=0x10000 +CONFIG_ENV_OFFSET=0x1F0000 +CONFIG_BOOTCOUNT_BOOTLIMIT=3 +# CONFIG_EFI_LOADER is not set +CONFIG_BUILD_TARGET="u-boot.kwb" +CONFIG_USE_PREBOOT=y +CONFIG_SYS_CONSOLE_INFO_QUIET=y +CONFIG_HUSH_PARSER=y +CONFIG_AUTOBOOT_KEYED=y +CONFIG_AUTOBOOT_PROMPT="Autoboot in %d seconds, to stop use 's' key\n" +CONFIG_AUTOBOOT_STOP_STR="s" +CONFIG_AUTOBOOT_KEYED_CTRLC=y +CONFIG_CMD_BOOTZ=y +# CONFIG_CMD_FLASH is not set +# CONFIG_CMD_I2C is not set +CONFIG_CMD_SPI=y +CONFIG_CMD_CACHE=y +CONFIG_CMD_UBI=y +CONFIG_CMD_FS_GENERIC=y +CONFIG_CMD_MTD=y +CONFIG_CMD_MTDPARTS=y +CONFIG_DEFAULT_DEVICE_TREE="armada-xp-crs328-4c-20s-4s" +CONFIG_ENV_IS_IN_SPI_FLASH=y +CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_BLK=y +CONFIG_BOOTCOUNT_LIMIT=y +CONFIG_BOOTCOUNT_ENV=y +# CONFIG_DM_I2C is not set +# CONFIG_SYS_I2C_MVTWSI is not set +# CONFIG_MMC is not set +CONFIG_MTD=y +CONFIG_MTD_PARTITIONS=y +CONFIG_DM_MTD=y +CONFIG_DM_SPI_FLASH=y +CONFIG_SPI_FLASH_MTD=y +CONFIG_SPI_FLASH_SFDP_SUPPORT=y +CONFIG_SPI_FLASH_BAR=y +CONFIG_SPI_FLASH_WINBOND=y +# CONFIG_SPI_FLASH_USE_4K_SECTORS is not set +CONFIG_FIT=y +CONFIG_FIT_ENABLE_SHA256_SUPPORT=y +CONFIG_FIT_VERBOSE=y +CONFIG_FIT_BEST_MATCH=y +CONFIG_PCI=y +CONFIG_PCI_MVEBU=y +CONFIG_SYS_NS16550=y +CONFIG_KIRKWOOD_SPI=y From patchwork Thu Jul 23 08:56:39 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luka Kovacic X-Patchwork-Id: 1334636 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=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=sartura.hr Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=sartura-hr.20150623.gappssmtp.com header.i=@sartura-hr.20150623.gappssmtp.com header.a=rsa-sha256 header.s=20150623 header.b=D10tZ/Hw; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4BC5pb12yjz9sRR for ; Thu, 23 Jul 2020 18:58:31 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id A82CF8217F; Thu, 23 Jul 2020 10:58:13 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=sartura.hr Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=sartura-hr.20150623.gappssmtp.com header.i=@sartura-hr.20150623.gappssmtp.com header.b="D10tZ/Hw"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 60BFF82055; Thu, 23 Jul 2020 10:58:08 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-wr1-x443.google.com (mail-wr1-x443.google.com [IPv6:2a00:1450:4864:20::443]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id D495B81BB3 for ; Thu, 23 Jul 2020 10:58:05 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=sartura.hr Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=luka.kovacic@sartura.hr Received: by mail-wr1-x443.google.com with SMTP id 88so4381003wrh.3 for ; Thu, 23 Jul 2020 01:58:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sartura-hr.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=wNsLrREAkIpB7FTVRG5YB3HYMEWZhgCpjAm91n1oLUE=; b=D10tZ/HwqB1VPm0mdZGXAAiR5q1xUbKlkl2YiKd9SkyOl1rbl+k5THfoSfIChV85Sg EKzi4qiBUyGxyl+eyUTjS/tBo/toMqQahIVHmz2SRzcKnO/TFKAm6OUWX94CHB9BxdsP xjLLDEccN5bNnbtQ95e/8USmL6eq5mCFZ66GyMs719qX9h52NmEyOUppaLeY+jzjJDHY +DrH8+wotsqGTvVWAxiRFV2lG9QsiRgct4CRafdTyZ2YsIEQnkkztbSlYGQ5pZ2XD5ig GoGlP4NOI49wb7w9PwG43hPxshXPQsB+VLP6Ps4ftUAWXBk94V7eAPUyWtLxLXgSXCsW 7D4A== 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=wNsLrREAkIpB7FTVRG5YB3HYMEWZhgCpjAm91n1oLUE=; b=ITxQ76jFcmvBE5GA9cHqL17fWgBogbpEtEPoDVjfj46iVpvi4mMHXUUM8gmvVb6xvs f+cO32YX+TTxheGICLv7hSRlacDGUbHuvzf+YFCY90GZSTSLDSsYCn+2JwV4sEknc4hw pafDWTp5LfsZfk25AsmNp/teiIiuuwZ2m1KYESFLnoieTIwPtQjXlpJTnFjXEL39mYlz AjzWV48LuEDBE9ikOpjYT8rLzsry3wWcU/eAcUA6U46qaSmIV/OzcQdY8bUVJGchgyQD jPiIgGNdJVdPH0iEA/+y2v/yRIgvEIaLvH0N747OAuKQZwf4xUOoOcz8zOPPUgislxpV GRqQ== X-Gm-Message-State: AOAM530rXHiwmDivjVc+9we3iSDwFVs/0xnDXOxadmAvK8XNogIFz2+2 0nzvPyQPpeJLD914f1OwaY/iTqULduT9JT4ibmGsZGqXWCU8OBtC9Oz35MdvE3+UBa5S6qz6qjI S0bDPpXgt1Cvne/XIW3jgxb0xZPrinXbnl2hjW5YwgxhSsiB8s/QDhvRM+tX9ZO/6z+2J5ZoV X-Google-Smtp-Source: ABdhPJznsrJ5WSpVzXLBevoGBioQTkz6Ba51t0NVseiCa1Hm5cNyCgwh4u1QSM+qTfaYR2gzbJ9LQg== X-Received: by 2002:adf:b1ca:: with SMTP id r10mr3347404wra.150.1595494685099; Thu, 23 Jul 2020 01:58:05 -0700 (PDT) Received: from lukakovacicapc.local ([2a00:ee2:4b0d:3001:fbc5:498b:ed6d:cfac]) by smtp.gmail.com with ESMTPSA id 78sm2711132wma.31.2020.07.23.01.58.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Jul 2020 01:58:04 -0700 (PDT) From: Luka Kovacic To: u-boot@lists.denx.de Cc: sr@denx.de, luka.perkov@sartura.hr, jakov.petrina@sartura.hr, Luka Kovacic Subject: [PATCH 4/5] arm: mvebu: crs3xx-98dx3236: Add a maintainer Date: Thu, 23 Jul 2020 10:56:39 +0200 Message-Id: <20200723085640.12232-5-luka.kovacic@sartura.hr> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200723085640.12232-1-luka.kovacic@sartura.hr> References: <20200723085640.12232-1-luka.kovacic@sartura.hr> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 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" X-Virus-Scanned: clamav-milter 0.102.3 at phobos.denx.de X-Virus-Status: Clean Add Luka Perkov to CRS3xx-98DX3236 MAINTAINERS. Signed-off-by: Luka Kovacic Cc: Luka Perkov Cc: Jakov Petrina Reviewed-by: Stefan Roese --- board/mikrotik/crs3xx-98dx3236/MAINTAINERS | 1 + 1 file changed, 1 insertion(+) diff --git a/board/mikrotik/crs3xx-98dx3236/MAINTAINERS b/board/mikrotik/crs3xx-98dx3236/MAINTAINERS index e6fbf3db1c..906ff98970 100644 --- a/board/mikrotik/crs3xx-98dx3236/MAINTAINERS +++ b/board/mikrotik/crs3xx-98dx3236/MAINTAINERS @@ -1,5 +1,6 @@ CRS3XX-98DX3236 BOARD M: Luka Kovacic +M: Luka Perkov S: Maintained F: board/mikrotik/crs3xx-98dx3236/ F: include/configs/crs3xx-98dx3236.h From patchwork Thu Jul 23 08:56:40 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luka Kovacic X-Patchwork-Id: 1334637 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=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=sartura.hr Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=sartura-hr.20150623.gappssmtp.com header.i=@sartura-hr.20150623.gappssmtp.com header.a=rsa-sha256 header.s=20150623 header.b=B2SDu9pk; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4BC5pp5Zlhz9sRR for ; Thu, 23 Jul 2020 18:58:42 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 419CD82185; Thu, 23 Jul 2020 10:58:18 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=sartura.hr Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=sartura-hr.20150623.gappssmtp.com header.i=@sartura-hr.20150623.gappssmtp.com header.b="B2SDu9pk"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id D82F182185; Thu, 23 Jul 2020 10:58:14 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-wr1-x444.google.com (mail-wr1-x444.google.com [IPv6:2a00:1450:4864:20::444]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id DC12D81C17 for ; Thu, 23 Jul 2020 10:58:11 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=sartura.hr Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=luka.kovacic@sartura.hr Received: by mail-wr1-x444.google.com with SMTP id r4so1414570wrx.9 for ; Thu, 23 Jul 2020 01:58:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sartura-hr.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=lw2+To6WSRYhARMPMdUQyqZJwaPE3bexTBS/S3ZfZhE=; b=B2SDu9pkgdcUZbJtZul9uadzQpkiTHlZJwxgaswFATjrh/fhSLdqu02bQi1XyLOVeY /2Tsm+gX0qD1VzCzt9FMEixI9I42ab2ffQ6th7PJ0tgkKQrJVC2ZJui3BW7cyTh6tOSZ 6ipEZkp0XKqtnmZShiXItNbMoqWKbjg033pi07bzQlQFYv+y66xKBJRZ4MJd1FJT9GPp hv5lZ13Jpv9OAkOz2mEfv4OSHTbJC9c7AbVUBZSIP9uXWmRMJV6o5GAKMUO6n27xA6lS aCAoyPCJjoXVksSpXl4eKm6hYM+AKSg2nFO6DMre9E5NOMsKuub7HEo0gesaRHyVinef h/KQ== 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=lw2+To6WSRYhARMPMdUQyqZJwaPE3bexTBS/S3ZfZhE=; b=UQaYvv7+WYWmISog9VWk42fAGGOJ0qtDenSYTeFkpUc9qHl3JF9KW7Bg6TvXViyWNp 3rfJA6sB2XaxgyNJhsARLqgeLFcoQcTB6krJHeWBIOGlNORXI3kpMZs7E0DrvPxKirzZ ZNlR9EjtB10nJ23xdJTZw06hLd5VtEDsNG2Q7k3GK9AqaxU6xD2aqXDdSuinutEPlFfJ ZIi/k43mtHlbnQBB5FG8ujZUr5SnhxOet4sHdjIgWC8H8zq03qjEN3Jd+Oq+Sh28cLcv m9jI7K6lPsfaV2NE+0DPAXrm788Brf+/US7WKaKfmIZXRaTNfUXYWGqkpvUsUeDu9MbA cp/g== X-Gm-Message-State: AOAM532nmlh7bUAj/DEVMpC3vg2CBpkboXNW+7AMTvUAYcVrHE4LO686 UuP0ABPPu8xBWI9pV/yAmvpgOLb41BIW4H//Xgp3JDHU4ohp0c3bMpJ2JHOIk5wAOqX00BUi15p 7d47v+NHDVdfRZdPO0t76DhbmwztcQwNO8tA+0JC/63OPpEfnxz26jdgHB9pLG3pzBGIu0R86 X-Google-Smtp-Source: ABdhPJxIsWcyx5JzPBE8wH/trSCvrVjfvN5xXmwcME7ECduGWepdYJNSJG648gr5ujzp1iyNvDS6+w== X-Received: by 2002:adf:f007:: with SMTP id j7mr2870712wro.195.1595494690680; Thu, 23 Jul 2020 01:58:10 -0700 (PDT) Received: from lukakovacicapc.local ([2a00:ee2:4b0d:3001:fbc5:498b:ed6d:cfac]) by smtp.gmail.com with ESMTPSA id 78sm2711132wma.31.2020.07.23.01.58.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Jul 2020 01:58:10 -0700 (PDT) From: Luka Kovacic To: u-boot@lists.denx.de Cc: sr@denx.de, luka.perkov@sartura.hr, jakov.petrina@sartura.hr, Luka Kovacic Subject: [PATCH 5/5] arm: mvebu: Update CRS305-1G-4S board flash layout Date: Thu, 23 Jul 2020 10:56:40 +0200 Message-Id: <20200723085640.12232-6-luka.kovacic@sartura.hr> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200723085640.12232-1-luka.kovacic@sartura.hr> References: <20200723085640.12232-1-luka.kovacic@sartura.hr> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 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" X-Virus-Scanned: clamav-milter 0.102.3 at phobos.denx.de X-Virus-Status: Clean Update the MikroTik CRS305-1G-4S flash layout to support redundant UBI partitions. Additionally enable the UBI commands in crs305-1g-4s_defconfig. Signed-off-by: Luka Kovacic Cc: Luka Perkov Cc: Jakov Petrina Reviewed-by: Stefan Roese --- arch/arm/dts/armada-xp-crs305-1g-4s.dtsi | 10 +++++----- configs/crs305-1g-4s_defconfig | 9 ++++++++- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/arch/arm/dts/armada-xp-crs305-1g-4s.dtsi b/arch/arm/dts/armada-xp-crs305-1g-4s.dtsi index c8839eac94..1a74ecd5b5 100644 --- a/arch/arm/dts/armada-xp-crs305-1g-4s.dtsi +++ b/arch/arm/dts/armada-xp-crs305-1g-4s.dtsi @@ -95,16 +95,16 @@ m25p,fast-read; partition@u-boot { - reg = <0x00000000 0x00080000>; + reg = <0x00000000 0x001f0000>; label = "u-boot"; }; partition@u-boot-env { - reg = <0x00080000 0x00010000>; + reg = <0x001f0000 0x00010000>; label = "u-boot-env"; }; - partition@firmware { - reg = <0x00090000 0x00f70000>; - label = "firmware"; + partition@ubi1 { + reg = <0x00200000 0x00e00000>; + label = "ubi1"; }; }; diff --git a/configs/crs305-1g-4s_defconfig b/configs/crs305-1g-4s_defconfig index a360fc5d3f..a62b14e856 100644 --- a/configs/crs305-1g-4s_defconfig +++ b/configs/crs305-1g-4s_defconfig @@ -5,14 +5,17 @@ CONFIG_SYS_TEXT_BASE=0x00800000 CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_TARGET_CRS3XX_98DX3236=y CONFIG_ENV_SIZE=0x10000 -CONFIG_ENV_OFFSET=0x80000 +CONFIG_ENV_OFFSET=0x1F0000 CONFIG_ENV_SECT_SIZE=0x10000 +CONFIG_BOOTCOUNT_BOOTLIMIT=3 CONFIG_BUILD_TARGET="u-boot.kwb" CONFIG_FIT=y +CONFIG_FIT_ENABLE_SHA256_SUPPORT=y CONFIG_FIT_VERBOSE=y CONFIG_FIT_BEST_MATCH=y CONFIG_USE_PREBOOT=y CONFIG_SYS_CONSOLE_INFO_QUIET=y +CONFIG_HUSH_PARSER=y CONFIG_AUTOBOOT_KEYED=y CONFIG_AUTOBOOT_PROMPT="Autoboot in %d seconds, to stop use 's' key\n" CONFIG_AUTOBOOT_STOP_STR="s" @@ -22,11 +25,15 @@ CONFIG_CMD_BOOTZ=y CONFIG_CMD_MTD=y CONFIG_CMD_SPI=y CONFIG_CMD_CACHE=y +CONFIG_CMD_UBI=y +CONFIG_CMD_FS_GENERIC=y CONFIG_CMD_MTDPARTS=y CONFIG_DEFAULT_DEVICE_TREE="armada-xp-crs305-1g-4s" CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_BLK=y +CONFIG_BOOTCOUNT_LIMIT=y +CONFIG_BOOTCOUNT_ENV=y # CONFIG_MMC is not set CONFIG_MTD=y CONFIG_DM_MTD=y