mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-05 18:39:59 +00:00
31cde0447d
The H2, H3, Perseus2, and FSample board files all contain the same duplicated code to handle NAND commands. That code is missing some casts around conversions from unsigned long to void __iomem *. Consolidate the duplicated code into a new file, arch/arm/mach-omap1/board-nand.c. Resolve the sparse warnings by adding appropriate casts: arch/arm/mach-omap1/board-h2.c:193:9: warning: incorrect type in argument 1 (different base types) arch/arm/mach-omap1/board-h2.c:193:9: expected void const volatile [noderef] <asn:2>*<noident> arch/arm/mach-omap1/board-h2.c:193:9: got unsigned long arch/arm/mach-omap1/board-perseus2.c:157:9: warning: incorrect type in argument 1 (different base types) arch/arm/mach-omap1/board-perseus2.c:157:9: expected void const volatile [noderef] <asn:2>*<noident> arch/arm/mach-omap1/board-perseus2.c:157:9: got unsigned long arch/arm/mach-omap1/board-fsample.c:199:9: warning: incorrect type in argument 1 (different base types) arch/arm/mach-omap1/board-fsample.c:199:9: expected void const volatile [noderef] <asn:2>*<noident> arch/arm/mach-omap1/board-fsample.c:199:9: got unsigned long arch/arm/mach-omap1/board-h3.c:195:9: warning: incorrect type in argument 1 (different base types) arch/arm/mach-omap1/board-h3.c:195:9: expected void const volatile [noderef] <asn:2>*<noident> arch/arm/mach-omap1/board-h3.c:195:9: got unsigned long Thanks to Arnd Bergmann <arnd@arndb.de> for suggesting a cleaner implementation of omap1_nand_cmd_ctl(), avoiding some casts. Signed-off-by: Paul Walmsley <paul@pwsan.com> Cc: Brian Swetland <swetland@google.com> Cc: Imre Deak <imre.deak@nokia.com> Cc: Greg Lonnon <glonnon@ridgerun.com> Cc: Kevin Hilman <kjh@hilman.org> Cc: Kevin Hilman <khilman@ti.com> Cc: Arnd Bergmann <arnd@arndb.de>
74 lines
2.2 KiB
Makefile
74 lines
2.2 KiB
Makefile
#
|
|
# Makefile for the linux kernel.
|
|
#
|
|
|
|
# Common support
|
|
obj-y := io.o id.o sram.o time.o irq.o mux.o flash.o serial.o devices.o dma.o
|
|
obj-y += clock.o clock_data.o opp_data.o reset.o pm_bus.o timer.o
|
|
|
|
ifneq ($(CONFIG_SND_OMAP_SOC_MCBSP),)
|
|
obj-y += mcbsp.o
|
|
endif
|
|
|
|
obj-$(CONFIG_OMAP_32K_TIMER) += timer32k.o
|
|
|
|
# OCPI interconnect support for 1710, 1610 and 5912
|
|
obj-$(CONFIG_ARCH_OMAP16XX) += ocpi.o
|
|
|
|
# Power Management
|
|
obj-$(CONFIG_PM) += pm.o sleep.o
|
|
|
|
# DSP
|
|
obj-$(CONFIG_OMAP_MBOX_FWK) += mailbox_mach.o
|
|
mailbox_mach-objs := mailbox.o
|
|
|
|
i2c-omap-$(CONFIG_I2C_OMAP) := i2c.o
|
|
obj-y += $(i2c-omap-m) $(i2c-omap-y)
|
|
|
|
led-y := leds.o
|
|
|
|
usb-fs-$(CONFIG_USB) := usb.o
|
|
obj-y += $(usb-fs-m) $(usb-fs-y)
|
|
|
|
# Specific board support
|
|
obj-$(CONFIG_MACH_OMAP_H2) += board-h2.o board-h2-mmc.o \
|
|
board-nand.o
|
|
obj-$(CONFIG_MACH_OMAP_INNOVATOR) += board-innovator.o
|
|
obj-$(CONFIG_MACH_OMAP_GENERIC) += board-generic.o
|
|
obj-$(CONFIG_MACH_OMAP_PERSEUS2) += board-perseus2.o board-nand.o
|
|
obj-$(CONFIG_MACH_OMAP_FSAMPLE) += board-fsample.o board-nand.o
|
|
obj-$(CONFIG_MACH_OMAP_OSK) += board-osk.o
|
|
obj-$(CONFIG_MACH_OMAP_H3) += board-h3.o board-h3-mmc.o \
|
|
board-nand.o
|
|
obj-$(CONFIG_MACH_VOICEBLUE) += board-voiceblue.o
|
|
obj-$(CONFIG_MACH_OMAP_PALMTE) += board-palmte.o
|
|
obj-$(CONFIG_MACH_OMAP_PALMZ71) += board-palmz71.o
|
|
obj-$(CONFIG_MACH_OMAP_PALMTT) += board-palmtt.o
|
|
obj-$(CONFIG_MACH_NOKIA770) += board-nokia770.o
|
|
obj-$(CONFIG_MACH_AMS_DELTA) += board-ams-delta.o ams-delta-fiq.o \
|
|
ams-delta-fiq-handler.o
|
|
obj-$(CONFIG_MACH_SX1) += board-sx1.o board-sx1-mmc.o
|
|
obj-$(CONFIG_MACH_HERALD) += board-htcherald.o
|
|
|
|
ifeq ($(CONFIG_ARCH_OMAP15XX),y)
|
|
# Innovator-1510 FPGA
|
|
obj-$(CONFIG_MACH_OMAP_INNOVATOR) += fpga.o
|
|
endif
|
|
|
|
# GPIO
|
|
obj-$(CONFIG_ARCH_OMAP730) += gpio7xx.o
|
|
obj-$(CONFIG_ARCH_OMAP850) += gpio7xx.o
|
|
obj-$(CONFIG_ARCH_OMAP15XX) += gpio15xx.o
|
|
obj-$(CONFIG_ARCH_OMAP16XX) += gpio16xx.o
|
|
|
|
# LEDs support
|
|
led-$(CONFIG_MACH_OMAP_H2) += leds-h2p2-debug.o
|
|
led-$(CONFIG_MACH_OMAP_H3) += leds-h2p2-debug.o
|
|
led-$(CONFIG_MACH_OMAP_INNOVATOR) += leds-innovator.o
|
|
led-$(CONFIG_MACH_OMAP_PERSEUS2) += leds-h2p2-debug.o
|
|
led-$(CONFIG_MACH_OMAP_OSK) += leds-osk.o
|
|
obj-$(CONFIG_LEDS) += $(led-y)
|
|
|
|
ifneq ($(CONFIG_FB_OMAP),)
|
|
obj-y += lcd_dma.o
|
|
endif
|