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

Commit d31f59f3 authored by Tony Lindgren's avatar Tony Lindgren
Browse files

omap: Update omap3_defconfig for omap2 



We need to enable ARM_ERRATA_411920 for omap2 and
remove the omap2 specific defconfigs.

Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 455d4d2d

arch/arm/configs/n8x0_defconfig

deleted100644 → 0
+0 −94
Original line number Diff line number Diff line 
CONFIG_EXPERIMENTAL=y

CONFIG_SYSVIPC=y

CONFIG_LOG_BUF_SHIFT=14

CONFIG_BLK_DEV_INITRD=y

CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

# CONFIG_LBDAF is not set

# CONFIG_BLK_DEV_BSG is not set

# CONFIG_IOSCHED_DEADLINE is not set

CONFIG_ARCH_OMAP=y

CONFIG_ARCH_OMAP2=y

CONFIG_OMAP_RESET_CLOCKS=y

# CONFIG_OMAP_MUX is not set

# CONFIG_OMAP_MCBSP is not set

CONFIG_OMAP_MBOX_FWK=y

CONFIG_OMAP_32K_TIMER=y

CONFIG_ARCH_OMAP2420=y

CONFIG_MACH_NOKIA_N8X0=y

CONFIG_AEABI=y

CONFIG_LEDS=y

CONFIG_ZBOOT_ROM_TEXT=0x10C08000

CONFIG_ZBOOT_ROM_BSS=0x10200000

CONFIG_CMDLINE="root=/dev/mmcblk0p2 console=ttyS2,115200n8 debug earlyprintk rootwait"

CONFIG_FPE_NWFPE=y

CONFIG_VFP=y

CONFIG_PM=y

CONFIG_PM_RUNTIME=y

CONFIG_NET=y

CONFIG_UNIX=y

CONFIG_INET=y

# CONFIG_INET_XFRM_MODE_TRANSPORT is not set

# CONFIG_INET_XFRM_MODE_TUNNEL is not set

# CONFIG_INET_XFRM_MODE_BEET is not set

# CONFIG_INET_LRO is not set

# CONFIG_IPV6 is not set

CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

CONFIG_MTD=y

CONFIG_MTD_CMDLINE_PARTS=y

CONFIG_MTD_ONENAND=y

CONFIG_MTD_ONENAND_OMAP2=y

CONFIG_MTD_ONENAND_OTP=y

CONFIG_BLK_DEV_RAM=y

# CONFIG_MISC_DEVICES is not set

# CONFIG_INPUT_MOUSEDEV_PSAUX is not set

# CONFIG_INPUT_KEYBOARD is not set

# CONFIG_INPUT_MOUSE is not set

CONFIG_SERIAL_8250=y

CONFIG_SERIAL_8250_CONSOLE=y

# CONFIG_LEGACY_PTYS is not set

# CONFIG_HW_RANDOM is not set

CONFIG_I2C=y

# CONFIG_I2C_COMPAT is not set

# CONFIG_I2C_HELPER_AUTO is not set

CONFIG_I2C_OMAP=y

CONFIG_SPI=y

CONFIG_SPI_OMAP24XX=y

# CONFIG_HWMON is not set

CONFIG_MENELAUS=y

CONFIG_REGULATOR=y

# CONFIG_VGA_CONSOLE is not set

# CONFIG_HID_SUPPORT is not set

CONFIG_USB=y

CONFIG_USB_DEBUG=y

CONFIG_USB_ANNOUNCE_NEW_DEVICES=y

CONFIG_USB_DEVICEFS=y

CONFIG_USB_SUSPEND=y

# CONFIG_USB_OTG_WHITELIST is not set

CONFIG_USB_MUSB_HDRC=y

CONFIG_USB_MUSB_OTG=y

CONFIG_USB_GADGET_MUSB_HDRC=y

# CONFIG_MUSB_PIO_ONLY is not set

CONFIG_USB_MUSB_DEBUG=y

CONFIG_USB_GADGET=y

CONFIG_USB_GADGET_DEBUG=y

CONFIG_USB_GADGET_DEBUG_FILES=y

CONFIG_USB_ETH=m

CONFIG_USB_ETH_EEM=y

CONFIG_MMC=y

CONFIG_MMC_OMAP=y

CONFIG_EXT3_FS=y

CONFIG_INOTIFY=y

CONFIG_VFAT_FS=y

CONFIG_TMPFS=y

CONFIG_JFFS2_FS=y

CONFIG_JFFS2_SUMMARY=y

CONFIG_JFFS2_COMPRESSION_OPTIONS=y

CONFIG_JFFS2_LZO=y

CONFIG_PRINTK_TIME=y

CONFIG_DEBUG_KERNEL=y

CONFIG_DEBUG_INFO=y

# CONFIG_RCU_CPU_STALL_DETECTOR is not set

CONFIG_DEBUG_USER=y

CONFIG_DEBUG_ERRORS=y

CONFIG_CRC_CCITT=y

arch/arm/configs/omap2plus_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ CONFIG_MACH_OMAP_3630SDP=y 
CONFIG_MACH_OMAP_4430SDP=y

CONFIG_ARM_THUMBEE=y

CONFIG_ARM_L1_CACHE_SHIFT=5

CONFIG_ARM_ERRATA_411920=y

CONFIG_NO_HZ=y

CONFIG_HIGH_RES_TIMERS=y

CONFIG_SMP=y

arch/arm/configs/omap_generic_2420_defconfig

deleted100644 → 0
+0 −37
Original line number Diff line number Diff line 
CONFIG_EXPERIMENTAL=y

CONFIG_SYSVIPC=y

CONFIG_LOG_BUF_SHIFT=14

CONFIG_BLK_DEV_INITRD=y

CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

# CONFIG_BLK_DEV_BSG is not set

CONFIG_ARCH_OMAP=y

CONFIG_ARCH_OMAP2=y

# CONFIG_OMAP_MUX is not set

CONFIG_MACH_OMAP_GENERIC=y

CONFIG_ARCH_OMAP2420=y

CONFIG_LEDS=y

CONFIG_ZBOOT_ROM_TEXT=0x10C08000

CONFIG_ZBOOT_ROM_BSS=0x10200000

CONFIG_FPE_NWFPE=y

CONFIG_BLK_DEV_RAM=y

CONFIG_INPUT_EVDEV=y

# CONFIG_INPUT_KEYBOARD is not set

# CONFIG_INPUT_MOUSE is not set

CONFIG_SERIAL_8250=y

CONFIG_SERIAL_8250_CONSOLE=y

# CONFIG_LEGACY_PTYS is not set

CONFIG_WATCHDOG=y

CONFIG_WATCHDOG_NOWAYOUT=y

CONFIG_VIDEO_OUTPUT_CONTROL=m

# CONFIG_VGA_CONSOLE is not set

CONFIG_EXT2_FS=y

CONFIG_EXT2_FS_XATTR=y

CONFIG_INOTIFY=y

CONFIG_ROMFS_FS=y

CONFIG_DEBUG_KERNEL=y

CONFIG_DEBUG_INFO=y

CONFIG_DEBUG_USER=y

CONFIG_DEBUG_ERRORS=y

CONFIG_DEBUG_LL=y

CONFIG_CRC_CCITT=y