From 75bf3c5368f330a7730d7a733b56129bdfe61b92 Mon Sep 17 00:00:00 2001 From: Nicolas Pitre Date: Thu, 18 Jul 2019 23:05:53 -0400 Subject: [PATCH] riscv: freedom: rename RISCV32 to RISCV This code is common to 32- and 64-bit builds. Signed-off-by: Nicolas Pitre --- boards/riscv/hifive1/Kconfig.board | 2 +- boards/riscv/hifive1/hifive1_defconfig | 4 ++-- boards/riscv/hifive1_revb/Kconfig.board | 2 +- boards/riscv/hifive1_revb/hifive1_revb_defconfig | 4 ++-- boards/riscv/qemu_riscv32/Kconfig.board | 2 +- boards/riscv/qemu_riscv32/qemu_riscv32_defconfig | 4 ++-- drivers/gpio/Kconfig.sifive | 2 +- drivers/i2c/Kconfig.sifive | 2 +- drivers/pinmux/Kconfig.sifive | 2 +- drivers/pwm/Kconfig.sifive | 2 +- drivers/serial/Kconfig.sifive | 2 +- drivers/spi/Kconfig.sifive | 2 +- .../riscv-privilege/sifive-freedom/Kconfig.defconfig.series | 4 ++-- soc/riscv/riscv-privilege/sifive-freedom/Kconfig.series | 4 ++-- soc/riscv/riscv-privilege/sifive-freedom/Kconfig.soc | 6 +++--- soc/riscv/riscv-privilege/sifive-freedom/soc.h | 6 +++--- 16 files changed, 25 insertions(+), 25 deletions(-) diff --git a/boards/riscv/hifive1/Kconfig.board b/boards/riscv/hifive1/Kconfig.board index c7ea951b74b..b5b32649441 100644 --- a/boards/riscv/hifive1/Kconfig.board +++ b/boards/riscv/hifive1/Kconfig.board @@ -2,4 +2,4 @@ config BOARD_HIFIVE1 bool "HiFive1 target" - depends on SOC_RISCV32_SIFIVE_FREEDOM + depends on SOC_RISCV_SIFIVE_FREEDOM diff --git a/boards/riscv/hifive1/hifive1_defconfig b/boards/riscv/hifive1/hifive1_defconfig index e1c08228a80..45aa1483fa2 100644 --- a/boards/riscv/hifive1/hifive1_defconfig +++ b/boards/riscv/hifive1/hifive1_defconfig @@ -1,8 +1,8 @@ # SPDX-License-Identifier: Apache-2.0 CONFIG_RISCV=y -CONFIG_SOC_SERIES_RISCV32_SIFIVE_FREEDOM=y -CONFIG_SOC_RISCV32_SIFIVE_FREEDOM=y +CONFIG_SOC_SERIES_RISCV_SIFIVE_FREEDOM=y +CONFIG_SOC_RISCV_SIFIVE_FREEDOM=y CONFIG_BOARD_HIFIVE1=y CONFIG_CONSOLE=y CONFIG_PRINTK=y diff --git a/boards/riscv/hifive1_revb/Kconfig.board b/boards/riscv/hifive1_revb/Kconfig.board index eedfd937f84..42b408f7545 100644 --- a/boards/riscv/hifive1_revb/Kconfig.board +++ b/boards/riscv/hifive1_revb/Kconfig.board @@ -2,4 +2,4 @@ # SPDX-License-Identifier: Apache-2.0 config BOARD_HIFIVE1_REVB bool "HiFive1 Rev B target" - depends on SOC_RISCV32_SIFIVE_FREEDOM + depends on SOC_RISCV_SIFIVE_FREEDOM diff --git a/boards/riscv/hifive1_revb/hifive1_revb_defconfig b/boards/riscv/hifive1_revb/hifive1_revb_defconfig index f96425513ed..9e1d9e2fa6e 100644 --- a/boards/riscv/hifive1_revb/hifive1_revb_defconfig +++ b/boards/riscv/hifive1_revb/hifive1_revb_defconfig @@ -1,6 +1,6 @@ CONFIG_RISCV=y -CONFIG_SOC_SERIES_RISCV32_SIFIVE_FREEDOM=y -CONFIG_SOC_RISCV32_SIFIVE_FREEDOM=y +CONFIG_SOC_SERIES_RISCV_SIFIVE_FREEDOM=y +CONFIG_SOC_RISCV_SIFIVE_FREEDOM=y CONFIG_BOARD_HIFIVE1_REVB=y CONFIG_RISCV_MACHINE_TIMER=y CONFIG_PLIC=y diff --git a/boards/riscv/qemu_riscv32/Kconfig.board b/boards/riscv/qemu_riscv32/Kconfig.board index 444a16163bf..6fdf7df63c1 100644 --- a/boards/riscv/qemu_riscv32/Kconfig.board +++ b/boards/riscv/qemu_riscv32/Kconfig.board @@ -2,5 +2,5 @@ config BOARD_QEMU_RISCV32 bool "QEMU RISCV32 target" - depends on SOC_RISCV32_SIFIVE_FREEDOM + depends on SOC_RISCV_SIFIVE_FREEDOM select QEMU_TARGET diff --git a/boards/riscv/qemu_riscv32/qemu_riscv32_defconfig b/boards/riscv/qemu_riscv32/qemu_riscv32_defconfig index ffc9bf644f0..f5d100db39e 100644 --- a/boards/riscv/qemu_riscv32/qemu_riscv32_defconfig +++ b/boards/riscv/qemu_riscv32/qemu_riscv32_defconfig @@ -1,8 +1,8 @@ # SPDX-License-Identifier: Apache-2.0 CONFIG_RISCV=y -CONFIG_SOC_SERIES_RISCV32_SIFIVE_FREEDOM=y -CONFIG_SOC_RISCV32_SIFIVE_FREEDOM=y +CONFIG_SOC_SERIES_RISCV_SIFIVE_FREEDOM=y +CONFIG_SOC_RISCV_SIFIVE_FREEDOM=y CONFIG_BOARD_QEMU_RISCV32=y CONFIG_CONSOLE=y CONFIG_PRINTK=y diff --git a/drivers/gpio/Kconfig.sifive b/drivers/gpio/Kconfig.sifive index a7a3ef51e7d..a92421c34bf 100644 --- a/drivers/gpio/Kconfig.sifive +++ b/drivers/gpio/Kconfig.sifive @@ -7,7 +7,7 @@ menuconfig GPIO_SIFIVE bool "SiFive Freedom Processor GPIO driver" - depends on SOC_RISCV32_SIFIVE_FREEDOM + depends on SOC_RISCV_SIFIVE_FREEDOM select HAS_DTS_GPIO help Enable driver for the SiFive Freedom GPIO controller. diff --git a/drivers/i2c/Kconfig.sifive b/drivers/i2c/Kconfig.sifive index 2b07c22fdcf..471c1b77217 100644 --- a/drivers/i2c/Kconfig.sifive +++ b/drivers/i2c/Kconfig.sifive @@ -6,7 +6,7 @@ menuconfig I2C_SIFIVE bool "Sifive I2C driver" - depends on SOC_SERIES_RISCV32_SIFIVE_FREEDOM + depends on SOC_SERIES_RISCV_SIFIVE_FREEDOM depends on HAS_DTS_I2C help Enable I2C support on SiFive Freedom diff --git a/drivers/pinmux/Kconfig.sifive b/drivers/pinmux/Kconfig.sifive index 29e5c5f6d33..af2e4b0a1a7 100644 --- a/drivers/pinmux/Kconfig.sifive +++ b/drivers/pinmux/Kconfig.sifive @@ -7,7 +7,7 @@ menuconfig PINMUX_SIFIVE bool "SiFive Freedom SOC pinmux driver" - depends on SOC_SERIES_RISCV32_SIFIVE_FREEDOM + depends on SOC_SERIES_RISCV_SIFIVE_FREEDOM help Enable driver for the SiFive Freedom SOC pinmux driver diff --git a/drivers/pwm/Kconfig.sifive b/drivers/pwm/Kconfig.sifive index 14ed8a0a53a..a0a646aaa49 100644 --- a/drivers/pwm/Kconfig.sifive +++ b/drivers/pwm/Kconfig.sifive @@ -8,7 +8,7 @@ menuconfig PWM_SIFIVE bool "SiFive Freedom PWM driver" - depends on SOC_SERIES_RISCV32_SIFIVE_FREEDOM + depends on SOC_SERIES_RISCV_SIFIVE_FREEDOM depends on HAS_DTS help Enable the PWM driver for the SiFive Freedom platform diff --git a/drivers/serial/Kconfig.sifive b/drivers/serial/Kconfig.sifive index 2594d62f220..8e745caee13 100644 --- a/drivers/serial/Kconfig.sifive +++ b/drivers/serial/Kconfig.sifive @@ -7,7 +7,7 @@ menuconfig UART_SIFIVE bool "SiFive Freedom serial driver" - depends on SOC_RISCV32_SIFIVE_FREEDOM + depends on SOC_RISCV_SIFIVE_FREEDOM select SERIAL_HAS_DRIVER select SERIAL_SUPPORT_INTERRUPT help diff --git a/drivers/spi/Kconfig.sifive b/drivers/spi/Kconfig.sifive index 4488f541625..c0b6ff706ee 100644 --- a/drivers/spi/Kconfig.sifive +++ b/drivers/spi/Kconfig.sifive @@ -8,7 +8,7 @@ menuconfig SPI_SIFIVE bool "SiFive SPI controller driver" - depends on SOC_SERIES_RISCV32_SIFIVE_FREEDOM + depends on SOC_SERIES_RISCV_SIFIVE_FREEDOM help Enable the SPI peripherals on SiFive Freedom processors diff --git a/soc/riscv/riscv-privilege/sifive-freedom/Kconfig.defconfig.series b/soc/riscv/riscv-privilege/sifive-freedom/Kconfig.defconfig.series index dcb6f29d7ac..d086749ccea 100644 --- a/soc/riscv/riscv-privilege/sifive-freedom/Kconfig.defconfig.series +++ b/soc/riscv/riscv-privilege/sifive-freedom/Kconfig.defconfig.series @@ -1,6 +1,6 @@ # SPDX-License-Identifier: Apache-2.0 -if SOC_SERIES_RISCV32_SIFIVE_FREEDOM +if SOC_SERIES_RISCV_SIFIVE_FREEDOM config SOC_SERIES string @@ -30,4 +30,4 @@ config XIP bool default y -endif # SOC_SERIES_RISCV32_SIFIVE_FREEDOM +endif # SOC_SERIES_RISCV_SIFIVE_FREEDOM diff --git a/soc/riscv/riscv-privilege/sifive-freedom/Kconfig.series b/soc/riscv/riscv-privilege/sifive-freedom/Kconfig.series index 4ba73b1b6ab..073acc64635 100644 --- a/soc/riscv/riscv-privilege/sifive-freedom/Kconfig.series +++ b/soc/riscv/riscv-privilege/sifive-freedom/Kconfig.series @@ -1,11 +1,11 @@ -# Kconfig - RISCV32_SIFIVE_FREEDOM SOC implementation +# Kconfig - RISCV_SIFIVE_FREEDOM SOC implementation # # Copyright (c) 2017 Jean-Paul Etienne # # SPDX-License-Identifier: Apache-2.0 # -config SOC_SERIES_RISCV32_SIFIVE_FREEDOM +config SOC_SERIES_RISCV_SIFIVE_FREEDOM bool "SiFive Freedom SOC implementation" depends on RISCV select SOC_FAMILY_RISCV_PRIVILEGE diff --git a/soc/riscv/riscv-privilege/sifive-freedom/Kconfig.soc b/soc/riscv/riscv-privilege/sifive-freedom/Kconfig.soc index 68444ae5169..5e1ebb0aad8 100644 --- a/soc/riscv/riscv-privilege/sifive-freedom/Kconfig.soc +++ b/soc/riscv/riscv-privilege/sifive-freedom/Kconfig.soc @@ -1,4 +1,4 @@ -# Kconfig - RISCV32_SIFIVE_FREEDOM SOC configuration options +# Kconfig - RISCV_SIFIVE_FREEDOM SOC configuration options # # Copyright (c) 2017 Jean-Paul Etienne # @@ -7,9 +7,9 @@ choice prompt "SiFive Freedom SOC implementation" -depends on SOC_SERIES_RISCV32_SIFIVE_FREEDOM +depends on SOC_SERIES_RISCV_SIFIVE_FREEDOM -config SOC_RISCV32_SIFIVE_FREEDOM +config SOC_RISCV_SIFIVE_FREEDOM bool "SiFive Freedom SOC implementation" select ATOMIC_OPERATIONS_C diff --git a/soc/riscv/riscv-privilege/sifive-freedom/soc.h b/soc/riscv/riscv-privilege/sifive-freedom/soc.h index 0b9141b540c..37be403c64f 100644 --- a/soc/riscv/riscv-privilege/sifive-freedom/soc.h +++ b/soc/riscv/riscv-privilege/sifive-freedom/soc.h @@ -8,8 +8,8 @@ * @file SoC configuration macros for the SiFive Freedom processor */ -#ifndef __RISCV32_SIFIVE_FREEDOM_SOC_H_ -#define __RISCV32_SIFIVE_FREEDOM_SOC_H_ +#ifndef __RISCV_SIFIVE_FREEDOM_SOC_H_ +#define __RISCV_SIFIVE_FREEDOM_SOC_H_ #include #include @@ -44,4 +44,4 @@ #define RISCV_RAM_BASE DT_SRAM_BASE_ADDRESS #define RISCV_RAM_SIZE KB(DT_SRAM_SIZE) -#endif /* __RISCV32_SIFIVE_FREEDOM_SOC_H_ */ +#endif /* __RISCV_SIFIVE_FREEDOM_SOC_H_ */