Message ID | 20210201012503.940145-1-mpe@ellerman.id.au (mailing list archive) |
---|---|
State | Accepted |
Headers | show |
Series | powerpc/akebono: Fix unmet dependency errors | expand |
Context | Check | Description |
---|---|---|
snowpatch_ozlabs/apply_patch | success | Successfully applied on branch powerpc/merge (44158b256b30415079588d0fcb1bccbdc2ccd009) |
snowpatch_ozlabs/build-ppc64le | success | Build succeeded |
snowpatch_ozlabs/build-ppc64be | success | Build succeeded |
snowpatch_ozlabs/build-ppc64e | success | Build succeeded |
snowpatch_ozlabs/build-pmac32 | success | Build succeeded |
snowpatch_ozlabs/checkpatch | warning | total: 0 errors, 1 warnings, 0 checks, 41 lines checked |
snowpatch_ozlabs/needsstable | success | Patch has no Fixes tags |
On 1/31/2021 5:25 PM, Michael Ellerman wrote: > The AKEBONO config has various selects under it, including some with > user-selectable dependencies, which means those dependencies can be > disabled. This leads to warnings from Kconfig. > > This can be seen with eg: > > $ make allnoconfig > $ ./scripts/config --file build~/.config -k -e CONFIG_44x -k -e CONFIG_PPC_47x -e CONFIG_AKEBONO > $ make olddefconfig > > WARNING: unmet direct dependencies detected for ATA > Depends on [n]: HAS_IOMEM [=y] && BLOCK [=n] > Selected by [y]: > - AKEBONO [=y] && PPC_47x [=y] > > WARNING: unmet direct dependencies detected for NETDEVICES > Depends on [n]: NET [=n] > Selected by [y]: > - AKEBONO [=y] && PPC_47x [=y] > > WARNING: unmet direct dependencies detected for ETHERNET > Depends on [n]: NETDEVICES [=y] && NET [=n] > Selected by [y]: > - AKEBONO [=y] && PPC_47x [=y] > > WARNING: unmet direct dependencies detected for MMC_SDHCI > Depends on [n]: MMC [=n] && HAS_DMA [=y] > Selected by [y]: > - AKEBONO [=y] && PPC_47x [=y] > > WARNING: unmet direct dependencies detected for MMC_SDHCI_PLTFM > Depends on [n]: MMC [=n] && MMC_SDHCI [=y] > Selected by [y]: > - AKEBONO [=y] && PPC_47x [=y] > > The problem is that AKEBONO is using select to enable things that are > not true dependencies, but rather things you probably want enabled in > an AKEBONO kernel. That is what a defconfig is for. > > So drop those selects and instead move those symbols into the > defconfig. This fixes all the kconfig warnings, and the result of make > 44x/akebono_defconfig is the same before and after the patch. > > Reported-by: Yury Norov <yury.norov@gmail.com> > Reported-by: Randy Dunlap <rdunlap@infradead.org> > Reported-by: Florian Fainelli <f.fainelli@gmail.com> > Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> Acked-by: Florian Fainelli <f.fainelli@gmail.com> Much better than my patch, thanks!
On 1/31/21 5:25 PM, Michael Ellerman wrote: > The AKEBONO config has various selects under it, including some with > user-selectable dependencies, which means those dependencies can be > disabled. This leads to warnings from Kconfig. > > > The problem is that AKEBONO is using select to enable things that are > not true dependencies, but rather things you probably want enabled in > an AKEBONO kernel. That is what a defconfig is for. > > So drop those selects and instead move those symbols into the > defconfig. This fixes all the kconfig warnings, and the result of make > 44x/akebono_defconfig is the same before and after the patch. > > Reported-by: Yury Norov <yury.norov@gmail.com> > Reported-by: Randy Dunlap <rdunlap@infradead.org> > Reported-by: Florian Fainelli <f.fainelli@gmail.com> > Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> > --- > arch/powerpc/configs/44x/akebono_defconfig | 5 +++++ > arch/powerpc/platforms/44x/Kconfig | 7 ------- > 2 files changed, 5 insertions(+), 7 deletions(-) Reviewed-by: Randy Dunlap <rdunlap@infradead.org> Tested-by: Randy Dunlap <rdunlap@infradead.org> Thanks.
On Mon, 1 Feb 2021 12:25:03 +1100, Michael Ellerman wrote: > The AKEBONO config has various selects under it, including some with > user-selectable dependencies, which means those dependencies can be > disabled. This leads to warnings from Kconfig. > > This can be seen with eg: > > $ make allnoconfig > $ ./scripts/config --file build~/.config -k -e CONFIG_44x -k -e CONFIG_PPC_47x -e CONFIG_AKEBONO > $ make olddefconfig > > [...] Applied to powerpc/next. [1/1] powerpc/akebono: Fix unmet dependency errors https://git.kernel.org/powerpc/c/665d8d58761cba41147fe7e98e2ceed1cbf603a2 cheers
diff --git a/arch/powerpc/configs/44x/akebono_defconfig b/arch/powerpc/configs/44x/akebono_defconfig index 3894ba8f8ffc..ae9b7beefdd6 100644 --- a/arch/powerpc/configs/44x/akebono_defconfig +++ b/arch/powerpc/configs/44x/akebono_defconfig @@ -21,6 +21,7 @@ CONFIG_IRQ_ALL_CPUS=y # CONFIG_COMPACTION is not set # CONFIG_SUSPEND is not set CONFIG_NET=y +CONFIG_NETDEVICES=y CONFIG_PACKET=y CONFIG_UNIX=y CONFIG_INET=y @@ -41,7 +42,9 @@ CONFIG_BLK_DEV_RAM_SIZE=35000 # CONFIG_SCSI_PROC_FS is not set CONFIG_BLK_DEV_SD=y # CONFIG_SCSI_LOWLEVEL is not set +CONFIG_ATA=y # CONFIG_SATA_PMP is not set +CONFIG_SATA_AHCI_PLATFORM=y # CONFIG_ATA_SFF is not set # CONFIG_NET_VENDOR_3COM is not set # CONFIG_NET_VENDOR_ADAPTEC is not set @@ -98,6 +101,8 @@ CONFIG_USB_OHCI_HCD=y # CONFIG_USB_OHCI_HCD_PCI is not set CONFIG_USB_STORAGE=y CONFIG_MMC=y +CONFIG_MMC_SDHCI=y +CONFIG_MMC_SDHCI_PLTFM=y CONFIG_RTC_CLASS=y CONFIG_RTC_DRV_M41T80=y CONFIG_EXT2_FS=y diff --git a/arch/powerpc/platforms/44x/Kconfig b/arch/powerpc/platforms/44x/Kconfig index 78ac6d67a935..7d41e9264510 100644 --- a/arch/powerpc/platforms/44x/Kconfig +++ b/arch/powerpc/platforms/44x/Kconfig @@ -206,17 +206,10 @@ config AKEBONO select PPC4xx_HSTA_MSI select I2C select I2C_IBM_IIC - select NETDEVICES - select ETHERNET - select NET_VENDOR_IBM select IBM_EMAC_EMAC4 if IBM_EMAC select USB if USB_SUPPORT select USB_OHCI_HCD_PLATFORM if USB_OHCI_HCD select USB_EHCI_HCD_PLATFORM if USB_EHCI_HCD - select MMC_SDHCI - select MMC_SDHCI_PLTFM - select ATA - select SATA_AHCI_PLATFORM help This option enables support for the IBM Akebono (476gtr) evaluation board
The AKEBONO config has various selects under it, including some with user-selectable dependencies, which means those dependencies can be disabled. This leads to warnings from Kconfig. This can be seen with eg: $ make allnoconfig $ ./scripts/config --file build~/.config -k -e CONFIG_44x -k -e CONFIG_PPC_47x -e CONFIG_AKEBONO $ make olddefconfig WARNING: unmet direct dependencies detected for ATA Depends on [n]: HAS_IOMEM [=y] && BLOCK [=n] Selected by [y]: - AKEBONO [=y] && PPC_47x [=y] WARNING: unmet direct dependencies detected for NETDEVICES Depends on [n]: NET [=n] Selected by [y]: - AKEBONO [=y] && PPC_47x [=y] WARNING: unmet direct dependencies detected for ETHERNET Depends on [n]: NETDEVICES [=y] && NET [=n] Selected by [y]: - AKEBONO [=y] && PPC_47x [=y] WARNING: unmet direct dependencies detected for MMC_SDHCI Depends on [n]: MMC [=n] && HAS_DMA [=y] Selected by [y]: - AKEBONO [=y] && PPC_47x [=y] WARNING: unmet direct dependencies detected for MMC_SDHCI_PLTFM Depends on [n]: MMC [=n] && MMC_SDHCI [=y] Selected by [y]: - AKEBONO [=y] && PPC_47x [=y] The problem is that AKEBONO is using select to enable things that are not true dependencies, but rather things you probably want enabled in an AKEBONO kernel. That is what a defconfig is for. So drop those selects and instead move those symbols into the defconfig. This fixes all the kconfig warnings, and the result of make 44x/akebono_defconfig is the same before and after the patch. Reported-by: Yury Norov <yury.norov@gmail.com> Reported-by: Randy Dunlap <rdunlap@infradead.org> Reported-by: Florian Fainelli <f.fainelli@gmail.com> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> --- arch/powerpc/configs/44x/akebono_defconfig | 5 +++++ arch/powerpc/platforms/44x/Kconfig | 7 ------- 2 files changed, 5 insertions(+), 7 deletions(-)