Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aae70193 authored by Uwe Kleine-König's avatar Uwe Kleine-König
Browse files

imx: only define deprecated symbols conditionally 



Define deprecated symbols in an #ifdef IMX_NEEDS_DEPRECATED_SYMBOLS ...

All files that still depend on the old definitions get
-DIMX_NEEDS_DEPRECATED_SYMBOLS passed to the compiler.

When all remaining users are fixed this allows including the soc
specific headers unconditionally.

Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Cc: Sascha Hauer <kernel@pengutronix.de>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Eric Benard <eric@eukrea.com>
Cc: Fabio Estevam <fabio.estevam@freescale.com>
Cc: Alan Carvalho de Assis <acassis@gmail.com>
Cc: Daniel Mack <daniel@caiaq.de>
Cc: Alberto Panizzo <maramaopercheseimorto@gmail.com>
Cc: Ilya Yanok <yanok@emcraft.com>
Cc: Holger Schurig <hs4233@mail.mn-solutions.de>
Cc: Jiri Kosina <jkosina@suse.cz>
Cc: Magnus Lilja <lilja.magnus@gmail.com>
parent a9b7a2dd

arch/arm/mach-mx2/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -5,6 +5,9 @@ 
# Object file lists.



obj-y	:=  generic.o devices.o serial.o

CFLAGS_generic.o = -DIMX_NEEDS_DEPRECATED_SYMBOLS

CFLAGS_devices.o = -DIMX_NEEDS_DEPRECATED_SYMBOLS

CFLAGS_serial.o = -DIMX_NEEDS_DEPRECATED_SYMBOLS



obj-$(CONFIG_MACH_MX21) += clock_imx21.o

arch/arm/mach-mx3/Makefile

+4 −0
Original line number Diff line number Diff line
@@ -5,6 +5,9 @@ 
# Object file lists.



obj-y				:= mm.o devices.o cpu.o

CFLAGS_mm.o = -DIMX_NEEDS_DEPRECATED_SYMBOLS

CFLAGS_devices.o = -DIMX_NEEDS_DEPRECATED_SYMBOLS

CFLAGS_cpu.o = -DIMX_NEEDS_DEPRECATED_SYMBOLS

obj-$(CONFIG_ARCH_MX31)		+= clock-imx31.o iomux-imx31.o

obj-$(CONFIG_ARCH_MX35)		+= clock-imx35.o

obj-$(CONFIG_MACH_MX31ADS)	+= mach-mx31ads.o
@@ -13,6 +16,7 @@ obj-$(CONFIG_MACH_MX31LITE) += mach-mx31lite.o mx31lite-db.o 
obj-$(CONFIG_MACH_PCM037)	+= mach-pcm037.o

obj-$(CONFIG_MACH_PCM037_EET)	+= mach-pcm037_eet.o

obj-$(CONFIG_MACH_MX31_3DS)	+= mach-mx31_3ds.o

CFLAGS_mach-mx31_3ds.o = -DIMX_NEEDS_DEPRECATED_SYMBOLS

obj-$(CONFIG_MACH_MX31MOBOARD)	+= mach-mx31moboard.o mx31moboard-devboard.o \

				   mx31moboard-marxbot.o

obj-$(CONFIG_MACH_QONG)		+= mach-qong.o

arch/arm/plat-mxc/Makefile

+4 −0
Original line number Diff line number Diff line
@@ -7,9 +7,13 @@ obj-y := irq.o clock.o gpio.o time.o devices.o cpu.o system.o 


obj-$(CONFIG_ARCH_MX1) += iomux-mx1-mx2.o dma-mx1-mx2.o

obj-$(CONFIG_ARCH_MX2) += iomux-mx1-mx2.o dma-mx1-mx2.o

CFLAGS_iomux-mx1-mx2.o = -DIMX_NEEDS_DEPRECATED_SYMBOLS

CFLAGS_dma-mx1-mx2.o = -DIMX_NEEDS_DEPRECATED_SYMBOLS

obj-$(CONFIG_ARCH_MXC_IOMUX_V3) += iomux-v3.o

obj-$(CONFIG_MXC_PWM)  += pwm.o

obj-$(CONFIG_USB_EHCI_MXC) += ehci.o

obj-$(CONFIG_MXC_ULPI) += ulpi.o

obj-$(CONFIG_ARCH_MXC_AUDMUX_V1) += audmux-v1.o

CFLAGS_audmux-v1.o = -DIMX_NEEDS_DEPRECATED_SYMBOLS

obj-$(CONFIG_ARCH_MXC_AUDMUX_V2) += audmux-v2.o

CFLAGS_audmux-v2.o = -DIMX_NEEDS_DEPRECATED_SYMBOLS

arch/arm/plat-mxc/include/mach/mx21.h

+2 −0
Original line number Diff line number Diff line
@@ -184,6 +184,7 @@ 
#define MX21_DMA_REQ_CSI_STAT	30

#define MX21_DMA_REQ_CSI_RX	31



#ifdef IMX_NEEDS_DEPRECATED_SYMBOLS

/* these should go away */

#define SDRAM_BASE_ADDR MX21_SDRAM_BASE_ADDR

#define CSD1_BASE_ADDR MX21_CSD1_BASE_ADDR
@@ -216,5 +217,6 @@ 
#define DMA_REQ_FIRI_RX MX21_DMA_REQ_FIRI_RX

#define DMA_REQ_BMI_TX MX21_DMA_REQ_BMI_TX

#define DMA_REQ_BMI_RX MX21_DMA_REQ_BMI_RX

#endif



#endif /* __ASM_ARCH_MXC_MX21_H__ */

arch/arm/plat-mxc/include/mach/mx27.h

+2 −0
Original line number Diff line number Diff line
@@ -230,6 +230,7 @@ 
extern int mx27_revision(void);

#endif



#ifdef IMX_NEEDS_DEPRECATED_SYMBOLS

/* these should go away */

#define MSHC_BASE_ADDR MX27_MSHC_BASE_ADDR

#define GPT5_BASE_ADDR MX27_GPT5_BASE_ADDR
@@ -297,5 +298,6 @@ extern int mx27_revision(void); 
#define DMA_REQ_UART6_RX MX27_DMA_REQ_UART6_RX

#define DMA_REQ_SDHC3 MX27_DMA_REQ_SDHC3

#define DMA_REQ_NFC MX27_DMA_REQ_NFC

#endif



#endif /* __ASM_ARCH_MXC_MX27_H__ */