Le ven. 14 août 2026 à 23:21, David Lechner <[email protected]> a écrit : > > Remove the UFS defconfigs for Genio 520/720/1200 and enable the UFS > options in the remaining defconfigs. This simplifies things a bit, e.g. > it makes fewer builds to run when testing. Users can instead use the > base defconfigs and pass DEVICE_TREE= to select the correct devicetree > for the target. Or alternatively, include devicetree overlays in a FIT > image that can be selected at runtime by the SPL. > > Signed-off-by: David Lechner <[email protected]> > --- > A bit more on the motivation behind this... > > As we are working on adding support for DSI displays for these that > are removable (and there are dip switches to select different types > of displays wired to the same pins) we need to add additional devicetree > overlays for these EVKs. We don't want to keep adding more defconfigs > for every permutation of the devicetree overlays. So better to go with > a single defconfig that has everything enabled and just control what > probes at runtime via the devicetree overlays. > --- > board/mediatek/MAINTAINERS | 4 ---- > configs/mt8189-ufs.config | 8 -------- > configs/mt8189.config | 4 ++++ > configs/mt8195.config | 5 +++++ > configs/mt8371_genio_520_evk_ufs_defconfig | 4 ---- > configs/mt8391_genio_720_evk_ufs_defconfig | 4 ---- > configs/mt8395_genio_1200_evk_ufs_defconfig | 8 -------- > 7 files changed, 9 insertions(+), 28 deletions(-) > > diff --git a/board/mediatek/MAINTAINERS b/board/mediatek/MAINTAINERS > index d99c6d708b2..47f91d6e81c 100644 > --- a/board/mediatek/MAINTAINERS > +++ b/board/mediatek/MAINTAINERS > @@ -5,12 +5,9 @@ F: arch/arm/dts/mt8371-genio-520-evk-u-boot.dtsi > F: arch/arm/dts/mt8371-genio-common-u-boot.dtsi > F: arch/arm/dts/mt8371-genio-common-ufs.dtso > F: arch/arm/dts/mt8391-genio-720-evk-u-boot.dtsi > -F: configs/mt8189-ufs.config > F: configs/mt8189.config > F: configs/mt8371_genio_520_evk_defconfig > -F: configs/mt8371_genio_520_evk_ufs_defconfig > F: configs/mt8391_genio_720_evk_defconfig > -F: configs/mt8391_genio_720_evk_ufs_defconfig > > MT8365 EVK > M: Julien Masson <[email protected]> > @@ -34,4 +31,3 @@ M: Julien Stephan <[email protected]> > S: Maintained > F: configs/mt8195.config > F: configs/mt8395_genio_1200_evk_defconfig > -F: configs/mt8395_genio_1200_evk_ufs_defconfig > diff --git a/configs/mt8189-ufs.config b/configs/mt8189-ufs.config > deleted file mode 100644 > index 8a7afb95b1b..00000000000 > --- a/configs/mt8189-ufs.config > +++ /dev/null > @@ -1,8 +0,0 @@ > -#include <configs/mt8189.config> > - > -CONFIG_PHY=y > -CONFIG_PHY_MTK_UFS=y > -CONFIG_SCSI=y > -CONFIG_UFS=y > -CONFIG_UFS_MEDIATEK=y > -CONFIG_CMD_UFS=y > diff --git a/configs/mt8189.config b/configs/mt8189.config > index ab56c90a17c..8db5815e9e0 100644 > --- a/configs/mt8189.config > +++ b/configs/mt8189.config > @@ -16,6 +16,7 @@ CONFIG_CMD_CLK=y > CONFIG_CMD_GPIO=y > CONFIG_CMD_GPT=y > CONFIG_CMD_MMC=y > +CONFIG_CMD_UFS=y > CONFIG_CMD_USB=y > CONFIG_CMD_PMIC=y > CONFIG_CMD_REGULATOR=y > @@ -42,6 +43,7 @@ CONFIG_DM_PMIC_MTK_PWRAP=y > CONFIG_DM_REGULATOR=y > CONFIG_DM_REGULATOR_FIXED=y > CONFIG_DM_REGULATOR_MT6359=y > +CONFIG_SCSI=y > CONFIG_BAUDRATE=921600 > CONFIG_DM_SERIAL=y > CONFIG_MTK_SERIAL=y > @@ -51,5 +53,7 @@ CONFIG_MTK_SNOR=y > CONFIG_USB=y > CONFIG_USB_XHCI_HCD=y > CONFIG_USB_XHCI_MTK=y > +CONFIG_UFS=y > +CONFIG_UFS_MEDIATEK=y > CONFIG_WDT=y > CONFIG_WDT_MTK=y > diff --git a/configs/mt8195.config b/configs/mt8195.config > index 03f57d46708..909b495e015 100644 > --- a/configs/mt8195.config > +++ b/configs/mt8195.config > @@ -13,9 +13,11 @@ CONFIG_BOOTSTD_FULL=y > CONFIG_CMD_CLK=y > CONFIG_CMD_GPT=y > CONFIG_CMD_MMC=y > +CONFIG_CMD_UFS=y > CONFIG_OF_UPSTREAM=y > CONFIG_CLK=y > CONFIG_MMC_MTK=y > +CONFIG_PHY=y > CONFIG_PINCTRL=y > CONFIG_PINCONF=y > CONFIG_PINCTRL_MT8195=y > @@ -23,8 +25,11 @@ CONFIG_DM_PMIC=y > CONFIG_DM_PMIC_MTK_PWRAP=y > CONFIG_DM_REGULATOR=y > CONFIG_DM_REGULATOR_MT6359=y > +CONFIG_SCSI=y > CONFIG_BAUDRATE=921600 > CONFIG_DM_SERIAL=y > CONFIG_MTK_SERIAL=y > +CONFIG_UFS=y > +CONFIG_UFS_MEDIATEK=y > CONFIG_WDT=y > CONFIG_WDT_MTK=y > diff --git a/configs/mt8371_genio_520_evk_ufs_defconfig > b/configs/mt8371_genio_520_evk_ufs_defconfig > deleted file mode 100644 > index a0b365a86a2..00000000000 > --- a/configs/mt8371_genio_520_evk_ufs_defconfig > +++ /dev/null > @@ -1,4 +0,0 @@ > -#include <configs/mt8189-ufs.config> > - > -CONFIG_DEFAULT_DEVICE_TREE="mt8371-genio-520-evk-ufs" > -CONFIG_DEFAULT_FDT_FILE="mt8371-genio-520-evk-ufs" > diff --git a/configs/mt8391_genio_720_evk_ufs_defconfig > b/configs/mt8391_genio_720_evk_ufs_defconfig > deleted file mode 100644 > index f1de9d5fa1e..00000000000 > --- a/configs/mt8391_genio_720_evk_ufs_defconfig > +++ /dev/null > @@ -1,4 +0,0 @@ > -#include <configs/mt8189-ufs.config> > - > -CONFIG_DEFAULT_DEVICE_TREE="mt8391-genio-720-evk-ufs" > -CONFIG_DEFAULT_FDT_FILE="mt8391-genio-720-evk-ufs" > diff --git a/configs/mt8395_genio_1200_evk_ufs_defconfig > b/configs/mt8395_genio_1200_evk_ufs_defconfig > deleted file mode 100644 > index 525638f5800..00000000000 > --- a/configs/mt8395_genio_1200_evk_ufs_defconfig > +++ /dev/null > @@ -1,8 +0,0 @@ > -#include <configs/mt8195.config> > - > -CONFIG_DEFAULT_DEVICE_TREE="mediatek/mt8395-genio-1200-evk-ufs" > -CONFIG_CMD_UFS=y > -CONFIG_PHY=y > -CONFIG_SCSI=y > -CONFIG_UFS=y > -CONFIG_UFS_MEDIATEK=y > > --- > base-commit: d3e8597e46b635ec556a057bc42f0b0859654bdf > change-id: 20260814-mtk-genio-720-remove-ufs-defconfig-d3e026765d4b > > Best regards, > -- > David Lechner <[email protected]> >
Hi David, Reviewed-by: Julien Stephan <[email protected]>
