On Wed, Oct 06, 2021 at 11:18:19AM -0500, Rob Herring wrote:
> On Wed, Oct 6, 2021 at 10:45 AM Jakub Kicinski <kuba@xxxxxxxxxx> wrote:
> >
> > Rob suggests to move of_net.c from under drivers/of/ somewhere
> > to the networking code.
> >
> > Suggested-by: Rob Herring <robh@xxxxxxxxxx>
> > Signed-off-by: Jakub Kicinski <kuba@xxxxxxxxxx>
> > ---
> > v2: new patch
> > ---
> > drivers/of/Makefile | 1 -
> > net/core/Makefile | 1 +
> > {drivers/of => net/core}/of_net.c | 0
> > 3 files changed, 1 insertion(+), 1 deletion(-)
> > rename {drivers/of => net/core}/of_net.c (100%)
> >
> > diff --git a/drivers/of/Makefile b/drivers/of/Makefile
> > index c13b982084a3..e0360a44306e 100644
> > --- a/drivers/of/Makefile
> > +++ b/drivers/of/Makefile
> > @@ -7,7 +7,6 @@ obj-$(CONFIG_OF_EARLY_FLATTREE) += fdt_address.o
> > obj-$(CONFIG_OF_PROMTREE) += pdt.o
> > obj-$(CONFIG_OF_ADDRESS) += address.o
> > obj-$(CONFIG_OF_IRQ) += irq.o
> > -obj-$(CONFIG_OF_NET) += of_net.o
> > obj-$(CONFIG_OF_UNITTEST) += unittest.o
> > obj-$(CONFIG_OF_RESERVED_MEM) += of_reserved_mem.o
> > obj-$(CONFIG_OF_RESOLVE) += resolver.o
> > diff --git a/net/core/Makefile b/net/core/Makefile
> > index 35ced6201814..37b1befc39aa 100644
> > --- a/net/core/Makefile
> > +++ b/net/core/Makefile
> > @@ -36,3 +36,4 @@ obj-$(CONFIG_FAILOVER) += failover.o
> > obj-$(CONFIG_NET_SOCK_MSG) += skmsg.o
> > obj-$(CONFIG_BPF_SYSCALL) += sock_map.o
> > obj-$(CONFIG_BPF_SYSCALL) += bpf_sk_storage.o
> > +obj-$(CONFIG_OF_NET) += of_net.o
>
> The OF_NET kconfig should move or disappear too. I imagine you can do just:
It is used in a few places:
net/ethernet/litex/Kconfig: depends on OF_NET
net/ethernet/amd/Kconfig: depends on ((OF_NET && OF_ADDRESS) || ACPI || PCI) && HAS_IOMEM
net/ethernet/mscc/Kconfig: depends on OF_NET
net/ethernet/ezchip/Kconfig: depends on OF_IRQ && OF_NET
net/ethernet/arc/Kconfig: depends on OF_IRQ && OF_NET
net/ethernet/arc/Kconfig: depends on OF_IRQ && OF_NET && REGULATOR
so it cannot just disappear. These will need reviewing and changing as
well.
Andrew
