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

Commit f9166e73 authored by Russell King's avatar Russell King Committed by Russell King
Browse files

Merge branches 'master', 'omap1-upstream' and 'orion' into devel 

* master:
  [ARM] constify function pointer tables
  [ARM] 4823/1: AT91 section fix
  [ARM] 4824/1: pxa: clear RDH bit after any reset
  [ARM] pxa: remove debugging PM: printk

* omap1-upstream:
  ARM: OMAP1: Misc clean-up
  ARM: OMAP1: Update defconfigs for omap1
  ARM: OMAP1: Palm Tungsten E board clean-up
  ARM: OMAP1: Use I2C bus registration helper for omap1
  ARM: OMAP1: Remove omap_sram_idle()
  ARM: OMAP1: PM fixes for OMAP1
  ARM: OMAP1: Use MMC multislot structures for Siemens SX1 board
  ARM: OMAP1: Make omap1 use MMC multislot structures
  ARM: OMAP1: Change the comments to C style
  ARM: OMAP1: Make omap1 boards to use omap_nand_platform_data
  ARM: OMAP: Add helper module for board specific I2C bus registration
  ARM: OMAP: Add dmtimer support for OMAP3
  ARM: OMAP: Pre-3430 clean-up for dmtimer.c
  ARM: OMAP: Add DMA support for chaining and 3430
  ARM: OMAP: Add 24xx GPIO debounce support
  ARM: OMAP: Get rid of unnecessary ifdefs in GPIO code
  ARM: OMAP: Add 3430 gpio support
  ARM: OMAP: Add 3430 CPU identification macros
  ARM: OMAP: Request DSP memory for McBSP

* orion:
  [ARM] Orion: Use the sata_mv driver for the TS-209 SATA
  [ARM] Orion: Use the sata_mv driver for the Kurobox SATA
  [ARM] Orion: free up kernel virtual address space
  [ARM] Orion: distinguish between physical and virtual addresses
  [ARM] Orion: kill orion_early_putstr()
  [ARM] Orion: update defconfig
  [ARM] Orion: Use the sata_mv driver for the integrated SATA controller
parents 2ffd6e18 e27a93a9 ee44391e

arch/arm/configs/omap_h2_1610_defconfig

+135 −66
Original line number Diff line number Diff line 
#

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.23-rc6

# Mon Sep 17 14:21:45 2007

# Linux kernel version: 2.6.24-rc5

# Mon Dec 17 20:04:38 2007

#

CONFIG_ARM=y

CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -41,9 +41,14 @@ CONFIG_SYSVIPC_SYSCTL=y 
# CONFIG_BSD_PROCESS_ACCT is not set

# CONFIG_TASKSTATS is not set

# CONFIG_USER_NS is not set

# CONFIG_PID_NS is not set

# CONFIG_AUDIT is not set

# CONFIG_IKCONFIG is not set

CONFIG_LOG_BUF_SHIFT=14

# CONFIG_CGROUPS is not set

CONFIG_FAIR_GROUP_SCHED=y

CONFIG_FAIR_USER_SCHED=y

# CONFIG_FAIR_CGROUP_SCHED is not set

# CONFIG_SYSFS_DEPRECATED is not set

# CONFIG_RELAY is not set

CONFIG_BLK_DEV_INITRD=y
@@ -64,7 +69,6 @@ CONFIG_FUTEX=y 
CONFIG_ANON_INODES=y

CONFIG_EPOLL=y

CONFIG_SIGNALFD=y

CONFIG_TIMERFD=y

CONFIG_EVENTFD=y

CONFIG_SHMEM=y

CONFIG_VM_EVENT_COUNTERS=y
@@ -224,10 +228,6 @@ CONFIG_ARM_THUMB=y 
#

# CONFIG_PCI_SYSCALL is not set

# CONFIG_ARCH_SUPPORTS_MSI is not set



#

# PCCARD (PCMCIA/CardBus) support

#

# CONFIG_PCCARD is not set



#
@@ -236,6 +236,7 @@ CONFIG_ARM_THUMB=y 
CONFIG_TICK_ONESHOT=y

CONFIG_NO_HZ=y

CONFIG_HIGH_RES_TIMERS=y

CONFIG_GENERIC_CLOCKEVENTS_BUILD=y

CONFIG_PREEMPT=y

CONFIG_HZ=128

CONFIG_AEABI=y
@@ -248,6 +249,7 @@ CONFIG_FLATMEM_MANUAL=y 
CONFIG_FLATMEM=y

CONFIG_FLAT_NODE_MEM_MAP=y

# CONFIG_SPARSEMEM_STATIC is not set

# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set

CONFIG_SPLIT_PTLOCK_CPUS=4096

# CONFIG_RESOURCES_64BIT is not set

CONFIG_ZONE_DMA_FLAG=1
@@ -275,6 +277,8 @@ CONFIG_CPU_FREQ_STAT=y 
# CONFIG_CPU_FREQ_STAT_DETAILS is not set

# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set

CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y

# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set

# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set

# CONFIG_CPU_FREQ_GOV_PERFORMANCE is not set

# CONFIG_CPU_FREQ_GOV_POWERSAVE is not set

CONFIG_CPU_FREQ_GOV_USERSPACE=y
@@ -347,6 +351,7 @@ CONFIG_IP_PNP_BOOTP=y 
CONFIG_INET_XFRM_MODE_TRANSPORT=y

CONFIG_INET_XFRM_MODE_TUNNEL=y

CONFIG_INET_XFRM_MODE_BEET=y

# CONFIG_INET_LRO is not set

CONFIG_INET_DIAG=y

CONFIG_INET_TCP_DIAG=y

# CONFIG_TCP_CONG_ADVANCED is not set
@@ -372,10 +377,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic" 
# CONFIG_LAPB is not set

# CONFIG_ECONET is not set

# CONFIG_WAN_ROUTER is not set



#

# QoS and/or fair queueing

#

# CONFIG_NET_SCHED is not set



#
@@ -404,6 +405,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" 
#

# Generic Driver Options

#

CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

CONFIG_STANDALONE=y

CONFIG_PREVENT_FIRMWARE_BUILD=y

# CONFIG_FW_LOADER is not set
@@ -422,6 +424,8 @@ CONFIG_BLK_DEV_RAM_SIZE=8192 
CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024

# CONFIG_CDROM_PKTCDVD is not set

CONFIG_ATA_OVER_ETH=m

CONFIG_MISC_DEVICES=y

# CONFIG_EEPROM_93CX6 is not set



#

# SCSI device support
@@ -459,6 +463,7 @@ CONFIG_SCSI_WAIT_SCAN=m 
# CONFIG_SCSI_FC_ATTRS is not set

# CONFIG_SCSI_ISCSI_ATTRS is not set

# CONFIG_SCSI_SAS_LIBSAS is not set

# CONFIG_SCSI_SRP_ATTRS is not set

CONFIG_SCSI_LOWLEVEL=y

# CONFIG_ISCSI_TCP is not set

# CONFIG_SCSI_DEBUG is not set
@@ -471,12 +476,18 @@ CONFIG_NETDEVICES=y 
# CONFIG_MACVLAN is not set

# CONFIG_EQUALIZER is not set

# CONFIG_TUN is not set

# CONFIG_VETH is not set

# CONFIG_PHYLIB is not set

CONFIG_NET_ETHERNET=y

CONFIG_MII=y

# CONFIG_AX88796 is not set

CONFIG_SMC91X=y

# CONFIG_DM9000 is not set

# CONFIG_IBM_NEW_EMAC_ZMII is not set

# CONFIG_IBM_NEW_EMAC_RGMII is not set

# CONFIG_IBM_NEW_EMAC_TAH is not set

# CONFIG_IBM_NEW_EMAC_EMAC4 is not set

# CONFIG_B44 is not set

CONFIG_NETDEV_1000=y

CONFIG_NETDEV_10000=y
@@ -522,7 +533,6 @@ CONFIG_INPUT_MOUSEDEV_PSAUX=y 
CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024

CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768

# CONFIG_INPUT_JOYDEV is not set

# CONFIG_INPUT_TSDEV is not set

CONFIG_INPUT_EVDEV=y

CONFIG_INPUT_EVBUG=y
@@ -576,20 +586,51 @@ CONFIG_SERIAL_CORE_CONSOLE=y 
CONFIG_UNIX98_PTYS=y

# CONFIG_LEGACY_PTYS is not set

# CONFIG_IPMI_HANDLER is not set

CONFIG_WATCHDOG=y

CONFIG_WATCHDOG_NOWAYOUT=y



#

# Watchdog Device Drivers

#

# CONFIG_SOFT_WATCHDOG is not set

# CONFIG_OMAP_WATCHDOG is not set

# CONFIG_HW_RANDOM is not set

# CONFIG_NVRAM is not set

# CONFIG_R3964 is not set

# CONFIG_RAW_DRIVER is not set

# CONFIG_TCG_TPM is not set

# CONFIG_I2C is not set

CONFIG_I2C=y

CONFIG_I2C_BOARDINFO=y

# CONFIG_I2C_CHARDEV is not set



#

# I2C Algorithms

#

# CONFIG_I2C_ALGOBIT is not set

# CONFIG_I2C_ALGOPCF is not set

# CONFIG_I2C_ALGOPCA is not set



#

# I2C Hardware Bus support

#

# CONFIG_I2C_GPIO is not set

# CONFIG_I2C_OCORES is not set

CONFIG_I2C_OMAP=y

# CONFIG_I2C_PARPORT_LIGHT is not set

# CONFIG_I2C_SIMTEC is not set

# CONFIG_I2C_TAOS_EVM is not set

