From bebf3adce1e88fca3735cc8ec56baf40a55dbc63 Mon Sep 17 00:00:00 2001 From: David Abdurachmanov Date: Sat, 28 Sep 2019 08:47:43 +0200 Subject: [PATCH] Attempt again to get MMC built-in for RISC-V Signed-off-by: David Abdurachmanov --- configs/fedora/generic/riscv/CONFIG_MMC | 1 + configs/fedora/generic/riscv/CONFIG_MMC_SPI | 2 +- configs/fedora/generic/riscv/CONFIG_REGMAP_SPI | 2 +- kernel-riscv64-debug.config | 6 +++--- kernel-riscv64.config | 6 +++--- kernel.spec | 2 +- 6 files changed, 10 insertions(+), 9 deletions(-) create mode 100644 configs/fedora/generic/riscv/CONFIG_MMC diff --git a/configs/fedora/generic/riscv/CONFIG_MMC b/configs/fedora/generic/riscv/CONFIG_MMC new file mode 100644 index 000000000..7c2be178c --- /dev/null +++ b/configs/fedora/generic/riscv/CONFIG_MMC @@ -0,0 +1 @@ +CONFIG_MMC=y diff --git a/configs/fedora/generic/riscv/CONFIG_MMC_SPI b/configs/fedora/generic/riscv/CONFIG_MMC_SPI index 04b40c54e..fd3f5873b 100644 --- a/configs/fedora/generic/riscv/CONFIG_MMC_SPI +++ b/configs/fedora/generic/riscv/CONFIG_MMC_SPI @@ -1 +1 @@ -CONFIG_MMC_SPI=m +CONFIG_MMC_SPI=y diff --git a/configs/fedora/generic/riscv/CONFIG_REGMAP_SPI b/configs/fedora/generic/riscv/CONFIG_REGMAP_SPI index adb8804fa..eb9c6a3f7 100644 --- a/configs/fedora/generic/riscv/CONFIG_REGMAP_SPI +++ b/configs/fedora/generic/riscv/CONFIG_REGMAP_SPI @@ -1 +1 @@ -CONFIG_REGMAP_SPI=m +CONFIG_REGMAP_SPI=y diff --git a/kernel-riscv64-debug.config b/kernel-riscv64-debug.config index a7004e538..df9bf2ff1 100644 --- a/kernel-riscv64-debug.config +++ b/kernel-riscv64-debug.config @@ -2863,7 +2863,6 @@ CONFIG_MMC_CB710=m CONFIG_MMC_CQHCI=m # CONFIG_MMC_DEBUG is not set # CONFIG_MMC_DW_BLUEFIELD is not set -CONFIG_MMC=m # CONFIG_MMC_MTK is not set CONFIG_MMC_REALTEK_PCI=m CONFIG_MMC_REALTEK_USB=m @@ -2882,7 +2881,7 @@ CONFIG_MMC_SDHCI_PCI=m CONFIG_MMC_SDHCI_PLTFM=m CONFIG_MMC_SDHCI_XENON=m CONFIG_MMC_SDRICOH_CS=m -CONFIG_MMC_SPI=m +CONFIG_MMC_SPI=y # CONFIG_MMC_TEST is not set CONFIG_MMC_TIFM_SD=m # CONFIG_MMC_TOSHIBA_PCI is not set @@ -2891,6 +2890,7 @@ CONFIG_MMC_USHC=m CONFIG_MMC_VIA_SDMMC=m CONFIG_MMC_VUB300=m CONFIG_MMC_WBSD=m +CONFIG_MMC=y CONFIG_MMIOTRACE=y CONFIG_MMU=y # CONFIG_MODULE_COMPRESS is not set @@ -4009,7 +4009,7 @@ CONFIG_REALTEK_PHY=y # CONFIG_REED_SOLOMON_TEST is not set CONFIG_REFCOUNT_FULL=y CONFIG_REGMAP_I2C=m -CONFIG_REGMAP_SPI=m +CONFIG_REGMAP_SPI=y CONFIG_REGMAP=y # CONFIG_REGULATOR_88PG86X is not set # CONFIG_REGULATOR_ACT8865 is not set diff --git a/kernel-riscv64.config b/kernel-riscv64.config index 1d13d89da..f16297d5f 100644 --- a/kernel-riscv64.config +++ b/kernel-riscv64.config @@ -2843,7 +2843,6 @@ CONFIG_MMC_CB710=m CONFIG_MMC_CQHCI=m # CONFIG_MMC_DEBUG is not set # CONFIG_MMC_DW_BLUEFIELD is not set -CONFIG_MMC=m # CONFIG_MMC_MTK is not set CONFIG_MMC_REALTEK_PCI=m CONFIG_MMC_REALTEK_USB=m @@ -2862,7 +2861,7 @@ CONFIG_MMC_SDHCI_PCI=m CONFIG_MMC_SDHCI_PLTFM=m CONFIG_MMC_SDHCI_XENON=m CONFIG_MMC_SDRICOH_CS=m -CONFIG_MMC_SPI=m +CONFIG_MMC_SPI=y # CONFIG_MMC_TEST is not set CONFIG_MMC_TIFM_SD=m # CONFIG_MMC_TOSHIBA_PCI is not set @@ -2871,6 +2870,7 @@ CONFIG_MMC_USHC=m CONFIG_MMC_VIA_SDMMC=m CONFIG_MMC_VUB300=m CONFIG_MMC_WBSD=m +CONFIG_MMC=y CONFIG_MMU=y # CONFIG_MODULE_COMPRESS is not set # CONFIG_MODULE_FORCE_LOAD is not set @@ -3987,7 +3987,7 @@ CONFIG_REALTEK_PHY=y # CONFIG_REED_SOLOMON_TEST is not set # CONFIG_REFCOUNT_FULL is not set CONFIG_REGMAP_I2C=m -CONFIG_REGMAP_SPI=m +CONFIG_REGMAP_SPI=y CONFIG_REGMAP=y # CONFIG_REGULATOR_88PG86X is not set # CONFIG_REGULATOR_ACT8865 is not set diff --git a/kernel.spec b/kernel.spec index 70cc9b179..dab855a44 100644 --- a/kernel.spec +++ b/kernel.spec @@ -144,7 +144,7 @@ Summary: The Linux kernel # pkg_release is what we'll fill in for the rpm Release: field %if 0%{?released_kernel} -%define pkg_release %{fedora_build}%{?buildid}.1.riscv64%{?dist} +%define pkg_release %{fedora_build}%{?buildid}.2.riscv64%{?dist} %else