From f0e70d4946332c681ceaba940652f30c7c33473d Mon Sep 17 00:00:00 2001 From: Enric Balletbo i Serra Date: Fri, 23 Apr 2021 09:52:01 +0200 Subject: [PATCH 1/2] arm64: defconfig: Do not override the MTK_PMIC_WRAP symbol Commit 'fbbe38309d56 ("arm64: defconfig: Allow mt8173-based boards to boot from usb")' added the MTK_PMIC_WRAP config built-in. It needs to be built-in in order to be able to boot from USB or the MMC without needing a ramdisk, but that symbol was already defined as a module so now we are getting the following warning: arch/arm64/configs/defconfig:996:warning: override: reassigning to symbol MTK_PMIC_WRAP Remove the MTK_PMIC_WRAP=m from the defconfig to remove the error. Fixes: fbbe38309d56 ("arm64: defconfig: Allow mt8173-based boards to boot from usb") Signed-off-by: Enric Balletbo i Serra Link: https://lore.kernel.org/r/20210423075201.2616023-1-enric.balletbo@collabora.com Signed-off-by: Matthias Brugger --- arch/arm64/configs/defconfig | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index 08c6f769df9a..9907a431db0d 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -491,7 +491,6 @@ CONFIG_SPI_S3C64XX=y CONFIG_SPI_SH_MSIOF=m CONFIG_SPI_SUN6I=y CONFIG_SPI_SPIDEV=m -CONFIG_MTK_PMIC_WRAP=m CONFIG_SPMI=y CONFIG_PINCTRL_SINGLE=y CONFIG_PINCTRL_MAX77620=y From 6c2cfc947607dc8de338377479939893f1288f37 Mon Sep 17 00:00:00 2001 From: Enric Balletbo i Serra Date: Fri, 23 Apr 2021 09:52:50 +0200 Subject: [PATCH 2/2] arm64: defconfig: Allow Mediatek boards to boot from the mmc Enable the MMC_MTK option necessary to boot Mediatek boards from the mmc. Booting from the mmc is the common method used for a bunch of boards, specially Chromebooks, to boot from. Hence this driver is built-in. Signed-off-by: Enric Balletbo i Serra Link: https://lore.kernel.org/r/20210423075250.2616275-1-enric.balletbo@collabora.com Signed-off-by: Matthias Brugger --- arch/arm64/configs/defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index 9907a431db0d..901598145297 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -865,6 +865,7 @@ CONFIG_MMC_DW_K3=y CONFIG_MMC_DW_ROCKCHIP=y CONFIG_MMC_SUNXI=y CONFIG_MMC_BCM2835=y +CONFIG_MMC_MTK=y CONFIG_MMC_SDHCI_XENON=y CONFIG_MMC_SDHCI_AM654=y CONFIG_MMC_OWL=y