# CONFIG_I2C_STUB is not set



#

# Miscellaneous I2C Chip support

#

# CONFIG_SENSORS_DS1337 is not set

# CONFIG_SENSORS_DS1374 is not set

# CONFIG_DS1682 is not set

# CONFIG_SENSORS_EEPROM is not set

# CONFIG_SENSORS_PCF8574 is not set

# CONFIG_SENSORS_PCA9539 is not set

# CONFIG_SENSORS_PCF8591 is not set

# CONFIG_ISP1301_OMAP is not set

CONFIG_TPS65010=y

# CONFIG_SENSORS_MAX6875 is not set

# CONFIG_SENSORS_TSL2550 is not set

# CONFIG_I2C_DEBUG_CORE is not set

# CONFIG_I2C_DEBUG_ALGO is not set

# CONFIG_I2C_DEBUG_BUS is not set

# CONFIG_I2C_DEBUG_CHIP is not set



#

# SPI support
@@ -597,28 +638,73 @@ CONFIG_WATCHDOG_NOWAYOUT=y 
# CONFIG_SPI is not set

# CONFIG_SPI_MASTER is not set

# CONFIG_W1 is not set

# CONFIG_POWER_SUPPLY is not set

CONFIG_HWMON=y

# CONFIG_HWMON_VID is not set

# CONFIG_SENSORS_ABITUGURU is not set

# CONFIG_SENSORS_ABITUGURU3 is not set

# CONFIG_SENSORS_AD7418 is not set

# CONFIG_SENSORS_ADM1021 is not set

# CONFIG_SENSORS_ADM1025 is not set

# CONFIG_SENSORS_ADM1026 is not set

# CONFIG_SENSORS_ADM1029 is not set

# CONFIG_SENSORS_ADM1031 is not set

# CONFIG_SENSORS_ADM9240 is not set

# CONFIG_SENSORS_ADT7470 is not set

# CONFIG_SENSORS_ATXP1 is not set

# CONFIG_SENSORS_DS1621 is not set

# CONFIG_SENSORS_F71805F is not set

# CONFIG_SENSORS_F71882FG is not set

# CONFIG_SENSORS_F75375S is not set

# CONFIG_SENSORS_GL518SM is not set

# CONFIG_SENSORS_GL520SM is not set

# CONFIG_SENSORS_IT87 is not set

# CONFIG_SENSORS_LM63 is not set

# CONFIG_SENSORS_LM75 is not set

# CONFIG_SENSORS_LM77 is not set

# CONFIG_SENSORS_LM78 is not set

# CONFIG_SENSORS_LM80 is not set

# CONFIG_SENSORS_LM83 is not set

# CONFIG_SENSORS_LM85 is not set

# CONFIG_SENSORS_LM87 is not set

# CONFIG_SENSORS_LM90 is not set

# CONFIG_SENSORS_LM92 is not set

# CONFIG_SENSORS_LM93 is not set

# CONFIG_SENSORS_MAX1619 is not set

# CONFIG_SENSORS_MAX6650 is not set

# CONFIG_SENSORS_PC87360 is not set

# CONFIG_SENSORS_PC87427 is not set

# CONFIG_SENSORS_DME1737 is not set

# CONFIG_SENSORS_SMSC47M1 is not set

# CONFIG_SENSORS_SMSC47M192 is not set

# CONFIG_SENSORS_SMSC47B397 is not set

# CONFIG_SENSORS_THMC50 is not set

# CONFIG_SENSORS_VT1211 is not set

# CONFIG_SENSORS_W83781D is not set

# CONFIG_SENSORS_W83791D is not set

# CONFIG_SENSORS_W83792D is not set

# CONFIG_SENSORS_W83793 is not set

# CONFIG_SENSORS_W83L785TS is not set

# CONFIG_SENSORS_W83627HF is not set

# CONFIG_SENSORS_W83627EHF is not set

# CONFIG_HWMON_DEBUG_CHIP is not set

CONFIG_MISC_DEVICES=y

# CONFIG_EEPROM_93CX6 is not set

CONFIG_WATCHDOG=y

CONFIG_WATCHDOG_NOWAYOUT=y



#

# Watchdog Device Drivers

#

# CONFIG_SOFT_WATCHDOG is not set

# CONFIG_OMAP_WATCHDOG is not set



#

# Sonics Silicon Backplane

#

CONFIG_SSB_POSSIBLE=y

# CONFIG_SSB is not set



#

# Multifunction device drivers

#

# CONFIG_MFD_SM501 is not set

# CONFIG_NEW_LEDS is not set



#

# Multimedia devices
@@ -630,12 +716,6 @@ CONFIG_DAB=y 
#

# Graphics support

#

# CONFIG_BACKLIGHT_LCD_SUPPORT is not set



#

# Display device support

#

# CONFIG_DISPLAY_SUPPORT is not set

# CONFIG_VGASTATE is not set

