Commit 3d6ee36d authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'late-for-linus' of git://git.linaro.org/people/rmk/linux-arm

Pull ARM update from Russell King:
 "This is the final round of stuff for ARM, left until the end of the
  merge window to reduce the number of conflicts.  This set contains the
  ARM part of David Howells UAPI changes, and a fix to the ordering of
  'select' statements in ARM Kconfig files (see the appropriate commit
  for why this happened - thanks to Andrew Morton for pointing out the
  problem.)

  I've left this as long as I dare for this window to avoid conflicts,
  and I regenerated the config patch yesterday, posting it to our
  mailing list for review and testing.  I have several acks which
  include successful test reports for it.

  However, today I notice we've got new conflicts with previously unseen
  code...  though that conflict should be trivial (it's my changes vs a
  one liner.)"

* 'late-for-linus' of git://git.linaro.org/people/rmk/linux-arm:
  ARM: config: make sure that platforms are ordered by option string
  ARM: config: sort select statements alphanumerically
  UAPI: (Scripted) Disintegrate arch/arm/include/asm

Fix up fairly conflict in arch/arm/Kconfig (the select re-organization
vs recent addition of GENERIC_KERNEL_EXECVE)
parents 0b381a28 244acb1b
This diff is collapsed.
config ARM_GIC config ARM_GIC
bool
select IRQ_DOMAIN select IRQ_DOMAIN
select MULTI_IRQ_HANDLER select MULTI_IRQ_HANDLER
bool
config GIC_NON_BANKED config GIC_NON_BANKED
bool bool
config ARM_VIC config ARM_VIC
bool
select IRQ_DOMAIN select IRQ_DOMAIN
select MULTI_IRQ_HANDLER select MULTI_IRQ_HANDLER
bool
config ARM_VIC_NR config ARM_VIC_NR
int int
......
include include/asm-generic/Kbuild.asm
header-y += hwcap.h
generic-y += auxvec.h generic-y += auxvec.h
generic-y += bitsperlong.h generic-y += bitsperlong.h
......
#ifndef __ASMARM_HWCAP_H #ifndef __ASMARM_HWCAP_H
#define __ASMARM_HWCAP_H #define __ASMARM_HWCAP_H
/* #include <uapi/asm/hwcap.h>
* HWCAP flags - for elf_hwcap (in kernel) and AT_HWCAP
*/
#define HWCAP_SWP (1 << 0)
#define HWCAP_HALF (1 << 1)
#define HWCAP_THUMB (1 << 2)
#define HWCAP_26BIT (1 << 3) /* Play it safe */
#define HWCAP_FAST_MULT (1 << 4)
#define HWCAP_FPA (1 << 5)
#define HWCAP_VFP (1 << 6)
#define HWCAP_EDSP (1 << 7)
#define HWCAP_JAVA (1 << 8)
#define HWCAP_IWMMXT (1 << 9)
#define HWCAP_CRUNCH (1 << 10)
#define HWCAP_THUMBEE (1 << 11)
#define HWCAP_NEON (1 << 12)
#define HWCAP_VFPv3 (1 << 13)
#define HWCAP_VFPv3D16 (1 << 14)
#define HWCAP_TLS (1 << 15)
#define HWCAP_VFPv4 (1 << 16)
#define HWCAP_IDIVA (1 << 17)
#define HWCAP_IDIVT (1 << 18)
#define HWCAP_IDIV (HWCAP_IDIVA | HWCAP_IDIVT)
#if defined(__KERNEL__)
#if !defined(__ASSEMBLY__) #if !defined(__ASSEMBLY__)
/* /*
* This yields a mask that user programs can use to figure out what * This yields a mask that user programs can use to figure out what
...@@ -35,5 +12,3 @@ ...@@ -35,5 +12,3 @@
extern unsigned int elf_hwcap; extern unsigned int elf_hwcap;
#endif #endif
#endif #endif
#endif
...@@ -10,133 +10,12 @@ ...@@ -10,133 +10,12 @@
#ifndef __ASM_ARM_PTRACE_H #ifndef __ASM_ARM_PTRACE_H
#define __ASM_ARM_PTRACE_H #define __ASM_ARM_PTRACE_H
#include <asm/hwcap.h> #include <uapi/asm/ptrace.h>
#define PTRACE_GETREGS 12
#define PTRACE_SETREGS 13
#define PTRACE_GETFPREGS 14
#define PTRACE_SETFPREGS 15
/* PTRACE_ATTACH is 16 */
/* PTRACE_DETACH is 17 */
#define PTRACE_GETWMMXREGS 18
#define PTRACE_SETWMMXREGS 19
/* 20 is unused */
#define PTRACE_OLDSETOPTIONS 21
#define PTRACE_GET_THREAD_AREA 22
#define PTRACE_SET_SYSCALL 23
/* PTRACE_SYSCALL is 24 */
#define PTRACE_GETCRUNCHREGS 25
#define PTRACE_SETCRUNCHREGS 26
#define PTRACE_GETVFPREGS 27
#define PTRACE_SETVFPREGS 28
#define PTRACE_GETHBPREGS 29
#define PTRACE_SETHBPREGS 30
/*
* PSR bits
*/
#define USR26_MODE 0x00000000
#define FIQ26_MODE 0x00000001
#define IRQ26_MODE 0x00000002
#define SVC26_MODE 0x00000003
#define USR_MODE 0x00000010
#define FIQ_MODE 0x00000011
#define IRQ_MODE 0x00000012
#define SVC_MODE 0x00000013
#define ABT_MODE 0x00000017
#define HYP_MODE 0x0000001a
#define UND_MODE 0x0000001b
#define SYSTEM_MODE 0x0000001f
#define MODE32_BIT 0x00000010
#define MODE_MASK 0x0000001f
#define PSR_T_BIT 0x00000020
#define PSR_F_BIT 0x00000040
#define PSR_I_BIT 0x00000080
#define PSR_A_BIT 0x00000100
#define PSR_E_BIT 0x00000200
#define PSR_J_BIT 0x01000000
#define PSR_Q_BIT 0x08000000
#define PSR_V_BIT 0x10000000
#define PSR_C_BIT 0x20000000
#define PSR_Z_BIT 0x40000000
#define PSR_N_BIT 0x80000000
/*
* Groups of PSR bits
*/
#define PSR_f 0xff000000 /* Flags */
#define PSR_s 0x00ff0000 /* Status */
#define PSR_x 0x0000ff00 /* Extension */
#define PSR_c 0x000000ff /* Control */
/*
* ARMv7 groups of PSR bits
*/
#define APSR_MASK 0xf80f0000 /* N, Z, C, V, Q and GE flags */
#define PSR_ISET_MASK 0x01000010 /* ISA state (J, T) mask */
#define PSR_IT_MASK 0x0600fc00 /* If-Then execution state mask */
#define PSR_ENDIAN_MASK 0x00000200 /* Endianness state mask */
/*
* Default endianness state
*/
#ifdef CONFIG_CPU_ENDIAN_BE8
#define PSR_ENDSTATE PSR_E_BIT
#else
#define PSR_ENDSTATE 0
#endif
/*
* These are 'magic' values for PTRACE_PEEKUSR that return info about where a
* process is located in memory.
*/
#define PT_TEXT_ADDR 0x10000
#define PT_DATA_ADDR 0x10004
#define PT_TEXT_END_ADDR 0x10008
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
/*
* This struct defines the way the registers are stored on the
* stack during a system call. Note that sizeof(struct pt_regs)
* has to be a multiple of 8.
*/
#ifndef __KERNEL__
struct pt_regs {
long uregs[18];
};
#else /* __KERNEL__ */
struct pt_regs { struct pt_regs {
unsigned long uregs[18]; unsigned long uregs[18];
}; };
#endif /* __KERNEL__ */
#define ARM_cpsr uregs[16]
#define ARM_pc uregs[15]
#define ARM_lr uregs[14]
#define ARM_sp uregs[13]
#define ARM_ip uregs[12]
#define ARM_fp uregs[11]
#define ARM_r10 uregs[10]
#define ARM_r9 uregs[9]
#define ARM_r8 uregs[8]
#define ARM_r7 uregs[7]
#define ARM_r6 uregs[6]
#define ARM_r5 uregs[5]
#define ARM_r4 uregs[4]
#define ARM_r3 uregs[3]
#define ARM_r2 uregs[2]
#define ARM_r1 uregs[1]
#define ARM_r0 uregs[0]
#define ARM_ORIG_r0 uregs[17]
/*
* The size of the user-visible VFP state as seen by PTRACE_GET/SETVFPREGS
* and core dumps.
*/
#define ARM_VFPREGS_SIZE ( 32 * 8 /*fpregs*/ + 4 /*fpscr*/ )
#ifdef __KERNEL__
#define user_mode(regs) \ #define user_mode(regs) \
(((regs)->ARM_cpsr & 0xf) == 0) (((regs)->ARM_cpsr & 0xf) == 0)
...@@ -260,9 +139,5 @@ static inline unsigned long user_stack_pointer(struct pt_regs *regs) ...@@ -260,9 +139,5 @@ static inline unsigned long user_stack_pointer(struct pt_regs *regs)
(struct pt_regs *)((sp | (THREAD_SIZE - 1)) - 7) - 1; \ (struct pt_regs *)((sp | (THREAD_SIZE - 1)) - 7) - 1; \
}) })
#endif /* __KERNEL__ */
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */
#endif #endif
...@@ -14,176 +14,8 @@ ...@@ -14,176 +14,8 @@
#ifndef __ASMARM_SETUP_H #ifndef __ASMARM_SETUP_H
#define __ASMARM_SETUP_H #define __ASMARM_SETUP_H
#include <linux/types.h> #include <uapi/asm/setup.h>
#define COMMAND_LINE_SIZE 1024
/* The list ends with an ATAG_NONE node. */
#define ATAG_NONE 0x00000000
struct tag_header {
__u32 size;
__u32 tag;
};
/* The list must start with an ATAG_CORE node */
#define ATAG_CORE 0x54410001
struct tag_core {
__u32 flags; /* bit 0 = read-only */
__u32 pagesize;
__u32 rootdev;
};
/* it is allowed to have multiple ATAG_MEM nodes */
#define ATAG_MEM 0x54410002
struct tag_mem32 {
__u32 size;
__u32 start; /* physical start address */
};
/* VGA text type displays */
#define ATAG_VIDEOTEXT 0x54410003
struct tag_videotext {
__u8 x;
__u8 y;
__u16 video_page;
__u8 video_mode;
__u8 video_cols;
__u16 video_ega_bx;
__u8 video_lines;
__u8 video_isvga;
__u16 video_points;
};
/* describes how the ramdisk will be used in kernel */
#define ATAG_RAMDISK 0x54410004
struct tag_ramdisk {
__u32 flags; /* bit 0 = load, bit 1 = prompt */
__u32 size; /* decompressed ramdisk size in _kilo_ bytes */
__u32 start; /* starting block of floppy-based RAM disk image */
};
/* describes where the compressed ramdisk image lives (virtual address) */
/*
* this one accidentally used virtual addresses - as such,
* it's deprecated.
*/
#define ATAG_INITRD 0x54410005
/* describes where the compressed ramdisk image lives (physical address) */
#define ATAG_INITRD2 0x54420005
struct tag_initrd {
__u32 start; /* physical start address */
__u32 size; /* size of compressed ramdisk image in bytes */
};
/* board serial number. "64 bits should be enough for everybody" */
#define ATAG_SERIAL 0x54410006
struct tag_serialnr {
__u32 low;
__u32 high;
};
/* board revision */
#define ATAG_REVISION 0x54410007
struct tag_revision {
__u32 rev;
};
/* initial values for vesafb-type framebuffers. see struct screen_info
* in include/linux/tty.h
*/
#define ATAG_VIDEOLFB 0x54410008
struct tag_videolfb {
__u16 lfb_width;
__u16 lfb_height;
__u16 lfb_depth;
__u16 lfb_linelength;
__u32 lfb_base;
__u32 lfb_size;
__u8 red_size;
__u8 red_pos;
__u8 green_size;
__u8 green_pos;
__u8 blue_size;
__u8 blue_pos;
__u8 rsvd_size;
__u8 rsvd_pos;
};
/* command line: \0 terminated string */
#define ATAG_CMDLINE 0x54410009
struct tag_cmdline {
char cmdline[1]; /* this is the minimum size */
};
/* acorn RiscPC specific information */
#define ATAG_ACORN 0x41000101
struct tag_acorn {
__u32 memc_control_reg;
__u32 vram_pages;
__u8 sounddefault;
__u8 adfsdrives;
};
/* footbridge memory clock, see arch/arm/mach-footbridge/arch.c */
#define ATAG_MEMCLK 0x41000402
struct tag_memclk {
__u32 fmemclk;
};
struct tag {
struct tag_header hdr;
union {
struct tag_core core;
struct tag_mem32 mem;
struct tag_videotext videotext;
struct tag_ramdisk ramdisk;
struct tag_initrd initrd;
struct tag_serialnr serialnr;
struct tag_revision revision;
struct tag_videolfb videolfb;
struct tag_cmdline cmdline;
/*
* Acorn specific
*/
struct tag_acorn acorn;
/*
* DC21285 specific
*/
struct tag_memclk memclk;
} u;
};
struct tagtable {
__u32 tag;
int (*parse)(const struct tag *);
};
#define tag_member_present(tag,member) \
((unsigned long)(&((struct tag *)0L)->member + 1) \
<= (tag)->hdr.size * 4)
#define tag_next(t) ((struct tag *)((__u32 *)(t) + (t)->hdr.size))
#define tag_size(type) ((sizeof(struct tag_header) + sizeof(struct type)) >> 2)
#define for_each_tag(t,base) \
for (t = base; t->hdr.size; t = tag_next(t))
#ifdef __KERNEL__
#define __tag __used __attribute__((__section__(".taglist.init"))) #define __tag __used __attribute__((__section__(".taglist.init")))
#define __tagtable(tag, fn) \ #define __tagtable(tag, fn) \
...@@ -221,6 +53,4 @@ extern int arm_add_memory(phys_addr_t start, phys_addr_t size); ...@@ -221,6 +53,4 @@ extern int arm_add_memory(phys_addr_t start, phys_addr_t size);
extern void early_print(const char *str, ...); extern void early_print(const char *str, ...);
extern void dump_machine_table(void); extern void dump_machine_table(void);
#endif /* __KERNEL__ */
#endif #endif
#ifndef _ASMARM_SIGNAL_H #ifndef _ASMARM_SIGNAL_H
#define _ASMARM_SIGNAL_H #define _ASMARM_SIGNAL_H
#include <linux/types.h> #include <uapi/asm/signal.h>
/* Avoid too many header ordering problems. */
struct siginfo;
#ifdef __KERNEL__
/* Most things should be clean enough to redefine this at will, if care /* Most things should be clean enough to redefine this at will, if care
is taken to make libc match. */ is taken to make libc match. */
...@@ -20,100 +16,6 @@ typedef struct { ...@@ -20,100 +16,6 @@ typedef struct {
unsigned long sig[_NSIG_WORDS]; unsigned long sig[_NSIG_WORDS];
} sigset_t; } sigset_t;
#else
/* Here we must cater to libcs that poke about in kernel headers. */
#define NSIG 32
typedef unsigned long sigset_t;
#endif /* __KERNEL__ */
#define SIGHUP 1
#define SIGINT 2
#define SIGQUIT 3
#define SIGILL 4
#define SIGTRAP 5
#define SIGABRT 6
#define SIGIOT 6
#define SIGBUS 7
#define SIGFPE 8
#define SIGKILL 9
#define SIGUSR1 10
#define SIGSEGV 11
#define SIGUSR2 12
#define SIGPIPE 13
#define SIGALRM 14
#define SIGTERM 15
#define SIGSTKFLT 16
#define SIGCHLD 17
#define SIGCONT 18
#define SIGSTOP 19
#define SIGTSTP 20
#define SIGTTIN 21
#define SIGTTOU 22
#define SIGURG 23
#define SIGXCPU 24
#define SIGXFSZ 25
#define SIGVTALRM 26
#define SIGPROF 27
#define SIGWINCH 28
#define SIGIO 29
#define SIGPOLL SIGIO
/*
#define SIGLOST 29
*/
#define SIGPWR 30
#define SIGSYS 31
#define SIGUNUSED 31
/* These should not be considered constants from userland. */
#define SIGRTMIN 32
#define SIGRTMAX _NSIG
#define SIGSWI 32
/*
* SA_FLAGS values:
*
* SA_NOCLDSTOP flag to turn off SIGCHLD when children stop.
* SA_NOCLDWAIT flag on SIGCHLD to inhibit zombies.
* SA_SIGINFO deliver the signal with SIGINFO structs
* SA_THIRTYTWO delivers the signal in 32-bit mode, even if the task
* is running in 26-bit.
* SA_ONSTACK allows alternate signal stacks (see sigaltstack(2)).
* SA_RESTART flag to get restarting signals (which were the default long ago)
* SA_NODEFER prevents the current signal from being masked in the handler.
* SA_RESETHAND clears the handler when the signal is delivered.
*
* SA_ONESHOT and SA_NOMASK are the historical Linux names for the Single
* Unix names RESETHAND and NODEFER respectively.
*/
#define SA_NOCLDSTOP 0x00000001
#define SA_NOCLDWAIT 0x00000002
#define SA_SIGINFO 0x00000004
#define SA_THIRTYTWO 0x02000000
#define SA_RESTORER 0x04000000
#define SA_ONSTACK 0x08000000
#define SA_RESTART 0x10000000
#define SA_NODEFER 0x40000000
#define SA_RESETHAND 0x80000000
#define SA_NOMASK SA_NODEFER
#define SA_ONESHOT SA_RESETHAND
/*
* sigaltstack controls
*/
#define SS_ONSTACK 1
#define SS_DISABLE 2
#define MINSIGSTKSZ 2048
#define SIGSTKSZ 8192
#include <asm-generic/signal-defs.h>
#ifdef __KERNEL__
struct old_sigaction { struct old_sigaction {
__sighandler_t sa_handler; __sighandler_t sa_handler;
old_sigset_t sa_mask; old_sigset_t sa_mask;
...@@ -132,33 +34,6 @@ struct k_sigaction { ...@@ -132,33 +34,6 @@ struct k_sigaction {
struct sigaction sa; struct sigaction sa;
}; };
#else
/* Here we must cater to libcs that poke about in kernel headers. */
struct sigaction {
union {
__sighandler_t _sa_handler;
void (*_sa_sigaction)(int, struct siginfo *, void *);
} _u;
sigset_t sa_mask;
unsigned long sa_flags;
void (*sa_restorer)(void);
};
#define sa_handler _u._sa_handler
#define sa_sigaction _u._sa_sigaction
#endif /* __KERNEL__ */
typedef struct sigaltstack {
void __user *ss_sp;
int ss_flags;
size_t ss_size;
} stack_t;
#ifdef __KERNEL__
#include <asm/sigcontext.h> #include <asm/sigcontext.h>
#define ptrace_signal_deliver(regs, cookie) do { } while (0) #define ptrace_signal_deliver(regs, cookie) do { } while (0)
#endif #endif
#endif
...@@ -15,14 +15,8 @@ ...@@ -15,14 +15,8 @@
#ifndef __ASM_ARM_SWAB_H #ifndef __ASM_ARM_SWAB_H
#define __ASM_ARM_SWAB_H #define __ASM_ARM_SWAB_H
#include <linux/compiler.h> #include <uapi/asm/swab.h>
#include <linux/types.h>
#if !defined(__STRICT_ANSI__) || defined(__KERNEL__)
# define __SWAB_64_THRU_32__
#endif
#if defined(__KERNEL__)
#if __LINUX_ARM_ARCH__ >= 6 #if __LINUX_ARM_ARCH__ >= 6
static inline __attribute_const__ __u32 __arch_swahb32(__u32 x) static inline __attribute_const__ __u32 __arch_swahb32(__u32 x)
...@@ -42,32 +36,3 @@ static inline __attribute_const__ __u32 __arch_swab32(__u32 x) ...@@ -42,32 +36,3 @@ static inline __attribute_const__ __u32 __arch_swab32(__u32 x)
#endif #endif
#endif #endif
#if !defined(__KERNEL__) || __LINUX_ARM_ARCH__ < 6
static inline __attribute_const__ __u32 __arch_swab32(__u32 x)
{
__u32 t;
#ifndef __thumb__
if (!__builtin_constant_p(x)) {
/*
* The compiler needs a bit of a hint here to always do the
* right thing and not screw it up to different degrees
* depending on the gcc version.
*/
asm ("eor\t%0, %1, %1, ror #16" : "=r" (t) : "r" (x));
} else
#endif
t = x ^ ((x << 16) | (x >> 16)); /* eor r1,r0,r0,ror #16 */
x = (x << 24) | (x >> 8); /* mov r0,r0,ror #8 */
t &= ~0x00FF0000; /* bic r1,r1,#0x00FF0000 */
x ^= (t >> 8); /* eor r0,r0,r1,lsr #8 */
return x;
}
#define __arch_swab32 __arch_swab32
#endif
#endif
This diff is collapsed.
# UAPI Header export list # UAPI Header export list
include include/uapi/asm-generic/Kbuild.asm include include/uapi/asm-generic/Kbuild.asm
header-y += a.out.h
header-y += byteorder.h
header-y += fcntl.h
header-y += hwcap.h
header-y += ioctls.h
header-y += kvm_para.h
header-y += mman.h
header-y += posix_types.h
header-y += ptrace.h
header-y += setup.h
header-y += sigcontext.h
header-y += signal.h
header-y += stat.h
header-y += statfs.h
header-y += swab.h
header-y += unistd.h
#ifndef _UAPI__ASMARM_HWCAP_H
#define _UAPI__ASMARM_HWCAP_H
/*
* HWCAP flags - for elf_hwcap (in kernel) and AT_HWCAP
*/
#define HWCAP_SWP (1 << 0)
#define HWCAP_HALF (1 << 1)
#define HWCAP_THUMB (1 << 2)
#define HWCAP_26BIT (1 << 3) /* Play it safe */
#define HWCAP_FAST_MULT (1 << 4)
#define HWCAP_FPA (1 << 5)
#define HWCAP_VFP (1 << 6)
#define HWCAP_EDSP (1 << 7)
#define HWCAP_JAVA (1 << 8)
#define HWCAP_IWMMXT (1 << 9)
#define HWCAP_CRUNCH (1 << 10)
#define HWCAP_THUMBEE (1 << 11)
#define HWCAP_NEON (1 << 12)
#define HWCAP_VFPv3 (1 << 13)
#define HWCAP_VFPv3D16 (1 << 14)
#define HWCAP_TLS (1 << 15)
#define HWCAP_VFPv4 (1 << 16)
#define HWCAP_IDIVA (1 << 17)
#define HWCAP_IDIVT (1 << 18)
#define HWCAP_IDIV (HWCAP_IDIVA | HWCAP_IDIVT)
#endif /* _UAPI__ASMARM_HWCAP_H */
/*
* arch/arm/include/asm/ptrace.h
*
* Copyright (C) 1996-2003 Russell King
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*/
#ifndef _UAPI__ASM_ARM_PTRACE_H
#define _UAPI__ASM_ARM_PTRACE_H
#include <asm/hwcap.h>
#define PTRACE_GETREGS 12
#define PTRACE_SETREGS 13
#define PTRACE_GETFPREGS 14
#define PTRACE_SETFPREGS 15
/* PTRACE_ATTACH is 16 */
/* PTRACE_DETACH is 17 */
#define PTRACE_GETWMMXREGS 18
#define PTRACE_SETWMMXREGS 19
/* 20 is unused */
#define PTRACE_OLDSETOPTIONS 21
#define PTRACE_GET_THREAD_AREA 22
#define PTRACE_SET_SYSCALL 23
/* PTRACE_SYSCALL is 24 */
#define PTRACE_GETCRUNCHREGS 25
#define PTRACE_SETCRUNCHREGS 26
#define PTRACE_GETVFPREGS 27
#define PTRACE_SETVFPREGS 28
#define PTRACE_GETHBPREGS 29
#define PTRACE_SETHBPREGS 30
/*
* PSR bits
*/
#define USR26_MODE 0x00000000
#define FIQ26_MODE 0x00000001
#define IRQ26_MODE 0x00000002
#define SVC26_MODE 0x00000003
#define USR_MODE 0x00000010
#define FIQ_MODE 0x00000011
#define IRQ_MODE 0x00000012
#define SVC_MODE 0x00000013
#define ABT_MODE 0x00000017
#define HYP_MODE 0x0000001a
#define UND_MODE 0x0000001b
#define SYSTEM_MODE 0x0000001f
#define MODE32_BIT 0x00000010
#define MODE_MASK 0x0000001f
#define PSR_T_BIT 0x00000020
#define PSR_F_BIT 0x00000040
#define PSR_I_BIT 0x00000080
#define PSR_A_BIT 0x00000100
#define PSR_E_BIT 0x00000200
#define PSR_J_BIT 0x01000000
#define PSR_Q_BIT 0x08000000
#define PSR_V_BIT 0x10000000
#define PSR_C_BIT 0x20000000
#define PSR_Z_BIT 0x40000000
#define PSR_N_BIT 0x80000000
/*
* Groups of PSR bits
*/
#define PSR_f 0xff000000 /* Flags */
#define PSR_s 0x00ff0000 /* Status */
#define PSR_x 0x0000ff00 /* Extension */
#define PSR_c 0x000000ff /* Control */
/*
* ARMv7 groups of PSR bits
*/
#define APSR_MASK 0xf80f0000 /* N, Z, C, V, Q and GE flags */
#define PSR_ISET_MASK 0x01000010 /* ISA state (J, T) mask */
#define PSR_IT_MASK 0x0600fc00 /* If-Then execution state mask */
#define PSR_ENDIAN_MASK 0x00000200 /* Endianness state mask */
/*
* Default endianness state
*/
#ifdef CONFIG_CPU_ENDIAN_BE8
#define PSR_ENDSTATE PSR_E_BIT
#else
#define PSR_ENDSTATE 0
#endif
/*
* These are 'magic' values for PTRACE_PEEKUSR that return info about where a
* process is located in memory.
*/
#define PT_TEXT_ADDR 0x10000
#define PT_DATA_ADDR 0x10004
#define PT_TEXT_END_ADDR 0x10008
#ifndef __ASSEMBLY__
/*
* This struct defines the way the registers are stored on the
* stack during a system call. Note that sizeof(struct pt_regs)
* has to be a multiple of 8.
*/
#ifndef __KERNEL__
struct pt_regs {
long uregs[18];
};
#endif /* __KERNEL__ */
#define ARM_cpsr uregs[16]
#define ARM_pc uregs[15]
#define ARM_lr uregs[14]
#define ARM_sp uregs[13]
#define ARM_ip uregs[12]
#define ARM_fp uregs[11]
#define ARM_r10 uregs[10]
#define ARM_r9 uregs[9]
#define ARM_r8 uregs[8]
#define ARM_r7 uregs[7]
#define ARM_r6 uregs[6]
#define ARM_r5 uregs[5]
#define ARM_r4 uregs[4]
#define ARM_r3 uregs[3]
#define ARM_r2 uregs[2]
#define ARM_r1 uregs[1]
#define ARM_r0 uregs[0]
#define ARM_ORIG_r0 uregs[17]
/*
* The size of the user-visible VFP state as seen by PTRACE_GET/SETVFPREGS
* and core dumps.
*/
#define ARM_VFPREGS_SIZE ( 32 * 8 /*fpregs*/ + 4 /*fpscr*/ )
#endif /* __ASSEMBLY__ */
#endif /* _UAPI__ASM_ARM_PTRACE_H */
/*
* linux/include/asm/setup.h
*
* Copyright (C) 1997-1999 Russell King
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*
* Structure passed to kernel to tell it about the
* hardware it's running on. See Documentation/arm/Setup
* for more info.
*/
#ifndef _UAPI__ASMARM_SETUP_H
#define _UAPI__ASMARM_SETUP_H
#include <linux/types.h>
#define COMMAND_LINE_SIZE 1024
/* The list ends with an ATAG_NONE node. */
#define ATAG_NONE 0x00000000
struct tag_header {
__u32 size;
__u32 tag;
};
/* The list must start with an ATAG_CORE node */
#define ATAG_CORE 0x54410001
struct tag_core {
__u32 flags; /* bit 0 = read-only */
__u32 pagesize;
__u32 rootdev;
};
/* it is allowed to have multiple ATAG_MEM nodes */
#define ATAG_MEM 0x54410002
struct tag_mem32 {
__u32 size;
__u32 start; /* physical start address */
};
/* VGA text type displays */
#define ATAG_VIDEOTEXT 0x54410003
struct tag_videotext {
__u8 x;
__u8 y;
__u16 video_page;
__u8 video_mode;
__u8 video_cols;
__u16 video_ega_bx;
__u8 video_lines;
__u8 video_isvga;
__u16 video_points;
};
/* describes how the ramdisk will be used in kernel */
#define ATAG_RAMDISK 0x54410004
struct tag_ramdisk {
__u32 flags; /* bit 0 = load, bit 1 = prompt */
__u32 size; /* decompressed ramdisk size in _kilo_ bytes */
__u32 start; /* starting block of floppy-based RAM disk image */
};
/* describes where the compressed ramdisk image lives (virtual address) */
/*
* this one accidentally used virtual addresses - as such,
* it's deprecated.
*/
#define ATAG_INITRD 0x54410005
/* describes where the compressed ramdisk image lives (physical address) */
#define ATAG_INITRD2 0x54420005
struct tag_initrd {
__u32 start; /* physical start address */
__u32 size; /* size of compressed ramdisk image in bytes */
};
/* board serial number. "64 bits should be enough for everybody" */
#define ATAG_SERIAL 0x54410006
struct tag_serialnr {
__u32 low;
__u32 high;
};
/* board revision */
#define ATAG_REVISION 0x54410007
struct tag_revision {
__u32 rev;
};
/* initial values for vesafb-type framebuffers. see struct screen_info
* in include/linux/tty.h
*/
#define ATAG_VIDEOLFB 0x54410008
struct tag_videolfb {
__u16 lfb_width;
__u16 lfb_height;
__u16 lfb_depth;
__u16 lfb_linelength;
__u32 lfb_base;
__u32 lfb_size;
__u8 red_size;
__u8 red_pos;
__u8 green_size;
__u8 green_pos;
__u8 blue_size;
__u8 blue_pos;
__u8 rsvd_size;
__u8 rsvd_pos;
};
/* command line: \0 terminated string */
#define ATAG_CMDLINE 0x54410009
struct tag_cmdline {
char cmdline[1]; /* this is the minimum size */
};
/* acorn RiscPC specific information */
#define ATAG_ACORN 0x41000101
struct tag_acorn {
__u32 memc_control_reg;
__u32 vram_pages;
__u8 sounddefault;
__u8 adfsdrives;
};
/* footbridge memory clock, see arch/arm/mach-footbridge/arch.c */
#define ATAG_MEMCLK 0x41000402
struct tag_memclk {
__u32 fmemclk;
};
struct tag {
struct tag_header hdr;
union {
struct tag_core core;
struct tag_mem32 mem;
struct tag_videotext videotext;
struct tag_ramdisk ramdisk;
struct tag_initrd initrd;
struct tag_serialnr serialnr;
struct tag_revision revision;
struct tag_videolfb videolfb;
struct tag_cmdline cmdline;
/*
* Acorn specific
*/
struct tag_acorn acorn;
/*
* DC21285 specific
*/
struct tag_memclk memclk;
} u;
};
struct tagtable {
__u32 tag;
int (*parse)(const struct tag *);
};
#define tag_member_present(tag,member) \
((unsigned long)(&((struct tag *)0L)->member + 1) \
<= (tag)->hdr.size * 4)
#define tag_next(t) ((struct tag *)((__u32 *)(t) + (t)->hdr.size))
#define tag_size(type) ((sizeof(struct tag_header) + sizeof(struct type)) >> 2)
#define for_each_tag(t,base) \
for (t = base; t->hdr.size; t = tag_next(t))
#endif /* _UAPI__ASMARM_SETUP_H */
#ifndef _UAPI_ASMARM_SIGNAL_H
#define _UAPI_ASMARM_SIGNAL_H
#include <linux/types.h>
/* Avoid too many header ordering problems. */
struct siginfo;
#ifndef __KERNEL__
/* Here we must cater to libcs that poke about in kernel headers. */
#define NSIG 32
typedef unsigned long sigset_t;
#endif /* __KERNEL__ */
#define SIGHUP 1
#define SIGINT 2
#define SIGQUIT 3
#define SIGILL 4
#define SIGTRAP 5
#define SIGABRT 6
#define SIGIOT 6
#define SIGBUS 7
#define SIGFPE 8
#define SIGKILL 9
#define SIGUSR1 10
#define SIGSEGV 11
#define SIGUSR2 12
#define SIGPIPE 13
#define SIGALRM 14
#define SIGTERM 15
#define SIGSTKFLT 16
#define SIGCHLD 17
#define SIGCONT 18
#define SIGSTOP 19
#define SIGTSTP 20
#define SIGTTIN 21
#define SIGTTOU 22
#define SIGURG 23
#define SIGXCPU 24
#define SIGXFSZ 25
#define SIGVTALRM 26
#define SIGPROF 27
#define SIGWINCH 28
#define SIGIO 29
#define SIGPOLL SIGIO
/*
#define SIGLOST 29
*/
#define SIGPWR 30
#define SIGSYS 31
#define SIGUNUSED 31
/* These should not be considered constants from userland. */
#define SIGRTMIN 32
#define SIGRTMAX _NSIG
#define SIGSWI 32
/*
* SA_FLAGS values:
*
* SA_NOCLDSTOP flag to turn off SIGCHLD when children stop.
* SA_NOCLDWAIT flag on SIGCHLD to inhibit zombies.
* SA_SIGINFO deliver the signal with SIGINFO structs
* SA_THIRTYTWO delivers the signal in 32-bit mode, even if the task
* is running in 26-bit.
* SA_ONSTACK allows alternate signal stacks (see sigaltstack(2)).
* SA_RESTART flag to get restarting signals (which were the default long ago)
* SA_NODEFER prevents the current signal from being masked in the handler.
* SA_RESETHAND clears the handler when the signal is delivered.
*
* SA_ONESHOT and SA_NOMASK are the historical Linux names for the Single
* Unix names RESETHAND and NODEFER respectively.
*/
#define SA_NOCLDSTOP 0x00000001
#define SA_NOCLDWAIT 0x00000002
#define SA_SIGINFO 0x00000004
#define SA_THIRTYTWO 0x02000000
#define SA_RESTORER 0x04000000
#define SA_ONSTACK 0x08000000
#define SA_RESTART 0x10000000
#define SA_NODEFER 0x40000000
#define SA_RESETHAND 0x80000000
#define SA_NOMASK SA_NODEFER
#define SA_ONESHOT SA_RESETHAND
/*
* sigaltstack controls
*/
#define SS_ONSTACK 1
#define SS_DISABLE 2
#define MINSIGSTKSZ 2048
#define SIGSTKSZ 8192
#include <asm-generic/signal-defs.h>
#ifndef __KERNEL__
/* Here we must cater to libcs that poke about in kernel headers. */
struct sigaction {
union {
__sighandler_t _sa_handler;
void (*_sa_sigaction)(int, struct siginfo *, void *);
} _u;
sigset_t sa_mask;
unsigned long sa_flags;
void (*sa_restorer)(void);
};
#define sa_handler _u._sa_handler
#define sa_sigaction _u._sa_sigaction
#endif /* __KERNEL__ */
typedef struct sigaltstack {
void __user *ss_sp;
int ss_flags;
size_t ss_size;
} stack_t;
#endif /* _UAPI_ASMARM_SIGNAL_H */
/*
* arch/arm/include/asm/byteorder.h
*
* ARM Endian-ness. In little endian mode, the data bus is connected such
* that byte accesses appear as:
* 0 = d0...d7, 1 = d8...d15, 2 = d16...d23, 3 = d24...d31
* and word accesses (data or instruction) appear as:
* d0...d31
*
* When in big endian mode, byte accesses appear as:
* 0 = d24...d31, 1 = d16...d23, 2 = d8...d15, 3 = d0...d7
* and word accesses (data or instruction) appear as:
* d0...d31
*/
#ifndef _UAPI__ASM_ARM_SWAB_H
#define _UAPI__ASM_ARM_SWAB_H
#include <linux/compiler.h>
#include <linux/types.h>
#if !defined(__STRICT_ANSI__) || defined(__KERNEL__)
# define __SWAB_64_THRU_32__
#endif
#if !defined(__KERNEL__) || __LINUX_ARM_ARCH__ < 6
static inline __attribute_const__ __u32 __arch_swab32(__u32 x)
{
__u32 t;
#ifndef __thumb__
if (!__builtin_constant_p(x)) {
/*
* The compiler needs a bit of a hint here to always do the
* right thing and not screw it up to different degrees
* depending on the gcc version.
*/
asm ("eor\t%0, %1, %1, ror #16" : "=r" (t) : "r" (x));
} else
#endif
t = x ^ ((x << 16) | (x >> 16)); /* eor r1,r0,r0,ror #16 */
x = (x << 24) | (x >> 8); /* mov r0,r0,ror #8 */
t &= ~0x00FF0000; /* bic r1,r1,#0x00FF0000 */
x ^= (t >> 8); /* eor r0,r0,r1,lsr #8 */
return x;
}
#define __arch_swab32 __arch_swab32
#endif
#endif /* _UAPI__ASM_ARM_SWAB_H */
This diff is collapsed.
...@@ -19,8 +19,8 @@ config AT91_SAM9G45_RESET ...@@ -19,8 +19,8 @@ config AT91_SAM9G45_RESET
config SOC_AT91SAM9 config SOC_AT91SAM9
bool bool
select GENERIC_CLOCKEVENTS
select CPU_ARM926T select CPU_ARM926T
select GENERIC_CLOCKEVENTS
menu "Atmel AT91 System-on-Chip" menu "Atmel AT91 System-on-Chip"
...@@ -28,66 +28,66 @@ comment "Atmel AT91 Processor" ...@@ -28,66 +28,66 @@ comment "Atmel AT91 Processor"
config SOC_AT91SAM9 config SOC_AT91SAM9
bool bool
select AT91_SAM9_SMC
select AT91_SAM9_TIME
select CPU_ARM926T select CPU_ARM926T
select MULTI_IRQ_HANDLER select MULTI_IRQ_HANDLER
select SPARSE_IRQ select SPARSE_IRQ
select AT91_SAM9_TIME
select AT91_SAM9_SMC
config SOC_AT91RM9200 config SOC_AT91RM9200
bool "AT91RM9200" bool "AT91RM9200"
select CPU_ARM920T select CPU_ARM920T
select MULTI_IRQ_HANDLER
select SPARSE_IRQ
select GENERIC_CLOCKEVENTS select GENERIC_CLOCKEVENTS
select HAVE_AT91_DBGU0 select HAVE_AT91_DBGU0
select MULTI_IRQ_HANDLER
select SPARSE_IRQ
config SOC_AT91SAM9260 config SOC_AT91SAM9260
bool "AT91SAM9260, AT91SAM9XE or AT91SAM9G20" bool "AT91SAM9260, AT91SAM9XE or AT91SAM9G20"
select SOC_AT91SAM9
select HAVE_AT91_DBGU0 select HAVE_AT91_DBGU0
select HAVE_NET_MACB select HAVE_NET_MACB
select SOC_AT91SAM9
help help
Select this if you are using one of Atmel's AT91SAM9260, AT91SAM9XE Select this if you are using one of Atmel's AT91SAM9260, AT91SAM9XE
or AT91SAM9G20 SoC. or AT91SAM9G20 SoC.
config SOC_AT91SAM9261 config SOC_AT91SAM9261
bool "AT91SAM9261 or AT91SAM9G10" bool "AT91SAM9261 or AT91SAM9G10"
select SOC_AT91SAM9
select HAVE_AT91_DBGU0 select HAVE_AT91_DBGU0
select HAVE_FB_ATMEL select HAVE_FB_ATMEL
select SOC_AT91SAM9
help help
Select this if you are using one of Atmel's AT91SAM9261 or AT91SAM9G10 SoC. Select this if you are using one of Atmel's AT91SAM9261 or AT91SAM9G10 SoC.
config SOC_AT91SAM9263 config SOC_AT91SAM9263
bool "AT91SAM9263" bool "AT91SAM9263"
select SOC_AT91SAM9
select HAVE_AT91_DBGU1 select HAVE_AT91_DBGU1
select HAVE_FB_ATMEL select HAVE_FB_ATMEL
select HAVE_NET_MACB select HAVE_NET_MACB
select SOC_AT91SAM9
config SOC_AT91SAM9RL config SOC_AT91SAM9RL
bool "AT91SAM9RL" bool "AT91SAM9RL"
select SOC_AT91SAM9
select HAVE_AT91_DBGU0 select HAVE_AT91_DBGU0
select HAVE_FB_ATMEL select HAVE_FB_ATMEL
select SOC_AT91SAM9
config SOC_AT91SAM9G45 config SOC_AT91SAM9G45
bool "AT91SAM9G45 or AT91SAM9M10 families" bool "AT91SAM9G45 or AT91SAM9M10 families"
select SOC_AT91SAM9
select HAVE_AT91_DBGU1 select HAVE_AT91_DBGU1
select HAVE_FB_ATMEL select HAVE_FB_ATMEL
select HAVE_NET_MACB select HAVE_NET_MACB
select SOC_AT91SAM9
help help
Select this if you are using one of Atmel's AT91SAM9G45 family SoC. Select this if you are using one of Atmel's AT91SAM9G45 family SoC.
This support covers AT91SAM9G45, AT91SAM9G46, AT91SAM9M10 and AT91SAM9M11. This support covers AT91SAM9G45, AT91SAM9G46, AT91SAM9M10 and AT91SAM9M11.
config SOC_AT91SAM9X5 config SOC_AT91SAM9X5
bool "AT91SAM9x5 family" bool "AT91SAM9x5 family"
select SOC_AT91SAM9
select HAVE_AT91_DBGU0 select HAVE_AT91_DBGU0
select HAVE_FB_ATMEL select HAVE_FB_ATMEL
select HAVE_NET_MACB select HAVE_NET_MACB
select SOC_AT91SAM9
help help
Select this if you are using one of Atmel's AT91SAM9x5 family SoC. Select this if you are using one of Atmel's AT91SAM9x5 family SoC.
This means that your SAM9 name finishes with a '5' (except if it is This means that your SAM9 name finishes with a '5' (except if it is
...@@ -97,9 +97,9 @@ config SOC_AT91SAM9X5 ...@@ -97,9 +97,9 @@ config SOC_AT91SAM9X5
config SOC_AT91SAM9N12 config SOC_AT91SAM9N12
bool "AT91SAM9N12 family" bool "AT91SAM9N12 family"
select SOC_AT91SAM9
select HAVE_AT91_DBGU0 select HAVE_AT91_DBGU0
select HAVE_FB_ATMEL select HAVE_FB_ATMEL
select SOC_AT91SAM9
help help
Select this if you are using Atmel's AT91SAM9N12 SoC. Select this if you are using Atmel's AT91SAM9N12 SoC.
...@@ -144,9 +144,9 @@ config ARCH_AT91SAM9G45 ...@@ -144,9 +144,9 @@ config ARCH_AT91SAM9G45
config ARCH_AT91X40 config ARCH_AT91X40
bool "AT91x40" bool "AT91x40"
depends on !MMU depends on !MMU
select ARCH_USES_GETTIMEOFFSET
select MULTI_IRQ_HANDLER select MULTI_IRQ_HANDLER
select SPARSE_IRQ select SPARSE_IRQ
select ARCH_USES_GETTIMEOFFSET
endchoice endchoice
......
...@@ -23,9 +23,9 @@ config ARCH_CLEP7312 ...@@ -23,9 +23,9 @@ config ARCH_CLEP7312
config ARCH_EDB7211 config ARCH_EDB7211
bool "EDB7211" bool "EDB7211"
select ISA
select ARCH_SPARSEMEM_ENABLE
select ARCH_SELECT_MEMORY_MODEL select ARCH_SELECT_MEMORY_MODEL
select ARCH_SPARSEMEM_ENABLE
select ISA
help help
Say Y here if you intend to run this kernel on a Cirrus Logic EDB-7211 Say Y here if you intend to run this kernel on a Cirrus Logic EDB-7211
evaluation board. evaluation board.
......
...@@ -4,12 +4,12 @@ config AINTC ...@@ -4,12 +4,12 @@ config AINTC
bool bool
config CP_INTC config CP_INTC
select IRQ_DOMAIN
bool bool
select IRQ_DOMAIN
config ARCH_DAVINCI_DMx config ARCH_DAVINCI_DMx
select CPU_ARM926T
bool bool
select CPU_ARM926T
menu "TI DaVinci Implementations" menu "TI DaVinci Implementations"
...@@ -32,19 +32,19 @@ config ARCH_DAVINCI_DM646x ...@@ -32,19 +32,19 @@ config ARCH_DAVINCI_DM646x
config ARCH_DAVINCI_DA830 config ARCH_DAVINCI_DA830
bool "DA830/OMAP-L137/AM17x based system" bool "DA830/OMAP-L137/AM17x based system"
select CP_INTC
select ARCH_DAVINCI_DA8XX select ARCH_DAVINCI_DA8XX
select CPU_DCACHE_WRITETHROUGH # needed on silicon revs 1.0, 1.1 select CPU_DCACHE_WRITETHROUGH # needed on silicon revs 1.0, 1.1
select CP_INTC
config ARCH_DAVINCI_DA850 config ARCH_DAVINCI_DA850
bool "DA850/OMAP-L138/AM18x based system" bool "DA850/OMAP-L138/AM18x based system"
select CP_INTC
select ARCH_DAVINCI_DA8XX select ARCH_DAVINCI_DA8XX
select ARCH_HAS_CPUFREQ select ARCH_HAS_CPUFREQ
select CP_INTC
config ARCH_DAVINCI_DA8XX config ARCH_DAVINCI_DA8XX
select CPU_ARM926T
bool bool
select CPU_ARM926T
config ARCH_DAVINCI_DM365 config ARCH_DAVINCI_DM365
bool "DaVinci 365 based system" bool "DaVinci 365 based system"
...@@ -52,9 +52,9 @@ config ARCH_DAVINCI_DM365 ...@@ -52,9 +52,9 @@ config ARCH_DAVINCI_DM365
select ARCH_DAVINCI_DMx select ARCH_DAVINCI_DMx
config ARCH_DAVINCI_TNETV107X config ARCH_DAVINCI_TNETV107X
bool "TNETV107X based system"
select CPU_V6 select CPU_V6
select CP_INTC select CP_INTC
bool "TNETV107X based system"
comment "DaVinci Board Type" comment "DaVinci Board Type"
...@@ -103,9 +103,9 @@ config MACH_DAVINCI_DM6467_EVM ...@@ -103,9 +103,9 @@ config MACH_DAVINCI_DM6467_EVM
bool "TI DM6467 EVM" bool "TI DM6467 EVM"
default ARCH_DAVINCI_DM646x default ARCH_DAVINCI_DM646x
depends on ARCH_DAVINCI_DM646x depends on ARCH_DAVINCI_DM646x
select MACH_DAVINCI_DM6467TEVM
select EEPROM_AT24 select EEPROM_AT24
select I2C select I2C
select MACH_DAVINCI_DM6467TEVM
help help
Configure this option to specify the whether the board used Configure this option to specify the whether the board used
for development is a DM6467 EVM for development is a DM6467 EVM
...@@ -127,8 +127,8 @@ config MACH_DAVINCI_DA830_EVM ...@@ -127,8 +127,8 @@ config MACH_DAVINCI_DA830_EVM
bool "TI DA830/OMAP-L137/AM17x Reference Platform" bool "TI DA830/OMAP-L137/AM17x Reference Platform"
default ARCH_DAVINCI_DA830 default ARCH_DAVINCI_DA830
depends on ARCH_DAVINCI_DA830 depends on ARCH_DAVINCI_DA830
select GPIO_PCF857X
select EEPROM_AT24 select EEPROM_AT24
select GPIO_PCF857X
select I2C select I2C
help help
Say Y here to select the TI DA830/OMAP-L137/AM17x Evaluation Module. Say Y here to select the TI DA830/OMAP-L137/AM17x Evaluation Module.
......
...@@ -31,11 +31,11 @@ config CPU_EXYNOS4210 ...@@ -31,11 +31,11 @@ config CPU_EXYNOS4210
bool "SAMSUNG EXYNOS4210" bool "SAMSUNG EXYNOS4210"
default y default y
depends on ARCH_EXYNOS4 depends on ARCH_EXYNOS4
select SAMSUNG_DMADEV
select ARM_CPU_SUSPEND if PM select ARM_CPU_SUSPEND if PM
select PM_GENERIC_DOMAINS
select S5P_PM if PM select S5P_PM if PM
select S5P_SLEEP if PM select S5P_SLEEP if PM
select PM_GENERIC_DOMAINS select SAMSUNG_DMADEV
help help
Enable EXYNOS4210 CPU support Enable EXYNOS4210 CPU support
...@@ -43,9 +43,9 @@ config SOC_EXYNOS4212 ...@@ -43,9 +43,9 @@ config SOC_EXYNOS4212
bool "SAMSUNG EXYNOS4212" bool "SAMSUNG EXYNOS4212"
default y default y
depends on ARCH_EXYNOS4 depends on ARCH_EXYNOS4
select SAMSUNG_DMADEV
select S5P_PM if PM select S5P_PM if PM
select S5P_SLEEP if PM select S5P_SLEEP if PM
select SAMSUNG_DMADEV
help help
Enable EXYNOS4212 SoC support Enable EXYNOS4212 SoC support
...@@ -61,9 +61,9 @@ config SOC_EXYNOS5250 ...@@ -61,9 +61,9 @@ config SOC_EXYNOS5250
bool "SAMSUNG EXYNOS5250" bool "SAMSUNG EXYNOS5250"
default y default y
depends on ARCH_EXYNOS5 depends on ARCH_EXYNOS5
select SAMSUNG_DMADEV
select S5P_PM if PM select S5P_PM if PM
select S5P_SLEEP if PM select S5P_SLEEP if PM
select SAMSUNG_DMADEV
help help
Enable EXYNOS5250 SoC support Enable EXYNOS5250 SoC support
...@@ -189,71 +189,71 @@ config MACH_SMDKC210 ...@@ -189,71 +189,71 @@ config MACH_SMDKC210
config MACH_SMDKV310 config MACH_SMDKV310
bool "SMDKV310" bool "SMDKV310"
select CPU_EXYNOS4210 select CPU_EXYNOS4210
select S5P_DEV_FIMD0 select EXYNOS4_DEV_AHCI
select EXYNOS4_DEV_USB_OHCI
select EXYNOS4_SETUP_FIMD0
select EXYNOS4_SETUP_I2C1
select EXYNOS4_SETUP_KEYPAD
select EXYNOS4_SETUP_SDHCI
select EXYNOS4_SETUP_USB_PHY
select EXYNOS_DEV_DMA
select EXYNOS_DEV_DRM
select EXYNOS_DEV_SYSMMU
select S3C24XX_PWM
select S3C_DEV_HSMMC
select S3C_DEV_HSMMC1
select S3C_DEV_HSMMC2
select S3C_DEV_HSMMC3
select S3C_DEV_I2C1
select S3C_DEV_RTC select S3C_DEV_RTC
select S3C_DEV_USB_HSOTG
select S3C_DEV_WDT select S3C_DEV_WDT
select S3C_DEV_I2C1
select S5P_DEV_FIMC0 select S5P_DEV_FIMC0
select S5P_DEV_FIMC1 select S5P_DEV_FIMC1
select S5P_DEV_FIMC2 select S5P_DEV_FIMC2
select S5P_DEV_FIMC3 select S5P_DEV_FIMC3
select S5P_DEV_FIMD0
select S5P_DEV_G2D select S5P_DEV_G2D
select S5P_DEV_I2C_HDMIPHY select S5P_DEV_I2C_HDMIPHY
select S5P_DEV_JPEG select S5P_DEV_JPEG
select S5P_DEV_MFC select S5P_DEV_MFC
select S5P_DEV_TV select S5P_DEV_TV
select S5P_DEV_USB_EHCI select S5P_DEV_USB_EHCI
select S3C_DEV_HSMMC
select S3C_DEV_HSMMC1
select S3C_DEV_HSMMC2
select S3C_DEV_HSMMC3
select S3C_DEV_USB_HSOTG
select SAMSUNG_DEV_BACKLIGHT select SAMSUNG_DEV_BACKLIGHT
select EXYNOS_DEV_DRM
select EXYNOS_DEV_SYSMMU
select EXYNOS4_DEV_AHCI
select SAMSUNG_DEV_KEYPAD select SAMSUNG_DEV_KEYPAD
select EXYNOS_DEV_DMA
select SAMSUNG_DEV_PWM select SAMSUNG_DEV_PWM
select EXYNOS4_DEV_USB_OHCI
select EXYNOS4_SETUP_FIMD0
select EXYNOS4_SETUP_I2C1
select EXYNOS4_SETUP_KEYPAD
select EXYNOS4_SETUP_SDHCI
select EXYNOS4_SETUP_USB_PHY
select S3C24XX_PWM
help help
Machine support for Samsung SMDKV310 Machine support for Samsung SMDKV310
config MACH_ARMLEX4210 config MACH_ARMLEX4210
bool "ARMLEX4210" bool "ARMLEX4210"
select CPU_EXYNOS4210 select CPU_EXYNOS4210
select S3C_DEV_RTC select EXYNOS4_DEV_AHCI
select S3C_DEV_WDT select EXYNOS4_SETUP_SDHCI
select EXYNOS_DEV_DMA
select S3C_DEV_HSMMC select S3C_DEV_HSMMC
select S3C_DEV_HSMMC2 select S3C_DEV_HSMMC2
select S3C_DEV_HSMMC3 select S3C_DEV_HSMMC3
select EXYNOS4_DEV_AHCI select S3C_DEV_RTC
select EXYNOS_DEV_DMA select S3C_DEV_WDT
select EXYNOS4_SETUP_SDHCI
help help
Machine support for Samsung ARMLEX4210 based on EXYNOS4210 Machine support for Samsung ARMLEX4210 based on EXYNOS4210
config MACH_UNIVERSAL_C210 config MACH_UNIVERSAL_C210
bool "Mobile UNIVERSAL_C210 Board" bool "Mobile UNIVERSAL_C210 Board"
select CPU_EXYNOS4210
select S5P_HRT
select CLKSRC_MMIO select CLKSRC_MMIO
select CPU_EXYNOS4210
select EXYNOS4_SETUP_FIMC
select EXYNOS4_SETUP_FIMD0
select EXYNOS4_SETUP_I2C1
select EXYNOS4_SETUP_I2C3
select EXYNOS4_SETUP_I2C5
select EXYNOS4_SETUP_SDHCI
select EXYNOS4_SETUP_USB_PHY
select EXYNOS_DEV_DMA
select EXYNOS_DEV_DRM
select EXYNOS_DEV_SYSMMU
select HAVE_SCHED_CLOCK select HAVE_SCHED_CLOCK
select S5P_GPIO_INT
select S5P_DEV_FIMC0
select S5P_DEV_FIMC1
select S5P_DEV_FIMC2
select S5P_DEV_FIMC3
select S5P_DEV_G2D
select S5P_DEV_CSIS0
select S5P_DEV_JPEG
select S5P_DEV_FIMD0
select S3C_DEV_HSMMC select S3C_DEV_HSMMC
select S3C_DEV_HSMMC2 select S3C_DEV_HSMMC2
select S3C_DEV_HSMMC3 select S3C_DEV_HSMMC3
...@@ -261,21 +261,21 @@ config MACH_UNIVERSAL_C210 ...@@ -261,21 +261,21 @@ config MACH_UNIVERSAL_C210
select S3C_DEV_I2C3 select S3C_DEV_I2C3
select S3C_DEV_I2C5 select S3C_DEV_I2C5
select S3C_DEV_USB_HSOTG select S3C_DEV_USB_HSOTG
select S5P_DEV_CSIS0
select S5P_DEV_FIMC0
select S5P_DEV_FIMC1
select S5P_DEV_FIMC2
select S5P_DEV_FIMC3
select S5P_DEV_FIMD0
select S5P_DEV_G2D
select S5P_DEV_I2C_HDMIPHY select S5P_DEV_I2C_HDMIPHY
select S5P_DEV_JPEG
select S5P_DEV_MFC select S5P_DEV_MFC
select S5P_DEV_ONENAND select S5P_DEV_ONENAND
select S5P_DEV_TV select S5P_DEV_TV
select EXYNOS_DEV_SYSMMU select S5P_GPIO_INT
select EXYNOS_DEV_DMA select S5P_HRT
select EXYNOS_DEV_DRM
select EXYNOS4_SETUP_FIMD0
select EXYNOS4_SETUP_I2C1
select EXYNOS4_SETUP_I2C3
select EXYNOS4_SETUP_I2C5
select EXYNOS4_SETUP_SDHCI
select EXYNOS4_SETUP_FIMC
select S5P_SETUP_MIPIPHY select S5P_SETUP_MIPIPHY
select EXYNOS4_SETUP_USB_PHY
help help
Machine support for Samsung Mobile Universal S5PC210 Reference Machine support for Samsung Mobile Universal S5PC210 Reference
Board. Board.
...@@ -283,10 +283,16 @@ config MACH_UNIVERSAL_C210 ...@@ -283,10 +283,16 @@ config MACH_UNIVERSAL_C210
config MACH_NURI config MACH_NURI
bool "Mobile NURI Board" bool "Mobile NURI Board"
select CPU_EXYNOS4210 select CPU_EXYNOS4210
select S5P_GPIO_INT select EXYNOS4_SETUP_FIMC
select S3C_DEV_WDT select EXYNOS4_SETUP_FIMD0
select S3C_DEV_RTC select EXYNOS4_SETUP_I2C1
select S5P_DEV_FIMD0 select EXYNOS4_SETUP_I2C3
select EXYNOS4_SETUP_I2C5
select EXYNOS4_SETUP_I2C6
select EXYNOS4_SETUP_SDHCI
select EXYNOS4_SETUP_USB_PHY
select EXYNOS_DEV_DMA
select EXYNOS_DEV_DRM
select S3C_DEV_HSMMC select S3C_DEV_HSMMC
select S3C_DEV_HSMMC2 select S3C_DEV_HSMMC2
select S3C_DEV_HSMMC3 select S3C_DEV_HSMMC3
...@@ -294,41 +300,42 @@ config MACH_NURI ...@@ -294,41 +300,42 @@ config MACH_NURI
select S3C_DEV_I2C3 select S3C_DEV_I2C3
select S3C_DEV_I2C5 select S3C_DEV_I2C5
select S3C_DEV_I2C6 select S3C_DEV_I2C6
select S3C_DEV_RTC
select S3C_DEV_USB_HSOTG select S3C_DEV_USB_HSOTG
select S3C_DEV_WDT
select S5P_DEV_CSIS0 select S5P_DEV_CSIS0
select S5P_DEV_JPEG
select S5P_DEV_FIMC0 select S5P_DEV_FIMC0
select S5P_DEV_FIMC1 select S5P_DEV_FIMC1
select S5P_DEV_FIMC2 select S5P_DEV_FIMC2
select S5P_DEV_FIMC3 select S5P_DEV_FIMC3
select S5P_DEV_FIMD0
select S5P_DEV_G2D select S5P_DEV_G2D
select S5P_DEV_JPEG
select S5P_DEV_MFC select S5P_DEV_MFC
select S5P_DEV_USB_EHCI select S5P_DEV_USB_EHCI
select S5P_GPIO_INT
select S5P_SETUP_MIPIPHY select S5P_SETUP_MIPIPHY
select EXYNOS_DEV_DMA
select EXYNOS_DEV_DRM
select EXYNOS4_SETUP_FIMC
select EXYNOS4_SETUP_FIMD0
select EXYNOS4_SETUP_I2C1
select EXYNOS4_SETUP_I2C3
select EXYNOS4_SETUP_I2C5
select EXYNOS4_SETUP_I2C6
select EXYNOS4_SETUP_SDHCI
select EXYNOS4_SETUP_USB_PHY
select S5P_SETUP_MIPIPHY
select SAMSUNG_DEV_PWM
select SAMSUNG_DEV_ADC select SAMSUNG_DEV_ADC
select SAMSUNG_DEV_PWM
help help
Machine support for Samsung Mobile NURI Board. Machine support for Samsung Mobile NURI Board.
config MACH_ORIGEN config MACH_ORIGEN
bool "ORIGEN" bool "ORIGEN"
select CPU_EXYNOS4210 select CPU_EXYNOS4210
select S3C_DEV_RTC select EXYNOS4_DEV_USB_OHCI
select S3C_DEV_WDT select EXYNOS4_SETUP_FIMD0
select EXYNOS4_SETUP_SDHCI
select EXYNOS4_SETUP_USB_PHY
select EXYNOS_DEV_DMA
select EXYNOS_DEV_DRM
select EXYNOS_DEV_SYSMMU
select S3C24XX_PWM
select S3C_DEV_HSMMC select S3C_DEV_HSMMC
select S3C_DEV_HSMMC2 select S3C_DEV_HSMMC2
select S3C_DEV_RTC
select S3C_DEV_USB_HSOTG select S3C_DEV_USB_HSOTG
select S3C_DEV_WDT
select S5P_DEV_FIMC0 select S5P_DEV_FIMC0
select S5P_DEV_FIMC1 select S5P_DEV_FIMC1
select S5P_DEV_FIMC2 select S5P_DEV_FIMC2
...@@ -342,14 +349,6 @@ config MACH_ORIGEN ...@@ -342,14 +349,6 @@ config MACH_ORIGEN
select S5P_DEV_USB_EHCI select S5P_DEV_USB_EHCI
select SAMSUNG_DEV_BACKLIGHT select SAMSUNG_DEV_BACKLIGHT
select SAMSUNG_DEV_PWM select SAMSUNG_DEV_PWM
select EXYNOS_DEV_DRM
select EXYNOS_DEV_SYSMMU
select EXYNOS_DEV_DMA
select EXYNOS4_DEV_USB_OHCI
select EXYNOS4_SETUP_FIMD0
select EXYNOS4_SETUP_SDHCI
select EXYNOS4_SETUP_USB_PHY
select S3C24XX_PWM
help help
Machine support for ORIGEN based on Samsung EXYNOS4210 Machine support for ORIGEN based on Samsung EXYNOS4210
...@@ -357,7 +356,17 @@ comment "EXYNOS4212 Boards" ...@@ -357,7 +356,17 @@ comment "EXYNOS4212 Boards"
config MACH_SMDK4212 config MACH_SMDK4212
bool "SMDK4212" bool "SMDK4212"
select SOC_EXYNOS4212 select EXYNOS4_SETUP_FIMD0
select EXYNOS4_SETUP_I2C1
select EXYNOS4_SETUP_I2C3
select EXYNOS4_SETUP_I2C7
select EXYNOS4_SETUP_KEYPAD
select EXYNOS4_SETUP_SDHCI
select EXYNOS4_SETUP_USB_PHY
select EXYNOS_DEV_DMA
select EXYNOS_DEV_DRM
select EXYNOS_DEV_SYSMMU
select S3C24XX_PWM
select S3C_DEV_HSMMC2 select S3C_DEV_HSMMC2
select S3C_DEV_HSMMC3 select S3C_DEV_HSMMC3
select S3C_DEV_I2C1 select S3C_DEV_I2C1
...@@ -375,17 +384,7 @@ config MACH_SMDK4212 ...@@ -375,17 +384,7 @@ config MACH_SMDK4212
select SAMSUNG_DEV_BACKLIGHT select SAMSUNG_DEV_BACKLIGHT
select SAMSUNG_DEV_KEYPAD select SAMSUNG_DEV_KEYPAD
select SAMSUNG_DEV_PWM select SAMSUNG_DEV_PWM
select EXYNOS_DEV_SYSMMU select SOC_EXYNOS4212
select EXYNOS_DEV_DMA
select EXYNOS_DEV_DRM
select EXYNOS4_SETUP_FIMD0
select EXYNOS4_SETUP_I2C1
select EXYNOS4_SETUP_I2C3
select EXYNOS4_SETUP_I2C7
select EXYNOS4_SETUP_KEYPAD
select EXYNOS4_SETUP_SDHCI
select EXYNOS4_SETUP_USB_PHY
select S3C24XX_PWM
help help
Machine support for Samsung SMDK4212 Machine support for Samsung SMDK4212
...@@ -393,8 +392,8 @@ comment "EXYNOS4412 Boards" ...@@ -393,8 +392,8 @@ comment "EXYNOS4412 Boards"
config MACH_SMDK4412 config MACH_SMDK4412
bool "SMDK4412" bool "SMDK4412"
select SOC_EXYNOS4412
select MACH_SMDK4212 select MACH_SMDK4212
select SOC_EXYNOS4412
help help
Machine support for Samsung SMDK4412 Machine support for Samsung SMDK4412
endif endif
...@@ -404,12 +403,12 @@ comment "Flattened Device Tree based board for EXYNOS SoCs" ...@@ -404,12 +403,12 @@ comment "Flattened Device Tree based board for EXYNOS SoCs"
config MACH_EXYNOS4_DT config MACH_EXYNOS4_DT
bool "Samsung Exynos4 Machine using device tree" bool "Samsung Exynos4 Machine using device tree"
depends on ARCH_EXYNOS4 depends on ARCH_EXYNOS4
select CPU_EXYNOS4210
select USE_OF
select ARM_AMBA select ARM_AMBA
select CPU_EXYNOS4210
select HAVE_SAMSUNG_KEYPAD if INPUT_KEYBOARD select HAVE_SAMSUNG_KEYPAD if INPUT_KEYBOARD
select PINCTRL select PINCTRL
select PINCTRL_EXYNOS4 select PINCTRL_EXYNOS4
select USE_OF
help help
Machine support for Samsung Exynos4 machine with device tree enabled. Machine support for Samsung Exynos4 machine with device tree enabled.
Select this if a fdt blob is available for the Exynos4 SoC based board. Select this if a fdt blob is available for the Exynos4 SoC based board.
...@@ -419,9 +418,9 @@ config MACH_EXYNOS4_DT ...@@ -419,9 +418,9 @@ config MACH_EXYNOS4_DT
config MACH_EXYNOS5_DT config MACH_EXYNOS5_DT
bool "SAMSUNG EXYNOS5 Machine using device tree" bool "SAMSUNG EXYNOS5 Machine using device tree"
depends on ARCH_EXYNOS5 depends on ARCH_EXYNOS5
select ARM_AMBA
select SOC_EXYNOS5250 select SOC_EXYNOS5250
select USE_OF select USE_OF
select ARM_AMBA
help help
Machine support for Samsung EXYNOS5 machine with device tree enabled. Machine support for Samsung EXYNOS5 machine with device tree enabled.
Select this if a fdt blob is available for the EXYNOS5 SoC based board. Select this if a fdt blob is available for the EXYNOS5 SoC based board.
......
...@@ -91,7 +91,7 @@ config FOOTBRIDGE_ADDIN ...@@ -91,7 +91,7 @@ config FOOTBRIDGE_ADDIN
# EBSA285 board in either host or addin mode # EBSA285 board in either host or addin mode
config ARCH_EBSA285 config ARCH_EBSA285
select ARCH_MAY_HAVE_PC_FDC
bool bool
select ARCH_MAY_HAVE_PC_FDC
endif endif
...@@ -12,9 +12,9 @@ config ARCH_H7201 ...@@ -12,9 +12,9 @@ config ARCH_H7201
config ARCH_H7202 config ARCH_H7202
bool "hms30c7202" bool "hms30c7202"
depends on ARCH_H720X
select CPU_H7202 select CPU_H7202
select ZONE_DMA select ZONE_DMA
depends on ARCH_H720X
help help
Say Y here if you are using the Hynix HMS30C7202 Reference Board Say Y here if you are using the Hynix HMS30C7202 Reference Board
......
This diff is collapsed.
...@@ -234,8 +234,8 @@ config IXP4XX_QMGR ...@@ -234,8 +234,8 @@ config IXP4XX_QMGR
config IXP4XX_NPE config IXP4XX_NPE
tristate "IXP4xx Network Processor Engine support" tristate "IXP4xx Network Processor Engine support"
select HOTPLUG
select FW_LOADER select FW_LOADER
select HOTPLUG
help help
This driver supports IXP4xx built-in network coprocessors This driver supports IXP4xx built-in network coprocessors
and is automatically selected by Ethernet and HSS drivers. and is automatically selected by Ethernet and HSS drivers.
......
...@@ -107,22 +107,22 @@ endmenu ...@@ -107,22 +107,22 @@ endmenu
config CPU_PXA168 config CPU_PXA168
bool bool
select CPU_MOHAWK
select COMMON_CLK select COMMON_CLK
select CPU_MOHAWK
help help
Select code specific to PXA168 Select code specific to PXA168
config CPU_PXA910 config CPU_PXA910
bool bool
select CPU_MOHAWK
select COMMON_CLK select COMMON_CLK
select CPU_MOHAWK
help help
Select code specific to PXA910 Select code specific to PXA910
config CPU_MMP2 config CPU_MMP2
bool bool
select CPU_PJ4
select COMMON_CLK select COMMON_CLK
select CPU_PJ4
help help
Select code specific to MMP2. MMP2 is ARMv7 compatible. Select code specific to MMP2. MMP2 is ARMv7 compatible.
......
...@@ -10,35 +10,35 @@ choice ...@@ -10,35 +10,35 @@ choice
config ARCH_MSM7X00A config ARCH_MSM7X00A
bool "MSM7x00A / MSM7x01A" bool "MSM7x00A / MSM7x01A"
select MACH_TROUT if !MACH_HALIBUT
select ARCH_MSM_ARM11 select ARCH_MSM_ARM11
select MSM_SMD
select MSM_SMD_PKG3
select CPU_V6 select CPU_V6
select GPIO_MSM_V1 select GPIO_MSM_V1
select MACH_TROUT if !MACH_HALIBUT
select MSM_PROC_COMM select MSM_PROC_COMM
select MSM_SMD
select MSM_SMD_PKG3
config ARCH_MSM7X30 config ARCH_MSM7X30
bool "MSM7x30" bool "MSM7x30"
select MACH_MSM7X30_SURF # if !
select ARCH_MSM_SCORPION select ARCH_MSM_SCORPION
select MSM_SMD
select MSM_VIC
select CPU_V7 select CPU_V7
select MSM_GPIOMUX
select GPIO_MSM_V1 select GPIO_MSM_V1
select MACH_MSM7X30_SURF # if !
select MSM_GPIOMUX
select MSM_PROC_COMM select MSM_PROC_COMM
select MSM_SMD
select MSM_VIC
config ARCH_QSD8X50 config ARCH_QSD8X50
bool "QSD8X50" bool "QSD8X50"
select MACH_QSD8X50_SURF if !MACH_QSD8X50A_ST1_5
select ARCH_MSM_SCORPION select ARCH_MSM_SCORPION
select MSM_SMD
select MSM_VIC
select CPU_V7 select CPU_V7
select MSM_GPIOMUX
select GPIO_MSM_V1 select GPIO_MSM_V1
select MACH_QSD8X50_SURF if !MACH_QSD8X50A_ST1_5
select MSM_GPIOMUX
select MSM_PROC_COMM select MSM_PROC_COMM
select MSM_SMD
select MSM_VIC
endchoice endchoice
...@@ -47,10 +47,10 @@ config ARCH_MSM8X60 ...@@ -47,10 +47,10 @@ config ARCH_MSM8X60
select ARCH_MSM_SCORPIONMP select ARCH_MSM_SCORPIONMP
select ARM_GIC select ARM_GIC
select CPU_V7 select CPU_V7
select MSM_V2_TLMM
select GPIO_MSM_V2 select GPIO_MSM_V2
select MSM_GPIOMUX select MSM_GPIOMUX
select MSM_SCM if SMP select MSM_SCM if SMP
select MSM_V2_TLMM
select USE_OF select USE_OF
config ARCH_MSM8960 config ARCH_MSM8960
...@@ -58,9 +58,9 @@ config ARCH_MSM8960 ...@@ -58,9 +58,9 @@ config ARCH_MSM8960
select ARCH_MSM_SCORPIONMP select ARCH_MSM_SCORPIONMP
select ARM_GIC select ARM_GIC
select CPU_V7 select CPU_V7
select MSM_V2_TLMM
select MSM_GPIOMUX select MSM_GPIOMUX
select MSM_SCM if SMP select MSM_SCM if SMP
select MSM_V2_TLMM
select USE_OF select USE_OF
config MSM_HAS_DEBUG_UART_HS config MSM_HAS_DEBUG_UART_HS
...@@ -110,8 +110,8 @@ config MACH_QSD8X50_SURF ...@@ -110,8 +110,8 @@ config MACH_QSD8X50_SURF
config MACH_QSD8X50A_ST1_5 config MACH_QSD8X50A_ST1_5
depends on ARCH_QSD8X50 depends on ARCH_QSD8X50
select MSM_SOC_REV_A
bool "QSD8x50A ST1.5" bool "QSD8x50A ST1.5"
select MSM_SOC_REV_A
help help
Support for the Qualcomm ST1.5. Support for the Qualcomm ST1.5.
......
...@@ -4,8 +4,8 @@ menu "Nomadik boards" ...@@ -4,8 +4,8 @@ menu "Nomadik boards"
config MACH_NOMADIK_8815NHK config MACH_NOMADIK_8815NHK
bool "ST 8815 Nomadik Hardware Kit (evaluation board)" bool "ST 8815 Nomadik Hardware Kit (evaluation board)"
select NOMADIK_8815
select HAS_MTU select HAS_MTU
select NOMADIK_8815
endmenu endmenu
...@@ -16,7 +16,7 @@ config I2C_BITBANG_8815NHK ...@@ -16,7 +16,7 @@ config I2C_BITBANG_8815NHK
tristate "Driver for bit-bang busses found on the 8815 NHK" tristate "Driver for bit-bang busses found on the 8815 NHK"
depends on I2C && MACH_NOMADIK_8815NHK depends on I2C && MACH_NOMADIK_8815NHK
depends on PINCTRL_NOMADIK depends on PINCTRL_NOMADIK
select I2C_ALGOBIT
default y default y
select I2C_ALGOBIT
endif endif
...@@ -8,15 +8,15 @@ comment "OMAP Core Type" ...@@ -8,15 +8,15 @@ comment "OMAP Core Type"
config ARCH_OMAP730 config ARCH_OMAP730
depends on ARCH_OMAP1 depends on ARCH_OMAP1
bool "OMAP730 Based System" bool "OMAP730 Based System"
select ARCH_OMAP_OTG
select CPU_ARM926T select CPU_ARM926T
select OMAP_MPU_TIMER select OMAP_MPU_TIMER
select ARCH_OMAP_OTG
config ARCH_OMAP850 config ARCH_OMAP850
depends on ARCH_OMAP1 depends on ARCH_OMAP1
bool "OMAP850 Based System" bool "OMAP850 Based System"
select CPU_ARM926T
select ARCH_OMAP_OTG select ARCH_OMAP_OTG
select CPU_ARM926T
config ARCH_OMAP15XX config ARCH_OMAP15XX
depends on ARCH_OMAP1 depends on ARCH_OMAP1
...@@ -28,8 +28,8 @@ config ARCH_OMAP15XX ...@@ -28,8 +28,8 @@ config ARCH_OMAP15XX
config ARCH_OMAP16XX config ARCH_OMAP16XX
depends on ARCH_OMAP1 depends on ARCH_OMAP1
bool "OMAP16xx Based System" bool "OMAP16xx Based System"
select CPU_ARM926T
select ARCH_OMAP_OTG select ARCH_OMAP_OTG
select CPU_ARM926T
comment "OMAP Board Type" comment "OMAP Board Type"
depends on ARCH_OMAP1 depends on ARCH_OMAP1
...@@ -132,8 +132,8 @@ config MACH_OMAP_PALMTT ...@@ -132,8 +132,8 @@ config MACH_OMAP_PALMTT
config MACH_SX1 config MACH_SX1
bool "Siemens SX1" bool "Siemens SX1"
select I2C
depends on ARCH_OMAP1 && ARCH_OMAP15XX depends on ARCH_OMAP1 && ARCH_OMAP15XX
select I2C
help help
Support for the Siemens SX1 phone. To boot the kernel, Support for the Siemens SX1 phone. To boot the kernel,
you'll need a SX1 compatible bootloader; check out you'll need a SX1 compatible bootloader; check out
......
...@@ -6,19 +6,19 @@ config ARCH_OMAP2PLUS_TYPICAL ...@@ -6,19 +6,19 @@ config ARCH_OMAP2PLUS_TYPICAL
bool "Typical OMAP configuration" bool "Typical OMAP configuration"
default y default y
select AEABI select AEABI
select REGULATOR select HIGHMEM
select PM_RUNTIME
select VFP
select NEON if ARCH_OMAP3 || ARCH_OMAP4 || SOC_OMAP5
select SERIAL_OMAP
select SERIAL_OMAP_CONSOLE
select I2C select I2C
select I2C_OMAP select I2C_OMAP
select MENELAUS if ARCH_OMAP2 select MENELAUS if ARCH_OMAP2
select NEON if ARCH_OMAP3 || ARCH_OMAP4 || SOC_OMAP5
select PINCTRL
select PM_RUNTIME
select REGULATOR
select SERIAL_OMAP
select SERIAL_OMAP_CONSOLE
select TWL4030_CORE if ARCH_OMAP3 || ARCH_OMAP4 select TWL4030_CORE if ARCH_OMAP3 || ARCH_OMAP4
select TWL4030_POWER if ARCH_OMAP3 || ARCH_OMAP4 select TWL4030_POWER if ARCH_OMAP3 || ARCH_OMAP4
select HIGHMEM select VFP
select PINCTRL
help help
Compile a kernel suitable for booting most boards Compile a kernel suitable for booting most boards
...@@ -40,44 +40,44 @@ config ARCH_OMAP3 ...@@ -40,44 +40,44 @@ config ARCH_OMAP3
bool "TI OMAP3" bool "TI OMAP3"
depends on ARCH_OMAP2PLUS depends on ARCH_OMAP2PLUS
default y default y
select CPU_V7
select USB_ARCH_HAS_EHCI if USB_SUPPORT
select ARCH_HAS_OPP select ARCH_HAS_OPP
select PM_RUNTIME if CPU_IDLE
select PM_OPP if PM
select ARM_CPU_SUSPEND if PM select ARM_CPU_SUSPEND if PM
select CPU_V7
select MULTI_IRQ_HANDLER select MULTI_IRQ_HANDLER
select SOC_HAS_OMAP2_SDRC
select OMAP_INTERCONNECT select OMAP_INTERCONNECT
select PM_OPP if PM
select PM_RUNTIME if CPU_IDLE
select SOC_HAS_OMAP2_SDRC
select USB_ARCH_HAS_EHCI if USB_SUPPORT
config ARCH_OMAP4 config ARCH_OMAP4
bool "TI OMAP4" bool "TI OMAP4"
default y default y
depends on ARCH_OMAP2PLUS depends on ARCH_OMAP2PLUS
select ARCH_HAS_OPP
select ARCH_NEEDS_CPU_IDLE_COUPLED if SMP
select ARM_CPU_SUSPEND if PM
select ARM_ERRATA_720789
select ARM_GIC
select CACHE_L2X0 select CACHE_L2X0
select CPU_V7 select CPU_V7
select ARM_GIC
select HAVE_SMP select HAVE_SMP
select LOCAL_TIMERS if SMP select LOCAL_TIMERS if SMP
select OMAP_INTERCONNECT
select PL310_ERRATA_588369 select PL310_ERRATA_588369
select PL310_ERRATA_727915 select PL310_ERRATA_727915
select ARM_ERRATA_720789
select ARCH_HAS_OPP
select PM_RUNTIME if CPU_IDLE
select PM_OPP if PM select PM_OPP if PM
select PM_RUNTIME if CPU_IDLE
select USB_ARCH_HAS_EHCI if USB_SUPPORT select USB_ARCH_HAS_EHCI if USB_SUPPORT
select ARM_CPU_SUSPEND if PM
select ARCH_NEEDS_CPU_IDLE_COUPLED if SMP
select OMAP_INTERCONNECT
config SOC_OMAP5 config SOC_OMAP5
bool "TI OMAP5" bool "TI OMAP5"
select CPU_V7 select ARM_ARCH_TIMER
select ARM_CPU_SUSPEND if PM
select ARM_GIC select ARM_GIC
select CPU_V7
select HAVE_SMP select HAVE_SMP
select ARM_CPU_SUSPEND if PM
select SOC_HAS_REALTIME_COUNTER select SOC_HAS_REALTIME_COUNTER
select ARM_ARCH_TIMER
comment "OMAP Core Type" comment "OMAP Core Type"
depends on ARCH_OMAP2 depends on ARCH_OMAP2
...@@ -109,8 +109,8 @@ config SOC_TI81XX ...@@ -109,8 +109,8 @@ config SOC_TI81XX
config SOC_AM33XX config SOC_AM33XX
bool "AM33XX support" bool "AM33XX support"
default y default y
select CPU_V7
select ARM_CPU_SUSPEND if PM select ARM_CPU_SUSPEND if PM
select CPU_V7
select MULTI_IRQ_HANDLER select MULTI_IRQ_HANDLER
config OMAP_PACKAGE_ZAF config OMAP_PACKAGE_ZAF
...@@ -157,8 +157,8 @@ config MACH_OMAP_H4 ...@@ -157,8 +157,8 @@ config MACH_OMAP_H4
bool "OMAP 2420 H4 board" bool "OMAP 2420 H4 board"
depends on SOC_OMAP2420 depends on SOC_OMAP2420
default y default y
select OMAP_PACKAGE_ZAF
select OMAP_DEBUG_DEVICES select OMAP_DEBUG_DEVICES
select OMAP_PACKAGE_ZAF
config MACH_OMAP_APOLLON config MACH_OMAP_APOLLON
bool "OMAP 2420 Apollon board" bool "OMAP 2420 Apollon board"
...@@ -193,8 +193,8 @@ config MACH_OMAP_LDP ...@@ -193,8 +193,8 @@ config MACH_OMAP_LDP
config MACH_OMAP3530_LV_SOM config MACH_OMAP3530_LV_SOM
bool "OMAP3 Logic 3530 LV SOM board" bool "OMAP3 Logic 3530 LV SOM board"
depends on ARCH_OMAP3 depends on ARCH_OMAP3
select OMAP_PACKAGE_CBB
default y default y
select OMAP_PACKAGE_CBB
help help
Support for the LogicPD OMAP3530 SOM Development kit Support for the LogicPD OMAP3530 SOM Development kit
for full description please see the products webpage at for full description please see the products webpage at
...@@ -203,8 +203,8 @@ config MACH_OMAP3530_LV_SOM ...@@ -203,8 +203,8 @@ config MACH_OMAP3530_LV_SOM
config MACH_OMAP3_TORPEDO config MACH_OMAP3_TORPEDO
bool "OMAP3 Logic 35x Torpedo board" bool "OMAP3 Logic 35x Torpedo board"
depends on ARCH_OMAP3 depends on ARCH_OMAP3
select OMAP_PACKAGE_CBB
default y default y
select OMAP_PACKAGE_CBB
help help
Support for the LogicPD OMAP35x Torpedo Development kit Support for the LogicPD OMAP35x Torpedo Development kit
for full description please see the products webpage at for full description please see the products webpage at
...@@ -265,17 +265,17 @@ config MACH_NOKIA_N8X0 ...@@ -265,17 +265,17 @@ config MACH_NOKIA_N8X0
bool "Nokia N800/N810" bool "Nokia N800/N810"
depends on SOC_OMAP2420 depends on SOC_OMAP2420
default y default y
select OMAP_PACKAGE_ZAC
select MACH_NOKIA_N800 select MACH_NOKIA_N800
select MACH_NOKIA_N810 select MACH_NOKIA_N810
select MACH_NOKIA_N810_WIMAX select MACH_NOKIA_N810_WIMAX
select OMAP_PACKAGE_ZAC
config MACH_NOKIA_RM680 config MACH_NOKIA_RM680
bool "Nokia RM-680/696 board" bool "Nokia RM-680/696 board"
depends on ARCH_OMAP3 depends on ARCH_OMAP3
default y default y
select OMAP_PACKAGE_CBB
select MACH_NOKIA_RM696 select MACH_NOKIA_RM696
select OMAP_PACKAGE_CBB
config MACH_NOKIA_RX51 config MACH_NOKIA_RX51
bool "Nokia RX-51 board" bool "Nokia RX-51 board"
...@@ -288,20 +288,20 @@ config MACH_OMAP_ZOOM2 ...@@ -288,20 +288,20 @@ config MACH_OMAP_ZOOM2
depends on ARCH_OMAP3 depends on ARCH_OMAP3
default y default y
select OMAP_PACKAGE_CBB select OMAP_PACKAGE_CBB
select REGULATOR_FIXED_VOLTAGE if REGULATOR
select SERIAL_8250 select SERIAL_8250
select SERIAL_CORE_CONSOLE
select SERIAL_8250_CONSOLE select SERIAL_8250_CONSOLE
select REGULATOR_FIXED_VOLTAGE if REGULATOR select SERIAL_CORE_CONSOLE
config MACH_OMAP_ZOOM3 config MACH_OMAP_ZOOM3
bool "OMAP3630 Zoom3 board" bool "OMAP3630 Zoom3 board"
depends on ARCH_OMAP3 depends on ARCH_OMAP3
default y default y
select OMAP_PACKAGE_CBP select OMAP_PACKAGE_CBP
select REGULATOR_FIXED_VOLTAGE if REGULATOR
select SERIAL_8250 select SERIAL_8250
select SERIAL_CORE_CONSOLE
select SERIAL_8250_CONSOLE select SERIAL_8250_CONSOLE
select REGULATOR_FIXED_VOLTAGE if REGULATOR select SERIAL_CORE_CONSOLE
config MACH_CM_T35 config MACH_CM_T35
bool "CompuLab CM-T35/CM-T3730 modules" bool "CompuLab CM-T35/CM-T3730 modules"
...@@ -329,8 +329,8 @@ config MACH_IGEP0030 ...@@ -329,8 +329,8 @@ config MACH_IGEP0030
bool "IGEP OMAP3 module" bool "IGEP OMAP3 module"
depends on ARCH_OMAP3 depends on ARCH_OMAP3
default y default y
select OMAP_PACKAGE_CBB
select MACH_IGEP0020 select MACH_IGEP0020
select OMAP_PACKAGE_CBB
config MACH_SBC3530 config MACH_SBC3530
bool "OMAP3 SBC STALKER board" bool "OMAP3 SBC STALKER board"
......
...@@ -6,8 +6,8 @@ config ARCH_PRIMA2 ...@@ -6,8 +6,8 @@ config ARCH_PRIMA2
bool "CSR SiRFSoC PRIMA2 ARM Cortex A9 Platform" bool "CSR SiRFSoC PRIMA2 ARM Cortex A9 Platform"
default y default y
select CPU_V7 select CPU_V7
select ZONE_DMA
select SIRF_IRQ select SIRF_IRQ
select ZONE_DMA
help help
Support for CSR SiRFSoC ARM Cortex A9 Platform Support for CSR SiRFSoC ARM Cortex A9 Platform
......
...@@ -27,10 +27,10 @@ comment "Intel/Marvell Dev Platforms (sorted by hardware release time)" ...@@ -27,10 +27,10 @@ comment "Intel/Marvell Dev Platforms (sorted by hardware release time)"
config MACH_PXA3XX_DT config MACH_PXA3XX_DT
bool "Support PXA3xx platforms from device tree" bool "Support PXA3xx platforms from device tree"
select PXA3xx
select CPU_PXA300 select CPU_PXA300
select POWER_SUPPLY
select HAVE_PWM select HAVE_PWM
select POWER_SUPPLY
select PXA3xx
select USE_OF select USE_OF
help help
Include support for Marvell PXA3xx based platforms using Include support for Marvell PXA3xx based platforms using
...@@ -44,13 +44,13 @@ config ARCH_LUBBOCK ...@@ -44,13 +44,13 @@ config ARCH_LUBBOCK
config MACH_MAINSTONE config MACH_MAINSTONE
bool "Intel HCDDBBVA0 Development Platform (aka Mainstone)" bool "Intel HCDDBBVA0 Development Platform (aka Mainstone)"
select PXA27x
select HAVE_PWM select HAVE_PWM
select PXA27x
config MACH_ZYLONITE config MACH_ZYLONITE
bool bool
select PXA3xx
select HAVE_PWM select HAVE_PWM
select PXA3xx
config MACH_ZYLONITE300 config MACH_ZYLONITE300
bool "PXA3xx Development Platform (aka Zylonite) PXA300/310" bool "PXA3xx Development Platform (aka Zylonite) PXA300/310"
...@@ -65,19 +65,19 @@ config MACH_ZYLONITE320 ...@@ -65,19 +65,19 @@ config MACH_ZYLONITE320
config MACH_LITTLETON config MACH_LITTLETON
bool "PXA3xx Form Factor Platform (aka Littleton)" bool "PXA3xx Form Factor Platform (aka Littleton)"
select PXA3xx
select CPU_PXA300 select CPU_PXA300
select CPU_PXA310 select CPU_PXA310
select PXA3xx
config MACH_TAVOREVB config MACH_TAVOREVB
bool "PXA930 Evaluation Board (aka TavorEVB)" bool "PXA930 Evaluation Board (aka TavorEVB)"
select PXA3xx
select CPU_PXA930 select CPU_PXA930
select PXA3xx
config MACH_SAAR config MACH_SAAR
bool "PXA930 Handheld Platform (aka SAAR)" bool "PXA930 Handheld Platform (aka SAAR)"
select PXA3xx
select CPU_PXA930 select CPU_PXA930
select PXA3xx
comment "Third Party Dev Platforms (sorted by vendor name)" comment "Third Party Dev Platforms (sorted by vendor name)"
...@@ -87,29 +87,29 @@ config ARCH_PXA_IDP ...@@ -87,29 +87,29 @@ config ARCH_PXA_IDP
config ARCH_VIPER config ARCH_VIPER
bool "Arcom/Eurotech VIPER SBC" bool "Arcom/Eurotech VIPER SBC"
select PXA25x select ARCOM_PCMCIA
select ISA
select I2C_GPIO
select HAVE_PWM select HAVE_PWM
select I2C_GPIO
select ISA
select PXA25x
select PXA_HAVE_ISA_IRQS select PXA_HAVE_ISA_IRQS
select ARCOM_PCMCIA
config MACH_ARCOM_ZEUS config MACH_ARCOM_ZEUS
bool "Arcom/Eurotech ZEUS SBC" bool "Arcom/Eurotech ZEUS SBC"
select PXA27x select ARCOM_PCMCIA
select ISA select ISA
select PXA27x
select PXA_HAVE_ISA_IRQS select PXA_HAVE_ISA_IRQS
select ARCOM_PCMCIA
config MACH_BALLOON3 config MACH_BALLOON3
bool "Balloon 3 board" bool "Balloon 3 board"
select PXA27x
select IWMMXT select IWMMXT
select PXA27x
config MACH_CSB726 config MACH_CSB726
bool "Enable Cogent CSB726 System On a Module" bool "Enable Cogent CSB726 System On a Module"
select PXA27x
select IWMMXT select IWMMXT
select PXA27x
help help
Say Y here if you intend to run this kernel on a Cogent Say Y here if you intend to run this kernel on a Cogent
CSB726 System On Module. CSB726 System On Module.
...@@ -121,11 +121,11 @@ config CSB726_CSB701 ...@@ -121,11 +121,11 @@ config CSB726_CSB701
config MACH_ARMCORE config MACH_ARMCORE
bool "CompuLab CM-X255/CM-X270 modules" bool "CompuLab CM-X255/CM-X270 modules"
select ARCH_HAS_DMA_SET_COHERENT_MASK if PCI select ARCH_HAS_DMA_SET_COHERENT_MASK if PCI
select PXA27x
select IWMMXT select IWMMXT
select PXA25x
select MIGHT_HAVE_PCI select MIGHT_HAVE_PCI
select NEED_MACH_IO_H if PCI select NEED_MACH_IO_H if PCI
select PXA25x
select PXA27x
config MACH_EM_X270 config MACH_EM_X270
bool "CompuLab EM-x270 platform" bool "CompuLab EM-x270 platform"
...@@ -137,10 +137,10 @@ config MACH_EXEDA ...@@ -137,10 +137,10 @@ config MACH_EXEDA
config MACH_CM_X300 config MACH_CM_X300
bool "CompuLab CM-X300 modules" bool "CompuLab CM-X300 modules"
select PXA3xx
select CPU_PXA300 select CPU_PXA300
select CPU_PXA310 select CPU_PXA310
select HAVE_PWM select HAVE_PWM
select PXA3xx
config MACH_CAPC7117 config MACH_CAPC7117
bool "Embedian CAPC-7117 evaluation kit based on the MXM-8x10 CoM" bool "Embedian CAPC-7117 evaluation kit based on the MXM-8x10 CoM"
...@@ -168,22 +168,22 @@ endchoice ...@@ -168,22 +168,22 @@ endchoice
config MACH_INTELMOTE2 config MACH_INTELMOTE2
bool "Intel Mote 2 Platform" bool "Intel Mote 2 Platform"
select PXA27x
select IWMMXT select IWMMXT
select PXA27x
config MACH_STARGATE2 config MACH_STARGATE2
bool "Intel Stargate 2 Platform" bool "Intel Stargate 2 Platform"
select PXA27x
select IWMMXT select IWMMXT
select PXA27x
config MACH_XCEP config MACH_XCEP
bool "Iskratel Electronics XCEP" bool "Iskratel Electronics XCEP"
select PXA25x
select MTD select MTD
select MTD_PHYSMAP
select MTD_CFI_INTELEXT
select MTD_CFI select MTD_CFI
select MTD_CFI_INTELEXT
select MTD_CHAR select MTD_CHAR
select MTD_PHYSMAP
select PXA25x
select SMC91X select SMC91X
help help
PXA255 based Single Board Computer with SMC 91C111 ethernet chip and 64 MB of flash. PXA255 based Single Board Computer with SMC 91C111 ethernet chip and 64 MB of flash.
...@@ -195,14 +195,14 @@ config TRIZEPS_PXA ...@@ -195,14 +195,14 @@ config TRIZEPS_PXA
config MACH_TRIZEPS4 config MACH_TRIZEPS4
bool "Keith und Koep Trizeps4 DIMM-Module" bool "Keith und Koep Trizeps4 DIMM-Module"
depends on TRIZEPS_PXA depends on TRIZEPS_PXA
select TRIZEPS_PCMCIA
select PXA27x select PXA27x
select TRIZEPS_PCMCIA
config MACH_TRIZEPS4WL config MACH_TRIZEPS4WL
bool "Keith und Koep Trizeps4-WL DIMM-Module" bool "Keith und Koep Trizeps4-WL DIMM-Module"
depends on TRIZEPS_PXA depends on TRIZEPS_PXA
select TRIZEPS_PCMCIA
select PXA27x select PXA27x
select TRIZEPS_PCMCIA
choice choice
prompt "Select base board for Trizeps module" prompt "Select base board for Trizeps module"
...@@ -231,18 +231,18 @@ config TRIZEPS_PCMCIA ...@@ -231,18 +231,18 @@ config TRIZEPS_PCMCIA
config MACH_LOGICPD_PXA270 config MACH_LOGICPD_PXA270
bool "LogicPD PXA270 Card Engine Development Platform" bool "LogicPD PXA270 Card Engine Development Platform"
select PXA27x
select HAVE_PWM select HAVE_PWM
select PXA27x
config MACH_PCM027 config MACH_PCM027
bool "Phytec phyCORE-PXA270 CPU module (PCM-027)" bool "Phytec phyCORE-PXA270 CPU module (PCM-027)"
select PXA27x
select IWMMXT select IWMMXT
select PXA27x
config MACH_PCM990_BASEBOARD config MACH_PCM990_BASEBOARD
bool "PHYTEC PCM-990 development board" bool "PHYTEC PCM-990 development board"
select HAVE_PWM
depends on MACH_PCM027 depends on MACH_PCM027
select HAVE_PWM
choice choice
prompt "display on pcm990" prompt "display on pcm990"
...@@ -266,19 +266,19 @@ config MACH_COLIBRI ...@@ -266,19 +266,19 @@ config MACH_COLIBRI
config MACH_COLIBRI_PXA270_INCOME config MACH_COLIBRI_PXA270_INCOME
bool "Income s.r.o. PXA270 SBC" bool "Income s.r.o. PXA270 SBC"
depends on MACH_COLIBRI depends on MACH_COLIBRI
select PXA27x
select HAVE_PWM select HAVE_PWM
select PXA27x
config MACH_COLIBRI300 config MACH_COLIBRI300
bool "Toradex Colibri PXA300/310" bool "Toradex Colibri PXA300/310"
select PXA3xx
select CPU_PXA300 select CPU_PXA300
select CPU_PXA310 select CPU_PXA310
select PXA3xx
config MACH_COLIBRI320 config MACH_COLIBRI320
bool "Toradex Colibri PXA320" bool "Toradex Colibri PXA320"
select PXA3xx
select CPU_PXA320 select CPU_PXA320
select PXA3xx
config MACH_COLIBRI_EVALBOARD config MACH_COLIBRI_EVALBOARD
bool "Toradex Colibri Evaluation Carrier Board support" bool "Toradex Colibri Evaluation Carrier Board support"
...@@ -286,8 +286,8 @@ config MACH_COLIBRI_EVALBOARD ...@@ -286,8 +286,8 @@ config MACH_COLIBRI_EVALBOARD
config MACH_VPAC270 config MACH_VPAC270
bool "Voipac PXA270" bool "Voipac PXA270"
select PXA27x
select HAVE_PATA_PLATFORM select HAVE_PATA_PLATFORM
select PXA27x
help help
PXA270 based Single Board Computer. PXA270 based Single Board Computer.
...@@ -295,9 +295,9 @@ comment "End-user Products (sorted by vendor name)" ...@@ -295,9 +295,9 @@ comment "End-user Products (sorted by vendor name)"
config MACH_H4700 config MACH_H4700
bool "HP iPAQ hx4700" bool "HP iPAQ hx4700"
select PXA27x
select IWMMXT
select HAVE_PWM select HAVE_PWM
select IWMMXT
select PXA27x
config MACH_H5000 config MACH_H5000
bool "HP iPAQ h5000" bool "HP iPAQ h5000"
...@@ -309,16 +309,16 @@ config MACH_HIMALAYA ...@@ -309,16 +309,16 @@ config MACH_HIMALAYA
config MACH_MAGICIAN config MACH_MAGICIAN
bool "Enable HTC Magician Support" bool "Enable HTC Magician Support"
select PXA27x
select IWMMXT
select HAVE_PWM select HAVE_PWM
select IWMMXT
select PXA27x
config MACH_MIOA701 config MACH_MIOA701
bool "Mitac Mio A701 Support" bool "Mitac Mio A701 Support"
select PXA27x
select IWMMXT
select HAVE_PWM
select GPIO_SYSFS select GPIO_SYSFS
select HAVE_PWM
select IWMMXT
select PXA27x
help help
Say Y here if you intend to run this kernel on a Say Y here if you intend to run this kernel on a
MIO A701. Currently there is only basic support MIO A701. Currently there is only basic support
...@@ -326,9 +326,9 @@ config MACH_MIOA701 ...@@ -326,9 +326,9 @@ config MACH_MIOA701
config PXA_EZX config PXA_EZX
bool "Motorola EZX Platform" bool "Motorola EZX Platform"
select PXA27x
select IWMMXT
select HAVE_PWM select HAVE_PWM
select IWMMXT
select PXA27x
config MACH_EZX_A780 config MACH_EZX_A780
bool "Motorola EZX A780" bool "Motorola EZX A780"
...@@ -393,9 +393,9 @@ config MACH_PALMT5 ...@@ -393,9 +393,9 @@ config MACH_PALMT5
bool "Palm Tungsten|T5" bool "Palm Tungsten|T5"
default y default y
depends on ARCH_PXA_PALM depends on ARCH_PXA_PALM
select PXA27x
select IWMMXT select IWMMXT
select MACH_PALM27X select MACH_PALM27X
select PXA27x
help help
Say Y here if you intend to run this kernel on a Palm Tungsten|T5 Say Y here if you intend to run this kernel on a Palm Tungsten|T5
handheld computer. handheld computer.
...@@ -404,9 +404,9 @@ config MACH_PALMTX ...@@ -404,9 +404,9 @@ config MACH_PALMTX
bool "Palm T|X" bool "Palm T|X"
default y default y
depends on ARCH_PXA_PALM depends on ARCH_PXA_PALM
select PXA27x
select IWMMXT select IWMMXT
select MACH_PALM27X select MACH_PALM27X
select PXA27x
help help
Say Y here if you intend to run this kernel on a Palm T|X Say Y here if you intend to run this kernel on a Palm T|X
handheld computer. handheld computer.
...@@ -415,9 +415,9 @@ config MACH_PALMZ72 ...@@ -415,9 +415,9 @@ config MACH_PALMZ72
bool "Palm Zire 72" bool "Palm Zire 72"
default y default y
depends on ARCH_PXA_PALM depends on ARCH_PXA_PALM
select PXA27x
select IWMMXT select IWMMXT
select MACH_PALM27X select MACH_PALM27X
select PXA27x
help help
Say Y here if you intend to run this kernel on Palm Zire 72 Say Y here if you intend to run this kernel on Palm Zire 72
handheld computer. handheld computer.
...@@ -426,9 +426,9 @@ config MACH_PALMLD ...@@ -426,9 +426,9 @@ config MACH_PALMLD
bool "Palm LifeDrive" bool "Palm LifeDrive"
default y default y
depends on ARCH_PXA_PALM depends on ARCH_PXA_PALM
select PXA27x
select IWMMXT select IWMMXT
select MACH_PALM27X select MACH_PALM27X
select PXA27x
help help
Say Y here if you intend to run this kernel on a Palm LifeDrive Say Y here if you intend to run this kernel on a Palm LifeDrive
handheld computer. handheld computer.
...@@ -441,10 +441,10 @@ config MACH_CENTRO ...@@ -441,10 +441,10 @@ config MACH_CENTRO
bool "Palm Centro 685 (GSM)" bool "Palm Centro 685 (GSM)"
default y default y
depends on ARCH_PXA_PALM depends on ARCH_PXA_PALM
select MACH_PALM27X
select PXA27x
select IWMMXT select IWMMXT
select MACH_PALM27X
select PALM_TREO select PALM_TREO
select PXA27x
help help
Say Y here if you intend to run this kernel on Palm Centro 685 (GSM) Say Y here if you intend to run this kernel on Palm Centro 685 (GSM)
smartphone. smartphone.
...@@ -453,37 +453,37 @@ config MACH_TREO680 ...@@ -453,37 +453,37 @@ config MACH_TREO680
bool "Palm Treo 680" bool "Palm Treo 680"
default y default y
depends on ARCH_PXA_PALM depends on ARCH_PXA_PALM
select MACH_PALM27X
select PXA27x
select IWMMXT select IWMMXT
select MACH_PALM27X
select PALM_TREO select PALM_TREO
select PXA27x
help help
Say Y here if you intend to run this kernel on Palm Treo 680 Say Y here if you intend to run this kernel on Palm Treo 680
smartphone. smartphone.
config MACH_RAUMFELD_RC config MACH_RAUMFELD_RC
bool "Raumfeld Controller" bool "Raumfeld Controller"
select PXA3xx
select CPU_PXA300 select CPU_PXA300
select POWER_SUPPLY
select HAVE_PWM select HAVE_PWM
select POWER_SUPPLY
select PXA3xx
config MACH_RAUMFELD_CONNECTOR config MACH_RAUMFELD_CONNECTOR
bool "Raumfeld Connector" bool "Raumfeld Connector"
select CPU_PXA300
select POWER_SUPPLY select POWER_SUPPLY
select PXA3xx select PXA3xx
select CPU_PXA300
config MACH_RAUMFELD_SPEAKER config MACH_RAUMFELD_SPEAKER
bool "Raumfeld Speaker" bool "Raumfeld Speaker"
select CPU_PXA300
select POWER_SUPPLY select POWER_SUPPLY
select PXA3xx select PXA3xx
select CPU_PXA300
config PXA_SHARPSL config PXA_SHARPSL
bool "SHARP Zaurus SL-5600, SL-C7xx and SL-Cxx00 Models" bool "SHARP Zaurus SL-5600, SL-C7xx and SL-Cxx00 Models"
select SHARP_SCOOP
select SHARP_PARAM select SHARP_PARAM
select SHARP_SCOOP
help help
Say Y here if you intend to run this kernel on a Say Y here if you intend to run this kernel on a
Sharp Zaurus SL-5600 (Poodle), SL-C700 (Corgi), Sharp Zaurus SL-5600 (Poodle), SL-C700 (Corgi),
...@@ -526,11 +526,11 @@ config MACH_HUSKY ...@@ -526,11 +526,11 @@ config MACH_HUSKY
config MACH_AKITA config MACH_AKITA
bool "Enable Sharp SL-1000 (Akita) Support" bool "Enable Sharp SL-1000 (Akita) Support"
depends on PXA_SHARPSL depends on PXA_SHARPSL
select PXA27x
select PXA_SHARP_Cxx00
select MACH_SPITZ
select I2C select I2C
select I2C_PXA select I2C_PXA
select MACH_SPITZ
select PXA27x
select PXA_SHARP_Cxx00
config MACH_SPITZ config MACH_SPITZ
bool "Enable Sharp Zaurus SL-3000 (Spitz) Support" bool "Enable Sharp Zaurus SL-3000 (Spitz) Support"
...@@ -575,8 +575,8 @@ config MACH_ICONTROL ...@@ -575,8 +575,8 @@ config MACH_ICONTROL
config ARCH_PXA_ESERIES config ARCH_PXA_ESERIES
bool "PXA based Toshiba e-series PDAs" bool "PXA based Toshiba e-series PDAs"
select PXA25x
select FB_W100 select FB_W100
select PXA25x
config MACH_E330 config MACH_E330
bool "Toshiba e330" bool "Toshiba e330"
...@@ -628,8 +628,8 @@ config MACH_E800 ...@@ -628,8 +628,8 @@ config MACH_E800
config MACH_ZIPIT2 config MACH_ZIPIT2
bool "Zipit Z2 Handheld" bool "Zipit Z2 Handheld"
select PXA27x
select HAVE_PWM select HAVE_PWM
select PXA27x
endif endif
endmenu endmenu
...@@ -720,9 +720,9 @@ config SHARPSL_PM ...@@ -720,9 +720,9 @@ config SHARPSL_PM
config SHARPSL_PM_MAX1111 config SHARPSL_PM_MAX1111
bool bool
select HWMON select HWMON
select SENSORS_MAX1111
select SPI select SPI
select SPI_MASTER select SPI_MASTER
select SENSORS_MAX1111
config PXA_HAVE_ISA_IRQS config PXA_HAVE_ISA_IRQS
bool bool
......
...@@ -21,8 +21,8 @@ config REALVIEW_EB_A9MP ...@@ -21,8 +21,8 @@ config REALVIEW_EB_A9MP
config REALVIEW_EB_ARM11MP config REALVIEW_EB_ARM11MP
bool "Support ARM11MPCore Tile" bool "Support ARM11MPCore Tile"
depends on MACH_REALVIEW_EB depends on MACH_REALVIEW_EB
select CPU_V6K
select ARCH_HAS_BARRIERS if SMP select ARCH_HAS_BARRIERS if SMP
select CPU_V6K
select HAVE_SMP select HAVE_SMP
select MIGHT_HAVE_CACHE_L2X0 select MIGHT_HAVE_CACHE_L2X0
help help
...@@ -40,12 +40,12 @@ config REALVIEW_EB_ARM11MP_REVB ...@@ -40,12 +40,12 @@ config REALVIEW_EB_ARM11MP_REVB
config MACH_REALVIEW_PB11MP config MACH_REALVIEW_PB11MP
bool "Support RealView(R) Platform Baseboard for ARM11MPCore" bool "Support RealView(R) Platform Baseboard for ARM11MPCore"
select CPU_V6K select ARCH_HAS_BARRIERS if SMP
select ARM_GIC select ARM_GIC
select CPU_V6K
select HAVE_PATA_PLATFORM select HAVE_PATA_PLATFORM
select HAVE_SMP select HAVE_SMP
select MIGHT_HAVE_CACHE_L2X0 select MIGHT_HAVE_CACHE_L2X0
select ARCH_HAS_BARRIERS if SMP
help help
Include support for the ARM(R) RealView(R) Platform Baseboard for Include support for the ARM(R) RealView(R) Platform Baseboard for
the ARM11MPCore. This platform has an on-board ARM11MPCore and has the ARM11MPCore. This platform has an on-board ARM11MPCore and has
...@@ -54,8 +54,8 @@ config MACH_REALVIEW_PB11MP ...@@ -54,8 +54,8 @@ config MACH_REALVIEW_PB11MP
# ARMv6 CPU without K extensions, but does have the new exclusive ops # ARMv6 CPU without K extensions, but does have the new exclusive ops
config MACH_REALVIEW_PB1176 config MACH_REALVIEW_PB1176
bool "Support RealView(R) Platform Baseboard for ARM1176JZF-S" bool "Support RealView(R) Platform Baseboard for ARM1176JZF-S"
select CPU_V6
select ARM_GIC select ARM_GIC
select CPU_V6
select HAVE_TCM select HAVE_TCM
select MIGHT_HAVE_CACHE_L2X0 select MIGHT_HAVE_CACHE_L2X0
help help
...@@ -73,8 +73,8 @@ config REALVIEW_PB1176_SECURE_FLASH ...@@ -73,8 +73,8 @@ config REALVIEW_PB1176_SECURE_FLASH
config MACH_REALVIEW_PBA8 config MACH_REALVIEW_PBA8
bool "Support RealView(R) Platform Baseboard for Cortex(tm)-A8 platform" bool "Support RealView(R) Platform Baseboard for Cortex(tm)-A8 platform"
select CPU_V7
select ARM_GIC select ARM_GIC
select CPU_V7
select HAVE_PATA_PLATFORM select HAVE_PATA_PLATFORM
help help
Include support for the ARM(R) RealView Platform Baseboard for Include support for the ARM(R) RealView Platform Baseboard for
...@@ -83,11 +83,11 @@ config MACH_REALVIEW_PBA8 ...@@ -83,11 +83,11 @@ config MACH_REALVIEW_PBA8
config MACH_REALVIEW_PBX config MACH_REALVIEW_PBX
bool "Support RealView(R) Platform Baseboard Explore" bool "Support RealView(R) Platform Baseboard Explore"
select ARCH_SPARSEMEM_ENABLE if CPU_V7 && !REALVIEW_HIGH_PHYS_OFFSET
select ARM_GIC select ARM_GIC
select HAVE_PATA_PLATFORM select HAVE_PATA_PLATFORM
select HAVE_SMP select HAVE_SMP
select MIGHT_HAVE_CACHE_L2X0 select MIGHT_HAVE_CACHE_L2X0
select ARCH_SPARSEMEM_ENABLE if CPU_V7 && !REALVIEW_HIGH_PHYS_OFFSET
select ZONE_DMA if SPARSEMEM select ZONE_DMA if SPARSEMEM
help help
Include support for the ARM(R) RealView(R) Platform Baseboard Include support for the ARM(R) RealView(R) Platform Baseboard
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
config S3C2412_CPUFREQ config S3C2412_CPUFREQ
bool bool
depends on CPU_FREQ_S3C24XX && CPU_S3C2412 depends on CPU_FREQ_S3C24XX && CPU_S3C2412
select S3C2412_IOTIMING
default y default y
select S3C2412_IOTIMING
help help
CPU Frequency scaling support for S3C2412 and S3C2413 SoC CPUs. CPU Frequency scaling support for S3C2412 and S3C2413 SoC CPUs.
...@@ -5,8 +5,8 @@ ...@@ -5,8 +5,8 @@
config S3C2440_CPUFREQ config S3C2440_CPUFREQ
bool "S3C2440/S3C2442 CPU Frequency scaling support" bool "S3C2440/S3C2442 CPU Frequency scaling support"
depends on CPU_FREQ_S3C24XX && (CPU_S3C2440 || CPU_S3C2442) depends on CPU_FREQ_S3C24XX && (CPU_S3C2440 || CPU_S3C2442)
select S3C2410_CPUFREQ_UTILS
default y default y
select S3C2410_CPUFREQ_UTILS
help help
CPU Frequency scaling support for S3C2440 and S3C2442 SoC CPUs. CPU Frequency scaling support for S3C2440 and S3C2442 SoC CPUs.
......
This diff is collapsed.
This diff is collapsed.
...@@ -9,18 +9,18 @@ if ARCH_S5P64X0 ...@@ -9,18 +9,18 @@ if ARCH_S5P64X0
config CPU_S5P6440 config CPU_S5P6440
bool bool
select SAMSUNG_DMADEV
select S5P_HRT select S5P_HRT
select S5P_SLEEP if PM select S5P_SLEEP if PM
select SAMSUNG_DMADEV
select SAMSUNG_WAKEMASK if PM select SAMSUNG_WAKEMASK if PM
help help
Enable S5P6440 CPU support Enable S5P6440 CPU support
config CPU_S5P6450 config CPU_S5P6450
bool bool
select SAMSUNG_DMADEV
select S5P_HRT select S5P_HRT
select S5P_SLEEP if PM select S5P_SLEEP if PM
select SAMSUNG_DMADEV
select SAMSUNG_WAKEMASK if PM select SAMSUNG_WAKEMASK if PM
help help
Enable S5P6450 CPU support Enable S5P6450 CPU support
...@@ -52,19 +52,19 @@ config MACH_SMDK6440 ...@@ -52,19 +52,19 @@ config MACH_SMDK6440
bool "SMDK6440" bool "SMDK6440"
select CPU_S5P6440 select CPU_S5P6440
select S3C_DEV_FB select S3C_DEV_FB
select S3C_DEV_I2C1
select S3C_DEV_RTC
select S3C_DEV_WDT
select S3C_DEV_HSMMC select S3C_DEV_HSMMC
select S3C_DEV_HSMMC1 select S3C_DEV_HSMMC1
select S3C_DEV_HSMMC2 select S3C_DEV_HSMMC2
select S3C_DEV_I2C1
select S3C_DEV_RTC
select S3C_DEV_WDT
select S5P64X0_SETUP_FB_24BPP
select S5P64X0_SETUP_I2C1
select S5P64X0_SETUP_SDHCI_GPIO
select SAMSUNG_DEV_ADC select SAMSUNG_DEV_ADC
select SAMSUNG_DEV_BACKLIGHT select SAMSUNG_DEV_BACKLIGHT
select SAMSUNG_DEV_PWM select SAMSUNG_DEV_PWM
select SAMSUNG_DEV_TS select SAMSUNG_DEV_TS
select S5P64X0_SETUP_FB_24BPP
select S5P64X0_SETUP_I2C1
select S5P64X0_SETUP_SDHCI_GPIO
help help
Machine support for the Samsung SMDK6440 Machine support for the Samsung SMDK6440
...@@ -72,19 +72,19 @@ config MACH_SMDK6450 ...@@ -72,19 +72,19 @@ config MACH_SMDK6450
bool "SMDK6450" bool "SMDK6450"
select CPU_S5P6450 select CPU_S5P6450
select S3C_DEV_FB select S3C_DEV_FB
select S3C_DEV_I2C1
select S3C_DEV_RTC
select S3C_DEV_WDT
select S3C_DEV_HSMMC select S3C_DEV_HSMMC
select S3C_DEV_HSMMC1 select S3C_DEV_HSMMC1
select S3C_DEV_HSMMC2 select S3C_DEV_HSMMC2
select S3C_DEV_I2C1
select S3C_DEV_RTC
select S3C_DEV_WDT
select S5P64X0_SETUP_FB_24BPP
select S5P64X0_SETUP_I2C1
select S5P64X0_SETUP_SDHCI_GPIO
select SAMSUNG_DEV_ADC select SAMSUNG_DEV_ADC
select SAMSUNG_DEV_BACKLIGHT select SAMSUNG_DEV_BACKLIGHT
select SAMSUNG_DEV_PWM select SAMSUNG_DEV_PWM
select SAMSUNG_DEV_TS select SAMSUNG_DEV_TS
select S5P64X0_SETUP_FB_24BPP
select S5P64X0_SETUP_I2C1
select S5P64X0_SETUP_SDHCI_GPIO
help help
Machine support for the Samsung SMDK6450 Machine support for the Samsung SMDK6450
......
...@@ -60,12 +60,6 @@ config MACH_SMDKC100 ...@@ -60,12 +60,6 @@ config MACH_SMDKC100
select S3C_DEV_I2C1 select S3C_DEV_I2C1
select S3C_DEV_RTC select S3C_DEV_RTC
select S3C_DEV_WDT select S3C_DEV_WDT
select SAMSUNG_DEV_ADC
select SAMSUNG_DEV_BACKLIGHT
select SAMSUNG_DEV_IDE
select SAMSUNG_DEV_KEYPAD
select SAMSUNG_DEV_PWM
select SAMSUNG_DEV_TS
select S5PC100_SETUP_FB_24BPP select S5PC100_SETUP_FB_24BPP
select S5PC100_SETUP_I2C1 select S5PC100_SETUP_I2C1
select S5PC100_SETUP_IDE select S5PC100_SETUP_IDE
...@@ -74,6 +68,12 @@ config MACH_SMDKC100 ...@@ -74,6 +68,12 @@ config MACH_SMDKC100
select S5P_DEV_FIMC0 select S5P_DEV_FIMC0
select S5P_DEV_FIMC1 select S5P_DEV_FIMC1
select S5P_DEV_FIMC2 select S5P_DEV_FIMC2
select SAMSUNG_DEV_ADC
select SAMSUNG_DEV_BACKLIGHT
select SAMSUNG_DEV_IDE
select SAMSUNG_DEV_KEYPAD
select SAMSUNG_DEV_PWM
select SAMSUNG_DEV_TS
help help
Machine support for the Samsung SMDKC100 Machine support for the Samsung SMDKC100
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment