On Wed, Mar 17, 2021 at 11:10:58AM +0800, Bin Meng wrote:
> In preparation to add SiFive Unmatched board support, let's rename
> the existing fu540 board to unleashed.
>
> Signed-off-by: Bin Meng <bmeng...@gmail.com>
>
> ---
>
> 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 <paul.walms...@sifive.com>
> M: Palmer Dabbelt <pal...@dabbelt.com>
> M: Anup Patel <anup.pa...@wdc.com>
> M: Atish Patra <atish.pa...@wdc.com>
> 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
> --
> 2.17.1
>
Reviewed-by: Leo Yu-Chi Liang <ycli...@andestech.com>