CONFIG_VIDEO_OUTPUT_CONTROL=m

CONFIG_FB=y
@@ -644,6 +724,7 @@ CONFIG_FIRMWARE_EDID=y 
# CONFIG_FB_CFB_FILLRECT is not set

# CONFIG_FB_CFB_COPYAREA is not set

# CONFIG_FB_CFB_IMAGEBLIT is not set

# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set

# CONFIG_FB_SYS_FILLRECT is not set

# CONFIG_FB_SYS_COPYAREA is not set

# CONFIG_FB_SYS_IMAGEBLIT is not set
@@ -659,8 +740,14 @@ CONFIG_FB_MODE_HELPERS=y 
# Frame buffer hardware drivers

#

# CONFIG_FB_S1D13XXX is not set

# CONFIG_FB_OMAP is not set

# CONFIG_FB_VIRTUAL is not set

# CONFIG_FB_OMAP is not set

# CONFIG_BACKLIGHT_LCD_SUPPORT is not set



#

# Display device support

#

# CONFIG_DISPLAY_SUPPORT is not set



#

# Console display driver support
@@ -705,6 +792,7 @@ CONFIG_SOUND_PRIME=y 
CONFIG_HID_SUPPORT=y

CONFIG_HID=y

CONFIG_HID_DEBUG=y

# CONFIG_HIDRAW is not set

CONFIG_USB_SUPPORT=y

CONFIG_USB_ARCH_HAS_HCD=y

CONFIG_USB_ARCH_HAS_OHCI=y
@@ -720,22 +808,10 @@ CONFIG_USB_ARCH_HAS_OHCI=y 
#

# CONFIG_USB_GADGET is not set

# CONFIG_MMC is not set

# CONFIG_NEW_LEDS is not set

CONFIG_RTC_LIB=y

# CONFIG_RTC_CLASS is not set



#

# DMA Engine support

#

# CONFIG_DMA_ENGINE is not set



#

# DMA Clients

#



#

# DMA Devices

#



#

# File systems

#
@@ -771,8 +847,9 @@ CONFIG_DNOTIFY=y 
#

CONFIG_FAT_FS=y

CONFIG_MSDOS_FS=y

# CONFIG_VFAT_FS is not set

CONFIG_VFAT_FS=y

CONFIG_FAT_DEFAULT_CODEPAGE=437

CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"

# CONFIG_NTFS_FS is not set



#
@@ -783,7 +860,6 @@ CONFIG_PROC_SYSCTL=y 
CONFIG_SYSFS=y

# CONFIG_TMPFS is not set

# CONFIG_HUGETLB_PAGE is not set

CONFIG_RAMFS=y

# CONFIG_CONFIGFS_FS is not set



#
@@ -802,10 +878,7 @@ CONFIG_CRAMFS=y 
# CONFIG_QNX4FS_FS is not set

# CONFIG_SYSV_FS is not set

# CONFIG_UFS_FS is not set



#

# Network File Systems

#

CONFIG_NETWORK_FILESYSTEMS=y

CONFIG_NFS_FS=y

CONFIG_NFS_V3=y

# CONFIG_NFS_V3_ACL is not set
@@ -832,13 +905,9 @@ CONFIG_RPCSEC_GSS_KRB5=y 
#

# CONFIG_PARTITION_ADVANCED is not set

CONFIG_MSDOS_PARTITION=y



#

# Native Language Support

#

CONFIG_NLS=y

CONFIG_NLS_DEFAULT="iso8859-1"

# CONFIG_NLS_CODEPAGE_437 is not set

CONFIG_NLS_CODEPAGE_437=y

# CONFIG_NLS_CODEPAGE_737 is not set

# CONFIG_NLS_CODEPAGE_775 is not set

# CONFIG_NLS_CODEPAGE_850 is not set
@@ -862,7 +931,7 @@ CONFIG_NLS_DEFAULT="iso8859-1" 
# CONFIG_NLS_CODEPAGE_1250 is not set

# CONFIG_NLS_CODEPAGE_1251 is not set

# CONFIG_NLS_ASCII is not set

# CONFIG_NLS_ISO8859_1 is not set

CONFIG_NLS_ISO8859_1=y

# CONFIG_NLS_ISO8859_2 is not set

# CONFIG_NLS_ISO8859_3 is not set

# CONFIG_NLS_ISO8859_4 is not set
@@ -876,21 +945,16 @@ CONFIG_NLS_DEFAULT="iso8859-1" 
# CONFIG_NLS_KOI8_R is not set

# CONFIG_NLS_KOI8_U is not set

# CONFIG_NLS_UTF8 is not set



#

# Distributed Lock Manager

#

# CONFIG_DLM is not set



#

# Profiling support

#

CONFIG_INSTRUMENTATION=y

# CONFIG_PROFILING is not set

# CONFIG_MARKERS is not set



#

# Kernel hacking

#

