diff options
author | Paul Mundt <lethal@linux-sh.org> | 2007-06-20 05:01:52 -0400 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2007-06-20 05:01:52 -0400 |
commit | 824e55f95f871d492cd095d7694df3cfcad1f8f5 (patch) | |
tree | 652add6016c00e994c67c1c1190de76bb6f991fe | |
parent | 0630e45c887b3d3d8d6ad27af03ec4054926d635 (diff) |
sh: Fix up cf-enabler dependency for SE boards.
This was using CONFIG_SH_SOLUTION_ENGINE, where we really wanted
CONFIG_SOLUTION_ENGINE. While we're at it, move the whole CF
enabler mess somewhere better suited.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
-rw-r--r-- | arch/sh/Kconfig | 87 |
1 files changed, 43 insertions, 44 deletions
diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig index b16407c9f2c4..924efe5b8c29 100644 --- a/arch/sh/Kconfig +++ b/arch/sh/Kconfig | |||
@@ -404,50 +404,6 @@ source "arch/sh/boards/renesas/hs7751rvoip/Kconfig" | |||
404 | source "arch/sh/boards/renesas/rts7751r2d/Kconfig" | 404 | source "arch/sh/boards/renesas/rts7751r2d/Kconfig" |
405 | source "arch/sh/boards/renesas/r7780rp/Kconfig" | 405 | source "arch/sh/boards/renesas/r7780rp/Kconfig" |
406 | 406 | ||
407 | config CF_ENABLER | ||
408 | bool "Compact Flash Enabler support" | ||
409 | depends on SH_SOLUTION_ENGINE || SH_SH03 | ||
410 | ---help--- | ||
411 | Compact Flash is a small, removable mass storage device introduced | ||
412 | in 1994 originally as a PCMCIA device. If you say `Y' here, you | ||
413 | compile in support for Compact Flash devices directly connected to | ||
414 | a SuperH processor. A Compact Flash FAQ is available at | ||
415 | <http://www.compactflash.org/faqs/faq.htm>. | ||
416 | |||
417 | If your board has "Directly Connected" CompactFlash at area 5 or 6, | ||
418 | you may want to enable this option. Then, you can use CF as | ||
419 | primary IDE drive (only tested for SanDisk). | ||
420 | |||
421 | If in doubt, select 'N'. | ||
422 | |||
423 | choice | ||
424 | prompt "Compact Flash Connection Area" | ||
425 | depends on CF_ENABLER | ||
426 | default CF_AREA6 | ||
427 | |||
428 | config CF_AREA5 | ||
429 | bool "Area5" | ||
430 | help | ||
431 | If your board has "Directly Connected" CompactFlash, You should | ||
432 | select the area where your CF is connected to. | ||
433 | |||
434 | - "Area5" if CompactFlash is connected to Area 5 (0x14000000) | ||
435 | - "Area6" if it is connected to Area 6 (0x18000000) | ||
436 | |||
437 | "Area6" will work for most boards. | ||
438 | |||
439 | config CF_AREA6 | ||
440 | bool "Area6" | ||
441 | |||
442 | endchoice | ||
443 | |||
444 | config CF_BASE_ADDR | ||
445 | hex | ||
446 | depends on CF_ENABLER | ||
447 | default "0xb8000000" if CF_AREA6 | ||
448 | default "0xb4000000" if CF_AREA5 | ||
449 | |||
450 | |||
451 | menu "Timer and clock configuration" | 407 | menu "Timer and clock configuration" |
452 | 408 | ||
453 | config SH_TMU | 409 | config SH_TMU |
@@ -705,6 +661,49 @@ config SUPERHYWAY | |||
705 | tristate "SuperHyway Bus support" | 661 | tristate "SuperHyway Bus support" |
706 | depends on CPU_SUBTYPE_SH4_202 | 662 | depends on CPU_SUBTYPE_SH4_202 |
707 | 663 | ||
664 | config CF_ENABLER | ||
665 | bool "Compact Flash Enabler support" | ||
666 | depends on SOLUTION_ENGINE || SH_SH03 | ||
667 | ---help--- | ||
668 | Compact Flash is a small, removable mass storage device introduced | ||
669 | in 1994 originally as a PCMCIA device. If you say `Y' here, you | ||
670 | compile in support for Compact Flash devices directly connected to | ||
671 | a SuperH processor. A Compact Flash FAQ is available at | ||
672 | <http://www.compactflash.org/faqs/faq.htm>. | ||
673 | |||
674 | If your board has "Directly Connected" CompactFlash at area 5 or 6, | ||
675 | you may want to enable this option. Then, you can use CF as | ||
676 | primary IDE drive (only tested for SanDisk). | ||
677 | |||
678 | If in doubt, select 'N'. | ||
679 | |||
680 | choice | ||
681 | prompt "Compact Flash Connection Area" | ||
682 | depends on CF_ENABLER | ||
683 | default CF_AREA6 | ||
684 | |||
685 | config CF_AREA5 | ||
686 | bool "Area5" | ||
687 | help | ||
688 | If your board has "Directly Connected" CompactFlash, You should | ||
689 | select the area where your CF is connected to. | ||
690 | |||
691 | - "Area5" if CompactFlash is connected to Area 5 (0x14000000) | ||
692 | - "Area6" if it is connected to Area 6 (0x18000000) | ||
693 | |||
694 | "Area6" will work for most boards. | ||
695 | |||
696 | config CF_AREA6 | ||
697 | bool "Area6" | ||
698 | |||
699 | endchoice | ||
700 | |||
701 | config CF_BASE_ADDR | ||
702 | hex | ||
703 | depends on CF_ENABLER | ||
704 | default "0xb8000000" if CF_AREA6 | ||
705 | default "0xb4000000" if CF_AREA5 | ||
706 | |||
708 | source "arch/sh/drivers/pci/Kconfig" | 707 | source "arch/sh/drivers/pci/Kconfig" |
709 | 708 | ||
710 | source "drivers/pci/Kconfig" | 709 | source "drivers/pci/Kconfig" |