| Message ID | 20240528-fsl-ifc-config-v2-2-5fd7be76650d@geanix.com |
|---|---|
| State | New |
| Headers | show |
| Series | memory: fsl_ifc: Make FSL_IFC config visible and selectable | expand |
On 28/05/2024 14:28, Esben Haabendal wrote: > With CONFIG_FSL_IFC now being user-visible, and thus changed from a select > to depends in CONFIG_MTD_NAND_FSL_IFC, the dependencies needs to be > selected in config snippets. > > Signed-off-by: Esben Haabendal <esben@geanix.com> > --- > arch/powerpc/configs/85xx-hw.config | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/arch/powerpc/configs/85xx-hw.config b/arch/powerpc/configs/85xx-hw.config > index 524db76f47b7..8aff83217397 100644 > --- a/arch/powerpc/configs/85xx-hw.config > +++ b/arch/powerpc/configs/85xx-hw.config > @@ -24,6 +24,7 @@ CONFIG_FS_ENET=y > CONFIG_FSL_CORENET_CF=y > CONFIG_FSL_DMA=y > CONFIG_FSL_HV_MANAGER=y > +CONFIG_FSL_IFC=y Does not look like placed according to config order. This is not alphabetically sorted, but as Kconfig creates it (make savedefconfig). > CONFIG_FSL_PQ_MDIO=y > CONFIG_FSL_RIO=y You also missed to update second defconfig - arm64. Best regards, Krzysztof
Krzysztof Kozlowski <krzk@kernel.org> writes: > On 28/05/2024 14:28, Esben Haabendal wrote: >> With CONFIG_FSL_IFC now being user-visible, and thus changed from a select >> to depends in CONFIG_MTD_NAND_FSL_IFC, the dependencies needs to be >> selected in config snippets. >> >> Signed-off-by: Esben Haabendal <esben@geanix.com> >> --- >> arch/powerpc/configs/85xx-hw.config | 2 ++ >> 1 file changed, 2 insertions(+) >> >> diff --git a/arch/powerpc/configs/85xx-hw.config b/arch/powerpc/configs/85xx-hw.config >> index 524db76f47b7..8aff83217397 100644 >> --- a/arch/powerpc/configs/85xx-hw.config >> +++ b/arch/powerpc/configs/85xx-hw.config >> @@ -24,6 +24,7 @@ CONFIG_FS_ENET=y >> CONFIG_FSL_CORENET_CF=y >> CONFIG_FSL_DMA=y >> CONFIG_FSL_HV_MANAGER=y >> +CONFIG_FSL_IFC=y > > Does not look like placed according to config order. Correct. > This is not alphabetically sorted, but as Kconfig creates it (make > savedefconfig). Are you sure about this? It looks very much alphabetically sorted, with only two "errors" $ diff -u 85xx-hw.config 85xx-hw.config.sorted --- 85xx-hw.config 2024-05-28 15:05:44.665354428 +0200 +++ 85xx-hw.config.sorted 2024-05-28 15:05:56.102019081 +0200 @@ -15,8 +15,8 @@ CONFIG_DMADEVICES=y CONFIG_E1000E=y CONFIG_E1000=y -CONFIG_EDAC=y CONFIG_EDAC_MPC85XX=y +CONFIG_EDAC=y CONFIG_EEPROM_AT24=y CONFIG_EEPROM_LEGACY=y CONFIG_FB_FSL_DIU=y @@ -71,10 +71,10 @@ CONFIG_MTD_CMDLINE_PARTS=y CONFIG_MTD_NAND_FSL_ELBC=y CONFIG_MTD_NAND_FSL_IFC=y -CONFIG_MTD_RAW_NAND=y CONFIG_MTD_PHYSMAP_OF=y CONFIG_MTD_PHYSMAP=y CONFIG_MTD_PLATRAM=y +CONFIG_MTD_RAW_NAND=y CONFIG_MTD_SPI_NOR=y CONFIG_NETDEVICES=y CONFIG_NVRAM=y I don't think that this file has ever been Kconfig sorted since it was created back in ancient times. And as it is merged with other config snippets using merge_into_defconfig function. I have no idea how to use savedefconfig to maintain such a snippet. It would require doing the reverse of the merge_into_defconfig. >> CONFIG_FSL_PQ_MDIO=y >> CONFIG_FSL_RIO=y > > You also missed to update second defconfig - arm64. Argh. I thought I checked, and it did not need any changes. But it needs to have CONFIG_FSL_IFC=y added. I will add that for v3. /Esben
On 28/05/2024 15:33, Esben Haabendal wrote: > Krzysztof Kozlowski <krzk@kernel.org> writes: > >> On 28/05/2024 14:28, Esben Haabendal wrote: >>> With CONFIG_FSL_IFC now being user-visible, and thus changed from a select >>> to depends in CONFIG_MTD_NAND_FSL_IFC, the dependencies needs to be >>> selected in config snippets. >>> >>> Signed-off-by: Esben Haabendal <esben@geanix.com> >>> --- >>> arch/powerpc/configs/85xx-hw.config | 2 ++ >>> 1 file changed, 2 insertions(+) >>> >>> diff --git a/arch/powerpc/configs/85xx-hw.config b/arch/powerpc/configs/85xx-hw.config >>> index 524db76f47b7..8aff83217397 100644 >>> --- a/arch/powerpc/configs/85xx-hw.config >>> +++ b/arch/powerpc/configs/85xx-hw.config >>> @@ -24,6 +24,7 @@ CONFIG_FS_ENET=y >>> CONFIG_FSL_CORENET_CF=y >>> CONFIG_FSL_DMA=y >>> CONFIG_FSL_HV_MANAGER=y >>> +CONFIG_FSL_IFC=y >> >> Does not look like placed according to config order. > > Correct. > >> This is not alphabetically sorted, but as Kconfig creates it (make >> savedefconfig). > > Are you sure about this? > > It looks very much alphabetically sorted, with only two "errors" Uh, ok, in general this is savedefconfig-sorted, but of course some platforms can choose other way. At least all arm and arm64 are savedefconfig-sorted. Follow whatever is there already, so in this case alphabetical. ... > >>> CONFIG_FSL_PQ_MDIO=y >>> CONFIG_FSL_RIO=y >> >> You also missed to update second defconfig - arm64. > > Argh. I thought I checked, and it did not need any changes. But it needs > to have CONFIG_FSL_IFC=y added. > > I will add that for v3. > > /Esben Best regards, Krzysztof
Esben Haabendal <esben@geanix.com> writes: > Krzysztof Kozlowski <krzk@kernel.org> writes: > >> On 28/05/2024 14:28, Esben Haabendal wrote: >>> With CONFIG_FSL_IFC now being user-visible, and thus changed from a select >>> to depends in CONFIG_MTD_NAND_FSL_IFC, the dependencies needs to be >>> selected in config snippets. >>> >>> Signed-off-by: Esben Haabendal <esben@geanix.com> >>> --- >>> arch/powerpc/configs/85xx-hw.config | 2 ++ >>> 1 file changed, 2 insertions(+) >>> >>> diff --git a/arch/powerpc/configs/85xx-hw.config b/arch/powerpc/configs/85xx-hw.config >>> index 524db76f47b7..8aff83217397 100644 >>> --- a/arch/powerpc/configs/85xx-hw.config >>> +++ b/arch/powerpc/configs/85xx-hw.config >>> @@ -24,6 +24,7 @@ CONFIG_FS_ENET=y >>> CONFIG_FSL_CORENET_CF=y >>> CONFIG_FSL_DMA=y >>> CONFIG_FSL_HV_MANAGER=y >>> +CONFIG_FSL_IFC=y >> >> Does not look like placed according to config order. > > Correct. > >> This is not alphabetically sorted, but as Kconfig creates it (make >> savedefconfig). > > Are you sure about this? > > It looks very much alphabetically sorted, with only two "errors" > > $ diff -u 85xx-hw.config 85xx-hw.config.sorted > --- 85xx-hw.config 2024-05-28 15:05:44.665354428 +0200 > +++ 85xx-hw.config.sorted 2024-05-28 15:05:56.102019081 +0200 > @@ -15,8 +15,8 @@ > CONFIG_DMADEVICES=y > CONFIG_E1000E=y > CONFIG_E1000=y > -CONFIG_EDAC=y > CONFIG_EDAC_MPC85XX=y > +CONFIG_EDAC=y > CONFIG_EEPROM_AT24=y > CONFIG_EEPROM_LEGACY=y > CONFIG_FB_FSL_DIU=y > @@ -71,10 +71,10 @@ > CONFIG_MTD_CMDLINE_PARTS=y > CONFIG_MTD_NAND_FSL_ELBC=y > CONFIG_MTD_NAND_FSL_IFC=y > -CONFIG_MTD_RAW_NAND=y > CONFIG_MTD_PHYSMAP_OF=y > CONFIG_MTD_PHYSMAP=y > CONFIG_MTD_PLATRAM=y > +CONFIG_MTD_RAW_NAND=y > CONFIG_MTD_SPI_NOR=y > CONFIG_NETDEVICES=y > CONFIG_NVRAM=y > > I don't think that this file has ever been Kconfig sorted since it was > created back in ancient times. > > And as it is merged with other config snippets using merge_into_defconfig > function. I have no idea how to use savedefconfig to maintain such a snippet. > It would require doing the reverse of the merge_into_defconfig. Right. This is a config fragment, not a full config, so it's not managed with savedefconfig. Alphabetical order is preferable when adding new symbols. cheers
diff --git a/arch/powerpc/configs/85xx-hw.config b/arch/powerpc/configs/85xx-hw.config index 524db76f47b7..8aff83217397 100644 --- a/arch/powerpc/configs/85xx-hw.config +++ b/arch/powerpc/configs/85xx-hw.config @@ -24,6 +24,7 @@ CONFIG_FS_ENET=y CONFIG_FSL_CORENET_CF=y CONFIG_FSL_DMA=y CONFIG_FSL_HV_MANAGER=y +CONFIG_FSL_IFC=y CONFIG_FSL_PQ_MDIO=y CONFIG_FSL_RIO=y CONFIG_FSL_XGMAC_MDIO=y @@ -58,6 +59,7 @@ CONFIG_INPUT_FF_MEMLESS=m CONFIG_MARVELL_PHY=y CONFIG_MDIO_BUS_MUX_GPIO=y CONFIG_MDIO_BUS_MUX_MMIOREG=y +CONFIG_MEMORY=y CONFIG_MMC_SDHCI_OF_ESDHC=y CONFIG_MMC_SDHCI_PLTFM=y CONFIG_MMC_SDHCI=y
With CONFIG_FSL_IFC now being user-visible, and thus changed from a select to depends in CONFIG_MTD_NAND_FSL_IFC, the dependencies needs to be selected in config snippets. Signed-off-by: Esben Haabendal <esben@geanix.com> --- arch/powerpc/configs/85xx-hw.config | 2 ++ 1 file changed, 2 insertions(+)