# CONFIG_PRINTK_TIME is not set

CONFIG_ENABLE_WARN_DEPRECATED=y

CONFIG_ENABLE_MUST_CHECK=y

# CONFIG_MAGIC_SYSRQ is not set

# CONFIG_UNUSED_SYMBOLS is not set
@@ -899,6 +963,7 @@ CONFIG_ENABLE_MUST_CHECK=y 
# CONFIG_DEBUG_KERNEL is not set

CONFIG_DEBUG_BUGVERBOSE=y

CONFIG_FRAME_POINTER=y

# CONFIG_SAMPLES is not set

# CONFIG_DEBUG_USER is not set



#
@@ -906,6 +971,7 @@ CONFIG_FRAME_POINTER=y 
#

# CONFIG_KEYS is not set

# CONFIG_SECURITY is not set

# CONFIG_SECURITY_FILE_CAPABILITIES is not set

CONFIG_CRYPTO=y

CONFIG_CRYPTO_ALGAPI=y

CONFIG_CRYPTO_BLKCIPHER=y
@@ -925,6 +991,7 @@ CONFIG_CRYPTO_ECB=m 
CONFIG_CRYPTO_CBC=y

CONFIG_CRYPTO_PCBC=m

# CONFIG_CRYPTO_LRW is not set

# CONFIG_CRYPTO_XTS is not set

# CONFIG_CRYPTO_CRYPTD is not set

CONFIG_CRYPTO_DES=y

# CONFIG_CRYPTO_FCRYPT is not set
@@ -938,11 +1005,13 @@ CONFIG_CRYPTO_DES=y 
# CONFIG_CRYPTO_ARC4 is not set

# CONFIG_CRYPTO_KHAZAD is not set

# CONFIG_CRYPTO_ANUBIS is not set

# CONFIG_CRYPTO_SEED is not set

# CONFIG_CRYPTO_DEFLATE is not set

# CONFIG_CRYPTO_MICHAEL_MIC is not set

# CONFIG_CRYPTO_CRC32C is not set

# CONFIG_CRYPTO_CAMELLIA is not set

# CONFIG_CRYPTO_TEST is not set

# CONFIG_CRYPTO_AUTHENC is not set

CONFIG_CRYPTO_HW=y



#

arch/arm/configs/omap_osk_5912_defconfig

+51 −59
Original line number Diff line number Diff line 
#

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.23-rc6

# Mon Sep 17 14:15:05 2007

# Linux kernel version: 2.6.24-rc5

# Mon Dec 17 21:12:45 2007

#

CONFIG_ARM=y

CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -40,9 +40,14 @@ CONFIG_SYSVIPC_SYSCTL=y 
# CONFIG_BSD_PROCESS_ACCT is not set

# CONFIG_TASKSTATS is not set

# CONFIG_USER_NS is not set

# CONFIG_PID_NS is not set

# CONFIG_AUDIT is not set

# CONFIG_IKCONFIG is not set

CONFIG_LOG_BUF_SHIFT=14

# CONFIG_CGROUPS is not set

CONFIG_FAIR_GROUP_SCHED=y

CONFIG_FAIR_USER_SCHED=y

# CONFIG_FAIR_CGROUP_SCHED is not set

# CONFIG_SYSFS_DEPRECATED is not set

# CONFIG_RELAY is not set

CONFIG_BLK_DEV_INITRD=y
@@ -63,7 +68,6 @@ CONFIG_FUTEX=y 
CONFIG_ANON_INODES=y

CONFIG_EPOLL=y

CONFIG_SIGNALFD=y

CONFIG_TIMERFD=y

CONFIG_EVENTFD=y

CONFIG_SHMEM=y

CONFIG_VM_EVENT_COUNTERS=y
@@ -224,10 +228,6 @@ CONFIG_CPU_CP15_MMU=y 
#

# CONFIG_PCI_SYSCALL is not set

# CONFIG_ARCH_SUPPORTS_MSI is not set



#

# PCCARD (PCMCIA/CardBus) support

#

CONFIG_PCCARD=y

# CONFIG_PCMCIA_DEBUG is not set

CONFIG_PCMCIA=y
@@ -245,6 +245,7 @@ CONFIG_OMAP_CF=y 
CONFIG_TICK_ONESHOT=y

CONFIG_NO_HZ=y

CONFIG_HIGH_RES_TIMERS=y

CONFIG_GENERIC_CLOCKEVENTS_BUILD=y

# CONFIG_PREEMPT is not set

CONFIG_HZ=128

CONFIG_AEABI=y
@@ -257,6 +258,7 @@ CONFIG_FLATMEM_MANUAL=y 
CONFIG_FLATMEM=y

CONFIG_FLAT_NODE_MEM_MAP=y

# CONFIG_SPARSEMEM_STATIC is not set

# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set

CONFIG_SPLIT_PTLOCK_CPUS=4096

