[armhf] Fix up OMAP configuration for 3.11
Enable ARCH_OMAP3, ARCH_OMAP4 instead of the (now automatic) ARCH_OMAP2PLUS. Enable MAILBOX, OMAP2PLUS_MBOX instead of the removed OMAP_MBOX_FWK. svn path=/dists/trunk/linux/; revision=20580
This commit is contained in:
parent
af07cdf241
commit
12d6bf86b5
|
@ -53,6 +53,8 @@ CONFIG_MACH_ARMADA_XP=y
|
|||
## file: arch/arm/mach-omap2/Kconfig
|
||||
##
|
||||
# CONFIG_ARCH_OMAP2 is not set
|
||||
CONFIG_ARCH_OMAP3=y
|
||||
CONFIG_ARCH_OMAP4=y
|
||||
CONFIG_SOC_OMAP5=y
|
||||
CONFIG_SOC_AM33XX=y
|
||||
CONFIG_ARCH_OMAP2PLUS_TYPICAL=y
|
||||
|
@ -244,6 +246,8 @@ CONFIG_LEDS_TRIGGER_GPIO=m
|
|||
##
|
||||
## file: drivers/mailbox/Kconfig
|
||||
##
|
||||
CONFIG_MAILBOX=y
|
||||
CONFIG_OMAP2PLUS_MBOX=y
|
||||
CONFIG_OMAP_MBOX_KFIFO_SIZE=256
|
||||
|
||||
##
|
||||
|
@ -641,7 +645,6 @@ CONFIG_LEDS_CPU=y
|
|||
CONFIG_OF_DISPLAY_TIMING=y
|
||||
CONFIG_OF_VIDEOMODE=y
|
||||
CONFIG_OMAP_32K_TIMER_HZ=128
|
||||
CONFIG_OMAP_MBOX_FWK=y
|
||||
CONFIG_USB_GADGET_MUSB_HDRC=y
|
||||
CONFIG_VIDEOMODE=y
|
||||
|
||||
|
|
|
@ -10,6 +10,8 @@ CONFIG_NEON=y
|
|||
## file: arch/arm/mach-omap2/Kconfig
|
||||
##
|
||||
# CONFIG_ARCH_OMAP2 is not set
|
||||
CONFIG_ARCH_OMAP3=y
|
||||
CONFIG_ARCH_OMAP4=y
|
||||
CONFIG_ARCH_OMAP2PLUS_TYPICAL=y
|
||||
|
||||
##
|
||||
|
@ -117,6 +119,8 @@ CONFIG_LEDS_TRIGGER_GPIO=m
|
|||
##
|
||||
## file: drivers/mailbox/Kconfig
|
||||
##
|
||||
CONFIG_MAILBOX=y
|
||||
CONFIG_OMAP2PLUS_MBOX=y
|
||||
CONFIG_OMAP_MBOX_KFIFO_SIZE=256
|
||||
|
||||
##
|
||||
|
@ -331,6 +335,5 @@ CONFIG_SND_OMAP_SOC_RX51=m
|
|||
CONFIG_LEDS=y
|
||||
CONFIG_LEDS_CPU=y
|
||||
CONFIG_OMAP_32K_TIMER_HZ=128
|
||||
CONFIG_OMAP_MBOX_FWK=y
|
||||
CONFIG_USB_GADGET_MUSB_HDRC=y
|
||||
|
||||
|
|
Loading…
Reference in New Issue