On Wed, Jan 11, 2023 at 06:22:18PM +0100, Ahmad Fatoum wrote: > The sama5d4[devices].c files are for non-OF instantiation of platform > devices. We don't need anything out of these two files, so don't build > them when compiling for CONFIG_AT91_MULTI_BOARDS. We use that instead of > CONFIG_OFDEVICE, as sama5d4_xplained_defconfig and sama5d4ek_defconfig > enable CONFIG_OFDEVICE, but probe no device at all from DT. > > Acked-by: Sam Ravnborg <sam@xxxxxxxxxxxx> > Signed-off-by: Ahmad Fatoum <a.fatoum@xxxxxxxxxxxxxx> > --- > v1 -> v2: > - use CONFIG_AT91_MULTI_BOARDS instead of CONFIG_OFDEVICE to fix > sama5d4 non-DT defconfigs build failure > > Sascha, please replace commit with same name in next with this. > --- > arch/arm/mach-at91/Makefile | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) Applied, thanks Sascha > > diff --git a/arch/arm/mach-at91/Makefile b/arch/arm/mach-at91/Makefile > index 390d49d03dee..f70e67bddebf 100644 > --- a/arch/arm/mach-at91/Makefile > +++ b/arch/arm/mach-at91/Makefile > @@ -27,9 +27,10 @@ obj-$(CONFIG_SOC_AT91RM9200) += at91rm9200.o at91rm9200_time.o at91rm9200_device > obj-$(CONFIG_SOC_AT91SAM9260) += at91sam9260.o at91sam9260_devices.o > obj-$(CONFIG_SOC_AT91SAM9261) += at91sam9261.o at91sam9261_devices.o > obj-$(CONFIG_SOC_AT91SAM9G10) += at91sam9261.o at91sam9261_devices.o > -ifeq ($(CONFIG_OFDEVICE),) > +ifeq ($(CONFIG_AT91_MULTI_BOARDS),) > obj-$(CONFIG_SOC_AT91SAM9263) += at91sam9263.o at91sam9263_devices.o > obj-$(CONFIG_SOC_SAMA5D3) += sama5d3.o sama5d3_devices.o > +obj-$(CONFIG_SOC_SAMA5D4) += sama5d4.o sama5d4_devices.o > endif > lwl-$(CONFIG_SOC_AT91SAM9263) += sam9263_ll.o > lwl-$(CONFIG_SOC_SAMA5D2) += sama5d2_ll.o > @@ -39,4 +40,3 @@ obj-$(CONFIG_SOC_AT91SAM9G20) += at91sam9260.o at91sam9260_devices.o > obj-$(CONFIG_SOC_AT91SAM9G45) += at91sam9g45.o at91sam9g45_devices.o > obj-$(CONFIG_SOC_AT91SAM9X5) += at91sam9x5.o at91sam9x5_devices.o > obj-$(CONFIG_SOC_AT91SAM9N12) += at91sam9n12.o at91sam9n12_devices.o > -obj-$(CONFIG_SOC_SAMA5D4) += sama5d4.o sama5d4_devices.o > -- > 2.30.2 > > > -- Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