# CONFIG_RESOURCES_64BIT is not set

CONFIG_ZONE_DMA_FLAG=1
@@ -346,6 +348,7 @@ CONFIG_IP_PNP_BOOTP=y 
CONFIG_INET_XFRM_MODE_TRANSPORT=y

CONFIG_INET_XFRM_MODE_TUNNEL=y

CONFIG_INET_XFRM_MODE_BEET=y

# CONFIG_INET_LRO is not set

CONFIG_INET_DIAG=y

CONFIG_INET_TCP_DIAG=y

# CONFIG_TCP_CONG_ADVANCED is not set
@@ -371,10 +374,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic" 
# CONFIG_LAPB is not set

# CONFIG_ECONET is not set

# CONFIG_WAN_ROUTER is not set



#

# QoS and/or fair queueing

#

# CONFIG_NET_SCHED is not set



#
@@ -403,6 +402,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" 
#

# Generic Driver Options

#

CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

CONFIG_STANDALONE=y

CONFIG_PREVENT_FIRMWARE_BUILD=y

CONFIG_FW_LOADER=y
@@ -427,6 +427,7 @@ CONFIG_MTD_BLOCK=y 
# CONFIG_INFTL is not set

# CONFIG_RFD_FTL is not set

# CONFIG_SSFDC is not set

# CONFIG_MTD_OOPS is not set



#

# RAM/ROM/Flash chip drivers
@@ -495,6 +496,8 @@ CONFIG_BLK_DEV_RAM_SIZE=8192 
CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024

# CONFIG_CDROM_PKTCDVD is not set

# CONFIG_ATA_OVER_ETH is not set

CONFIG_MISC_DEVICES=y

# CONFIG_EEPROM_93CX6 is not set

CONFIG_IDE=m

CONFIG_BLK_DEV_IDE=m
@@ -515,9 +518,10 @@ CONFIG_IDE_PROC_FS=y 
# IDE chipset support/bugfixes

#

# CONFIG_IDE_GENERIC is not set

# CONFIG_IDEPCI_PCIBUS_ORDER is not set

# CONFIG_BLK_DEV_PLATFORM is not set

# CONFIG_IDE_ARM is not set

# CONFIG_BLK_DEV_IDEDMA is not set

CONFIG_IDE_ARCH_OBSOLETE_INIT=y

# CONFIG_BLK_DEV_HD is not set



#
@@ -536,12 +540,18 @@ CONFIG_NETDEVICES=y 
# CONFIG_MACVLAN is not set

# CONFIG_EQUALIZER is not set

# CONFIG_TUN is not set

# CONFIG_VETH is not set

# CONFIG_PHYLIB is not set

CONFIG_NET_ETHERNET=y

CONFIG_MII=y

# CONFIG_AX88796 is not set

CONFIG_SMC91X=y

# CONFIG_DM9000 is not set

# CONFIG_IBM_NEW_EMAC_ZMII is not set

# CONFIG_IBM_NEW_EMAC_RGMII is not set

# CONFIG_IBM_NEW_EMAC_TAH is not set

# CONFIG_IBM_NEW_EMAC_EMAC4 is not set

# CONFIG_B44 is not set

CONFIG_NETDEV_1000=y

CONFIG_NETDEV_10000=y
@@ -585,7 +595,6 @@ CONFIG_INPUT_MOUSEDEV=y 
CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024

CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768

# CONFIG_INPUT_JOYDEV is not set

# CONFIG_INPUT_TSDEV is not set

CONFIG_INPUT_EVDEV=y

# CONFIG_INPUT_EVBUG is not set
@@ -651,7 +660,6 @@ CONFIG_UNIX98_PTYS=y 
CONFIG_LEGACY_PTYS=y

CONFIG_LEGACY_PTY_COUNT=256

# CONFIG_IPMI_HANDLER is not set

# CONFIG_WATCHDOG is not set

CONFIG_HW_RANDOM=m

CONFIG_HW_RANDOM_OMAP=m

# CONFIG_NVRAM is not set
@@ -712,10 +720,9 @@ CONFIG_TPS65010=y 
# CONFIG_SPI is not set

# CONFIG_SPI_MASTER is not set

# CONFIG_W1 is not set

# CONFIG_POWER_SUPPLY is not set

CONFIG_HWMON=y

# CONFIG_HWMON_VID is not set

# CONFIG_SENSORS_ABITUGURU is not set

# CONFIG_SENSORS_ABITUGURU3 is not set

# CONFIG_SENSORS_AD7418 is not set

# CONFIG_SENSORS_ADM1021 is not set

# CONFIG_SENSORS_ADM1025 is not set
@@ -723,12 +730,12 @@ CONFIG_HWMON=y 
# CONFIG_SENSORS_ADM1029 is not set

# CONFIG_SENSORS_ADM1031 is not set

# CONFIG_SENSORS_ADM9240 is not set

