diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-28 11:41:13 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-28 11:41:13 -0400 |
commit | b10a8b7238d7b034f28d32a85bb05c48475f132a (patch) | |
tree | 8e70e816757c2a517de6fb721dd9ac2276619c26 /arch/sh/Kconfig | |
parent | 37eaf8c7463e53cf1acf025fb566fb6c4573297f (diff) | |
parent | 8b2224dc6a5b46cfa1d54ab1fe82107351c66443 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: (72 commits)
sh: SuperH Mobile CEU and camera platform data for AP325RXA
sh: Update smc911x platform data for AP325RXA
sh: SuperH Mobile LCDC platform data for AP325RXA
sh: Add SuperH Mobile CEU platform data for Migo-R
sh: Add SuperH Mobile LCDC platform data for Migo-R
sh: Move asid_cache() out of ifdef to fix SH-3/4 nommu build.
sh: Workaround for __put_user_asm() bug with gcc 4.x on big-endian.
sh: Wire up new syscalls.
sh: fix uImage Entry Point
sh_keysc: remove request_mem_region() and release_mem_region()
sh: Don't miss pending signals returning to user mode after signal processing
sh: Use clk_always_enable() on sh7366
sh: Use clk_always_enable() on sh7343 / SE77343
sh: Use clk_always_enable() on sh7722 / Migo-R / SE7722
sh: Use clk_always_enable() on sh7723 / ap325rxa
sh: Introduce clk_always_enable() function
sh: Show all clocks and their state in /proc/clocks
sh: Merge sh7343 and sh7722 clock code
sh: Add SuperH Mobile MSTPCR bits to clock framework
sh: Use arch_flags to simplify sh7722 siu clock code
...
Diffstat (limited to 'arch/sh/Kconfig')
-rw-r--r-- | arch/sh/Kconfig | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig index 8879938f3356..7bfb0d219d67 100644 --- a/arch/sh/Kconfig +++ b/arch/sh/Kconfig | |||
@@ -477,6 +477,10 @@ config SH_RTS7751R2D | |||
477 | Select RTS7751R2D if configuring for a Renesas Technology | 477 | Select RTS7751R2D if configuring for a Renesas Technology |
478 | Sales SH-Graphics board. | 478 | Sales SH-Graphics board. |
479 | 479 | ||
480 | config SH_RSK7203 | ||
481 | bool "RSK7203" | ||
482 | depends on CPU_SUBTYPE_SH7203 | ||
483 | |||
480 | config SH_SDK7780 | 484 | config SH_SDK7780 |
481 | bool "SDK7780R3" | 485 | bool "SDK7780R3" |
482 | depends on CPU_SUBTYPE_SH7780 | 486 | depends on CPU_SUBTYPE_SH7780 |
@@ -491,6 +495,21 @@ config SH_HIGHLANDER | |||
491 | select SYS_SUPPORTS_PCI | 495 | select SYS_SUPPORTS_PCI |
492 | select IO_TRAPPED | 496 | select IO_TRAPPED |
493 | 497 | ||
498 | config SH_SH7785LCR | ||
499 | bool "SH7785LCR" | ||
500 | depends on CPU_SUBTYPE_SH7785 | ||
501 | select SYS_SUPPORTS_PCI | ||
502 | select IO_TRAPPED | ||
503 | |||
504 | config SH_SH7785LCR_29BIT_PHYSMAPS | ||
505 | bool "SH7785LCR 29bit physmaps" | ||
506 | depends on SH_SH7785LCR | ||
507 | default y | ||
508 | help | ||
509 | This board has 2 physical memory maps. It can be changed with | ||
510 | DIP switch(S2-5). If you set the DIP switch for S2-5 = ON, | ||
511 | you can access all on-board device in 29bit address mode. | ||
512 | |||
494 | config SH_MIGOR | 513 | config SH_MIGOR |
495 | bool "Migo-R" | 514 | bool "Migo-R" |
496 | depends on CPU_SUBTYPE_SH7722 | 515 | depends on CPU_SUBTYPE_SH7722 |
@@ -498,6 +517,20 @@ config SH_MIGOR | |||
498 | Select Migo-R if configuring for the SH7722 Migo-R platform | 517 | Select Migo-R if configuring for the SH7722 Migo-R platform |
499 | by Renesas System Solutions Asia Pte. Ltd. | 518 | by Renesas System Solutions Asia Pte. Ltd. |
500 | 519 | ||
520 | config SH_AP325RXA | ||
521 | bool "AP-325RXA" | ||
522 | depends on CPU_SUBTYPE_SH7723 | ||
523 | help | ||
524 | Renesas "AP-325RXA" support. | ||
525 | Compatible with ALGO SYSTEM CO.,LTD. "AP-320A" | ||
526 | |||
527 | config SH_SH7763RDP | ||
528 | bool "SH7763RDP" | ||
529 | depends on CPU_SUBTYPE_SH7763 | ||
530 | help | ||
531 | Select SH7763RDP if configuring for a Renesas SH7763 | ||
532 | evaluation board. | ||
533 | |||
501 | config SH_EDOSK7705 | 534 | config SH_EDOSK7705 |
502 | bool "EDOSK7705" | 535 | bool "EDOSK7705" |
503 | depends on CPU_SUBTYPE_SH7705 | 536 | depends on CPU_SUBTYPE_SH7705 |
@@ -559,6 +592,7 @@ endmenu | |||
559 | source "arch/sh/boards/renesas/rts7751r2d/Kconfig" | 592 | source "arch/sh/boards/renesas/rts7751r2d/Kconfig" |
560 | source "arch/sh/boards/renesas/r7780rp/Kconfig" | 593 | source "arch/sh/boards/renesas/r7780rp/Kconfig" |
561 | source "arch/sh/boards/renesas/sdk7780/Kconfig" | 594 | source "arch/sh/boards/renesas/sdk7780/Kconfig" |
595 | source "arch/sh/boards/renesas/migor/Kconfig" | ||
562 | source "arch/sh/boards/magicpanelr2/Kconfig" | 596 | source "arch/sh/boards/magicpanelr2/Kconfig" |
563 | 597 | ||
564 | menu "Timer and clock configuration" | 598 | menu "Timer and clock configuration" |