From patchwork Wed Mar 17 03:10:58 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bin Meng X-Patchwork-Id: 1454409 X-Patchwork-Delegate: uboot@andestech.com 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; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=uLhil6qY; 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 4F0Ztj0G9Jz9sWQ for ; Wed, 17 Mar 2021 14:11:22 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 4F87582807; Wed, 17 Mar 2021 04:11:15 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com 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=gmail.com header.i=@gmail.com header.b="uLhil6qY"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 5E4028280D; Wed, 17 Mar 2021 04:11:13 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-ej1-x631.google.com (mail-ej1-x631.google.com [IPv6:2a00:1450:4864:20::631]) (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 C8CE6827FA for ; Wed, 17 Mar 2021 04:11:09 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=bmeng.cn@gmail.com Received: by mail-ej1-x631.google.com with SMTP id p7so227578eju.6 for ; Tue, 16 Mar 2021 20:11:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=Sd3FvfJd6U2WqvW8SeT819NsBr8V+xLqnTPCV0mJ9V0=; b=uLhil6qYfEFOxKvshoNoQmL6gOmQ9GTcBAn+CpSIZxfxVe/p9a0bS04M2E5YL5Xku/ +2UeQdVD+eSVqnJUTH58gFpYc4boFzzZgZsDSSy5Upl2EV3zrQeqxWTTIhUWWR/lF6Tn CcE+n6wfvNePG4T1rN5m41RwqvRG5Hea0vQA2icQAslRnYxwhsjlZOhicDcOmveV/RMg dO+N1YII3jWGSJcXxIsOv7Drc15ow0SSZsQ1dKjjasSiDEW2BBCvrgYygpl533fsbNsU PbOR0OsNj8WUPe9dpIr5IpUfN85gyGd4qPYE0Zs2Y4GDXfVyQtMNhaF3d8pwJuegZ9I8 HzHA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=Sd3FvfJd6U2WqvW8SeT819NsBr8V+xLqnTPCV0mJ9V0=; b=aFgPT+JCJRNA3hq8lStxRf+8T9jB33PKp5LTDHCa8YEAqs/wNEgD1HeOuoLUuqClK4 eVWkhYZCtbduVXQhwWY8SgvcgLlnpHmz7p1K8DQqJx4Neqb2zV76TeH1M3NSgk2bHUCA nEwoahhbL+AIZcUNmA5CzAYTqGePjH+pWD1CyLYhlX9wdcBqwRkTSeAVVhuPq+1Ss/xO mTxSIiavyFn1ItVfbYYaG3HAbC7d+PoVGrcBOde1+I1PgcTL1ckrhazJMLNPB7ZvzXPo zBWZFn+2R51ZNi8VYXj+KHmw6swwzjfOrNlnm/ZyHoNaTISf8x/Pn0Fof+jW09gXD4Fg ZTqQ== X-Gm-Message-State: AOAM532XGVlFXl41OjFsBD170nDJdmJBZKLFUbeEcNBi/pn6vnryRxqj 2rmsvRWS0RsDz5pV8KGi8/U= X-Google-Smtp-Source: ABdhPJz5YKSjGSW9Q6LOGZ42WZTJ7xRfXJxug9lz5mmLpoG1ErBjvUjSE7ZWI//sFRTLUHJuy1y3gA== X-Received: by 2002:a17:907:76b6:: with SMTP id jw22mr32856123ejc.11.1615950669444; Tue, 16 Mar 2021 20:11:09 -0700 (PDT) Received: from pek-vx-bsp9.wrs.com (ec2-44-242-66-180.us-west-2.compute.amazonaws.com. [44.242.66.180]) by smtp.gmail.com with ESMTPSA id b4sm5683792eja.47.2021.03.16.20.11.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 Mar 2021 20:11:09 -0700 (PDT) From: Bin Meng To: Green Wan , Pragnesh Patel , Rick Chen , u-boot@lists.denx.de Subject: [PATCH v2] riscv: sifive: Rename fu540 board to unleashed Date: Wed, 17 Mar 2021 11:10:58 +0800 Message-Id: <20210317031058.53964-1-bmeng.cn@gmail.com> X-Mailer: git-send-email 2.17.1 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.4 at phobos.denx.de X-Virus-Status: Clean In preparation to add SiFive Unmatched board support, let's rename the existing fu540 board to unleashed. Signed-off-by: Bin Meng Reviewed-by: Leo Yu-Chi Liang --- Changes in v2: - fix a typo in the commit message - rename fu540.rst arch/riscv/Kconfig | 6 +++--- arch/riscv/dts/Makefile | 2 +- board/sifive/{fu540 => unleashed}/Kconfig | 6 +++--- board/sifive/{fu540 => unleashed}/MAINTAINERS | 10 +++++----- board/sifive/{fu540 => unleashed}/Makefile | 2 +- board/sifive/{fu540 => unleashed}/spl.c | 0 board/sifive/{fu540/fu540.c => unleashed/unleashed.c} | 0 common/spl/Kconfig | 5 +++-- ...five_fu540_defconfig => sifive_unleashed_defconfig} | 2 +- doc/board/sifive/index.rst | 2 +- doc/board/sifive/{fu540.rst => unleashed.rst} | 0 drivers/ram/sifive/Kconfig | 2 +- drivers/reset/Kconfig | 2 +- include/configs/{sifive-fu540.h => sifive-unleashed.h} | 0 14 files changed, 20 insertions(+), 19 deletions(-) rename board/sifive/{fu540 => unleashed}/Kconfig (91%) rename board/sifive/{fu540 => unleashed}/MAINTAINERS (50%) rename board/sifive/{fu540 => unleashed}/Makefile (87%) rename board/sifive/{fu540 => unleashed}/spl.c (100%) rename board/sifive/{fu540/fu540.c => unleashed/unleashed.c} (100%) rename configs/{sifive_fu540_defconfig => sifive_unleashed_defconfig} (95%) rename doc/board/sifive/{fu540.rst => unleashed.rst} (100%) rename include/configs/{sifive-fu540.h => sifive-unleashed.h} (100%) diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig index 55eaee2da6..e8494c2a49 100644 --- a/arch/riscv/Kconfig +++ b/arch/riscv/Kconfig @@ -17,8 +17,8 @@ config TARGET_MICROCHIP_ICICLE config TARGET_QEMU_VIRT bool "Support QEMU Virt Board" -config TARGET_SIFIVE_FU540 - bool "Support SiFive FU540 Board" +config TARGET_SIFIVE_UNLEASHED + bool "Support SiFive Unleashed Board" config TARGET_SIPEED_MAIX bool "Support Sipeed Maix Board" @@ -55,7 +55,7 @@ config SPL_SYS_DCACHE_OFF source "board/AndesTech/ax25-ae350/Kconfig" source "board/emulation/qemu-riscv/Kconfig" source "board/microchip/mpfs_icicle/Kconfig" -source "board/sifive/fu540/Kconfig" +source "board/sifive/unleashed/Kconfig" source "board/sipeed/maix/Kconfig" # platform-specific options below diff --git a/arch/riscv/dts/Makefile b/arch/riscv/dts/Makefile index 01331b0aa1..8138d89d84 100644 --- a/arch/riscv/dts/Makefile +++ b/arch/riscv/dts/Makefile @@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0+ dtb-$(CONFIG_TARGET_AX25_AE350) += ae350_32.dtb ae350_64.dtb -dtb-$(CONFIG_TARGET_SIFIVE_FU540) += hifive-unleashed-a00.dtb +dtb-$(CONFIG_TARGET_SIFIVE_UNLEASHED) += hifive-unleashed-a00.dtb dtb-$(CONFIG_TARGET_SIPEED_MAIX) += k210-maix-bit.dtb dtb-$(CONFIG_TARGET_MICROCHIP_ICICLE) += microchip-mpfs-icicle-kit.dtb diff --git a/board/sifive/fu540/Kconfig b/board/sifive/unleashed/Kconfig similarity index 91% rename from board/sifive/fu540/Kconfig rename to board/sifive/unleashed/Kconfig index 64fdbd44b4..dbffd59c98 100644 --- a/board/sifive/fu540/Kconfig +++ b/board/sifive/unleashed/Kconfig @@ -1,7 +1,7 @@ -if TARGET_SIFIVE_FU540 +if TARGET_SIFIVE_UNLEASHED config SYS_BOARD - default "fu540" + default "unleashed" config SYS_VENDOR default "sifive" @@ -10,7 +10,7 @@ config SYS_CPU default "fu540" config SYS_CONFIG_NAME - default "sifive-fu540" + default "sifive-unleashed" config SYS_TEXT_BASE default 0x80200000 if SPL diff --git a/board/sifive/fu540/MAINTAINERS b/board/sifive/unleashed/MAINTAINERS similarity index 50% rename from board/sifive/fu540/MAINTAINERS rename to board/sifive/unleashed/MAINTAINERS index 27620727bd..2ea00749cb 100644 --- a/board/sifive/fu540/MAINTAINERS +++ b/board/sifive/unleashed/MAINTAINERS @@ -1,10 +1,10 @@ -SiFive FU540 BOARD +SiFive HiFive Unleashed BOARD M: Paul Walmsley M: Palmer Dabbelt M: Anup Patel M: Atish Patra S: Maintained -F: board/sifive/fu540/ -F: doc/board/sifive/fu540.rst -F: include/configs/sifive-fu540.h -F: configs/sifive_fu540_defconfig +F: board/sifive/unleashed/ +F: doc/board/sifive/unleashed.rst +F: include/configs/sifive-unleashed.h +F: configs/sifive_unleashed_defconfig diff --git a/board/sifive/fu540/Makefile b/board/sifive/unleashed/Makefile similarity index 87% rename from board/sifive/fu540/Makefile rename to board/sifive/unleashed/Makefile index b05e2f5807..5821679dd9 100644 --- a/board/sifive/fu540/Makefile +++ b/board/sifive/unleashed/Makefile @@ -2,7 +2,7 @@ # # Copyright (c) 2019 Western Digital Corporation or its affiliates. -obj-y += fu540.o +obj-y += unleashed.o ifdef CONFIG_SPL_BUILD obj-y += spl.o diff --git a/board/sifive/fu540/spl.c b/board/sifive/unleashed/spl.c similarity index 100% rename from board/sifive/fu540/spl.c rename to board/sifive/unleashed/spl.c diff --git a/board/sifive/fu540/fu540.c b/board/sifive/unleashed/unleashed.c similarity index 100% rename from board/sifive/fu540/fu540.c rename to board/sifive/unleashed/unleashed.c diff --git a/common/spl/Kconfig b/common/spl/Kconfig index 774541c02b..6e6a790dd6 100644 --- a/common/spl/Kconfig +++ b/common/spl/Kconfig @@ -317,7 +317,8 @@ config SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR ARCH_MX6 || ARCH_MX7 || \ ARCH_ROCKCHIP || ARCH_MVEBU || ARCH_SOCFPGA || \ ARCH_AT91 || ARCH_ZYNQ || ARCH_KEYSTONE || OMAP34XX || \ - OMAP44XX || OMAP54XX || AM33XX || AM43XX || TARGET_SIFIVE_FU540 + OMAP44XX || OMAP54XX || AM33XX || AM43XX || \ + TARGET_SIFIVE_UNLEASHED help Use sector number for specifying U-Boot location on MMC/SD in raw mode. @@ -334,7 +335,7 @@ config SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR default 0x300 if ARCH_ZYNQ || ARCH_KEYSTONE || OMAP34XX || OMAP44XX || \ OMAP54XX || AM33XX || AM43XX || ARCH_K3 default 0x4000 if ARCH_ROCKCHIP - default 0x822 if TARGET_SIFIVE_FU540 + default 0x822 if TARGET_SIFIVE_UNLEASHED help Address on the MMC to load U-Boot from, when the MMC is being used in raw mode. Units: MMC sectors (1 sector = 512 bytes). diff --git a/configs/sifive_fu540_defconfig b/configs/sifive_unleashed_defconfig similarity index 95% rename from configs/sifive_fu540_defconfig rename to configs/sifive_unleashed_defconfig index cabd3b1778..62416a7c1d 100644 --- a/configs/sifive_fu540_defconfig +++ b/configs/sifive_unleashed_defconfig @@ -8,7 +8,7 @@ CONFIG_SPL=y CONFIG_SPL_SPI_FLASH_SUPPORT=y CONFIG_SPL_SPI_SUPPORT=y CONFIG_DEFAULT_DEVICE_TREE="hifive-unleashed-a00" -CONFIG_TARGET_SIFIVE_FU540=y +CONFIG_TARGET_SIFIVE_UNLEASHED=y CONFIG_ARCH_RV64I=y CONFIG_RISCV_SMODE=y CONFIG_DISTRO_DEFAULTS=y diff --git a/doc/board/sifive/index.rst b/doc/board/sifive/index.rst index ad614c9bf2..ed7eacfb54 100644 --- a/doc/board/sifive/index.rst +++ b/doc/board/sifive/index.rst @@ -6,4 +6,4 @@ SiFive .. toctree:: :maxdepth: 2 - fu540 + unleashed diff --git a/doc/board/sifive/fu540.rst b/doc/board/sifive/unleashed.rst similarity index 100% rename from doc/board/sifive/fu540.rst rename to doc/board/sifive/unleashed.rst diff --git a/drivers/ram/sifive/Kconfig b/drivers/ram/sifive/Kconfig index 6aca22ab2a..08de692e02 100644 --- a/drivers/ram/sifive/Kconfig +++ b/drivers/ram/sifive/Kconfig @@ -8,6 +8,6 @@ config RAM_SIFIVE config SIFIVE_FU540_DDR bool "SiFive FU540 DDR driver" depends on RAM_SIFIVE - default y if TARGET_SIFIVE_FU540 + default y if TARGET_SIFIVE_UNLEASHED help This enables DDR support for the platforms based on SiFive FU540 SoC. diff --git a/drivers/reset/Kconfig b/drivers/reset/Kconfig index f5b3f8826f..019565f979 100644 --- a/drivers/reset/Kconfig +++ b/drivers/reset/Kconfig @@ -166,7 +166,7 @@ config RESET_IPQ419 config RESET_SIFIVE bool "Reset Driver for SiFive SoC's" - depends on DM_RESET && CLK_SIFIVE_FU540_PRCI && TARGET_SIFIVE_FU540 + depends on DM_RESET && CLK_SIFIVE_FU540_PRCI && TARGET_SIFIVE_UNLEASHED default y help PRCI module within SiFive SoC's provides mechanism to reset diff --git a/include/configs/sifive-fu540.h b/include/configs/sifive-unleashed.h similarity index 100% rename from include/configs/sifive-fu540.h rename to include/configs/sifive-unleashed.h