# CONFIG_SENSORS_ASB100 is not set

# CONFIG_SENSORS_ADT7470 is not set

# CONFIG_SENSORS_ATXP1 is not set

# CONFIG_SENSORS_DS1621 is not set

# CONFIG_SENSORS_F71805F is not set

# CONFIG_SENSORS_FSCHER is not set

# CONFIG_SENSORS_FSCPOS is not set

# CONFIG_SENSORS_F71882FG is not set

# CONFIG_SENSORS_F75375S is not set

# CONFIG_SENSORS_GL518SM is not set

# CONFIG_SENSORS_GL520SM is not set

# CONFIG_SENSORS_IT87 is not set
@@ -761,14 +768,18 @@ CONFIG_HWMON=y 
# CONFIG_SENSORS_W83627HF is not set

# CONFIG_SENSORS_W83627EHF is not set

# CONFIG_HWMON_DEBUG_CHIP is not set

CONFIG_MISC_DEVICES=y

# CONFIG_EEPROM_93CX6 is not set

# CONFIG_WATCHDOG is not set



#

# Sonics Silicon Backplane

#

CONFIG_SSB_POSSIBLE=y

# CONFIG_SSB is not set



#

# Multifunction device drivers

#

# CONFIG_MFD_SM501 is not set

# CONFIG_NEW_LEDS is not set



#

# Multimedia devices
@@ -780,12 +791,6 @@ CONFIG_DAB=y 
#

# Graphics support

#

# CONFIG_BACKLIGHT_LCD_SUPPORT is not set



#

# Display device support

#

# CONFIG_DISPLAY_SUPPORT is not set

# CONFIG_VGASTATE is not set

CONFIG_VIDEO_OUTPUT_CONTROL=m

CONFIG_FB=y
@@ -794,6 +799,7 @@ CONFIG_FIRMWARE_EDID=y 
# CONFIG_FB_CFB_FILLRECT is not set

# CONFIG_FB_CFB_COPYAREA is not set

# CONFIG_FB_CFB_IMAGEBLIT is not set

# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set

# CONFIG_FB_SYS_FILLRECT is not set

# CONFIG_FB_SYS_COPYAREA is not set

# CONFIG_FB_SYS_IMAGEBLIT is not set
@@ -809,8 +815,14 @@ CONFIG_FB_MODE_HELPERS=y 
# Frame buffer hardware drivers

#

# CONFIG_FB_S1D13XXX is not set

# CONFIG_FB_OMAP is not set

# CONFIG_FB_VIRTUAL is not set

# CONFIG_FB_OMAP is not set

# CONFIG_BACKLIGHT_LCD_SUPPORT is not set



#

# Display device support

#

# CONFIG_DISPLAY_SUPPORT is not set



#

# Console display driver support
@@ -843,6 +855,7 @@ CONFIG_LOGO_LINUX_CLUT224=y 
CONFIG_HID_SUPPORT=y

CONFIG_HID=y

CONFIG_HID_DEBUG=y

# CONFIG_HIDRAW is not set

CONFIG_USB_SUPPORT=y

CONFIG_USB_ARCH_HAS_HCD=y

CONFIG_USB_ARCH_HAS_OHCI=y
@@ -858,22 +871,10 @@ CONFIG_USB_ARCH_HAS_OHCI=y 
#

# CONFIG_USB_GADGET is not set

# CONFIG_MMC is not set

# CONFIG_NEW_LEDS is not set

CONFIG_RTC_LIB=y

# CONFIG_RTC_CLASS is not set



#

# DMA Engine support

#

# CONFIG_DMA_ENGINE is not set



#

# DMA Clients

#



#

# DMA Devices

#



#

# File systems

#
@@ -922,7 +923,6 @@ CONFIG_PROC_SYSCTL=y 
CONFIG_SYSFS=y

# CONFIG_TMPFS is not set

# CONFIG_HUGETLB_PAGE is not set

CONFIG_RAMFS=y

# CONFIG_CONFIGFS_FS is not set



#
@@ -938,10 +938,12 @@ CONFIG_RAMFS=y 
CONFIG_JFFS2_FS=y

CONFIG_JFFS2_FS_DEBUG=0

CONFIG_JFFS2_FS_WRITEBUFFER=y

# CONFIG_JFFS2_FS_WBUF_VERIFY is not set

# CONFIG_JFFS2_SUMMARY is not set

# CONFIG_JFFS2_FS_XATTR is not set

# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set

CONFIG_JFFS2_ZLIB=y

# CONFIG_JFFS2_LZO is not set

CONFIG_JFFS2_RTIME=y

# CONFIG_JFFS2_RUBIN is not set

# CONFIG_CRAMFS is not set
@@ -950,10 +952,7 @@ CONFIG_JFFS2_RTIME=y 
# CONFIG_QNX4FS_FS is not set

# CONFIG_SYSV_FS is not set

# CONFIG_UFS_FS is not set



