diff options
Diffstat (limited to 'arch')
27 files changed, 840 insertions, 695 deletions
diff --git a/arch/arm/configs/jornada720_defconfig b/arch/arm/configs/jornada720_defconfig index 0c556289a3f4..81fadafae02d 100644 --- a/arch/arm/configs/jornada720_defconfig +++ b/arch/arm/configs/jornada720_defconfig | |||
| @@ -1,84 +1,174 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.12-rc1-bk2 | 3 | # Linux kernel version: 2.6.27-rc6 |
| 4 | # Sun Mar 27 23:10:35 2005 | 4 | # Tue Sep 16 18:56:58 2008 |
| 5 | # | 5 | # |
| 6 | CONFIG_ARM=y | 6 | CONFIG_ARM=y |
| 7 | CONFIG_SYS_SUPPORTS_APM_EMULATION=y | ||
| 8 | CONFIG_GENERIC_GPIO=y | ||
| 9 | CONFIG_GENERIC_TIME=y | ||
| 10 | CONFIG_GENERIC_CLOCKEVENTS=y | ||
| 7 | CONFIG_MMU=y | 11 | CONFIG_MMU=y |
| 8 | CONFIG_UID16=y | 12 | # CONFIG_NO_IOPORT is not set |
| 13 | CONFIG_GENERIC_HARDIRQS=y | ||
| 14 | CONFIG_STACKTRACE_SUPPORT=y | ||
| 15 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | ||
| 16 | CONFIG_LOCKDEP_SUPPORT=y | ||
| 17 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | ||
| 18 | CONFIG_HARDIRQS_SW_RESEND=y | ||
| 19 | CONFIG_GENERIC_IRQ_PROBE=y | ||
| 9 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | 20 | CONFIG_RWSEM_GENERIC_SPINLOCK=y |
| 21 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set | ||
| 22 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set | ||
| 23 | CONFIG_GENERIC_HWEIGHT=y | ||
| 10 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 24 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 11 | CONFIG_GENERIC_IOMAP=y | 25 | CONFIG_ARCH_SUPPORTS_AOUT=y |
| 26 | CONFIG_ZONE_DMA=y | ||
| 27 | CONFIG_ARCH_MTD_XIP=y | ||
| 28 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y | ||
| 29 | CONFIG_VECTORS_BASE=0xffff0000 | ||
| 30 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | ||
| 12 | 31 | ||
| 13 | # | 32 | # |
| 14 | # Code maturity level options | 33 | # General setup |
| 15 | # | 34 | # |
| 16 | CONFIG_EXPERIMENTAL=y | 35 | CONFIG_EXPERIMENTAL=y |
| 17 | CONFIG_CLEAN_COMPILE=y | ||
| 18 | CONFIG_BROKEN_ON_SMP=y | 36 | CONFIG_BROKEN_ON_SMP=y |
| 19 | 37 | CONFIG_INIT_ENV_ARG_LIMIT=32 | |
| 20 | # | ||
| 21 | # General setup | ||
| 22 | # | ||
| 23 | CONFIG_LOCALVERSION="" | 38 | CONFIG_LOCALVERSION="" |
| 39 | CONFIG_LOCALVERSION_AUTO=y | ||
| 24 | CONFIG_SWAP=y | 40 | CONFIG_SWAP=y |
| 25 | CONFIG_SYSVIPC=y | 41 | CONFIG_SYSVIPC=y |
| 42 | CONFIG_SYSVIPC_SYSCTL=y | ||
| 26 | # CONFIG_POSIX_MQUEUE is not set | 43 | # CONFIG_POSIX_MQUEUE is not set |
| 27 | # CONFIG_BSD_PROCESS_ACCT is not set | 44 | # CONFIG_BSD_PROCESS_ACCT is not set |
| 28 | CONFIG_SYSCTL=y | 45 | # CONFIG_TASKSTATS is not set |
| 29 | # CONFIG_AUDIT is not set | 46 | # CONFIG_AUDIT is not set |
| 30 | CONFIG_HOTPLUG=y | ||
| 31 | CONFIG_KOBJECT_UEVENT=y | ||
| 32 | # CONFIG_IKCONFIG is not set | 47 | # CONFIG_IKCONFIG is not set |
| 48 | CONFIG_LOG_BUF_SHIFT=14 | ||
| 49 | # CONFIG_CGROUPS is not set | ||
| 50 | # CONFIG_GROUP_SCHED is not set | ||
| 51 | CONFIG_SYSFS_DEPRECATED=y | ||
| 52 | CONFIG_SYSFS_DEPRECATED_V2=y | ||
| 53 | # CONFIG_RELAY is not set | ||
| 54 | CONFIG_NAMESPACES=y | ||
| 55 | # CONFIG_UTS_NS is not set | ||
| 56 | # CONFIG_IPC_NS is not set | ||
| 57 | # CONFIG_USER_NS is not set | ||
| 58 | # CONFIG_PID_NS is not set | ||
| 59 | # CONFIG_BLK_DEV_INITRD is not set | ||
| 60 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y | ||
| 61 | CONFIG_SYSCTL=y | ||
| 33 | # CONFIG_EMBEDDED is not set | 62 | # CONFIG_EMBEDDED is not set |
| 63 | CONFIG_UID16=y | ||
| 64 | CONFIG_SYSCTL_SYSCALL=y | ||
| 34 | CONFIG_KALLSYMS=y | 65 | CONFIG_KALLSYMS=y |
| 35 | # CONFIG_KALLSYMS_ALL is not set | 66 | # CONFIG_KALLSYMS_ALL is not set |
| 36 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 67 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| 68 | CONFIG_HOTPLUG=y | ||
| 69 | CONFIG_PRINTK=y | ||
| 70 | CONFIG_BUG=y | ||
| 71 | CONFIG_ELF_CORE=y | ||
| 72 | CONFIG_COMPAT_BRK=y | ||
| 37 | CONFIG_BASE_FULL=y | 73 | CONFIG_BASE_FULL=y |
| 38 | CONFIG_FUTEX=y | 74 | CONFIG_FUTEX=y |
| 75 | CONFIG_ANON_INODES=y | ||
| 39 | CONFIG_EPOLL=y | 76 | CONFIG_EPOLL=y |
| 40 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y | 77 | CONFIG_SIGNALFD=y |
| 78 | CONFIG_TIMERFD=y | ||
| 79 | CONFIG_EVENTFD=y | ||
| 41 | CONFIG_SHMEM=y | 80 | CONFIG_SHMEM=y |
| 42 | CONFIG_CC_ALIGN_FUNCTIONS=0 | 81 | CONFIG_VM_EVENT_COUNTERS=y |
| 43 | CONFIG_CC_ALIGN_LABELS=0 | 82 | CONFIG_SLUB_DEBUG=y |
| 44 | CONFIG_CC_ALIGN_LOOPS=0 | 83 | # CONFIG_SLAB is not set |
| 45 | CONFIG_CC_ALIGN_JUMPS=0 | 84 | CONFIG_SLUB=y |
| 85 | # CONFIG_SLOB is not set | ||
| 86 | # CONFIG_PROFILING is not set | ||
| 87 | # CONFIG_MARKERS is not set | ||
| 88 | CONFIG_HAVE_OPROFILE=y | ||
| 89 | # CONFIG_KPROBES is not set | ||
| 90 | # CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is not set | ||
| 91 | # CONFIG_HAVE_IOREMAP_PROT is not set | ||
| 92 | CONFIG_HAVE_KPROBES=y | ||
| 93 | CONFIG_HAVE_KRETPROBES=y | ||
| 94 | # CONFIG_HAVE_ARCH_TRACEHOOK is not set | ||
| 95 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 96 | # CONFIG_USE_GENERIC_SMP_HELPERS is not set | ||
| 97 | CONFIG_HAVE_CLK=y | ||
| 98 | CONFIG_PROC_PAGE_MONITOR=y | ||
| 99 | CONFIG_HAVE_GENERIC_DMA_COHERENT=y | ||
| 100 | CONFIG_SLABINFO=y | ||
| 101 | CONFIG_RT_MUTEXES=y | ||
| 46 | # CONFIG_TINY_SHMEM is not set | 102 | # CONFIG_TINY_SHMEM is not set |
| 47 | CONFIG_BASE_SMALL=0 | 103 | CONFIG_BASE_SMALL=0 |
| 48 | |||
| 49 | # | ||
| 50 | # Loadable module support | ||
| 51 | # | ||
| 52 | CONFIG_MODULES=y | 104 | CONFIG_MODULES=y |
| 105 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
| 53 | # CONFIG_MODULE_UNLOAD is not set | 106 | # CONFIG_MODULE_UNLOAD is not set |
| 54 | CONFIG_OBSOLETE_MODPARM=y | ||
| 55 | # CONFIG_MODVERSIONS is not set | 107 | # CONFIG_MODVERSIONS is not set |
| 56 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 108 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
| 57 | CONFIG_KMOD=y | 109 | CONFIG_KMOD=y |
| 110 | CONFIG_BLOCK=y | ||
| 111 | # CONFIG_LBD is not set | ||
| 112 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
| 113 | # CONFIG_LSF is not set | ||
| 114 | # CONFIG_BLK_DEV_BSG is not set | ||
| 115 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
| 116 | |||
| 117 | # | ||
| 118 | # IO Schedulers | ||
| 119 | # | ||
| 120 | CONFIG_IOSCHED_NOOP=y | ||
| 121 | CONFIG_IOSCHED_AS=y | ||
| 122 | CONFIG_IOSCHED_DEADLINE=y | ||
| 123 | CONFIG_IOSCHED_CFQ=y | ||
| 124 | # CONFIG_DEFAULT_AS is not set | ||
| 125 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 126 | CONFIG_DEFAULT_CFQ=y | ||
| 127 | # CONFIG_DEFAULT_NOOP is not set | ||
| 128 | CONFIG_DEFAULT_IOSCHED="cfq" | ||
| 129 | CONFIG_CLASSIC_RCU=y | ||
| 58 | 130 | ||
| 59 | # | 131 | # |
| 60 | # System Type | 132 | # System Type |
| 61 | # | 133 | # |
| 134 | # CONFIG_ARCH_AAEC2000 is not set | ||
| 135 | # CONFIG_ARCH_INTEGRATOR is not set | ||
| 136 | # CONFIG_ARCH_REALVIEW is not set | ||
| 137 | # CONFIG_ARCH_VERSATILE is not set | ||
| 138 | # CONFIG_ARCH_AT91 is not set | ||
| 62 | # CONFIG_ARCH_CLPS7500 is not set | 139 | # CONFIG_ARCH_CLPS7500 is not set |
| 63 | # CONFIG_ARCH_CLPS711X is not set | 140 | # CONFIG_ARCH_CLPS711X is not set |
| 64 | # CONFIG_ARCH_CO285 is not set | ||
| 65 | # CONFIG_ARCH_EBSA110 is not set | 141 | # CONFIG_ARCH_EBSA110 is not set |
| 142 | # CONFIG_ARCH_EP93XX is not set | ||
| 66 | # CONFIG_ARCH_FOOTBRIDGE is not set | 143 | # CONFIG_ARCH_FOOTBRIDGE is not set |
| 67 | # CONFIG_ARCH_INTEGRATOR is not set | 144 | # CONFIG_ARCH_NETX is not set |
| 68 | # CONFIG_ARCH_IOP3XX is not set | 145 | # CONFIG_ARCH_H720X is not set |
| 69 | # CONFIG_ARCH_IXP4XX is not set | 146 | # CONFIG_ARCH_IMX is not set |
| 147 | # CONFIG_ARCH_IOP13XX is not set | ||
| 148 | # CONFIG_ARCH_IOP32X is not set | ||
| 149 | # CONFIG_ARCH_IOP33X is not set | ||
| 150 | # CONFIG_ARCH_IXP23XX is not set | ||
| 70 | # CONFIG_ARCH_IXP2000 is not set | 151 | # CONFIG_ARCH_IXP2000 is not set |
| 152 | # CONFIG_ARCH_IXP4XX is not set | ||
| 71 | # CONFIG_ARCH_L7200 is not set | 153 | # CONFIG_ARCH_L7200 is not set |
| 154 | # CONFIG_ARCH_KIRKWOOD is not set | ||
| 155 | # CONFIG_ARCH_KS8695 is not set | ||
| 156 | # CONFIG_ARCH_NS9XXX is not set | ||
| 157 | # CONFIG_ARCH_LOKI is not set | ||
| 158 | # CONFIG_ARCH_MV78XX0 is not set | ||
| 159 | # CONFIG_ARCH_MXC is not set | ||
| 160 | # CONFIG_ARCH_ORION5X is not set | ||
| 161 | # CONFIG_ARCH_PNX4008 is not set | ||
| 72 | # CONFIG_ARCH_PXA is not set | 162 | # CONFIG_ARCH_PXA is not set |
| 73 | # CONFIG_ARCH_RPC is not set | 163 | # CONFIG_ARCH_RPC is not set |
| 74 | CONFIG_ARCH_SA1100=y | 164 | CONFIG_ARCH_SA1100=y |
| 75 | # CONFIG_ARCH_S3C2410 is not set | 165 | # CONFIG_ARCH_S3C2410 is not set |
| 76 | # CONFIG_ARCH_SHARK is not set | 166 | # CONFIG_ARCH_SHARK is not set |
| 77 | # CONFIG_ARCH_LH7A40X is not set | 167 | # CONFIG_ARCH_LH7A40X is not set |
| 168 | # CONFIG_ARCH_DAVINCI is not set | ||
| 78 | # CONFIG_ARCH_OMAP is not set | 169 | # CONFIG_ARCH_OMAP is not set |
| 79 | # CONFIG_ARCH_VERSATILE is not set | 170 | # CONFIG_ARCH_MSM7X00A is not set |
| 80 | # CONFIG_ARCH_IMX is not set | 171 | CONFIG_DMABOUNCE=y |
| 81 | # CONFIG_ARCH_H720X is not set | ||
| 82 | 172 | ||
| 83 | # | 173 | # |
| 84 | # SA11x0 Implementations | 174 | # SA11x0 Implementations |
| @@ -91,12 +181,21 @@ CONFIG_ARCH_SA1100=y | |||
| 91 | # CONFIG_SA1100_H3800 is not set | 181 | # CONFIG_SA1100_H3800 is not set |
| 92 | # CONFIG_SA1100_BADGE4 is not set | 182 | # CONFIG_SA1100_BADGE4 is not set |
| 93 | CONFIG_SA1100_JORNADA720=y | 183 | CONFIG_SA1100_JORNADA720=y |
| 184 | CONFIG_SA1100_JORNADA720_SSP=y | ||
| 94 | # CONFIG_SA1100_HACKKIT is not set | 185 | # CONFIG_SA1100_HACKKIT is not set |
| 95 | # CONFIG_SA1100_LART is not set | 186 | # CONFIG_SA1100_LART is not set |
| 96 | # CONFIG_SA1100_PLEB is not set | 187 | # CONFIG_SA1100_PLEB is not set |
| 97 | # CONFIG_SA1100_SHANNON is not set | 188 | # CONFIG_SA1100_SHANNON is not set |
| 98 | # CONFIG_SA1100_SIMPAD is not set | 189 | # CONFIG_SA1100_SIMPAD is not set |
| 99 | # CONFIG_SA1100_SSP is not set | 190 | CONFIG_SA1100_SSP=y |
| 191 | |||
| 192 | # | ||
| 193 | # Boot options | ||
| 194 | # | ||
| 195 | |||
| 196 | # | ||
| 197 | # Power management | ||
| 198 | # | ||
| 100 | 199 | ||
| 101 | # | 200 | # |
| 102 | # Processor Type | 201 | # Processor Type |
| @@ -105,44 +204,71 @@ CONFIG_CPU_32=y | |||
| 105 | CONFIG_CPU_SA1100=y | 204 | CONFIG_CPU_SA1100=y |
| 106 | CONFIG_CPU_32v4=y | 205 | CONFIG_CPU_32v4=y |
| 107 | CONFIG_CPU_ABRT_EV4=y | 206 | CONFIG_CPU_ABRT_EV4=y |
| 207 | CONFIG_CPU_PABRT_NOIFAR=y | ||
| 108 | CONFIG_CPU_CACHE_V4WB=y | 208 | CONFIG_CPU_CACHE_V4WB=y |
| 109 | CONFIG_CPU_CACHE_VIVT=y | 209 | CONFIG_CPU_CACHE_VIVT=y |
| 110 | CONFIG_CPU_TLB_V4WB=y | 210 | CONFIG_CPU_TLB_V4WB=y |
| 111 | CONFIG_CPU_MINICACHE=y | 211 | CONFIG_CPU_CP15=y |
| 212 | CONFIG_CPU_CP15_MMU=y | ||
| 112 | 213 | ||
| 113 | # | 214 | # |
| 114 | # Processor Features | 215 | # Processor Features |
| 115 | # | 216 | # |
| 217 | # CONFIG_CPU_ICACHE_DISABLE is not set | ||
| 218 | # CONFIG_CPU_DCACHE_DISABLE is not set | ||
| 219 | # CONFIG_OUTER_CACHE is not set | ||
| 116 | CONFIG_SA1111=y | 220 | CONFIG_SA1111=y |
| 117 | CONFIG_DMABOUNCE=y | ||
| 118 | CONFIG_FORCE_MAX_ZONEORDER=9 | 221 | CONFIG_FORCE_MAX_ZONEORDER=9 |
| 119 | 222 | ||
| 120 | # | 223 | # |
| 121 | # Bus support | 224 | # Bus support |
| 122 | # | 225 | # |
| 123 | CONFIG_ISA=y | 226 | CONFIG_ISA=y |
| 124 | 227 | # CONFIG_PCI_SYSCALL is not set | |
| 125 | # | 228 | # CONFIG_ARCH_SUPPORTS_MSI is not set |
| 126 | # PCCARD (PCMCIA/CardBus) support | ||
| 127 | # | ||
| 128 | CONFIG_PCCARD=y | 229 | CONFIG_PCCARD=y |
| 129 | # CONFIG_PCMCIA_DEBUG is not set | 230 | # CONFIG_PCMCIA_DEBUG is not set |
| 130 | CONFIG_PCMCIA=y | 231 | CONFIG_PCMCIA=y |
| 232 | CONFIG_PCMCIA_LOAD_CIS=y | ||
| 233 | CONFIG_PCMCIA_IOCTL=y | ||
| 131 | 234 | ||
| 132 | # | 235 | # |
| 133 | # PC-card bridges | 236 | # PC-card bridges |
| 134 | # | 237 | # |
| 135 | CONFIG_I82365=y | 238 | # CONFIG_I82365 is not set |
| 136 | # CONFIG_TCIC is not set | 239 | # CONFIG_TCIC is not set |
| 137 | CONFIG_PCMCIA_SA1100=y | 240 | CONFIG_PCMCIA_SA1100=y |
| 138 | # CONFIG_PCMCIA_SA1111 is not set | 241 | # CONFIG_PCMCIA_SA1111 is not set |
| 139 | CONFIG_PCCARD_NONSTATIC=y | ||
| 140 | 242 | ||
| 141 | # | 243 | # |
| 142 | # Kernel Features | 244 | # Kernel Features |
| 143 | # | 245 | # |
| 246 | CONFIG_TICK_ONESHOT=y | ||
| 247 | # CONFIG_NO_HZ is not set | ||
| 248 | # CONFIG_HIGH_RES_TIMERS is not set | ||
| 249 | CONFIG_GENERIC_CLOCKEVENTS_BUILD=y | ||
| 144 | # CONFIG_PREEMPT is not set | 250 | # CONFIG_PREEMPT is not set |
| 251 | CONFIG_HZ=100 | ||
| 252 | # CONFIG_AEABI is not set | ||
| 253 | CONFIG_ARCH_DISCONTIGMEM_ENABLE=y | ||
| 254 | CONFIG_ARCH_SPARSEMEM_ENABLE=y | ||
| 255 | CONFIG_ARCH_SELECT_MEMORY_MODEL=y | ||
| 256 | CONFIG_NODES_SHIFT=2 | ||
| 257 | CONFIG_SELECT_MEMORY_MODEL=y | ||
| 258 | # CONFIG_FLATMEM_MANUAL is not set | ||
| 259 | CONFIG_DISCONTIGMEM_MANUAL=y | ||
| 260 | # CONFIG_SPARSEMEM_MANUAL is not set | ||
| 145 | CONFIG_DISCONTIGMEM=y | 261 | CONFIG_DISCONTIGMEM=y |
| 262 | CONFIG_FLAT_NODE_MEM_MAP=y | ||
| 263 | CONFIG_NEED_MULTIPLE_NODES=y | ||
| 264 | # CONFIG_SPARSEMEM_STATIC is not set | ||
| 265 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | ||
| 266 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 267 | CONFIG_SPLIT_PTLOCK_CPUS=4096 | ||
| 268 | # CONFIG_RESOURCES_64BIT is not set | ||
| 269 | CONFIG_ZONE_DMA_FLAG=1 | ||
| 270 | CONFIG_BOUNCE=y | ||
| 271 | CONFIG_VIRT_TO_BUS=y | ||
| 146 | # CONFIG_LEDS is not set | 272 | # CONFIG_LEDS is not set |
| 147 | CONFIG_ALIGNMENT_TRAP=y | 273 | CONFIG_ALIGNMENT_TRAP=y |
| 148 | 274 | ||
| @@ -151,8 +277,9 @@ CONFIG_ALIGNMENT_TRAP=y | |||
| 151 | # | 277 | # |
| 152 | CONFIG_ZBOOT_ROM_TEXT=0x0 | 278 | CONFIG_ZBOOT_ROM_TEXT=0x0 |
| 153 | CONFIG_ZBOOT_ROM_BSS=0x0 | 279 | CONFIG_ZBOOT_ROM_BSS=0x0 |
| 154 | CONFIG_CMDLINE="keepinitrd mem=32M" | 280 | CONFIG_CMDLINE="" |
| 155 | # CONFIG_XIP_KERNEL is not set | 281 | # CONFIG_XIP_KERNEL is not set |
| 282 | # CONFIG_KEXEC is not set | ||
| 156 | 283 | ||
| 157 | # | 284 | # |
| 158 | # CPU Frequency scaling | 285 | # CPU Frequency scaling |
| @@ -174,7 +301,7 @@ CONFIG_FPE_FASTFPE=y | |||
| 174 | # Userspace binary formats | 301 | # Userspace binary formats |
| 175 | # | 302 | # |
| 176 | CONFIG_BINFMT_ELF=y | 303 | CONFIG_BINFMT_ELF=y |
| 177 | CONFIG_BINFMT_AOUT=m | 304 | CONFIG_BINFMT_AOUT=y |
| 178 | # CONFIG_BINFMT_MISC is not set | 305 | # CONFIG_BINFMT_MISC is not set |
| 179 | # CONFIG_ARTHUR is not set | 306 | # CONFIG_ARTHUR is not set |
| 180 | 307 | ||
| @@ -182,188 +309,12 @@ CONFIG_BINFMT_AOUT=m | |||
| 182 | # Power management options | 309 | # Power management options |
| 183 | # | 310 | # |
| 184 | CONFIG_PM=y | 311 | CONFIG_PM=y |
| 185 | # CONFIG_PM_LEGACY is not set | 312 | # CONFIG_PM_DEBUG is not set |
| 186 | # CONFIG_APM is not set | 313 | CONFIG_PM_SLEEP=y |
| 187 | 314 | CONFIG_SUSPEND=y | |
| 188 | # | 315 | CONFIG_SUSPEND_FREEZER=y |
| 189 | # Device Drivers | 316 | # CONFIG_APM_EMULATION is not set |
| 190 | # | 317 | CONFIG_ARCH_SUSPEND_POSSIBLE=y |
| 191 | |||
| 192 | # | ||
| 193 | # Generic Driver Options | ||
| 194 | # | ||
| 195 | CONFIG_STANDALONE=y | ||
| 196 | CONFIG_PREVENT_FIRMWARE_BUILD=y | ||
| 197 | # CONFIG_FW_LOADER is not set | ||
| 198 | # CONFIG_DEBUG_DRIVER is not set | ||
| 199 | |||
| 200 | # | ||
| 201 | # Memory Technology Devices (MTD) | ||
| 202 | # | ||
| 203 | CONFIG_MTD=y | ||
| 204 | CONFIG_MTD_DEBUG=y | ||
| 205 | CONFIG_MTD_DEBUG_VERBOSE=1 | ||
| 206 | # CONFIG_MTD_CONCAT is not set | ||
| 207 | CONFIG_MTD_PARTITIONS=y | ||
| 208 | # CONFIG_MTD_REDBOOT_PARTS is not set | ||
| 209 | # CONFIG_MTD_CMDLINE_PARTS is not set | ||
| 210 | # CONFIG_MTD_AFS_PARTS is not set | ||
| 211 | |||
| 212 | # | ||
| 213 | # User Modules And Translation Layers | ||
| 214 | # | ||
| 215 | CONFIG_MTD_CHAR=m | ||
| 216 | CONFIG_MTD_BLOCK=y | ||
| 217 | # CONFIG_FTL is not set | ||
| 218 | # CONFIG_NFTL is not set | ||
| 219 | # CONFIG_INFTL is not set | ||
| 220 | |||
| 221 | # | ||
| 222 | # RAM/ROM/Flash chip drivers | ||
| 223 | # | ||
| 224 | CONFIG_MTD_CFI=y | ||
| 225 | # CONFIG_MTD_JEDECPROBE is not set | ||
| 226 | CONFIG_MTD_GEN_PROBE=y | ||
| 227 | CONFIG_MTD_CFI_ADV_OPTIONS=y | ||
| 228 | CONFIG_MTD_CFI_NOSWAP=y | ||
| 229 | # CONFIG_MTD_CFI_BE_BYTE_SWAP is not set | ||
| 230 | # CONFIG_MTD_CFI_LE_BYTE_SWAP is not set | ||
| 231 | CONFIG_MTD_CFI_GEOMETRY=y | ||
| 232 | CONFIG_MTD_MAP_BANK_WIDTH_1=y | ||
| 233 | CONFIG_MTD_MAP_BANK_WIDTH_2=y | ||
| 234 | CONFIG_MTD_MAP_BANK_WIDTH_4=y | ||
| 235 | # CONFIG_MTD_MAP_BANK_WIDTH_8 is not set | ||
| 236 | # CONFIG_MTD_MAP_BANK_WIDTH_16 is not set | ||
| 237 | # CONFIG_MTD_MAP_BANK_WIDTH_32 is not set | ||
| 238 | CONFIG_MTD_CFI_I1=y | ||
| 239 | CONFIG_MTD_CFI_I2=y | ||
| 240 | # CONFIG_MTD_CFI_I4 is not set | ||
| 241 | # CONFIG_MTD_CFI_I8 is not set | ||
| 242 | CONFIG_MTD_CFI_INTELEXT=y | ||
| 243 | # CONFIG_MTD_CFI_AMDSTD is not set | ||
| 244 | # CONFIG_MTD_CFI_STAA is not set | ||
| 245 | CONFIG_MTD_CFI_UTIL=y | ||
| 246 | # CONFIG_MTD_RAM is not set | ||
| 247 | # CONFIG_MTD_ROM is not set | ||
| 248 | # CONFIG_MTD_ABSENT is not set | ||
| 249 | # CONFIG_MTD_XIP is not set | ||
| 250 | |||
| 251 | # | ||
| 252 | # Mapping drivers for chip access | ||
| 253 | # | ||
| 254 | # CONFIG_MTD_COMPLEX_MAPPINGS is not set | ||
| 255 | # CONFIG_MTD_PHYSMAP is not set | ||
| 256 | # CONFIG_MTD_ARM_INTEGRATOR is not set | ||
| 257 | CONFIG_MTD_SA1100=y | ||
| 258 | # CONFIG_MTD_EDB7312 is not set | ||
| 259 | |||
| 260 | # | ||
| 261 | # Self-contained MTD device drivers | ||
| 262 | # | ||
| 263 | # CONFIG_MTD_SLRAM is not set | ||
| 264 | # CONFIG_MTD_PHRAM is not set | ||
| 265 | # CONFIG_MTD_MTDRAM is not set | ||
| 266 | # CONFIG_MTD_BLKMTD is not set | ||
| 267 | # CONFIG_MTD_BLOCK2MTD is not set | ||
| 268 | |||
| 269 | # | ||
| 270 | # Disk-On-Chip Device Drivers | ||
| 271 | # | ||
| 272 | # CONFIG_MTD_DOC2000 is not set | ||
| 273 | # CONFIG_MTD_DOC2001 is not set | ||
| 274 | # CONFIG_MTD_DOC2001PLUS is not set | ||
| 275 | |||
| 276 | # | ||
| 277 | # NAND Flash Device Drivers | ||
| 278 | # | ||
| 279 | # CONFIG_MTD_NAND is not set | ||
| 280 | |||
| 281 | # | ||
| 282 | # Parallel port support | ||
| 283 | # | ||
| 284 | # CONFIG_PARPORT is not set | ||
| 285 | |||
| 286 | # | ||
| 287 | # Plug and Play support | ||
| 288 | # | ||
| 289 | # CONFIG_PNP is not set | ||
| 290 | |||
| 291 | # | ||
| 292 | # Block devices | ||
| 293 | # | ||
| 294 | # CONFIG_BLK_DEV_FD is not set | ||
| 295 | # CONFIG_BLK_DEV_XD is not set | ||
| 296 | # CONFIG_BLK_DEV_COW_COMMON is not set | ||
| 297 | CONFIG_BLK_DEV_LOOP=m | ||
| 298 | # CONFIG_BLK_DEV_CRYPTOLOOP is not set | ||
| 299 | CONFIG_BLK_DEV_NBD=m | ||
| 300 | # CONFIG_BLK_DEV_RAM is not set | ||
| 301 | CONFIG_BLK_DEV_RAM_COUNT=16 | ||
| 302 | CONFIG_INITRAMFS_SOURCE="" | ||
| 303 | # CONFIG_CDROM_PKTCDVD is not set | ||
| 304 | |||
| 305 | # | ||
| 306 | # IO Schedulers | ||
| 307 | # | ||
| 308 | CONFIG_IOSCHED_NOOP=y | ||
| 309 | CONFIG_IOSCHED_AS=y | ||
| 310 | CONFIG_IOSCHED_DEADLINE=y | ||
| 311 | CONFIG_IOSCHED_CFQ=y | ||
| 312 | # CONFIG_ATA_OVER_ETH is not set | ||
| 313 | |||
| 314 | # | ||
| 315 | # ATA/ATAPI/MFM/RLL support | ||
| 316 | # | ||
| 317 | CONFIG_IDE=m | ||
| 318 | CONFIG_BLK_DEV_IDE=m | ||
| 319 | |||
| 320 | # | ||
| 321 | # Please see Documentation/ide.txt for help/info on IDE drives | ||
| 322 | # | ||
| 323 | # CONFIG_BLK_DEV_IDE_SATA is not set | ||
| 324 | CONFIG_BLK_DEV_IDEDISK=m | ||
| 325 | # CONFIG_IDEDISK_MULTI_MODE is not set | ||
| 326 | # CONFIG_BLK_DEV_IDECS is not set | ||
| 327 | CONFIG_BLK_DEV_IDECD=m | ||
| 328 | # CONFIG_BLK_DEV_IDETAPE is not set | ||
| 329 | # CONFIG_BLK_DEV_IDEFLOPPY is not set | ||
| 330 | # CONFIG_IDE_TASK_IOCTL is not set | ||
| 331 | |||
| 332 | # | ||
| 333 | # IDE chipset support/bugfixes | ||
| 334 | # | ||
| 335 | CONFIG_IDE_GENERIC=m | ||
| 336 | # CONFIG_IDE_ARM is not set | ||
| 337 | # CONFIG_IDE_CHIPSETS is not set | ||
| 338 | # CONFIG_BLK_DEV_IDEDMA is not set | ||
| 339 | # CONFIG_IDEDMA_AUTO is not set | ||
| 340 | # CONFIG_BLK_DEV_HD is not set | ||
| 341 | |||
| 342 | # | ||
| 343 | # SCSI device support | ||
| 344 | # | ||
| 345 | # CONFIG_SCSI is not set | ||
| 346 | |||
| 347 | # | ||
| 348 | # Multi-device support (RAID and LVM) | ||
| 349 | # | ||
| 350 | # CONFIG_MD is not set | ||
| 351 | |||
| 352 | # | ||
| 353 | # Fusion MPT device support | ||
| 354 | # | ||
| 355 | |||
| 356 | # | ||
| 357 | # IEEE 1394 (FireWire) support | ||
| 358 | # | ||
| 359 | |||
| 360 | # | ||
| 361 | # I2O device support | ||
| 362 | # | ||
| 363 | |||
| 364 | # | ||
| 365 | # Networking support | ||
| 366 | # | ||
| 367 | CONFIG_NET=y | 318 | CONFIG_NET=y |
| 368 | 319 | ||
| 369 | # | 320 | # |
| @@ -371,12 +322,17 @@ CONFIG_NET=y | |||
| 371 | # | 322 | # |
| 372 | CONFIG_PACKET=y | 323 | CONFIG_PACKET=y |
| 373 | CONFIG_PACKET_MMAP=y | 324 | CONFIG_PACKET_MMAP=y |
| 374 | # CONFIG_NETLINK_DEV is not set | ||
| 375 | CONFIG_UNIX=y | 325 | CONFIG_UNIX=y |
| 326 | CONFIG_XFRM=y | ||
| 327 | # CONFIG_XFRM_USER is not set | ||
| 328 | # CONFIG_XFRM_SUB_POLICY is not set | ||
| 329 | # CONFIG_XFRM_MIGRATE is not set | ||
| 330 | # CONFIG_XFRM_STATISTICS is not set | ||
| 376 | # CONFIG_NET_KEY is not set | 331 | # CONFIG_NET_KEY is not set |
| 377 | CONFIG_INET=y | 332 | CONFIG_INET=y |
| 378 | CONFIG_IP_MULTICAST=y | 333 | CONFIG_IP_MULTICAST=y |
| 379 | # CONFIG_IP_ADVANCED_ROUTER is not set | 334 | # CONFIG_IP_ADVANCED_ROUTER is not set |
| 335 | CONFIG_IP_FIB_HASH=y | ||
| 380 | # CONFIG_IP_PNP is not set | 336 | # CONFIG_IP_PNP is not set |
| 381 | # CONFIG_NET_IPIP is not set | 337 | # CONFIG_NET_IPIP is not set |
| 382 | # CONFIG_NET_IPGRE is not set | 338 | # CONFIG_NET_IPGRE is not set |
| @@ -386,31 +342,42 @@ CONFIG_IP_MULTICAST=y | |||
| 386 | # CONFIG_INET_AH is not set | 342 | # CONFIG_INET_AH is not set |
| 387 | # CONFIG_INET_ESP is not set | 343 | # CONFIG_INET_ESP is not set |
| 388 | # CONFIG_INET_IPCOMP is not set | 344 | # CONFIG_INET_IPCOMP is not set |
| 345 | # CONFIG_INET_XFRM_TUNNEL is not set | ||
| 389 | # CONFIG_INET_TUNNEL is not set | 346 | # CONFIG_INET_TUNNEL is not set |
| 390 | # CONFIG_IP_TCPDIAG is not set | 347 | CONFIG_INET_XFRM_MODE_TRANSPORT=y |
| 391 | # CONFIG_IP_TCPDIAG_IPV6 is not set | 348 | CONFIG_INET_XFRM_MODE_TUNNEL=y |
| 392 | 349 | CONFIG_INET_XFRM_MODE_BEET=y | |
| 393 | # | 350 | # CONFIG_INET_LRO is not set |
| 394 | # IP: Virtual Server Configuration | 351 | CONFIG_INET_DIAG=y |
| 395 | # | 352 | CONFIG_INET_TCP_DIAG=y |
| 353 | # CONFIG_TCP_CONG_ADVANCED is not set | ||
| 354 | CONFIG_TCP_CONG_CUBIC=y | ||
| 355 | CONFIG_DEFAULT_TCP_CONG="cubic" | ||
| 356 | # CONFIG_TCP_MD5SIG is not set | ||
| 396 | # CONFIG_IP_VS is not set | 357 | # CONFIG_IP_VS is not set |
| 397 | # CONFIG_IPV6 is not set | 358 | # CONFIG_IPV6 is not set |
| 359 | # CONFIG_NETWORK_SECMARK is not set | ||
| 398 | CONFIG_NETFILTER=y | 360 | CONFIG_NETFILTER=y |
| 399 | # CONFIG_NETFILTER_DEBUG is not set | 361 | # CONFIG_NETFILTER_DEBUG is not set |
| 362 | CONFIG_NETFILTER_ADVANCED=y | ||
| 363 | |||
| 364 | # | ||
| 365 | # Core Netfilter Configuration | ||
| 366 | # | ||
| 367 | # CONFIG_NETFILTER_NETLINK_QUEUE is not set | ||
| 368 | # CONFIG_NETFILTER_NETLINK_LOG is not set | ||
| 369 | # CONFIG_NF_CONNTRACK is not set | ||
| 370 | # CONFIG_NETFILTER_XTABLES is not set | ||
| 400 | 371 | ||
| 401 | # | 372 | # |
| 402 | # IP: Netfilter Configuration | 373 | # IP: Netfilter Configuration |
| 403 | # | 374 | # |
| 404 | # CONFIG_IP_NF_CONNTRACK is not set | ||
| 405 | # CONFIG_IP_NF_CONNTRACK_MARK is not set | ||
| 406 | # CONFIG_IP_NF_QUEUE is not set | 375 | # CONFIG_IP_NF_QUEUE is not set |
| 407 | # CONFIG_IP_NF_IPTABLES is not set | 376 | # CONFIG_IP_NF_IPTABLES is not set |
| 408 | # CONFIG_IP_NF_ARPTABLES is not set | 377 | # CONFIG_IP_NF_ARPTABLES is not set |
| 409 | 378 | # CONFIG_IP_DCCP is not set | |
| 410 | # | ||
| 411 | # SCTP Configuration (EXPERIMENTAL) | ||
| 412 | # | ||
| 413 | # CONFIG_IP_SCTP is not set | 379 | # CONFIG_IP_SCTP is not set |
| 380 | # CONFIG_TIPC is not set | ||
| 414 | # CONFIG_ATM is not set | 381 | # CONFIG_ATM is not set |
| 415 | # CONFIG_BRIDGE is not set | 382 | # CONFIG_BRIDGE is not set |
| 416 | # CONFIG_VLAN_8021Q is not set | 383 | # CONFIG_VLAN_8021Q is not set |
| @@ -420,30 +387,22 @@ CONFIG_NETFILTER=y | |||
| 420 | # CONFIG_ATALK is not set | 387 | # CONFIG_ATALK is not set |
| 421 | # CONFIG_X25 is not set | 388 | # CONFIG_X25 is not set |
| 422 | # CONFIG_LAPB is not set | 389 | # CONFIG_LAPB is not set |
| 423 | # CONFIG_NET_DIVERT is not set | ||
| 424 | # CONFIG_ECONET is not set | 390 | # CONFIG_ECONET is not set |
| 425 | # CONFIG_WAN_ROUTER is not set | 391 | # CONFIG_WAN_ROUTER is not set |
| 426 | |||
| 427 | # | ||
| 428 | # QoS and/or fair queueing | ||
| 429 | # | ||
| 430 | # CONFIG_NET_SCHED is not set | 392 | # CONFIG_NET_SCHED is not set |
| 431 | # CONFIG_NET_CLS_ROUTE is not set | ||
| 432 | 393 | ||
| 433 | # | 394 | # |
| 434 | # Network testing | 395 | # Network testing |
| 435 | # | 396 | # |
| 436 | # CONFIG_NET_PKTGEN is not set | 397 | # CONFIG_NET_PKTGEN is not set |
| 437 | # CONFIG_NETPOLL is not set | ||
| 438 | # CONFIG_NET_POLL_CONTROLLER is not set | ||
| 439 | # CONFIG_HAMRADIO is not set | 398 | # CONFIG_HAMRADIO is not set |
| 399 | # CONFIG_CAN is not set | ||
| 440 | CONFIG_IRDA=m | 400 | CONFIG_IRDA=m |
| 441 | 401 | ||
| 442 | # | 402 | # |
| 443 | # IrDA protocols | 403 | # IrDA protocols |
| 444 | # | 404 | # |
| 445 | CONFIG_IRLAN=m | 405 | CONFIG_IRLAN=m |
| 446 | # CONFIG_IRNET is not set | ||
| 447 | CONFIG_IRCOMM=m | 406 | CONFIG_IRCOMM=m |
| 448 | # CONFIG_IRDA_ULTRA is not set | 407 | # CONFIG_IRDA_ULTRA is not set |
| 449 | 408 | ||
| @@ -468,89 +427,105 @@ CONFIG_IRCOMM=m | |||
| 468 | # | 427 | # |
| 469 | 428 | ||
| 470 | # | 429 | # |
| 471 | # Old SIR device drivers | ||
| 472 | # | ||
| 473 | # CONFIG_IRPORT_SIR is not set | ||
| 474 | |||
| 475 | # | ||
| 476 | # Old Serial dongle support | ||
| 477 | # | ||
| 478 | |||
| 479 | # | ||
| 480 | # FIR device drivers | 430 | # FIR device drivers |
| 481 | # | 431 | # |
| 482 | # CONFIG_NSC_FIR is not set | ||
| 483 | # CONFIG_WINBOND_FIR is not set | ||
| 484 | # CONFIG_SMC_IRCC_FIR is not set | ||
| 485 | # CONFIG_ALI_FIR is not set | ||
| 486 | CONFIG_SA1100_FIR=m | 432 | CONFIG_SA1100_FIR=m |
| 487 | # CONFIG_BT is not set | 433 | # CONFIG_BT is not set |
| 488 | CONFIG_NETDEVICES=y | 434 | # CONFIG_AF_RXRPC is not set |
| 489 | # CONFIG_DUMMY is not set | ||
| 490 | # CONFIG_BONDING is not set | ||
| 491 | # CONFIG_EQUALIZER is not set | ||
| 492 | # CONFIG_TUN is not set | ||
| 493 | |||
| 494 | # | ||
| 495 | # ARCnet devices | ||
| 496 | # | ||
| 497 | # CONFIG_ARCNET is not set | ||
| 498 | |||
| 499 | # | ||
| 500 | # Ethernet (10 or 100Mbit) | ||
| 501 | # | ||
| 502 | # CONFIG_NET_ETHERNET is not set | ||
| 503 | CONFIG_MII=m | ||
| 504 | 435 | ||
| 505 | # | 436 | # |
| 506 | # Ethernet (1000 Mbit) | 437 | # Wireless |
| 507 | # | 438 | # |
| 439 | # CONFIG_CFG80211 is not set | ||
| 440 | # CONFIG_WIRELESS_EXT is not set | ||
| 441 | # CONFIG_MAC80211 is not set | ||
| 442 | # CONFIG_IEEE80211 is not set | ||
| 443 | # CONFIG_RFKILL is not set | ||
| 444 | # CONFIG_NET_9P is not set | ||
| 508 | 445 | ||
| 509 | # | 446 | # |
| 510 | # Ethernet (10000 Mbit) | 447 | # Device Drivers |
| 511 | # | ||
| 512 | |||
| 513 | # | ||
| 514 | # Token Ring devices | ||
| 515 | # | ||
| 516 | # CONFIG_TR is not set | ||
| 517 | |||
| 518 | # | ||
| 519 | # Wireless LAN (non-hamradio) | ||
| 520 | # | 448 | # |
| 521 | CONFIG_NET_RADIO=y | ||
| 522 | 449 | ||
| 523 | # | 450 | # |
| 524 | # Obsolete Wireless cards support (pre-802.11) | 451 | # Generic Driver Options |
| 525 | # | 452 | # |
| 526 | # CONFIG_STRIP is not set | 453 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" |
| 527 | CONFIG_ARLAN=m | 454 | CONFIG_STANDALONE=y |
| 528 | CONFIG_WAVELAN=m | 455 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
| 529 | CONFIG_PCMCIA_WAVELAN=m | 456 | CONFIG_FW_LOADER=y |
| 530 | # CONFIG_PCMCIA_NETWAVE is not set | 457 | CONFIG_FIRMWARE_IN_KERNEL=y |
| 458 | CONFIG_EXTRA_FIRMWARE="" | ||
| 459 | # CONFIG_DEBUG_DRIVER is not set | ||
| 460 | # CONFIG_DEBUG_DEVRES is not set | ||
| 461 | # CONFIG_SYS_HYPERVISOR is not set | ||
| 462 | # CONFIG_CONNECTOR is not set | ||
| 463 | # CONFIG_MTD is not set | ||
| 464 | # CONFIG_PARPORT is not set | ||
| 465 | # CONFIG_PNP is not set | ||
| 466 | CONFIG_BLK_DEV=y | ||
| 467 | # CONFIG_BLK_DEV_COW_COMMON is not set | ||
| 468 | CONFIG_BLK_DEV_LOOP=m | ||
| 469 | # CONFIG_BLK_DEV_CRYPTOLOOP is not set | ||
| 470 | CONFIG_BLK_DEV_NBD=m | ||
| 471 | # CONFIG_BLK_DEV_RAM is not set | ||
| 472 | # CONFIG_CDROM_PKTCDVD is not set | ||
| 473 | # CONFIG_ATA_OVER_ETH is not set | ||
| 474 | CONFIG_MISC_DEVICES=y | ||
| 475 | # CONFIG_EEPROM_93CX6 is not set | ||
| 476 | # CONFIG_ENCLOSURE_SERVICES is not set | ||
| 477 | CONFIG_HAVE_IDE=y | ||
| 478 | CONFIG_IDE=y | ||
| 479 | CONFIG_BLK_DEV_IDE=y | ||
| 531 | 480 | ||
| 532 | # | 481 | # |
| 533 | # Wireless 802.11 Frequency Hopping cards support | 482 | # Please see Documentation/ide/ide.txt for help/info on IDE drives |
| 534 | # | 483 | # |
| 535 | # CONFIG_PCMCIA_RAYCS is not set | 484 | # CONFIG_BLK_DEV_IDE_SATA is not set |
| 485 | CONFIG_BLK_DEV_IDEDISK=y | ||
| 486 | # CONFIG_IDEDISK_MULTI_MODE is not set | ||
| 487 | CONFIG_BLK_DEV_IDECS=y | ||
| 488 | # CONFIG_BLK_DEV_IDECD is not set | ||
| 489 | # CONFIG_BLK_DEV_IDETAPE is not set | ||
| 490 | # CONFIG_BLK_DEV_IDEFLOPPY is not set | ||
| 491 | # CONFIG_IDE_TASK_IOCTL is not set | ||
| 492 | CONFIG_IDE_PROC_FS=y | ||
| 536 | 493 | ||
| 537 | # | 494 | # |
| 538 | # Wireless 802.11b ISA/PCI cards support | 495 | # IDE chipset support/bugfixes |
| 539 | # | 496 | # |
| 540 | CONFIG_HERMES=m | 497 | # CONFIG_BLK_DEV_PLATFORM is not set |
| 541 | # CONFIG_ATMEL is not set | 498 | # CONFIG_BLK_DEV_IDEDMA is not set |
| 542 | 499 | ||
| 543 | # | 500 | # |
| 544 | # Wireless 802.11b Pcmcia/Cardbus cards support | 501 | # SCSI device support |
| 545 | # | 502 | # |
| 546 | CONFIG_PCMCIA_HERMES=m | 503 | # CONFIG_RAID_ATTRS is not set |
| 547 | CONFIG_AIRO_CS=m | 504 | # CONFIG_SCSI is not set |
| 548 | # CONFIG_PCMCIA_WL3501 is not set | 505 | # CONFIG_SCSI_DMA is not set |
| 549 | CONFIG_NET_WIRELESS=y | 506 | # CONFIG_SCSI_NETLINK is not set |
| 507 | # CONFIG_ATA is not set | ||
| 508 | # CONFIG_MD is not set | ||
| 509 | CONFIG_NETDEVICES=y | ||
| 510 | CONFIG_DUMMY=y | ||
| 511 | # CONFIG_BONDING is not set | ||
| 512 | # CONFIG_MACVLAN is not set | ||
| 513 | # CONFIG_EQUALIZER is not set | ||
| 514 | # CONFIG_TUN is not set | ||
| 515 | # CONFIG_VETH is not set | ||
| 516 | # CONFIG_ARCNET is not set | ||
| 517 | # CONFIG_NET_ETHERNET is not set | ||
| 518 | CONFIG_MII=m | ||
| 519 | # CONFIG_NETDEV_1000 is not set | ||
| 520 | # CONFIG_NETDEV_10000 is not set | ||
| 521 | # CONFIG_TR is not set | ||
| 550 | 522 | ||
| 551 | # | 523 | # |
| 552 | # PCMCIA network device support | 524 | # Wireless LAN |
| 553 | # | 525 | # |
| 526 | # CONFIG_WLAN_PRE80211 is not set | ||
| 527 | # CONFIG_WLAN_80211 is not set | ||
| 528 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 554 | CONFIG_NET_PCMCIA=y | 529 | CONFIG_NET_PCMCIA=y |
| 555 | CONFIG_PCMCIA_3C589=m | 530 | CONFIG_PCMCIA_3C589=m |
| 556 | CONFIG_PCMCIA_3C574=m | 531 | CONFIG_PCMCIA_3C574=m |
| @@ -560,32 +535,20 @@ CONFIG_PCMCIA_NMCLAN=m | |||
| 560 | CONFIG_PCMCIA_SMC91C92=m | 535 | CONFIG_PCMCIA_SMC91C92=m |
| 561 | CONFIG_PCMCIA_XIRC2PS=m | 536 | CONFIG_PCMCIA_XIRC2PS=m |
| 562 | CONFIG_PCMCIA_AXNET=m | 537 | CONFIG_PCMCIA_AXNET=m |
| 563 | |||
| 564 | # | ||
| 565 | # Wan interfaces | ||
| 566 | # | ||
| 567 | # CONFIG_WAN is not set | 538 | # CONFIG_WAN is not set |
| 568 | CONFIG_PPP=m | 539 | # CONFIG_PPP is not set |
| 569 | # CONFIG_PPP_MULTILINK is not set | ||
| 570 | # CONFIG_PPP_FILTER is not set | ||
| 571 | CONFIG_PPP_ASYNC=m | ||
| 572 | # CONFIG_PPP_SYNC_TTY is not set | ||
| 573 | CONFIG_PPP_DEFLATE=m | ||
| 574 | CONFIG_PPP_BSDCOMP=m | ||
| 575 | # CONFIG_PPPOE is not set | ||
| 576 | # CONFIG_SLIP is not set | 540 | # CONFIG_SLIP is not set |
| 577 | # CONFIG_SHAPER is not set | ||
| 578 | # CONFIG_NETCONSOLE is not set | 541 | # CONFIG_NETCONSOLE is not set |
| 579 | 542 | # CONFIG_NETPOLL is not set | |
| 580 | # | 543 | # CONFIG_NET_POLL_CONTROLLER is not set |
| 581 | # ISDN subsystem | ||
| 582 | # | ||
| 583 | # CONFIG_ISDN is not set | 544 | # CONFIG_ISDN is not set |
| 584 | 545 | ||
| 585 | # | 546 | # |
| 586 | # Input device support | 547 | # Input device support |
| 587 | # | 548 | # |
| 588 | CONFIG_INPUT=y | 549 | CONFIG_INPUT=y |
| 550 | # CONFIG_INPUT_FF_MEMLESS is not set | ||
| 551 | # CONFIG_INPUT_POLLDEV is not set | ||
| 589 | 552 | ||
| 590 | # | 553 | # |
| 591 | # Userland interfaces | 554 | # Userland interfaces |
| @@ -595,7 +558,6 @@ CONFIG_INPUT_MOUSEDEV_PSAUX=y | |||
| 595 | CONFIG_INPUT_MOUSEDEV_SCREEN_X=640 | 558 | CONFIG_INPUT_MOUSEDEV_SCREEN_X=640 |
| 596 | CONFIG_INPUT_MOUSEDEV_SCREEN_Y=240 | 559 | CONFIG_INPUT_MOUSEDEV_SCREEN_Y=240 |
| 597 | # CONFIG_INPUT_JOYDEV is not set | 560 | # CONFIG_INPUT_JOYDEV is not set |
| 598 | # CONFIG_INPUT_TSDEV is not set | ||
| 599 | # CONFIG_INPUT_EVDEV is not set | 561 | # CONFIG_INPUT_EVDEV is not set |
| 600 | # CONFIG_INPUT_EVBUG is not set | 562 | # CONFIG_INPUT_EVBUG is not set |
| 601 | 563 | ||
| @@ -603,20 +565,31 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=240 | |||
| 603 | # Input Device Drivers | 565 | # Input Device Drivers |
| 604 | # | 566 | # |
| 605 | CONFIG_INPUT_KEYBOARD=y | 567 | CONFIG_INPUT_KEYBOARD=y |
| 606 | CONFIG_KEYBOARD_ATKBD=y | 568 | # CONFIG_KEYBOARD_ATKBD is not set |
| 607 | # CONFIG_KEYBOARD_SUNKBD is not set | 569 | # CONFIG_KEYBOARD_SUNKBD is not set |
| 608 | # CONFIG_KEYBOARD_LKKBD is not set | 570 | # CONFIG_KEYBOARD_LKKBD is not set |
| 609 | # CONFIG_KEYBOARD_XTKBD is not set | 571 | # CONFIG_KEYBOARD_XTKBD is not set |
| 610 | # CONFIG_KEYBOARD_NEWTON is not set | 572 | # CONFIG_KEYBOARD_NEWTON is not set |
| 611 | CONFIG_INPUT_MOUSE=y | 573 | # CONFIG_KEYBOARD_STOWAWAY is not set |
| 612 | CONFIG_MOUSE_PS2=y | 574 | CONFIG_KEYBOARD_HP7XX=y |
| 613 | # CONFIG_MOUSE_SERIAL is not set | 575 | # CONFIG_KEYBOARD_GPIO is not set |
| 614 | # CONFIG_MOUSE_INPORT is not set | 576 | # CONFIG_INPUT_MOUSE is not set |
| 615 | # CONFIG_MOUSE_LOGIBM is not set | ||
| 616 | # CONFIG_MOUSE_PC110PAD is not set | ||
| 617 | # CONFIG_MOUSE_VSXXXAA is not set | ||
| 618 | # CONFIG_INPUT_JOYSTICK is not set | 577 | # CONFIG_INPUT_JOYSTICK is not set |
| 619 | # CONFIG_INPUT_TOUCHSCREEN is not set | 578 | # CONFIG_INPUT_TABLET is not set |
| 579 | CONFIG_INPUT_TOUCHSCREEN=y | ||
| 580 | # CONFIG_TOUCHSCREEN_FUJITSU is not set | ||
| 581 | # CONFIG_TOUCHSCREEN_GUNZE is not set | ||
| 582 | # CONFIG_TOUCHSCREEN_ELO is not set | ||
| 583 | # CONFIG_TOUCHSCREEN_MTOUCH is not set | ||
| 584 | # CONFIG_TOUCHSCREEN_INEXIO is not set | ||
| 585 | # CONFIG_TOUCHSCREEN_MK712 is not set | ||
| 586 | CONFIG_TOUCHSCREEN_HP7XX=y | ||
| 587 | # CONFIG_TOUCHSCREEN_HTCPEN is not set | ||
| 588 | # CONFIG_TOUCHSCREEN_PENMOUNT is not set | ||
| 589 | # CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set | ||
| 590 | # CONFIG_TOUCHSCREEN_TOUCHWIN is not set | ||
| 591 | # CONFIG_TOUCHSCREEN_UCB1400 is not set | ||
| 592 | # CONFIG_TOUCHSCREEN_TOUCHIT213 is not set | ||
| 620 | # CONFIG_INPUT_MISC is not set | 593 | # CONFIG_INPUT_MISC is not set |
| 621 | 594 | ||
| 622 | # | 595 | # |
| @@ -625,17 +598,18 @@ CONFIG_MOUSE_PS2=y | |||
| 625 | CONFIG_SERIO=y | 598 | CONFIG_SERIO=y |
| 626 | CONFIG_SERIO_SERPORT=y | 599 | CONFIG_SERIO_SERPORT=y |
| 627 | # CONFIG_SERIO_SA1111 is not set | 600 | # CONFIG_SERIO_SA1111 is not set |
| 628 | CONFIG_SERIO_LIBPS2=y | ||
| 629 | # CONFIG_SERIO_RAW is not set | 601 | # CONFIG_SERIO_RAW is not set |
| 630 | # CONFIG_GAMEPORT is not set | 602 | # CONFIG_GAMEPORT is not set |
| 631 | CONFIG_SOUND_GAMEPORT=y | ||
| 632 | 603 | ||
| 633 | # | 604 | # |
| 634 | # Character devices | 605 | # Character devices |
| 635 | # | 606 | # |
| 636 | CONFIG_VT=y | 607 | CONFIG_VT=y |
| 608 | CONFIG_CONSOLE_TRANSLATIONS=y | ||
| 637 | CONFIG_VT_CONSOLE=y | 609 | CONFIG_VT_CONSOLE=y |
| 638 | CONFIG_HW_CONSOLE=y | 610 | CONFIG_HW_CONSOLE=y |
| 611 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | ||
| 612 | CONFIG_DEVKMEM=y | ||
| 639 | # CONFIG_SERIAL_NONSTANDARD is not set | 613 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 640 | 614 | ||
| 641 | # | 615 | # |
| @@ -652,69 +626,120 @@ CONFIG_SERIAL_CORE=y | |||
| 652 | CONFIG_SERIAL_CORE_CONSOLE=y | 626 | CONFIG_SERIAL_CORE_CONSOLE=y |
| 653 | CONFIG_UNIX98_PTYS=y | 627 | CONFIG_UNIX98_PTYS=y |
| 654 | CONFIG_LEGACY_PTYS=y | 628 | CONFIG_LEGACY_PTYS=y |
| 655 | CONFIG_LEGACY_PTY_COUNT=256 | 629 | CONFIG_LEGACY_PTY_COUNT=32 |
| 630 | # CONFIG_IPMI_HANDLER is not set | ||
| 631 | CONFIG_HW_RANDOM=m | ||
| 632 | # CONFIG_NVRAM is not set | ||
| 633 | # CONFIG_DTLK is not set | ||
| 634 | # CONFIG_R3964 is not set | ||
| 656 | 635 | ||
| 657 | # | 636 | # |
| 658 | # IPMI | 637 | # PCMCIA character devices |
| 659 | # | 638 | # |
| 660 | # CONFIG_IPMI_HANDLER is not set | 639 | # CONFIG_SYNCLINK_CS is not set |
| 640 | # CONFIG_CARDMAN_4000 is not set | ||
| 641 | # CONFIG_CARDMAN_4040 is not set | ||
| 642 | # CONFIG_IPWIRELESS is not set | ||
| 643 | # CONFIG_RAW_DRIVER is not set | ||
| 644 | # CONFIG_TCG_TPM is not set | ||
| 645 | CONFIG_DEVPORT=y | ||
| 646 | # CONFIG_I2C is not set | ||
| 647 | # CONFIG_SPI is not set | ||
| 648 | CONFIG_ARCH_REQUIRE_GPIOLIB=y | ||
| 649 | CONFIG_GPIOLIB=y | ||
| 650 | # CONFIG_DEBUG_GPIO is not set | ||
| 651 | # CONFIG_GPIO_SYSFS is not set | ||
| 661 | 652 | ||
| 662 | # | 653 | # |
| 663 | # Watchdog Cards | 654 | # I2C GPIO expanders: |
| 664 | # | 655 | # |
| 665 | # CONFIG_WATCHDOG is not set | ||
| 666 | # CONFIG_NVRAM is not set | ||
| 667 | # CONFIG_RTC is not set | ||
| 668 | # CONFIG_DTLK is not set | ||
| 669 | # CONFIG_R3964 is not set | ||
| 670 | 656 | ||
| 671 | # | 657 | # |
| 672 | # Ftape, the floppy tape device driver | 658 | # PCI GPIO expanders: |
| 673 | # | 659 | # |
| 674 | # CONFIG_DRM is not set | ||
| 675 | 660 | ||
| 676 | # | 661 | # |
| 677 | # PCMCIA character devices | 662 | # SPI GPIO expanders: |
| 678 | # | 663 | # |
| 679 | # CONFIG_SYNCLINK_CS is not set | 664 | # CONFIG_W1 is not set |
| 680 | # CONFIG_RAW_DRIVER is not set | 665 | # CONFIG_POWER_SUPPLY is not set |
| 666 | # CONFIG_HWMON is not set | ||
| 667 | # CONFIG_WATCHDOG is not set | ||
| 681 | 668 | ||
| 682 | # | 669 | # |
| 683 | # TPM devices | 670 | # Sonics Silicon Backplane |
| 684 | # | 671 | # |
| 685 | # CONFIG_TCG_TPM is not set | 672 | CONFIG_SSB_POSSIBLE=y |
| 673 | # CONFIG_SSB is not set | ||
| 686 | 674 | ||
| 687 | # | 675 | # |
| 688 | # I2C support | 676 | # Multifunction device drivers |
| 689 | # | 677 | # |
| 690 | # CONFIG_I2C is not set | 678 | # CONFIG_MFD_CORE is not set |
| 679 | # CONFIG_MFD_SM501 is not set | ||
| 680 | # CONFIG_HTC_EGPIO is not set | ||
| 681 | # CONFIG_HTC_PASIC3 is not set | ||
| 682 | # CONFIG_MFD_TMIO is not set | ||
| 683 | # CONFIG_MFD_T7L66XB is not set | ||
| 684 | # CONFIG_MFD_TC6387XB is not set | ||
| 685 | # CONFIG_MFD_TC6393XB is not set | ||
| 691 | 686 | ||
| 692 | # | 687 | # |
| 693 | # Misc devices | 688 | # Multimedia Capabilities Port drivers |
| 694 | # | 689 | # |
| 690 | # CONFIG_MCP_SA11X0 is not set | ||
| 695 | 691 | ||
| 696 | # | 692 | # |
| 697 | # Multimedia devices | 693 | # Multimedia devices |
| 698 | # | 694 | # |
| 695 | |||
| 696 | # | ||
| 697 | # Multimedia core support | ||
| 698 | # | ||
| 699 | # CONFIG_VIDEO_DEV is not set | 699 | # CONFIG_VIDEO_DEV is not set |
| 700 | # CONFIG_DVB_CORE is not set | ||
| 701 | # CONFIG_VIDEO_MEDIA is not set | ||
| 700 | 702 | ||
| 701 | # | 703 | # |
| 702 | # Digital Video Broadcasting Devices | 704 | # Multimedia drivers |
| 703 | # | 705 | # |
| 704 | # CONFIG_DVB is not set | 706 | # CONFIG_DAB is not set |
| 705 | 707 | ||
| 706 | # | 708 | # |
| 707 | # Graphics support | 709 | # Graphics support |
| 708 | # | 710 | # |
| 711 | # CONFIG_VGASTATE is not set | ||
| 712 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set | ||
| 709 | CONFIG_FB=y | 713 | CONFIG_FB=y |
| 710 | # CONFIG_FB_CFB_FILLRECT is not set | 714 | # CONFIG_FIRMWARE_EDID is not set |
| 711 | # CONFIG_FB_CFB_COPYAREA is not set | 715 | # CONFIG_FB_DDC is not set |
| 712 | # CONFIG_FB_CFB_IMAGEBLIT is not set | 716 | CONFIG_FB_CFB_FILLRECT=y |
| 713 | # CONFIG_FB_SOFT_CURSOR is not set | 717 | CONFIG_FB_CFB_COPYAREA=y |
| 718 | CONFIG_FB_CFB_IMAGEBLIT=y | ||
| 719 | # CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set | ||
| 720 | # CONFIG_FB_SYS_FILLRECT is not set | ||
| 721 | # CONFIG_FB_SYS_COPYAREA is not set | ||
| 722 | # CONFIG_FB_SYS_IMAGEBLIT is not set | ||
| 723 | # CONFIG_FB_FOREIGN_ENDIAN is not set | ||
| 724 | # CONFIG_FB_SYS_FOPS is not set | ||
| 725 | # CONFIG_FB_SVGALIB is not set | ||
| 726 | # CONFIG_FB_MACMODES is not set | ||
| 727 | # CONFIG_FB_BACKLIGHT is not set | ||
| 714 | # CONFIG_FB_MODE_HELPERS is not set | 728 | # CONFIG_FB_MODE_HELPERS is not set |
| 715 | # CONFIG_FB_TILEBLITTING is not set | 729 | # CONFIG_FB_TILEBLITTING is not set |
| 730 | |||
| 731 | # | ||
| 732 | # Frame buffer hardware drivers | ||
| 733 | # | ||
| 716 | # CONFIG_FB_SA1100 is not set | 734 | # CONFIG_FB_SA1100 is not set |
| 735 | CONFIG_FB_S1D13XXX=y | ||
| 717 | # CONFIG_FB_VIRTUAL is not set | 736 | # CONFIG_FB_VIRTUAL is not set |
| 737 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | ||
| 738 | |||
| 739 | # | ||
| 740 | # Display device support | ||
| 741 | # | ||
| 742 | # CONFIG_DISPLAY_SUPPORT is not set | ||
| 718 | 743 | ||
| 719 | # | 744 | # |
| 720 | # Console display driver support | 745 | # Console display driver support |
| @@ -722,94 +747,110 @@ CONFIG_FB=y | |||
| 722 | # CONFIG_VGA_CONSOLE is not set | 747 | # CONFIG_VGA_CONSOLE is not set |
| 723 | # CONFIG_MDA_CONSOLE is not set | 748 | # CONFIG_MDA_CONSOLE is not set |
| 724 | CONFIG_DUMMY_CONSOLE=y | 749 | CONFIG_DUMMY_CONSOLE=y |
| 725 | # CONFIG_FRAMEBUFFER_CONSOLE is not set | 750 | CONFIG_FRAMEBUFFER_CONSOLE=y |
| 726 | 751 | CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y | |
| 727 | # | 752 | # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set |
| 728 | # Logo configuration | 753 | # CONFIG_FONTS is not set |
| 729 | # | 754 | CONFIG_FONT_8x8=y |
| 755 | CONFIG_FONT_8x16=y | ||
| 730 | # CONFIG_LOGO is not set | 756 | # CONFIG_LOGO is not set |
| 731 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | 757 | # CONFIG_SOUND is not set |
| 732 | 758 | # CONFIG_HID_SUPPORT is not set | |
| 733 | # | 759 | # CONFIG_USB_SUPPORT is not set |
| 734 | # Sound | 760 | # CONFIG_MMC is not set |
| 735 | # | 761 | # CONFIG_NEW_LEDS is not set |
| 736 | CONFIG_SOUND=m | 762 | CONFIG_RTC_LIB=y |
| 763 | CONFIG_RTC_CLASS=y | ||
| 764 | CONFIG_RTC_HCTOSYS=y | ||
| 765 | CONFIG_RTC_HCTOSYS_DEVICE="rtc0" | ||
| 766 | # CONFIG_RTC_DEBUG is not set | ||
| 737 | 767 | ||
| 738 | # | 768 | # |
| 739 | # Advanced Linux Sound Architecture | 769 | # RTC interfaces |
| 740 | # | 770 | # |
| 741 | # CONFIG_SND is not set | 771 | CONFIG_RTC_INTF_SYSFS=y |
| 772 | CONFIG_RTC_INTF_PROC=y | ||
| 773 | CONFIG_RTC_INTF_DEV=y | ||
| 774 | # CONFIG_RTC_INTF_DEV_UIE_EMUL is not set | ||
| 775 | # CONFIG_RTC_DRV_TEST is not set | ||
| 742 | 776 | ||
| 743 | # | 777 | # |
| 744 | # Open Sound System | 778 | # SPI RTC drivers |
| 745 | # | 779 | # |
| 746 | # CONFIG_SOUND_PRIME is not set | ||
| 747 | 780 | ||
| 748 | # | 781 | # |
| 749 | # USB support | 782 | # Platform RTC drivers |
| 750 | # | 783 | # |
| 751 | CONFIG_USB_ARCH_HAS_HCD=y | 784 | # CONFIG_RTC_DRV_CMOS is not set |
| 752 | CONFIG_USB_ARCH_HAS_OHCI=y | 785 | # CONFIG_RTC_DRV_DS1511 is not set |
| 753 | # CONFIG_USB is not set | 786 | # CONFIG_RTC_DRV_DS1553 is not set |
| 787 | # CONFIG_RTC_DRV_DS1742 is not set | ||
| 788 | # CONFIG_RTC_DRV_STK17TA8 is not set | ||
| 789 | # CONFIG_RTC_DRV_M48T86 is not set | ||
| 790 | # CONFIG_RTC_DRV_M48T59 is not set | ||
| 791 | # CONFIG_RTC_DRV_V3020 is not set | ||
| 754 | 792 | ||
| 755 | # | 793 | # |
| 756 | # USB Gadget Support | 794 | # on-CPU RTC drivers |
| 757 | # | 795 | # |
| 758 | # CONFIG_USB_GADGET is not set | 796 | CONFIG_RTC_DRV_SA1100=y |
| 797 | # CONFIG_DMADEVICES is not set | ||
| 759 | 798 | ||
| 760 | # | 799 | # |
| 761 | # MMC/SD Card support | 800 | # Voltage and Current regulators |
| 762 | # | 801 | # |
| 763 | # CONFIG_MMC is not set | 802 | # CONFIG_REGULATOR is not set |
| 803 | # CONFIG_REGULATOR_FIXED_VOLTAGE is not set | ||
| 804 | # CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set | ||
| 805 | # CONFIG_REGULATOR_BQ24022 is not set | ||
| 806 | # CONFIG_UIO is not set | ||
| 764 | 807 | ||
| 765 | # | 808 | # |
| 766 | # File systems | 809 | # File systems |
| 767 | # | 810 | # |
| 768 | CONFIG_EXT2_FS=y | 811 | CONFIG_EXT2_FS=y |
| 769 | # CONFIG_EXT2_FS_XATTR is not set | 812 | # CONFIG_EXT2_FS_XATTR is not set |
| 813 | # CONFIG_EXT2_FS_XIP is not set | ||
| 770 | # CONFIG_EXT3_FS is not set | 814 | # CONFIG_EXT3_FS is not set |
| 771 | # CONFIG_JBD is not set | 815 | # CONFIG_EXT4DEV_FS is not set |
| 772 | # CONFIG_REISERFS_FS is not set | 816 | # CONFIG_REISERFS_FS is not set |
| 773 | # CONFIG_JFS_FS is not set | 817 | # CONFIG_JFS_FS is not set |
| 774 | 818 | # CONFIG_FS_POSIX_ACL is not set | |
| 775 | # | ||
| 776 | # XFS support | ||
| 777 | # | ||
| 778 | # CONFIG_XFS_FS is not set | 819 | # CONFIG_XFS_FS is not set |
| 779 | # CONFIG_MINIX_FS is not set | 820 | # CONFIG_OCFS2_FS is not set |
| 780 | # CONFIG_ROMFS_FS is not set | ||
| 781 | # CONFIG_QUOTA is not set | ||
| 782 | CONFIG_DNOTIFY=y | 821 | CONFIG_DNOTIFY=y |
| 822 | CONFIG_INOTIFY=y | ||
| 823 | CONFIG_INOTIFY_USER=y | ||
| 824 | # CONFIG_QUOTA is not set | ||
| 783 | # CONFIG_AUTOFS_FS is not set | 825 | # CONFIG_AUTOFS_FS is not set |
| 784 | # CONFIG_AUTOFS4_FS is not set | 826 | # CONFIG_AUTOFS4_FS is not set |
| 827 | # CONFIG_FUSE_FS is not set | ||
| 785 | 828 | ||
| 786 | # | 829 | # |
| 787 | # CD-ROM/DVD Filesystems | 830 | # CD-ROM/DVD Filesystems |
| 788 | # | 831 | # |
| 789 | CONFIG_ISO9660_FS=m | 832 | # CONFIG_ISO9660_FS is not set |
| 790 | # CONFIG_JOLIET is not set | ||
| 791 | # CONFIG_ZISOFS is not set | ||
| 792 | # CONFIG_UDF_FS is not set | 833 | # CONFIG_UDF_FS is not set |
| 793 | 834 | ||
| 794 | # | 835 | # |
| 795 | # DOS/FAT/NT Filesystems | 836 | # DOS/FAT/NT Filesystems |
| 796 | # | 837 | # |
| 797 | # CONFIG_MSDOS_FS is not set | 838 | CONFIG_FAT_FS=y |
| 798 | # CONFIG_VFAT_FS is not set | 839 | CONFIG_MSDOS_FS=y |
| 840 | CONFIG_VFAT_FS=y | ||
| 841 | CONFIG_FAT_DEFAULT_CODEPAGE=437 | ||
| 842 | CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" | ||
| 799 | # CONFIG_NTFS_FS is not set | 843 | # CONFIG_NTFS_FS is not set |
| 800 | 844 | ||
| 801 | # | 845 | # |
| 802 | # Pseudo filesystems | 846 | # Pseudo filesystems |
| 803 | # | 847 | # |
| 804 | CONFIG_PROC_FS=y | 848 | CONFIG_PROC_FS=y |
| 849 | CONFIG_PROC_SYSCTL=y | ||
| 805 | CONFIG_SYSFS=y | 850 | CONFIG_SYSFS=y |
| 806 | CONFIG_DEVFS_FS=y | ||
| 807 | CONFIG_DEVFS_MOUNT=y | ||
| 808 | CONFIG_DEVFS_DEBUG=y | ||
| 809 | # CONFIG_DEVPTS_FS_XATTR is not set | ||
| 810 | # CONFIG_TMPFS is not set | 851 | # CONFIG_TMPFS is not set |
| 811 | # CONFIG_HUGETLB_PAGE is not set | 852 | # CONFIG_HUGETLB_PAGE is not set |
| 812 | CONFIG_RAMFS=y | 853 | # CONFIG_CONFIGFS_FS is not set |
| 813 | 854 | ||
| 814 | # | 855 | # |
| 815 | # Miscellaneous filesystems | 856 | # Miscellaneous filesystems |
| @@ -821,75 +862,122 @@ CONFIG_RAMFS=y | |||
| 821 | # CONFIG_BEFS_FS is not set | 862 | # CONFIG_BEFS_FS is not set |
| 822 | # CONFIG_BFS_FS is not set | 863 | # CONFIG_BFS_FS is not set |
| 823 | # CONFIG_EFS_FS is not set | 864 | # CONFIG_EFS_FS is not set |
| 824 | # CONFIG_JFFS_FS is not set | ||
| 825 | CONFIG_JFFS2_FS=y | ||
| 826 | CONFIG_JFFS2_FS_DEBUG=2 | ||
| 827 | # CONFIG_JFFS2_FS_NAND is not set | ||
| 828 | # CONFIG_JFFS2_FS_NOR_ECC is not set | ||
| 829 | # CONFIG_JFFS2_COMPRESSION_OPTIONS is not set | ||
| 830 | CONFIG_JFFS2_ZLIB=y | ||
| 831 | CONFIG_JFFS2_RTIME=y | ||
| 832 | # CONFIG_JFFS2_RUBIN is not set | ||
| 833 | # CONFIG_CRAMFS is not set | 865 | # CONFIG_CRAMFS is not set |
| 834 | # CONFIG_VXFS_FS is not set | 866 | # CONFIG_VXFS_FS is not set |
| 867 | # CONFIG_MINIX_FS is not set | ||
| 868 | # CONFIG_OMFS_FS is not set | ||
| 835 | # CONFIG_HPFS_FS is not set | 869 | # CONFIG_HPFS_FS is not set |
| 836 | # CONFIG_QNX4FS_FS is not set | 870 | # CONFIG_QNX4FS_FS is not set |
| 871 | # CONFIG_ROMFS_FS is not set | ||
| 837 | # CONFIG_SYSV_FS is not set | 872 | # CONFIG_SYSV_FS is not set |
| 838 | # CONFIG_UFS_FS is not set | 873 | # CONFIG_UFS_FS is not set |
| 839 | 874 | # CONFIG_NETWORK_FILESYSTEMS is not set | |
| 840 | # | ||
| 841 | # Network File Systems | ||
| 842 | # | ||
| 843 | CONFIG_NFS_FS=m | ||
| 844 | CONFIG_NFS_V3=y | ||
| 845 | # CONFIG_NFS_V4 is not set | ||
| 846 | # CONFIG_NFS_DIRECTIO is not set | ||
| 847 | # CONFIG_NFSD is not set | ||
| 848 | CONFIG_LOCKD=m | ||
| 849 | CONFIG_LOCKD_V4=y | ||
| 850 | CONFIG_SUNRPC=m | ||
| 851 | # CONFIG_RPCSEC_GSS_KRB5 is not set | ||
| 852 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | ||
| 853 | # CONFIG_SMB_FS is not set | ||
| 854 | # CONFIG_CIFS is not set | ||
| 855 | # CONFIG_NCP_FS is not set | ||
| 856 | # CONFIG_CODA_FS is not set | ||
| 857 | # CONFIG_AFS_FS is not set | ||
| 858 | 875 | ||
| 859 | # | 876 | # |
| 860 | # Partition Types | 877 | # Partition Types |
| 861 | # | 878 | # |
| 862 | # CONFIG_PARTITION_ADVANCED is not set | 879 | # CONFIG_PARTITION_ADVANCED is not set |
| 863 | CONFIG_MSDOS_PARTITION=y | 880 | CONFIG_MSDOS_PARTITION=y |
| 864 | 881 | CONFIG_NLS=y | |
| 865 | # | 882 | CONFIG_NLS_DEFAULT="iso8859-1" |
| 866 | # Native Language Support | 883 | CONFIG_NLS_CODEPAGE_437=m |
| 867 | # | 884 | CONFIG_NLS_CODEPAGE_737=m |
| 868 | # CONFIG_NLS is not set | 885 | CONFIG_NLS_CODEPAGE_775=m |
| 869 | 886 | CONFIG_NLS_CODEPAGE_850=m | |
| 870 | # | 887 | CONFIG_NLS_CODEPAGE_852=m |
| 871 | # Profiling support | 888 | CONFIG_NLS_CODEPAGE_855=m |
| 872 | # | 889 | CONFIG_NLS_CODEPAGE_857=m |
| 873 | # CONFIG_PROFILING is not set | 890 | CONFIG_NLS_CODEPAGE_860=m |
| 891 | CONFIG_NLS_CODEPAGE_861=m | ||
| 892 | CONFIG_NLS_CODEPAGE_862=m | ||
| 893 | CONFIG_NLS_CODEPAGE_863=m | ||
| 894 | CONFIG_NLS_CODEPAGE_864=m | ||
| 895 | CONFIG_NLS_CODEPAGE_865=m | ||
| 896 | CONFIG_NLS_CODEPAGE_866=m | ||
| 897 | CONFIG_NLS_CODEPAGE_869=m | ||
| 898 | CONFIG_NLS_CODEPAGE_936=m | ||
| 899 | CONFIG_NLS_CODEPAGE_950=m | ||
| 900 | CONFIG_NLS_CODEPAGE_932=m | ||
| 901 | CONFIG_NLS_CODEPAGE_949=m | ||
| 902 | CONFIG_NLS_CODEPAGE_874=m | ||
| 903 | CONFIG_NLS_ISO8859_8=m | ||
| 904 | CONFIG_NLS_CODEPAGE_1250=m | ||
| 905 | CONFIG_NLS_CODEPAGE_1251=m | ||
| 906 | CONFIG_NLS_ASCII=m | ||
| 907 | CONFIG_NLS_ISO8859_1=m | ||
| 908 | CONFIG_NLS_ISO8859_2=m | ||
| 909 | CONFIG_NLS_ISO8859_3=m | ||
| 910 | CONFIG_NLS_ISO8859_4=m | ||
| 911 | CONFIG_NLS_ISO8859_5=m | ||
| 912 | CONFIG_NLS_ISO8859_6=m | ||
| 913 | CONFIG_NLS_ISO8859_7=m | ||
| 914 | CONFIG_NLS_ISO8859_9=m | ||
| 915 | CONFIG_NLS_ISO8859_13=m | ||
| 916 | CONFIG_NLS_ISO8859_14=m | ||
| 917 | CONFIG_NLS_ISO8859_15=m | ||
| 918 | CONFIG_NLS_KOI8_R=m | ||
| 919 | CONFIG_NLS_KOI8_U=m | ||
| 920 | CONFIG_NLS_UTF8=m | ||
| 921 | # CONFIG_DLM is not set | ||
| 874 | 922 | ||
| 875 | # | 923 | # |
| 876 | # Kernel hacking | 924 | # Kernel hacking |
| 877 | # | 925 | # |
| 878 | # CONFIG_PRINTK_TIME is not set | 926 | # CONFIG_PRINTK_TIME is not set |
| 879 | CONFIG_DEBUG_KERNEL=y | 927 | CONFIG_ENABLE_WARN_DEPRECATED=y |
| 928 | CONFIG_ENABLE_MUST_CHECK=y | ||
| 929 | CONFIG_FRAME_WARN=1024 | ||
| 880 | # CONFIG_MAGIC_SYSRQ is not set | 930 | # CONFIG_MAGIC_SYSRQ is not set |
| 881 | CONFIG_LOG_BUF_SHIFT=14 | 931 | # CONFIG_UNUSED_SYMBOLS is not set |
| 932 | # CONFIG_DEBUG_FS is not set | ||
| 933 | # CONFIG_HEADERS_CHECK is not set | ||
| 934 | CONFIG_DEBUG_KERNEL=y | ||
| 935 | # CONFIG_DEBUG_SHIRQ is not set | ||
| 936 | CONFIG_DETECT_SOFTLOCKUP=y | ||
| 937 | # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set | ||
| 938 | CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 | ||
| 939 | CONFIG_SCHED_DEBUG=y | ||
| 882 | # CONFIG_SCHEDSTATS is not set | 940 | # CONFIG_SCHEDSTATS is not set |
| 883 | CONFIG_DEBUG_SLAB=y | 941 | # CONFIG_TIMER_STATS is not set |
| 942 | # CONFIG_DEBUG_OBJECTS is not set | ||
| 943 | # CONFIG_SLUB_DEBUG_ON is not set | ||
| 944 | # CONFIG_SLUB_STATS is not set | ||
| 945 | # CONFIG_DEBUG_RT_MUTEXES is not set | ||
| 946 | # CONFIG_RT_MUTEX_TESTER is not set | ||
| 884 | # CONFIG_DEBUG_SPINLOCK is not set | 947 | # CONFIG_DEBUG_SPINLOCK is not set |
| 948 | # CONFIG_DEBUG_MUTEXES is not set | ||
| 949 | # CONFIG_DEBUG_LOCK_ALLOC is not set | ||
| 950 | # CONFIG_PROVE_LOCKING is not set | ||
| 951 | # CONFIG_LOCK_STAT is not set | ||
| 885 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | 952 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set |
| 953 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set | ||
| 886 | # CONFIG_DEBUG_KOBJECT is not set | 954 | # CONFIG_DEBUG_KOBJECT is not set |
| 887 | CONFIG_DEBUG_BUGVERBOSE=y | 955 | CONFIG_DEBUG_BUGVERBOSE=y |
| 888 | # CONFIG_DEBUG_INFO is not set | 956 | # CONFIG_DEBUG_INFO is not set |
| 889 | # CONFIG_DEBUG_FS is not set | 957 | # CONFIG_DEBUG_VM is not set |
| 958 | # CONFIG_DEBUG_WRITECOUNT is not set | ||
| 959 | CONFIG_DEBUG_MEMORY_INIT=y | ||
| 960 | # CONFIG_DEBUG_LIST is not set | ||
| 961 | # CONFIG_DEBUG_SG is not set | ||
| 890 | CONFIG_FRAME_POINTER=y | 962 | CONFIG_FRAME_POINTER=y |
| 963 | # CONFIG_BOOT_PRINTK_DELAY is not set | ||
| 964 | # CONFIG_RCU_TORTURE_TEST is not set | ||
| 965 | # CONFIG_BACKTRACE_SELF_TEST is not set | ||
| 966 | # CONFIG_FAULT_INJECTION is not set | ||
| 967 | # CONFIG_LATENCYTOP is not set | ||
| 968 | # CONFIG_SYSCTL_SYSCALL_CHECK is not set | ||
| 969 | CONFIG_HAVE_FTRACE=y | ||
| 970 | CONFIG_HAVE_DYNAMIC_FTRACE=y | ||
| 971 | # CONFIG_FTRACE is not set | ||
| 972 | # CONFIG_IRQSOFF_TRACER is not set | ||
| 973 | # CONFIG_SCHED_TRACER is not set | ||
| 974 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
| 975 | # CONFIG_SAMPLES is not set | ||
| 976 | CONFIG_HAVE_ARCH_KGDB=y | ||
| 977 | # CONFIG_KGDB is not set | ||
| 891 | # CONFIG_DEBUG_USER is not set | 978 | # CONFIG_DEBUG_USER is not set |
| 892 | CONFIG_DEBUG_ERRORS=y | 979 | CONFIG_DEBUG_ERRORS=y |
| 980 | # CONFIG_DEBUG_STACK_USAGE is not set | ||
| 893 | CONFIG_DEBUG_LL=y | 981 | CONFIG_DEBUG_LL=y |
| 894 | # CONFIG_DEBUG_ICEDCC is not set | 982 | # CONFIG_DEBUG_ICEDCC is not set |
| 895 | 983 | ||
| @@ -898,21 +986,100 @@ CONFIG_DEBUG_LL=y | |||
| 898 | # | 986 | # |
| 899 | # CONFIG_KEYS is not set | 987 | # CONFIG_KEYS is not set |
| 900 | # CONFIG_SECURITY is not set | 988 | # CONFIG_SECURITY is not set |
| 989 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | ||
| 990 | CONFIG_CRYPTO=y | ||
| 991 | |||
| 992 | # | ||
| 993 | # Crypto core or helper | ||
| 994 | # | ||
| 995 | # CONFIG_CRYPTO_MANAGER is not set | ||
| 996 | # CONFIG_CRYPTO_GF128MUL is not set | ||
| 997 | # CONFIG_CRYPTO_NULL is not set | ||
| 998 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 999 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 1000 | # CONFIG_CRYPTO_TEST is not set | ||
| 1001 | |||
| 1002 | # | ||
| 1003 | # Authenticated Encryption with Associated Data | ||
| 1004 | # | ||
| 1005 | # CONFIG_CRYPTO_CCM is not set | ||
| 1006 | # CONFIG_CRYPTO_GCM is not set | ||
| 1007 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1008 | |||
| 1009 | # | ||
| 1010 | # Block modes | ||
| 1011 | # | ||
| 1012 | # CONFIG_CRYPTO_CBC is not set | ||
| 1013 | # CONFIG_CRYPTO_CTR is not set | ||
| 1014 | # CONFIG_CRYPTO_CTS is not set | ||
| 1015 | # CONFIG_CRYPTO_ECB is not set | ||
| 1016 | # CONFIG_CRYPTO_LRW is not set | ||
| 1017 | # CONFIG_CRYPTO_PCBC is not set | ||
| 1018 | # CONFIG_CRYPTO_XTS is not set | ||
| 1019 | |||
| 1020 | # | ||
| 1021 | # Hash modes | ||
| 1022 | # | ||
| 1023 | # CONFIG_CRYPTO_HMAC is not set | ||
| 1024 | # CONFIG_CRYPTO_XCBC is not set | ||
| 1025 | |||
| 1026 | # | ||
| 1027 | # Digest | ||
| 1028 | # | ||
| 1029 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1030 | # CONFIG_CRYPTO_MD4 is not set | ||
| 1031 | # CONFIG_CRYPTO_MD5 is not set | ||
| 1032 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1033 | # CONFIG_CRYPTO_RMD128 is not set | ||
| 1034 | # CONFIG_CRYPTO_RMD160 is not set | ||
| 1035 | # CONFIG_CRYPTO_RMD256 is not set | ||
| 1036 | # CONFIG_CRYPTO_RMD320 is not set | ||
| 1037 | # CONFIG_CRYPTO_SHA1 is not set | ||
| 1038 | # CONFIG_CRYPTO_SHA256 is not set | ||
| 1039 | # CONFIG_CRYPTO_SHA512 is not set | ||
| 1040 | # CONFIG_CRYPTO_TGR192 is not set | ||
| 1041 | # CONFIG_CRYPTO_WP512 is not set | ||
| 901 | 1042 | ||
| 902 | # | 1043 | # |
| 903 | # Cryptographic options | 1044 | # Ciphers |
| 904 | # | 1045 | # |
| 905 | # CONFIG_CRYPTO is not set | 1046 | # CONFIG_CRYPTO_AES is not set |
| 1047 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1048 | # CONFIG_CRYPTO_ARC4 is not set | ||
| 1049 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1050 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1051 | # CONFIG_CRYPTO_CAST5 is not set | ||
| 1052 | # CONFIG_CRYPTO_CAST6 is not set | ||
| 1053 | # CONFIG_CRYPTO_DES is not set | ||
| 1054 | # CONFIG_CRYPTO_FCRYPT is not set | ||
| 1055 | # CONFIG_CRYPTO_KHAZAD is not set | ||
| 1056 | # CONFIG_CRYPTO_SALSA20 is not set | ||
| 1057 | # CONFIG_CRYPTO_SEED is not set | ||
| 1058 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1059 | # CONFIG_CRYPTO_TEA is not set | ||
| 1060 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 906 | 1061 | ||
| 907 | # | 1062 | # |
| 908 | # Hardware crypto devices | 1063 | # Compression |
| 909 | # | 1064 | # |
| 1065 | # CONFIG_CRYPTO_DEFLATE is not set | ||
| 1066 | # CONFIG_CRYPTO_LZO is not set | ||
| 1067 | CONFIG_CRYPTO_HW=y | ||
| 910 | 1068 | ||
| 911 | # | 1069 | # |
| 912 | # Library routines | 1070 | # Library routines |
| 913 | # | 1071 | # |
| 1072 | CONFIG_BITREVERSE=y | ||
| 1073 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 1074 | # CONFIG_GENERIC_FIND_NEXT_BIT is not set | ||
| 914 | CONFIG_CRC_CCITT=m | 1075 | CONFIG_CRC_CCITT=m |
| 1076 | # CONFIG_CRC16 is not set | ||
| 1077 | # CONFIG_CRC_T10DIF is not set | ||
| 1078 | # CONFIG_CRC_ITU_T is not set | ||
| 915 | CONFIG_CRC32=y | 1079 | CONFIG_CRC32=y |
| 1080 | # CONFIG_CRC7 is not set | ||
| 916 | # CONFIG_LIBCRC32C is not set | 1081 | # CONFIG_LIBCRC32C is not set |
| 917 | CONFIG_ZLIB_INFLATE=y | 1082 | CONFIG_PLIST=y |
| 918 | CONFIG_ZLIB_DEFLATE=y | 1083 | CONFIG_HAS_IOMEM=y |
| 1084 | CONFIG_HAS_IOPORT=y | ||
| 1085 | CONFIG_HAS_DMA=y | ||
diff --git a/arch/arm/mach-ep93xx/Kconfig b/arch/arm/mach-ep93xx/Kconfig index ea8549bfbef2..5a1b8c05c958 100644 --- a/arch/arm/mach-ep93xx/Kconfig +++ b/arch/arm/mach-ep93xx/Kconfig | |||
| @@ -88,6 +88,20 @@ config MACH_TS72XX | |||
| 88 | Say 'Y' here if you want your kernel to support the | 88 | Say 'Y' here if you want your kernel to support the |
| 89 | Technologic Systems TS-72xx board. | 89 | Technologic Systems TS-72xx board. |
| 90 | 90 | ||
| 91 | choice | ||
| 92 | prompt "Select a UART for early kernel messages" | ||
| 93 | |||
| 94 | config EP93XX_EARLY_UART1 | ||
| 95 | bool "UART1" | ||
| 96 | |||
| 97 | config EP93XX_EARLY_UART2 | ||
| 98 | bool "UART2" | ||
| 99 | |||
| 100 | config EP93XX_EARLY_UART3 | ||
| 101 | bool "UART3" | ||
| 102 | |||
| 103 | endchoice | ||
| 104 | |||
| 91 | endmenu | 105 | endmenu |
| 92 | 106 | ||
| 93 | endif | 107 | endif |
diff --git a/arch/arm/mach-ep93xx/adssphere.c b/arch/arm/mach-ep93xx/adssphere.c index 18f8b1dc8bd0..561db73ec1ae 100644 --- a/arch/arm/mach-ep93xx/adssphere.c +++ b/arch/arm/mach-ep93xx/adssphere.c | |||
| @@ -47,36 +47,12 @@ static struct ep93xx_eth_data adssphere_eth_data = { | |||
| 47 | .phy_id = 1, | 47 | .phy_id = 1, |
| 48 | }; | 48 | }; |
| 49 | 49 | ||
| 50 | static struct resource adssphere_eth_resource[] = { | ||
| 51 | { | ||
| 52 | .start = EP93XX_ETHERNET_PHYS_BASE, | ||
| 53 | .end = EP93XX_ETHERNET_PHYS_BASE + 0xffff, | ||
| 54 | .flags = IORESOURCE_MEM, | ||
| 55 | }, { | ||
| 56 | .start = IRQ_EP93XX_ETHERNET, | ||
| 57 | .end = IRQ_EP93XX_ETHERNET, | ||
| 58 | .flags = IORESOURCE_IRQ, | ||
| 59 | } | ||
| 60 | }; | ||
| 61 | |||
| 62 | static struct platform_device adssphere_eth_device = { | ||
| 63 | .name = "ep93xx-eth", | ||
| 64 | .id = -1, | ||
| 65 | .dev = { | ||
| 66 | .platform_data = &adssphere_eth_data, | ||
| 67 | }, | ||
| 68 | .num_resources = 2, | ||
| 69 | .resource = adssphere_eth_resource, | ||
| 70 | }; | ||
| 71 | |||
| 72 | static void __init adssphere_init_machine(void) | 50 | static void __init adssphere_init_machine(void) |
| 73 | { | 51 | { |
| 74 | ep93xx_init_devices(); | 52 | ep93xx_init_devices(); |
| 75 | platform_device_register(&adssphere_flash); | 53 | platform_device_register(&adssphere_flash); |
| 76 | 54 | ||
| 77 | memcpy(adssphere_eth_data.dev_addr, | 55 | ep93xx_register_eth(&adssphere_eth_data, 1); |
| 78 | (void *)(EP93XX_ETHERNET_BASE + 0x50), 6); | ||
| 79 | platform_device_register(&adssphere_eth_device); | ||
| 80 | } | 56 | } |
| 81 | 57 | ||
| 82 | MACHINE_START(ADSSPHERE, "ADS Sphere board") | 58 | MACHINE_START(ADSSPHERE, "ADS Sphere board") |
diff --git a/arch/arm/mach-ep93xx/core.c b/arch/arm/mach-ep93xx/core.c index 1a5af1b262be..7e65d23e14b5 100644 --- a/arch/arm/mach-ep93xx/core.c +++ b/arch/arm/mach-ep93xx/core.c | |||
| @@ -157,7 +157,7 @@ static unsigned char gpio_int_type2[3]; | |||
| 157 | static const u8 int_type1_register_offset[3] = { 0x90, 0xac, 0x4c }; | 157 | static const u8 int_type1_register_offset[3] = { 0x90, 0xac, 0x4c }; |
| 158 | static const u8 int_type2_register_offset[3] = { 0x94, 0xb0, 0x50 }; | 158 | static const u8 int_type2_register_offset[3] = { 0x94, 0xb0, 0x50 }; |
| 159 | static const u8 eoi_register_offset[3] = { 0x98, 0xb4, 0x54 }; | 159 | static const u8 eoi_register_offset[3] = { 0x98, 0xb4, 0x54 }; |
| 160 | static const u8 int_en_register_offset[3] = { 0x9c, 0xb8, 0x5c }; | 160 | static const u8 int_en_register_offset[3] = { 0x9c, 0xb8, 0x58 }; |
| 161 | 161 | ||
| 162 | void ep93xx_gpio_update_int_params(unsigned port) | 162 | void ep93xx_gpio_update_int_params(unsigned port) |
| 163 | { | 163 | { |
| @@ -461,6 +461,41 @@ static struct platform_device ep93xx_ohci_device = { | |||
| 461 | .resource = ep93xx_ohci_resources, | 461 | .resource = ep93xx_ohci_resources, |
| 462 | }; | 462 | }; |
| 463 | 463 | ||
| 464 | static struct ep93xx_eth_data ep93xx_eth_data; | ||
| 465 | |||
| 466 | static struct resource ep93xx_eth_resource[] = { | ||
| 467 | { | ||
| 468 | .start = EP93XX_ETHERNET_PHYS_BASE, | ||
| 469 | .end = EP93XX_ETHERNET_PHYS_BASE + 0xffff, | ||
| 470 | .flags = IORESOURCE_MEM, | ||
| 471 | }, { | ||
| 472 | .start = IRQ_EP93XX_ETHERNET, | ||
| 473 | .end = IRQ_EP93XX_ETHERNET, | ||
| 474 | .flags = IORESOURCE_IRQ, | ||
| 475 | } | ||
| 476 | }; | ||
| 477 | |||
| 478 | static struct platform_device ep93xx_eth_device = { | ||
| 479 | .name = "ep93xx-eth", | ||
| 480 | .id = -1, | ||
| 481 | .dev = { | ||
| 482 | .platform_data = &ep93xx_eth_data, | ||
| 483 | }, | ||
| 484 | .num_resources = ARRAY_SIZE(ep93xx_eth_resource), | ||
| 485 | .resource = ep93xx_eth_resource, | ||
| 486 | }; | ||
| 487 | |||
| 488 | void __init ep93xx_register_eth(struct ep93xx_eth_data *data, int copy_addr) | ||
| 489 | { | ||
| 490 | if (copy_addr) { | ||
| 491 | memcpy(data->dev_addr, | ||
| 492 | (void *)(EP93XX_ETHERNET_BASE + 0x50), 6); | ||
| 493 | } | ||
| 494 | |||
| 495 | ep93xx_eth_data = *data; | ||
| 496 | platform_device_register(&ep93xx_eth_device); | ||
| 497 | } | ||
| 498 | |||
| 464 | extern void ep93xx_gpio_init(void); | 499 | extern void ep93xx_gpio_init(void); |
| 465 | 500 | ||
| 466 | void __init ep93xx_init_devices(void) | 501 | void __init ep93xx_init_devices(void) |
diff --git a/arch/arm/mach-ep93xx/edb9302.c b/arch/arm/mach-ep93xx/edb9302.c index 358a83392d04..e4add5bdccfd 100644 --- a/arch/arm/mach-ep93xx/edb9302.c +++ b/arch/arm/mach-ep93xx/edb9302.c | |||
| @@ -43,10 +43,16 @@ static struct platform_device edb9302_flash = { | |||
| 43 | .resource = &edb9302_flash_resource, | 43 | .resource = &edb9302_flash_resource, |
| 44 | }; | 44 | }; |
| 45 | 45 | ||
| 46 | static struct ep93xx_eth_data edb9302_eth_data = { | ||
| 47 | .phy_id = 1, | ||
| 48 | }; | ||
| 49 | |||
| 46 | static void __init edb9302_init_machine(void) | 50 | static void __init edb9302_init_machine(void) |
| 47 | { | 51 | { |
| 48 | ep93xx_init_devices(); | 52 | ep93xx_init_devices(); |
| 49 | platform_device_register(&edb9302_flash); | 53 | platform_device_register(&edb9302_flash); |
| 54 | |||
| 55 | ep93xx_register_eth(&edb9302_eth_data, 1); | ||
| 50 | } | 56 | } |
| 51 | 57 | ||
| 52 | MACHINE_START(EDB9302, "Cirrus Logic EDB9302 Evaluation Board") | 58 | MACHINE_START(EDB9302, "Cirrus Logic EDB9302 Evaluation Board") |
diff --git a/arch/arm/mach-ep93xx/edb9302a.c b/arch/arm/mach-ep93xx/edb9302a.c index 65cc55cfeac7..02c4405afed7 100644 --- a/arch/arm/mach-ep93xx/edb9302a.c +++ b/arch/arm/mach-ep93xx/edb9302a.c | |||
| @@ -47,36 +47,12 @@ static struct ep93xx_eth_data edb9302a_eth_data = { | |||
| 47 | .phy_id = 1, | 47 | .phy_id = 1, |
| 48 | }; | 48 | }; |
| 49 | 49 | ||
| 50 | static struct resource edb9302a_eth_resource[] = { | ||
| 51 | { | ||
| 52 | .start = EP93XX_ETHERNET_PHYS_BASE, | ||
| 53 | .end = EP93XX_ETHERNET_PHYS_BASE + 0xffff, | ||
| 54 | .flags = IORESOURCE_MEM, | ||
| 55 | }, { | ||
| 56 | .start = IRQ_EP93XX_ETHERNET, | ||
| 57 | .end = IRQ_EP93XX_ETHERNET, | ||
| 58 | .flags = IORESOURCE_IRQ, | ||
| 59 | } | ||
| 60 | }; | ||
| 61 | |||
| 62 | static struct platform_device edb9302a_eth_device = { | ||
| 63 | .name = "ep93xx-eth", | ||
| 64 | .id = -1, | ||
| 65 | .dev = { | ||
| 66 | .platform_data = &edb9302a_eth_data, | ||
| 67 | }, | ||
| 68 | .num_resources = 2, | ||
| 69 | .resource = edb9302a_eth_resource, | ||
| 70 | }; | ||
| 71 | |||
| 72 | static void __init edb9302a_init_machine(void) | 50 | static void __init edb9302a_init_machine(void) |
| 73 | { | 51 | { |
| 74 | ep93xx_init_devices(); | 52 | ep93xx_init_devices(); |
| 75 | platform_device_register(&edb9302a_flash); | 53 | platform_device_register(&edb9302a_flash); |
| 76 | 54 | ||
| 77 | memcpy(edb9302a_eth_data.dev_addr, | 55 | ep93xx_register_eth(&edb9302a_eth_data, 1); |
| 78 | (void *)(EP93XX_ETHERNET_BASE + 0x50), 6); | ||
| 79 | platform_device_register(&edb9302a_eth_device); | ||
| 80 | } | 56 | } |
| 81 | 57 | ||
| 82 | MACHINE_START(EDB9302A, "Cirrus Logic EDB9302A Evaluation Board") | 58 | MACHINE_START(EDB9302A, "Cirrus Logic EDB9302A Evaluation Board") |
diff --git a/arch/arm/mach-ep93xx/edb9307.c b/arch/arm/mach-ep93xx/edb9307.c index 551de24d6f25..040edbd2ea05 100644 --- a/arch/arm/mach-ep93xx/edb9307.c +++ b/arch/arm/mach-ep93xx/edb9307.c | |||
| @@ -47,36 +47,12 @@ static struct ep93xx_eth_data edb9307_eth_data = { | |||
| 47 | .phy_id = 1, | 47 | .phy_id = 1, |
| 48 | }; | 48 | }; |
| 49 | 49 | ||
| 50 | static struct resource edb9307_eth_resource[] = { | ||
| 51 | { | ||
| 52 | .start = EP93XX_ETHERNET_PHYS_BASE, | ||
| 53 | .end = EP93XX_ETHERNET_PHYS_BASE + 0xffff, | ||
| 54 | .flags = IORESOURCE_MEM, | ||
| 55 | }, { | ||
| 56 | .start = IRQ_EP93XX_ETHERNET, | ||
| 57 | .end = IRQ_EP93XX_ETHERNET, | ||
| 58 | .flags = IORESOURCE_IRQ, | ||
| 59 | } | ||
| 60 | }; | ||
| 61 | |||
| 62 | static struct platform_device edb9307_eth_device = { | ||
| 63 | .name = "ep93xx-eth", | ||
| 64 | .id = -1, | ||
| 65 | .dev = { | ||
| 66 | .platform_data = &edb9307_eth_data, | ||
| 67 | }, | ||
| 68 | .num_resources = 2, | ||
| 69 | .resource = edb9307_eth_resource, | ||
| 70 | }; | ||
| 71 | |||
| 72 | static void __init edb9307_init_machine(void) | 50 | static void __init edb9307_init_machine(void) |
| 73 | { | 51 | { |
| 74 | ep93xx_init_devices(); | 52 | ep93xx_init_devices(); |
| 75 | platform_device_register(&edb9307_flash); | 53 | platform_device_register(&edb9307_flash); |
| 76 | 54 | ||
| 77 | memcpy(edb9307_eth_data.dev_addr, | 55 | ep93xx_register_eth(&edb9307_eth_data, 1); |
| 78 | (void *)(EP93XX_ETHERNET_BASE + 0x50), 6); | ||
| 79 | platform_device_register(&edb9307_eth_device); | ||
| 80 | } | 56 | } |
| 81 | 57 | ||
| 82 | MACHINE_START(EDB9307, "Cirrus Logic EDB9307 Evaluation Board") | 58 | MACHINE_START(EDB9307, "Cirrus Logic EDB9307 Evaluation Board") |
diff --git a/arch/arm/mach-ep93xx/edb9312.c b/arch/arm/mach-ep93xx/edb9312.c index 9167e7c8dbc4..6853e302bc3a 100644 --- a/arch/arm/mach-ep93xx/edb9312.c +++ b/arch/arm/mach-ep93xx/edb9312.c | |||
| @@ -44,10 +44,16 @@ static struct platform_device edb9312_flash = { | |||
| 44 | .resource = &edb9312_flash_resource, | 44 | .resource = &edb9312_flash_resource, |
| 45 | }; | 45 | }; |
| 46 | 46 | ||
| 47 | static struct ep93xx_eth_data edb9312_eth_data = { | ||
| 48 | .phy_id = 1, | ||
| 49 | }; | ||
| 50 | |||
| 47 | static void __init edb9312_init_machine(void) | 51 | static void __init edb9312_init_machine(void) |
| 48 | { | 52 | { |
| 49 | ep93xx_init_devices(); | 53 | ep93xx_init_devices(); |
| 50 | platform_device_register(&edb9312_flash); | 54 | platform_device_register(&edb9312_flash); |
| 55 | |||
| 56 | ep93xx_register_eth(&edb9312_eth_data, 1); | ||
| 51 | } | 57 | } |
| 52 | 58 | ||
| 53 | MACHINE_START(EDB9312, "Cirrus Logic EDB9312 Evaluation Board") | 59 | MACHINE_START(EDB9312, "Cirrus Logic EDB9312 Evaluation Board") |
diff --git a/arch/arm/mach-ep93xx/edb9315.c b/arch/arm/mach-ep93xx/edb9315.c index d267bb644473..9469b350d253 100644 --- a/arch/arm/mach-ep93xx/edb9315.c +++ b/arch/arm/mach-ep93xx/edb9315.c | |||
| @@ -43,10 +43,16 @@ static struct platform_device edb9315_flash = { | |||
| 43 | .resource = &edb9315_flash_resource, | 43 | .resource = &edb9315_flash_resource, |
| 44 | }; | 44 | }; |
| 45 | 45 | ||
| 46 | static struct ep93xx_eth_data edb9315_eth_data = { | ||
| 47 | .phy_id = 1, | ||
| 48 | }; | ||
| 49 | |||
| 46 | static void __init edb9315_init_machine(void) | 50 | static void __init edb9315_init_machine(void) |
| 47 | { | 51 | { |
| 48 | ep93xx_init_devices(); | 52 | ep93xx_init_devices(); |
| 49 | platform_device_register(&edb9315_flash); | 53 | platform_device_register(&edb9315_flash); |
| 54 | |||
| 55 | ep93xx_register_eth(&edb9315_eth_data, 1); | ||
| 50 | } | 56 | } |
| 51 | 57 | ||
| 52 | MACHINE_START(EDB9315, "Cirrus Logic EDB9315 Evaluation Board") | 58 | MACHINE_START(EDB9315, "Cirrus Logic EDB9315 Evaluation Board") |
diff --git a/arch/arm/mach-ep93xx/edb9315a.c b/arch/arm/mach-ep93xx/edb9315a.c index 6ffe21d81e46..584457ce7c80 100644 --- a/arch/arm/mach-ep93xx/edb9315a.c +++ b/arch/arm/mach-ep93xx/edb9315a.c | |||
| @@ -47,36 +47,12 @@ static struct ep93xx_eth_data edb9315a_eth_data = { | |||
| 47 | .phy_id = 1, | 47 | .phy_id = 1, |
| 48 | }; | 48 | }; |
| 49 | 49 | ||
| 50 | static struct resource edb9315a_eth_resource[] = { | ||
| 51 | { | ||
| 52 | .start = EP93XX_ETHERNET_PHYS_BASE, | ||
| 53 | .end = EP93XX_ETHERNET_PHYS_BASE + 0xffff, | ||
| 54 | .flags = IORESOURCE_MEM, | ||
| 55 | }, { | ||
| 56 | .start = IRQ_EP93XX_ETHERNET, | ||
| 57 | .end = IRQ_EP93XX_ETHERNET, | ||
| 58 | .flags = IORESOURCE_IRQ, | ||
| 59 | } | ||
| 60 | }; | ||
| 61 | |||
| 62 | static struct platform_device edb9315a_eth_device = { | ||
| 63 | .name = "ep93xx-eth", | ||
| 64 | .id = -1, | ||
| 65 | .dev = { | ||
| 66 | .platform_data = &edb9315a_eth_data, | ||
| 67 | }, | ||
| 68 | .num_resources = 2, | ||
| 69 | .resource = edb9315a_eth_resource, | ||
| 70 | }; | ||
| 71 | |||
| 72 | static void __init edb9315a_init_machine(void) | 50 | static void __init edb9315a_init_machine(void) |
| 73 | { | 51 | { |
| 74 | ep93xx_init_devices(); | 52 | ep93xx_init_devices(); |
| 75 | platform_device_register(&edb9315a_flash); | 53 | platform_device_register(&edb9315a_flash); |
| 76 | 54 | ||
| 77 | memcpy(edb9315a_eth_data.dev_addr, | 55 | ep93xx_register_eth(&edb9315a_eth_data, 1); |
| 78 | (void *)(EP93XX_ETHERNET_BASE + 0x50), 6); | ||
| 79 | platform_device_register(&edb9315a_eth_device); | ||
| 80 | } | 56 | } |
| 81 | 57 | ||
| 82 | MACHINE_START(EDB9315A, "Cirrus Logic EDB9315A Evaluation Board") | 58 | MACHINE_START(EDB9315A, "Cirrus Logic EDB9315A Evaluation Board") |
diff --git a/arch/arm/mach-ep93xx/gesbc9312.c b/arch/arm/mach-ep93xx/gesbc9312.c index ad57bb1780da..035b24e31b64 100644 --- a/arch/arm/mach-ep93xx/gesbc9312.c +++ b/arch/arm/mach-ep93xx/gesbc9312.c | |||
| @@ -44,36 +44,15 @@ static struct platform_device gesbc9312_flash = { | |||
| 44 | }; | 44 | }; |
| 45 | 45 | ||
| 46 | static struct ep93xx_eth_data gesbc9312_eth_data = { | 46 | static struct ep93xx_eth_data gesbc9312_eth_data = { |
| 47 | .phy_id = 1, | 47 | .phy_id = 1, |
| 48 | }; | ||
| 49 | |||
| 50 | static struct resource gesbc9312_eth_resource[] = { | ||
| 51 | { | ||
| 52 | .start = EP93XX_ETHERNET_PHYS_BASE, | ||
| 53 | .end = EP93XX_ETHERNET_PHYS_BASE + 0xffff, | ||
| 54 | .flags = IORESOURCE_MEM, | ||
| 55 | }, { | ||
| 56 | .start = IRQ_EP93XX_ETHERNET, | ||
| 57 | .end = IRQ_EP93XX_ETHERNET, | ||
| 58 | .flags = IORESOURCE_IRQ, | ||
| 59 | } | ||
| 60 | }; | ||
| 61 | |||
| 62 | static struct platform_device gesbc9312_eth_device = { | ||
| 63 | .name = "ep93xx-eth", | ||
| 64 | .id = -1, | ||
| 65 | .dev = { | ||
| 66 | .platform_data = &gesbc9312_eth_data, | ||
| 67 | }, | ||
| 68 | .num_resources = 2, | ||
| 69 | .resource = gesbc9312_eth_resource, | ||
| 70 | }; | 48 | }; |
| 71 | 49 | ||
| 72 | static void __init gesbc9312_init_machine(void) | 50 | static void __init gesbc9312_init_machine(void) |
| 73 | { | 51 | { |
| 74 | ep93xx_init_devices(); | 52 | ep93xx_init_devices(); |
| 75 | platform_device_register(&gesbc9312_flash); | 53 | platform_device_register(&gesbc9312_flash); |
| 76 | platform_device_register(&gesbc9312_eth_device); | 54 | |
| 55 | ep93xx_register_eth(&gesbc9312_eth_data, 0); | ||
| 77 | } | 56 | } |
| 78 | 57 | ||
| 79 | MACHINE_START(GESBC9312, "Glomation GESBC-9312-sx") | 58 | MACHINE_START(GESBC9312, "Glomation GESBC-9312-sx") |
diff --git a/arch/arm/mach-ep93xx/gpio.c b/arch/arm/mach-ep93xx/gpio.c index 5a06ed9eafdc..482cf3d2fbcd 100644 --- a/arch/arm/mach-ep93xx/gpio.c +++ b/arch/arm/mach-ep93xx/gpio.c | |||
| @@ -141,10 +141,10 @@ static void ep93xx_gpio_dbg_show(struct seq_file *s, struct gpio_chip *chip) | |||
| 141 | static struct ep93xx_gpio_chip ep93xx_gpio_banks[] = { | 141 | static struct ep93xx_gpio_chip ep93xx_gpio_banks[] = { |
| 142 | EP93XX_GPIO_BANK("A", 0x00, 0x10, 0), | 142 | EP93XX_GPIO_BANK("A", 0x00, 0x10, 0), |
| 143 | EP93XX_GPIO_BANK("B", 0x04, 0x14, 8), | 143 | EP93XX_GPIO_BANK("B", 0x04, 0x14, 8), |
| 144 | EP93XX_GPIO_BANK("C", 0x30, 0x34, 40), | 144 | EP93XX_GPIO_BANK("C", 0x08, 0x18, 40), |
| 145 | EP93XX_GPIO_BANK("D", 0x0c, 0x1c, 24), | 145 | EP93XX_GPIO_BANK("D", 0x0c, 0x1c, 24), |
| 146 | EP93XX_GPIO_BANK("E", 0x20, 0x24, 32), | 146 | EP93XX_GPIO_BANK("E", 0x20, 0x24, 32), |
| 147 | EP93XX_GPIO_BANK("F", 0x08, 0x18, 16), | 147 | EP93XX_GPIO_BANK("F", 0x30, 0x34, 16), |
| 148 | EP93XX_GPIO_BANK("G", 0x38, 0x3c, 48), | 148 | EP93XX_GPIO_BANK("G", 0x38, 0x3c, 48), |
| 149 | EP93XX_GPIO_BANK("H", 0x40, 0x44, 56), | 149 | EP93XX_GPIO_BANK("H", 0x40, 0x44, 56), |
| 150 | }; | 150 | }; |
diff --git a/arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h b/arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h index 9f4458c8e070..22d6c9a6e4ca 100644 --- a/arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h +++ b/arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h | |||
| @@ -6,6 +6,40 @@ | |||
| 6 | #define __ASM_ARCH_EP93XX_REGS_H | 6 | #define __ASM_ARCH_EP93XX_REGS_H |
| 7 | 7 | ||
| 8 | /* | 8 | /* |
| 9 | * EP93xx Physical Memory Map: | ||
| 10 | * | ||
| 11 | * The ASDO pin is sampled at system reset to select a synchronous or | ||
| 12 | * asynchronous boot configuration. When ASDO is "1" (i.e. pulled-up) | ||
| 13 | * the synchronous boot mode is selected. When ASDO is "0" (i.e | ||
| 14 | * pulled-down) the asynchronous boot mode is selected. | ||
| 15 | * | ||
| 16 | * In synchronous boot mode nSDCE3 is decoded starting at physical address | ||
| 17 | * 0x00000000 and nCS0 is decoded starting at 0xf0000000. For asynchronous | ||
| 18 | * boot mode they are swapped with nCS0 decoded at 0x00000000 ann nSDCE3 | ||
| 19 | * decoded at 0xf0000000. | ||
| 20 | * | ||
| 21 | * There is known errata for the EP93xx dealing with External Memory | ||
| 22 | * Configurations. Please refer to "AN273: EP93xx Silicon Rev E Design | ||
| 23 | * Guidelines" for more information. This document can be found at: | ||
| 24 | * | ||
| 25 | * http://www.cirrus.com/en/pubs/appNote/AN273REV4.pdf | ||
| 26 | */ | ||
| 27 | |||
| 28 | #define EP93XX_CS0_PHYS_BASE_ASYNC 0x00000000 /* ASDO Pin = 0 */ | ||
| 29 | #define EP93XX_SDCE3_PHYS_BASE_SYNC 0x00000000 /* ASDO Pin = 1 */ | ||
| 30 | #define EP93XX_CS1_PHYS_BASE 0x10000000 | ||
| 31 | #define EP93XX_CS2_PHYS_BASE 0x20000000 | ||
| 32 | #define EP93XX_CS3_PHYS_BASE 0x30000000 | ||
| 33 | #define EP93XX_PCMCIA_PHYS_BASE 0x40000000 | ||
| 34 | #define EP93XX_CS6_PHYS_BASE 0x60000000 | ||
| 35 | #define EP93XX_CS7_PHYS_BASE 0x70000000 | ||
| 36 | #define EP93XX_SDCE0_PHYS_BASE 0xc0000000 | ||
| 37 | #define EP93XX_SDCE1_PHYS_BASE 0xd0000000 | ||
| 38 | #define EP93XX_SDCE2_PHYS_BASE 0xe0000000 | ||
| 39 | #define EP93XX_SDCE3_PHYS_BASE_ASYNC 0xf0000000 /* ASDO Pin = 0 */ | ||
| 40 | #define EP93XX_CS0_PHYS_BASE_SYNC 0xf0000000 /* ASDO Pin = 1 */ | ||
| 41 | |||
| 42 | /* | ||
| 9 | * EP93xx linux memory map: | 43 | * EP93xx linux memory map: |
| 10 | * | 44 | * |
| 11 | * virt phys size | 45 | * virt phys size |
diff --git a/arch/arm/mach-ep93xx/include/mach/platform.h b/arch/arm/mach-ep93xx/include/mach/platform.h index b5c182473f5d..db2489d3bda7 100644 --- a/arch/arm/mach-ep93xx/include/mach/platform.h +++ b/arch/arm/mach-ep93xx/include/mach/platform.h | |||
| @@ -4,17 +4,17 @@ | |||
| 4 | 4 | ||
| 5 | #ifndef __ASSEMBLY__ | 5 | #ifndef __ASSEMBLY__ |
| 6 | 6 | ||
| 7 | void ep93xx_map_io(void); | ||
| 8 | void ep93xx_init_irq(void); | ||
| 9 | void ep93xx_init_time(unsigned long); | ||
| 10 | void ep93xx_init_devices(void); | ||
| 11 | extern struct sys_timer ep93xx_timer; | ||
| 12 | |||
| 13 | struct ep93xx_eth_data | 7 | struct ep93xx_eth_data |
| 14 | { | 8 | { |
| 15 | unsigned char dev_addr[6]; | 9 | unsigned char dev_addr[6]; |
| 16 | unsigned char phy_id; | 10 | unsigned char phy_id; |
| 17 | }; | 11 | }; |
| 18 | 12 | ||
| 13 | void ep93xx_map_io(void); | ||
| 14 | void ep93xx_init_irq(void); | ||
| 15 | void ep93xx_init_time(unsigned long); | ||
| 16 | void ep93xx_register_eth(struct ep93xx_eth_data *data, int copy_addr); | ||
| 17 | void ep93xx_init_devices(void); | ||
| 18 | extern struct sys_timer ep93xx_timer; | ||
| 19 | 19 | ||
| 20 | #endif | 20 | #endif |
diff --git a/arch/arm/mach-ep93xx/include/mach/uncompress.h b/arch/arm/mach-ep93xx/include/mach/uncompress.h index 1fd2f17de325..16026c2b1c8c 100644 --- a/arch/arm/mach-ep93xx/include/mach/uncompress.h +++ b/arch/arm/mach-ep93xx/include/mach/uncompress.h | |||
| @@ -31,10 +31,19 @@ static void __raw_writel(unsigned int value, unsigned int ptr) | |||
| 31 | *((volatile unsigned int *)ptr) = value; | 31 | *((volatile unsigned int *)ptr) = value; |
| 32 | } | 32 | } |
| 33 | 33 | ||
| 34 | 34 | #if defined(CONFIG_EP93XX_EARLY_UART1) | |
| 35 | #define PHYS_UART1_DATA 0x808c0000 | 35 | #define UART_BASE EP93XX_UART1_PHYS_BASE |
| 36 | #define PHYS_UART1_FLAG 0x808c0018 | 36 | #elif defined(CONFIG_EP93XX_EARLY_UART2) |
| 37 | #define UART1_FLAG_TXFF 0x20 | 37 | #define UART_BASE EP93XX_UART2_PHYS_BASE |
| 38 | #elif defined(CONFIG_EP93XX_EARLY_UART3) | ||
| 39 | #define UART_BASE EP93XX_UART3_PHYS_BASE | ||
| 40 | #else | ||
| 41 | #define UART_BASE EP93XX_UART1_PHYS_BASE | ||
| 42 | #endif | ||
| 43 | |||
| 44 | #define PHYS_UART_DATA (UART_BASE + 0x00) | ||
| 45 | #define PHYS_UART_FLAG (UART_BASE + 0x18) | ||
| 46 | #define UART_FLAG_TXFF 0x20 | ||
| 38 | 47 | ||
| 39 | static inline void putc(int c) | 48 | static inline void putc(int c) |
| 40 | { | 49 | { |
| @@ -42,11 +51,11 @@ static inline void putc(int c) | |||
| 42 | 51 | ||
| 43 | for (i = 0; i < 1000; i++) { | 52 | for (i = 0; i < 1000; i++) { |
| 44 | /* Transmit fifo not full? */ | 53 | /* Transmit fifo not full? */ |
| 45 | if (!(__raw_readb(PHYS_UART1_FLAG) & UART1_FLAG_TXFF)) | 54 | if (!(__raw_readb(PHYS_UART_FLAG) & UART_FLAG_TXFF)) |
| 46 | break; | 55 | break; |
| 47 | } | 56 | } |
| 48 | 57 | ||
| 49 | __raw_writeb(c, PHYS_UART1_DATA); | 58 | __raw_writeb(c, PHYS_UART_DATA); |
| 50 | } | 59 | } |
| 51 | 60 | ||
| 52 | static inline void flush(void) | 61 | static inline void flush(void) |
diff --git a/arch/arm/mach-ep93xx/micro9.c b/arch/arm/mach-ep93xx/micro9.c index 06555f372cd1..c2197236b632 100644 --- a/arch/arm/mach-ep93xx/micro9.c +++ b/arch/arm/mach-ep93xx/micro9.c | |||
| @@ -28,38 +28,9 @@ static struct ep93xx_eth_data micro9_eth_data = { | |||
| 28 | .phy_id = 0x1f, | 28 | .phy_id = 0x1f, |
| 29 | }; | 29 | }; |
| 30 | 30 | ||
| 31 | static struct resource micro9_eth_resource[] = { | ||
| 32 | { | ||
| 33 | .start = EP93XX_ETHERNET_PHYS_BASE, | ||
| 34 | .end = EP93XX_ETHERNET_PHYS_BASE + 0xffff, | ||
| 35 | .flags = IORESOURCE_MEM, | ||
| 36 | }, { | ||
| 37 | .start = IRQ_EP93XX_ETHERNET, | ||
| 38 | .end = IRQ_EP93XX_ETHERNET, | ||
| 39 | .flags = IORESOURCE_IRQ, | ||
| 40 | } | ||
| 41 | }; | ||
| 42 | |||
| 43 | static struct platform_device micro9_eth_device = { | ||
| 44 | .name = "ep93xx-eth", | ||
| 45 | .id = -1, | ||
| 46 | .dev = { | ||
| 47 | .platform_data = µ9_eth_data, | ||
| 48 | }, | ||
| 49 | .num_resources = ARRAY_SIZE(micro9_eth_resource), | ||
| 50 | .resource = micro9_eth_resource, | ||
| 51 | }; | ||
| 52 | |||
| 53 | static void __init micro9_eth_init(void) | ||
| 54 | { | ||
| 55 | memcpy(micro9_eth_data.dev_addr, | ||
| 56 | (void *)(EP93XX_ETHERNET_BASE + 0x50), 6); | ||
| 57 | platform_device_register(µ9_eth_device); | ||
| 58 | } | ||
| 59 | |||
| 60 | static void __init micro9_init(void) | 31 | static void __init micro9_init(void) |
| 61 | { | 32 | { |
| 62 | micro9_eth_init(); | 33 | ep93xx_register_eth(µ9_eth_data, 1); |
| 63 | } | 34 | } |
| 64 | 35 | ||
| 65 | /* | 36 | /* |
diff --git a/arch/arm/mach-ep93xx/ts72xx.c b/arch/arm/mach-ep93xx/ts72xx.c index a6959c8bb84f..b4aa4c054276 100644 --- a/arch/arm/mach-ep93xx/ts72xx.c +++ b/arch/arm/mach-ep93xx/ts72xx.c | |||
| @@ -161,28 +161,6 @@ static struct ep93xx_eth_data ts72xx_eth_data = { | |||
| 161 | .phy_id = 1, | 161 | .phy_id = 1, |
| 162 | }; | 162 | }; |
| 163 | 163 | ||
| 164 | static struct resource ts72xx_eth_resource[] = { | ||
| 165 | { | ||
| 166 | .start = EP93XX_ETHERNET_PHYS_BASE, | ||
| 167 | .end = EP93XX_ETHERNET_PHYS_BASE + 0xffff, | ||
| 168 | .flags = IORESOURCE_MEM, | ||
| 169 | }, { | ||
| 170 | .start = IRQ_EP93XX_ETHERNET, | ||
| 171 | .end = IRQ_EP93XX_ETHERNET, | ||
| 172 | .flags = IORESOURCE_IRQ, | ||
| 173 | } | ||
| 174 | }; | ||
| 175 | |||
| 176 | static struct platform_device ts72xx_eth_device = { | ||
| 177 | .name = "ep93xx-eth", | ||
| 178 | .id = -1, | ||
| 179 | .dev = { | ||
| 180 | .platform_data = &ts72xx_eth_data, | ||
| 181 | }, | ||
| 182 | .num_resources = 2, | ||
| 183 | .resource = ts72xx_eth_resource, | ||
| 184 | }; | ||
| 185 | |||
| 186 | static void __init ts72xx_init_machine(void) | 164 | static void __init ts72xx_init_machine(void) |
| 187 | { | 165 | { |
| 188 | ep93xx_init_devices(); | 166 | ep93xx_init_devices(); |
| @@ -190,9 +168,7 @@ static void __init ts72xx_init_machine(void) | |||
| 190 | platform_device_register(&ts72xx_flash); | 168 | platform_device_register(&ts72xx_flash); |
| 191 | platform_device_register(&ts72xx_rtc_device); | 169 | platform_device_register(&ts72xx_rtc_device); |
| 192 | 170 | ||
| 193 | memcpy(ts72xx_eth_data.dev_addr, | 171 | ep93xx_register_eth(&ts72xx_eth_data, 1); |
| 194 | (void *)(EP93XX_ETHERNET_BASE + 0x50), 6); | ||
| 195 | platform_device_register(&ts72xx_eth_device); | ||
| 196 | } | 172 | } |
| 197 | 173 | ||
| 198 | MACHINE_START(TS72XX, "Technologic Systems TS-72xx SBC") | 174 | MACHINE_START(TS72XX, "Technologic Systems TS-72xx SBC") |
diff --git a/arch/arm/mach-ks8695/gpio.c b/arch/arm/mach-ks8695/gpio.c index 2f122823f85a..9aecf0c4b8b1 100644 --- a/arch/arm/mach-ks8695/gpio.c +++ b/arch/arm/mach-ks8695/gpio.c | |||
| @@ -72,7 +72,7 @@ int __init_or_module ks8695_gpio_interrupt(unsigned int pin, unsigned int type) | |||
| 72 | 72 | ||
| 73 | /* set pin as input */ | 73 | /* set pin as input */ |
| 74 | x = __raw_readl(KS8695_GPIO_VA + KS8695_IOPM); | 74 | x = __raw_readl(KS8695_GPIO_VA + KS8695_IOPM); |
| 75 | x &= ~IOPM_(pin); | 75 | x &= ~IOPM(pin); |
| 76 | __raw_writel(x, KS8695_GPIO_VA + KS8695_IOPM); | 76 | __raw_writel(x, KS8695_GPIO_VA + KS8695_IOPM); |
| 77 | 77 | ||
| 78 | local_irq_restore(flags); | 78 | local_irq_restore(flags); |
| @@ -108,7 +108,7 @@ int __init_or_module gpio_direction_input(unsigned int pin) | |||
| 108 | 108 | ||
| 109 | /* set pin as input */ | 109 | /* set pin as input */ |
| 110 | x = __raw_readl(KS8695_GPIO_VA + KS8695_IOPM); | 110 | x = __raw_readl(KS8695_GPIO_VA + KS8695_IOPM); |
| 111 | x &= ~IOPM_(pin); | 111 | x &= ~IOPM(pin); |
| 112 | __raw_writel(x, KS8695_GPIO_VA + KS8695_IOPM); | 112 | __raw_writel(x, KS8695_GPIO_VA + KS8695_IOPM); |
| 113 | 113 | ||
| 114 | local_irq_restore(flags); | 114 | local_irq_restore(flags); |
| @@ -136,14 +136,14 @@ int __init_or_module gpio_direction_output(unsigned int pin, unsigned int state) | |||
| 136 | /* set line state */ | 136 | /* set line state */ |
| 137 | x = __raw_readl(KS8695_GPIO_VA + KS8695_IOPD); | 137 | x = __raw_readl(KS8695_GPIO_VA + KS8695_IOPD); |
| 138 | if (state) | 138 | if (state) |
| 139 | x |= (1 << pin); | 139 | x |= IOPD(pin); |
| 140 | else | 140 | else |
| 141 | x &= ~(1 << pin); | 141 | x &= ~IOPD(pin); |
| 142 | __raw_writel(x, KS8695_GPIO_VA + KS8695_IOPD); | 142 | __raw_writel(x, KS8695_GPIO_VA + KS8695_IOPD); |
| 143 | 143 | ||
| 144 | /* set pin as output */ | 144 | /* set pin as output */ |
| 145 | x = __raw_readl(KS8695_GPIO_VA + KS8695_IOPM); | 145 | x = __raw_readl(KS8695_GPIO_VA + KS8695_IOPM); |
| 146 | x |= IOPM_(pin); | 146 | x |= IOPM(pin); |
| 147 | __raw_writel(x, KS8695_GPIO_VA + KS8695_IOPM); | 147 | __raw_writel(x, KS8695_GPIO_VA + KS8695_IOPM); |
| 148 | 148 | ||
| 149 | local_irq_restore(flags); | 149 | local_irq_restore(flags); |
| @@ -168,9 +168,9 @@ void gpio_set_value(unsigned int pin, unsigned int state) | |||
| 168 | /* set output line state */ | 168 | /* set output line state */ |
| 169 | x = __raw_readl(KS8695_GPIO_VA + KS8695_IOPD); | 169 | x = __raw_readl(KS8695_GPIO_VA + KS8695_IOPD); |
| 170 | if (state) | 170 | if (state) |
| 171 | x |= (1 << pin); | 171 | x |= IOPD(pin); |
| 172 | else | 172 | else |
| 173 | x &= ~(1 << pin); | 173 | x &= ~IOPD(pin); |
| 174 | __raw_writel(x, KS8695_GPIO_VA + KS8695_IOPD); | 174 | __raw_writel(x, KS8695_GPIO_VA + KS8695_IOPD); |
| 175 | 175 | ||
| 176 | local_irq_restore(flags); | 176 | local_irq_restore(flags); |
| @@ -189,7 +189,7 @@ int gpio_get_value(unsigned int pin) | |||
| 189 | return -EINVAL; | 189 | return -EINVAL; |
| 190 | 190 | ||
| 191 | x = __raw_readl(KS8695_GPIO_VA + KS8695_IOPD); | 191 | x = __raw_readl(KS8695_GPIO_VA + KS8695_IOPD); |
| 192 | return (x & (1 << pin)) != 0; | 192 | return (x & IOPD(pin)) != 0; |
| 193 | } | 193 | } |
| 194 | EXPORT_SYMBOL(gpio_get_value); | 194 | EXPORT_SYMBOL(gpio_get_value); |
| 195 | 195 | ||
| @@ -240,7 +240,7 @@ static int ks8695_gpio_show(struct seq_file *s, void *unused) | |||
| 240 | for (i = KS8695_GPIO_0; i <= KS8695_GPIO_15 ; i++) { | 240 | for (i = KS8695_GPIO_0; i <= KS8695_GPIO_15 ; i++) { |
| 241 | seq_printf(s, "%i:\t", i); | 241 | seq_printf(s, "%i:\t", i); |
| 242 | 242 | ||
| 243 | seq_printf(s, "%s\t", (mode & IOPM_(i)) ? "Output" : "Input"); | 243 | seq_printf(s, "%s\t", (mode & IOPM(i)) ? "Output" : "Input"); |
| 244 | 244 | ||
| 245 | if (i <= KS8695_GPIO_3) { | 245 | if (i <= KS8695_GPIO_3) { |
| 246 | if (ctrl & enable[i]) { | 246 | if (ctrl & enable[i]) { |
| @@ -273,7 +273,7 @@ static int ks8695_gpio_show(struct seq_file *s, void *unused) | |||
| 273 | 273 | ||
| 274 | seq_printf(s, "\t"); | 274 | seq_printf(s, "\t"); |
| 275 | 275 | ||
| 276 | seq_printf(s, "%i\n", (data & IOPD_(i)) ? 1 : 0); | 276 | seq_printf(s, "%i\n", (data & IOPD(i)) ? 1 : 0); |
| 277 | } | 277 | } |
| 278 | return 0; | 278 | return 0; |
| 279 | } | 279 | } |
diff --git a/arch/arm/mach-ks8695/include/mach/memory.h b/arch/arm/mach-ks8695/include/mach/memory.h index dadbe66cb75c..8fbc4c76c38b 100644 --- a/arch/arm/mach-ks8695/include/mach/memory.h +++ b/arch/arm/mach-ks8695/include/mach/memory.h | |||
| @@ -31,8 +31,8 @@ | |||
| 31 | /* Platform-bus mapping */ | 31 | /* Platform-bus mapping */ |
| 32 | extern struct bus_type platform_bus_type; | 32 | extern struct bus_type platform_bus_type; |
| 33 | #define is_lbus_device(dev) (dev && dev->bus == &platform_bus_type) | 33 | #define is_lbus_device(dev) (dev && dev->bus == &platform_bus_type) |
| 34 | #define __arch_dma_to_virt(dev, x) ({ is_lbus_device(dev) ? \ | 34 | #define __arch_dma_to_virt(dev, x) ({ (void *) (is_lbus_device(dev) ? \ |
| 35 | __phys_to_virt(x) : __bus_to_virt(x); }) | 35 | __phys_to_virt(x) : __bus_to_virt(x)); }) |
| 36 | #define __arch_virt_to_dma(dev, x) ({ is_lbus_device(dev) ? \ | 36 | #define __arch_virt_to_dma(dev, x) ({ is_lbus_device(dev) ? \ |
| 37 | (dma_addr_t)__virt_to_phys(x) : (dma_addr_t)__virt_to_bus(x); }) | 37 | (dma_addr_t)__virt_to_phys(x) : (dma_addr_t)__virt_to_bus(x); }) |
| 38 | #define __arch_page_to_dma(dev, x) __arch_virt_to_dma(dev, page_address(x)) | 38 | #define __arch_page_to_dma(dev, x) __arch_virt_to_dma(dev, page_address(x)) |
diff --git a/arch/arm/mach-ks8695/include/mach/regs-gpio.h b/arch/arm/mach-ks8695/include/mach/regs-gpio.h index 0df6fe61d1ce..90614a7d0548 100644 --- a/arch/arm/mach-ks8695/include/mach/regs-gpio.h +++ b/arch/arm/mach-ks8695/include/mach/regs-gpio.h | |||
| @@ -24,7 +24,7 @@ | |||
| 24 | 24 | ||
| 25 | 25 | ||
| 26 | /* Port Mode Register */ | 26 | /* Port Mode Register */ |
| 27 | #define IOPM_(x) (1 << (x)) /* Mode for GPIO Pin x */ | 27 | #define IOPM(x) (1 << (x)) /* Mode for GPIO Pin x */ |
| 28 | 28 | ||
| 29 | /* Port Control Register */ | 29 | /* Port Control Register */ |
| 30 | #define IOPC_IOTIM1EN (1 << 17) /* GPIO Pin for Timer1 Enable */ | 30 | #define IOPC_IOTIM1EN (1 << 17) /* GPIO Pin for Timer1 Enable */ |
| @@ -50,6 +50,6 @@ | |||
| 50 | #define IOPC_TM_EDGE (6) /* Both Edge Detection */ | 50 | #define IOPC_TM_EDGE (6) /* Both Edge Detection */ |
| 51 | 51 | ||
| 52 | /* Port Data Register */ | 52 | /* Port Data Register */ |
| 53 | #define IOPD_(x) (1 << (x)) /* Signal Level of GPIO Pin x */ | 53 | #define IOPD(x) (1 << (x)) /* Signal Level of GPIO Pin x */ |
| 54 | 54 | ||
| 55 | #endif | 55 | #endif |
diff --git a/arch/arm/mach-ks8695/include/mach/regs-lan.h b/arch/arm/mach-ks8695/include/mach/regs-lan.h index 9ef409901e76..82c5f3791afb 100644 --- a/arch/arm/mach-ks8695/include/mach/regs-lan.h +++ b/arch/arm/mach-ks8695/include/mach/regs-lan.h | |||
| @@ -29,8 +29,8 @@ | |||
| 29 | #define KS8695_LRDLB (0x14) /* Receive Descriptor List Base Address */ | 29 | #define KS8695_LRDLB (0x14) /* Receive Descriptor List Base Address */ |
| 30 | #define KS8695_LMAL (0x18) /* MAC Station Address Low */ | 30 | #define KS8695_LMAL (0x18) /* MAC Station Address Low */ |
| 31 | #define KS8695_LMAH (0x1c) /* MAC Station Address High */ | 31 | #define KS8695_LMAH (0x1c) /* MAC Station Address High */ |
| 32 | #define KS8695_LMAAL_(n) (0x80 + ((n)*8)) /* MAC Additional Station Address (0..15) Low */ | 32 | #define KS8695_LMAAL(n) (0x80 + ((n)*8)) /* MAC Additional Station Address (0..15) Low */ |
| 33 | #define KS8695_LMAAH_(n) (0x84 + ((n)*8)) /* MAC Additional Station Address (0..15) High */ | 33 | #define KS8695_LMAAH(n) (0x84 + ((n)*8)) /* MAC Additional Station Address (0..15) High */ |
| 34 | 34 | ||
| 35 | 35 | ||
| 36 | /* DMA Transmit Control Register */ | 36 | /* DMA Transmit Control Register */ |
diff --git a/arch/arm/mach-ks8695/include/mach/regs-wan.h b/arch/arm/mach-ks8695/include/mach/regs-wan.h index eb494ec6e956..c475bed22b8e 100644 --- a/arch/arm/mach-ks8695/include/mach/regs-wan.h +++ b/arch/arm/mach-ks8695/include/mach/regs-wan.h | |||
| @@ -29,8 +29,8 @@ | |||
| 29 | #define KS8695_WRDLB (0x14) /* Receive Descriptor List Base Address */ | 29 | #define KS8695_WRDLB (0x14) /* Receive Descriptor List Base Address */ |
| 30 | #define KS8695_WMAL (0x18) /* MAC Station Address Low */ | 30 | #define KS8695_WMAL (0x18) /* MAC Station Address Low */ |
| 31 | #define KS8695_WMAH (0x1c) /* MAC Station Address High */ | 31 | #define KS8695_WMAH (0x1c) /* MAC Station Address High */ |
| 32 | #define KS8695_WMAAL_(n) (0x80 + ((n)*8)) /* MAC Additional Station Address (0..15) Low */ | 32 | #define KS8695_WMAAL(n) (0x80 + ((n)*8)) /* MAC Additional Station Address (0..15) Low */ |
| 33 | #define KS8695_WMAAH_(n) (0x84 + ((n)*8)) /* MAC Additional Station Address (0..15) High */ | 33 | #define KS8695_WMAAH(n) (0x84 + ((n)*8)) /* MAC Additional Station Address (0..15) High */ |
| 34 | 34 | ||
| 35 | 35 | ||
| 36 | /* DMA Transmit Control Register */ | 36 | /* DMA Transmit Control Register */ |
diff --git a/arch/arm/mach-ks8695/pci.c b/arch/arm/mach-ks8695/pci.c index 064b3208141d..f5ebcc0fcab9 100644 --- a/arch/arm/mach-ks8695/pci.c +++ b/arch/arm/mach-ks8695/pci.c | |||
| @@ -141,7 +141,7 @@ static struct pci_ops ks8695_pci_ops = { | |||
| 141 | .write = ks8695_pci_writeconfig, | 141 | .write = ks8695_pci_writeconfig, |
| 142 | }; | 142 | }; |
| 143 | 143 | ||
| 144 | static struct pci_bus *ks8695_pci_scan_bus(int nr, struct pci_sys_data *sys) | 144 | static struct pci_bus* __init ks8695_pci_scan_bus(int nr, struct pci_sys_data *sys) |
| 145 | { | 145 | { |
| 146 | return pci_scan_bus(sys->busnr, &ks8695_pci_ops, sys); | 146 | return pci_scan_bus(sys->busnr, &ks8695_pci_ops, sys); |
| 147 | } | 147 | } |
diff --git a/arch/arm/mach-sa1100/badge4.c b/arch/arm/mach-sa1100/badge4.c index 3efefbdd2527..ab5883b39ddf 100644 --- a/arch/arm/mach-sa1100/badge4.c +++ b/arch/arm/mach-sa1100/badge4.c | |||
| @@ -95,19 +95,19 @@ static int __init badge4_sa1111_init(void) | |||
| 95 | * One-hundred-twenty-seven 32 KiW Main Blocks (8128 Ki b) | 95 | * One-hundred-twenty-seven 32 KiW Main Blocks (8128 Ki b) |
| 96 | */ | 96 | */ |
| 97 | static struct mtd_partition badge4_partitions[] = { | 97 | static struct mtd_partition badge4_partitions[] = { |
| 98 | { | 98 | { |
| 99 | .name = "BLOB boot loader", | 99 | .name = "BLOB boot loader", |
| 100 | .offset = 0, | 100 | .offset = 0, |
| 101 | .size = 0x0000A000 | 101 | .size = 0x0000A000 |
| 102 | }, { | 102 | }, { |
| 103 | .name = "params", | 103 | .name = "params", |
| 104 | .offset = MTDPART_OFS_APPEND, | 104 | .offset = MTDPART_OFS_APPEND, |
| 105 | .size = 0x00006000 | 105 | .size = 0x00006000 |
| 106 | }, { | 106 | }, { |
| 107 | .name = "root", | 107 | .name = "root", |
| 108 | .offset = MTDPART_OFS_APPEND, | 108 | .offset = MTDPART_OFS_APPEND, |
| 109 | .size = MTDPART_SIZ_FULL | 109 | .size = MTDPART_SIZ_FULL |
| 110 | } | 110 | } |
| 111 | }; | 111 | }; |
| 112 | 112 | ||
| 113 | static struct flash_platform_data badge4_flash_data = { | 113 | static struct flash_platform_data badge4_flash_data = { |
| @@ -126,7 +126,7 @@ static int five_v_on __initdata = 0; | |||
| 126 | 126 | ||
| 127 | static int __init five_v_on_setup(char *ignore) | 127 | static int __init five_v_on_setup(char *ignore) |
| 128 | { | 128 | { |
| 129 | five_v_on = 1; | 129 | five_v_on = 1; |
| 130 | return 1; | 130 | return 1; |
| 131 | } | 131 | } |
| 132 | __setup("five_v_on", five_v_on_setup); | 132 | __setup("five_v_on", five_v_on_setup); |
| @@ -171,15 +171,15 @@ static int __init badge4_init(void) | |||
| 171 | GPCR = BADGE4_GPIO_TESTPT_J7; | 171 | GPCR = BADGE4_GPIO_TESTPT_J7; |
| 172 | GPDR |= BADGE4_GPIO_TESTPT_J7; | 172 | GPDR |= BADGE4_GPIO_TESTPT_J7; |
| 173 | 173 | ||
| 174 | /* 5V supply rail. */ | 174 | /* 5V supply rail. */ |
| 175 | GPCR = BADGE4_GPIO_PCMEN5V; /* initially off */ | 175 | GPCR = BADGE4_GPIO_PCMEN5V; /* initially off */ |
| 176 | GPDR |= BADGE4_GPIO_PCMEN5V; | 176 | GPDR |= BADGE4_GPIO_PCMEN5V; |
| 177 | 177 | ||
| 178 | /* CPLD sdram type inputs; set up by blob */ | 178 | /* CPLD sdram type inputs; set up by blob */ |
| 179 | //GPDR |= (BADGE4_GPIO_SDTYP1 | BADGE4_GPIO_SDTYP0); | 179 | //GPDR |= (BADGE4_GPIO_SDTYP1 | BADGE4_GPIO_SDTYP0); |
| 180 | printk(KERN_DEBUG __FILE__ ": SDRAM CPLD typ1=%d typ0=%d\n", | 180 | printk(KERN_DEBUG __FILE__ ": SDRAM CPLD typ1=%d typ0=%d\n", |
| 181 | !!(GPLR & BADGE4_GPIO_SDTYP1), | 181 | !!(GPLR & BADGE4_GPIO_SDTYP1), |
| 182 | !!(GPLR & BADGE4_GPIO_SDTYP0)); | 182 | !!(GPLR & BADGE4_GPIO_SDTYP0)); |
| 183 | 183 | ||
| 184 | /* SA1111 reset pin; set up by blob */ | 184 | /* SA1111 reset pin; set up by blob */ |
| 185 | //GPSR = BADGE4_GPIO_SA1111_NRST; | 185 | //GPSR = BADGE4_GPIO_SA1111_NRST; |
| @@ -205,8 +205,8 @@ static int __init badge4_init(void) | |||
| 205 | ret = badge4_sa1111_init(); | 205 | ret = badge4_sa1111_init(); |
| 206 | if (ret < 0) | 206 | if (ret < 0) |
| 207 | printk(KERN_ERR | 207 | printk(KERN_ERR |
| 208 | "%s: SA-1111 initialization failed (%d)\n", | 208 | "%s: SA-1111 initialization failed (%d)\n", |
| 209 | __func__, ret); | 209 | __func__, ret); |
| 210 | 210 | ||
| 211 | 211 | ||
| 212 | /* maybe turn on 5v0 from the start */ | 212 | /* maybe turn on 5v0 from the start */ |
| @@ -254,7 +254,7 @@ EXPORT_SYMBOL(badge4_set_5V); | |||
| 254 | 254 | ||
| 255 | 255 | ||
| 256 | static struct map_desc badge4_io_desc[] __initdata = { | 256 | static struct map_desc badge4_io_desc[] __initdata = { |
| 257 | { /* SRAM bank 1 */ | 257 | { /* SRAM bank 1 */ |
| 258 | .virtual = 0xf1000000, | 258 | .virtual = 0xf1000000, |
| 259 | .pfn = __phys_to_pfn(0x08000000), | 259 | .pfn = __phys_to_pfn(0x08000000), |
| 260 | .length = 0x00100000, | 260 | .length = 0x00100000, |
diff --git a/arch/arm/mach-sa1100/generic.c b/arch/arm/mach-sa1100/generic.c index 1362994c78aa..b9fae2a39851 100644 --- a/arch/arm/mach-sa1100/generic.c +++ b/arch/arm/mach-sa1100/generic.c | |||
| @@ -42,7 +42,7 @@ EXPORT_SYMBOL(reset_status); | |||
| 42 | static const unsigned short cclk_frequency_100khz[NR_FREQS] = { | 42 | static const unsigned short cclk_frequency_100khz[NR_FREQS] = { |
| 43 | 590, /* 59.0 MHz */ | 43 | 590, /* 59.0 MHz */ |
| 44 | 737, /* 73.7 MHz */ | 44 | 737, /* 73.7 MHz */ |
| 45 | 885, /* 88.5 MHz */ | 45 | 885, /* 88.5 MHz */ |
| 46 | 1032, /* 103.2 MHz */ | 46 | 1032, /* 103.2 MHz */ |
| 47 | 1180, /* 118.0 MHz */ | 47 | 1180, /* 118.0 MHz */ |
| 48 | 1327, /* 132.7 MHz */ | 48 | 1327, /* 132.7 MHz */ |
| @@ -52,10 +52,10 @@ static const unsigned short cclk_frequency_100khz[NR_FREQS] = { | |||
| 52 | 1917, /* 191.7 MHz */ | 52 | 1917, /* 191.7 MHz */ |
| 53 | 2064, /* 206.4 MHz */ | 53 | 2064, /* 206.4 MHz */ |
| 54 | 2212, /* 221.2 MHz */ | 54 | 2212, /* 221.2 MHz */ |
| 55 | 2359, /* 235.9 MHz */ | 55 | 2359, /* 235.9 MHz */ |
| 56 | 2507, /* 250.7 MHz */ | 56 | 2507, /* 250.7 MHz */ |
| 57 | 2654, /* 265.4 MHz */ | 57 | 2654, /* 265.4 MHz */ |
| 58 | 2802 /* 280.2 MHz */ | 58 | 2802 /* 280.2 MHz */ |
| 59 | }; | 59 | }; |
| 60 | 60 | ||
| 61 | #if defined(CONFIG_CPU_FREQ_SA1100) || defined(CONFIG_CPU_FREQ_SA1110) | 61 | #if defined(CONFIG_CPU_FREQ_SA1100) || defined(CONFIG_CPU_FREQ_SA1110) |
| @@ -113,7 +113,7 @@ unsigned int sa11x0_getspeed(unsigned int cpu) | |||
| 113 | #else | 113 | #else |
| 114 | /* | 114 | /* |
| 115 | * We still need to provide this so building without cpufreq works. | 115 | * We still need to provide this so building without cpufreq works. |
| 116 | */ | 116 | */ |
| 117 | unsigned int cpufreq_get(unsigned int cpu) | 117 | unsigned int cpufreq_get(unsigned int cpu) |
| 118 | { | 118 | { |
| 119 | return cclk_frequency_100khz[PPCR & 0xf] * 100; | 119 | return cclk_frequency_100khz[PPCR & 0xf] * 100; |
| @@ -389,7 +389,7 @@ EXPORT_SYMBOL(sa1100fb_lcd_power); | |||
| 389 | */ | 389 | */ |
| 390 | 390 | ||
| 391 | static struct map_desc standard_io_desc[] __initdata = { | 391 | static struct map_desc standard_io_desc[] __initdata = { |
| 392 | { /* PCM */ | 392 | { /* PCM */ |
| 393 | .virtual = 0xf8000000, | 393 | .virtual = 0xf8000000, |
| 394 | .pfn = __phys_to_pfn(0x80000000), | 394 | .pfn = __phys_to_pfn(0x80000000), |
| 395 | .length = 0x00100000, | 395 | .length = 0x00100000, |
diff --git a/arch/arm/mach-sa1100/pleb.c b/arch/arm/mach-sa1100/pleb.c index 159fffb96d72..e45d3a1890bc 100644 --- a/arch/arm/mach-sa1100/pleb.c +++ b/arch/arm/mach-sa1100/pleb.c | |||
| @@ -38,8 +38,8 @@ | |||
| 38 | 38 | ||
| 39 | static struct resource smc91x_resources[] = { | 39 | static struct resource smc91x_resources[] = { |
| 40 | [0] = { | 40 | [0] = { |
| 41 | .start = PLEB_ETH0_P, | 41 | .start = PLEB_ETH0_P, |
| 42 | .end = PLEB_ETH0_P | 0x03ffffff, | 42 | .end = PLEB_ETH0_P | 0x03ffffff, |
| 43 | .flags = IORESOURCE_MEM, | 43 | .flags = IORESOURCE_MEM, |
| 44 | }, | 44 | }, |
| 45 | #if 0 /* Autoprobe instead, to get rising/falling edge characteristic right */ | 45 | #if 0 /* Autoprobe instead, to get rising/falling edge characteristic right */ |
| @@ -86,15 +86,15 @@ static struct resource pleb_flash_resources[] = { | |||
| 86 | static struct mtd_partition pleb_partitions[] = { | 86 | static struct mtd_partition pleb_partitions[] = { |
| 87 | { | 87 | { |
| 88 | .name = "blob", | 88 | .name = "blob", |
| 89 | .offset = 0, | 89 | .offset = 0, |
| 90 | .size = 0x00020000, | 90 | .size = 0x00020000, |
| 91 | }, { | 91 | }, { |
| 92 | .name = "kernel", | 92 | .name = "kernel", |
| 93 | .offset = MTDPART_OFS_APPEND, | 93 | .offset = MTDPART_OFS_APPEND, |
| 94 | .size = 0x000e0000, | 94 | .size = 0x000e0000, |
| 95 | }, { | 95 | }, { |
| 96 | .name = "rootfs", | 96 | .name = "rootfs", |
| 97 | .offset = MTDPART_OFS_APPEND, | 97 | .offset = MTDPART_OFS_APPEND, |
| 98 | .size = 0x00300000, | 98 | .size = 0x00300000, |
| 99 | } | 99 | } |
| 100 | }; | 100 | }; |
diff --git a/arch/arm/tools/mach-types b/arch/arm/tools/mach-types index 56281c030a7b..43aa2020f85c 100644 --- a/arch/arm/tools/mach-types +++ b/arch/arm/tools/mach-types | |||
| @@ -12,7 +12,7 @@ | |||
| 12 | # | 12 | # |
| 13 | # http://www.arm.linux.org.uk/developer/machines/?action=new | 13 | # http://www.arm.linux.org.uk/developer/machines/?action=new |
| 14 | # | 14 | # |
| 15 | # Last update: Wed Aug 13 21:56:02 2008 | 15 | # Last update: Thu Sep 25 10:10:50 2008 |
| 16 | # | 16 | # |
| 17 | # machine_is_xxx CONFIG_xxxx MACH_TYPE_xxx number | 17 | # machine_is_xxx CONFIG_xxxx MACH_TYPE_xxx number |
| 18 | # | 18 | # |
| @@ -1810,7 +1810,7 @@ kriss_sensor MACH_KRISS_SENSOR KRISS_SENSOR 1819 | |||
| 1810 | pilz_pmi5 MACH_PILZ_PMI5 PILZ_PMI5 1820 | 1810 | pilz_pmi5 MACH_PILZ_PMI5 PILZ_PMI5 1820 |
| 1811 | jade MACH_JADE JADE 1821 | 1811 | jade MACH_JADE JADE 1821 |
| 1812 | ks8695_softplc MACH_KS8695_SOFTPLC KS8695_SOFTPLC 1822 | 1812 | ks8695_softplc MACH_KS8695_SOFTPLC KS8695_SOFTPLC 1822 |
| 1813 | gprisc3 MACH_GPRISC4 GPRISC4 1823 | 1813 | gprisc3 MACH_GPRISC3 GPRISC3 1823 |
| 1814 | stamp9260 MACH_STAMP9260 STAMP9260 1824 | 1814 | stamp9260 MACH_STAMP9260 STAMP9260 1824 |
| 1815 | smdk6430 MACH_SMDK6430 SMDK6430 1825 | 1815 | smdk6430 MACH_SMDK6430 SMDK6430 1825 |
| 1816 | smdkc100 MACH_SMDKC100 SMDKC100 1826 | 1816 | smdkc100 MACH_SMDKC100 SMDKC100 1826 |
| @@ -1859,5 +1859,43 @@ kbio9260 MACH_KBIO9260 KBIO9260 1868 | |||
| 1859 | ginza MACH_GINZA GINZA 1869 | 1859 | ginza MACH_GINZA GINZA 1869 |
| 1860 | a636n MACH_A636N A636N 1870 | 1860 | a636n MACH_A636N A636N 1870 |
| 1861 | imx27ipcam MACH_IMX27IPCAM IMX27IPCAM 1871 | 1861 | imx27ipcam MACH_IMX27IPCAM IMX27IPCAM 1871 |
| 1862 | nenoc MACH_NEMOC NEMOC 1872 | 1862 | nemoc MACH_NEMOC NEMOC 1872 |
| 1863 | geneva MACH_GENEVA GENEVA 1873 | 1863 | geneva MACH_GENEVA GENEVA 1873 |
| 1864 | htcpharos MACH_HTCPHAROS HTCPHAROS 1874 | ||
| 1865 | neonc MACH_NEONC NEONC 1875 | ||
| 1866 | nas7100 MACH_NAS7100 NAS7100 1876 | ||
| 1867 | teuphone MACH_TEUPHONE TEUPHONE 1877 | ||
| 1868 | annax_eth2 MACH_ANNAX_ETH2 ANNAX_ETH2 1878 | ||
| 1869 | csb733 MACH_CSB733 CSB733 1879 | ||
| 1870 | bk3 MACH_BK3 BK3 1880 | ||
| 1871 | omap_em32 MACH_OMAP_EM32 OMAP_EM32 1881 | ||
| 1872 | et9261cp MACH_ET9261CP ET9261CP 1882 | ||
| 1873 | jasperc MACH_JASPERC JASPERC 1883 | ||
| 1874 | issi_arm9 MACH_ISSI_ARM9 ISSI_ARM9 1884 | ||
| 1875 | ued MACH_UED UED 1885 | ||
| 1876 | esiblade MACH_ESIBLADE ESIBLADE 1886 | ||
| 1877 | eye02 MACH_EYE02 EYE02 1887 | ||
| 1878 | imx27kbd MACH_IMX27KBD IMX27KBD 1888 | ||
| 1879 | sst61vc010_fpga MACH_SST61VC010_FPGA SST61VC010_FPGA 1889 | ||
| 1880 | kixvp435 MACH_KIXVP435 KIXVP435 1890 | ||
| 1881 | kixnp435 MACH_KIXNP435 KIXNP435 1891 | ||
| 1882 | africa MACH_AFRICA AFRICA 1892 | ||
| 1883 | nh233 MACH_NH233 NH233 1893 | ||
| 1884 | rd88f6183ap_ge MACH_RD88F6183AP_GE RD88F6183AP_GE 1894 | ||
| 1885 | bcm4760 MACH_BCM4760 BCM4760 1895 | ||
| 1886 | eddy_v2 MACH_EDDY_V2 EDDY_V2 1896 | ||
| 1887 | realview_pba8 MACH_REALVIEW_PBA8 REALVIEW_PBA8 1897 | ||
| 1888 | hid_a7 MACH_HID_A7 HID_A7 1898 | ||
| 1889 | hero MACH_HERO HERO 1899 | ||
| 1890 | omap_poseidon MACH_OMAP_POSEIDON OMAP_POSEIDON 1900 | ||
| 1891 | realview_pbx MACH_REALVIEW_PBX REALVIEW_PBX 1901 | ||
| 1892 | micro9s MACH_MICRO9S MICRO9S 1902 | ||
| 1893 | mako MACH_MAKO MAKO 1903 | ||
| 1894 | xdaflame MACH_XDAFLAME XDAFLAME 1904 | ||
| 1895 | phidget_sbc2 MACH_PHIDGET_SBC2 PHIDGET_SBC2 1905 | ||
| 1896 | limestone MACH_LIMESTONE LIMESTONE 1906 | ||
| 1897 | iprobe_c32 MACH_IPROBE_C32 IPROBE_C32 1907 | ||
| 1898 | rut100 MACH_RUT100 RUT100 1908 | ||
| 1899 | asusp535 MACH_ASUSP535 ASUSP535 1909 | ||
| 1900 | htcraphael MACH_HTCRAPHAEL HTCRAPHAEL 1910 | ||
| 1901 | sygdg1 MACH_SYGDG1 SYGDG1 1911 | ||