#

# Network File Systems

#

CONFIG_NETWORK_FILESYSTEMS=y

CONFIG_NFS_FS=y

CONFIG_NFS_V3=y

# CONFIG_NFS_V3_ACL is not set
@@ -979,10 +978,6 @@ CONFIG_SUNRPC=y 
#

# CONFIG_PARTITION_ADVANCED is not set

CONFIG_MSDOS_PARTITION=y



#

# Native Language Support

#

CONFIG_NLS=m

CONFIG_NLS_DEFAULT="iso8859-1"

CONFIG_NLS_CODEPAGE_437=m
@@ -1023,21 +1018,16 @@ CONFIG_NLS_ISO8859_1=m 
# CONFIG_NLS_KOI8_R is not set

# CONFIG_NLS_KOI8_U is not set

# CONFIG_NLS_UTF8 is not set



#

# Distributed Lock Manager

#

# CONFIG_DLM is not set



#

# Profiling support

#

CONFIG_INSTRUMENTATION=y

# CONFIG_PROFILING is not set

# CONFIG_MARKERS is not set



#

# Kernel hacking

#

# CONFIG_PRINTK_TIME is not set

CONFIG_ENABLE_WARN_DEPRECATED=y

CONFIG_ENABLE_MUST_CHECK=y

# CONFIG_MAGIC_SYSRQ is not set

# CONFIG_UNUSED_SYMBOLS is not set
@@ -1046,6 +1036,7 @@ CONFIG_ENABLE_MUST_CHECK=y 
# CONFIG_DEBUG_KERNEL is not set

CONFIG_DEBUG_BUGVERBOSE=y

CONFIG_FRAME_POINTER=y

# CONFIG_SAMPLES is not set

# CONFIG_DEBUG_USER is not set



#
@@ -1053,6 +1044,7 @@ CONFIG_FRAME_POINTER=y 
#

# CONFIG_KEYS is not set

# CONFIG_SECURITY is not set

# CONFIG_SECURITY_FILE_CAPABILITIES is not set

# CONFIG_CRYPTO is not set



#

arch/arm/configs/orion_defconfig

+46 −47

File changed.

Preview size limit exceeded, changes collapsed.

arch/arm/mach-omap1/Makefile

+3 −3
Original line number Diff line number Diff line
@@ -13,20 +13,20 @@ obj-$(CONFIG_PM) += pm.o sleep.o 
led-y := leds.o



# Specific board support

obj-$(CONFIG_MACH_OMAP_H2)		+= board-h2.o

obj-$(CONFIG_MACH_OMAP_H2)		+= board-h2.o board-h2-mmc.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

obj-$(CONFIG_MACH_OMAP_FSAMPLE)		+= board-fsample.o

obj-$(CONFIG_MACH_OMAP_OSK)		+= board-osk.o

obj-$(CONFIG_MACH_OMAP_H3)		+= board-h3.o

obj-$(CONFIG_MACH_OMAP_H3)		+= board-h3.o board-h3-mmc.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

obj-$(CONFIG_MACH_SX1)			+= board-sx1.o

obj-$(CONFIG_MACH_SX1)			+= board-sx1.o board-sx1-mmc.o



ifeq ($(CONFIG_ARCH_OMAP15XX),y)

# Innovator-1510 FPGA

arch/arm/mach-omap1/board-ams-delta.c

+4 −3
Original line number Diff line number Diff line
@@ -135,21 +135,21 @@ static void __init ams_delta_init_irq(void) 
}



static struct map_desc ams_delta_io_desc[] __initdata = {

	// AMS_DELTA_LATCH1

	/* AMS_DELTA_LATCH1 */

	{

		.virtual	= AMS_DELTA_LATCH1_VIRT,

		.pfn		= __phys_to_pfn(AMS_DELTA_LATCH1_PHYS),

		.length		= 0x01000000,

		.type		= MT_DEVICE

	},

	// AMS_DELTA_LATCH2

	/* AMS_DELTA_LATCH2 */

	{

		.virtual	= AMS_DELTA_LATCH2_VIRT,

		.pfn		= __phys_to_pfn(AMS_DELTA_LATCH2_PHYS),

		.length		= 0x01000000,

		.type		= MT_DEVICE

	},

	// AMS_DELTA_MODEM

	/* AMS_DELTA_MODEM */

	{

		.virtual	= AMS_DELTA_MODEM_VIRT,

		.pfn		= __phys_to_pfn(AMS_DELTA_MODEM_PHYS),
@@ -227,6 +227,7 @@ static void __init ams_delta_init(void) 
	omap_board_config = ams_delta_config;

	omap_board_config_size = ARRAY_SIZE(ams_delta_config);

	omap_serial_init();

	omap_register_i2c_bus(1, 100, NULL, 0);



	/* Clear latch2 (NAND, LCD, modem enable) */

	ams_delta_latch2_write(~0, 0);