diff options
author | Paul Mackerras <paulus@samba.org> | 2008-06-16 07:14:12 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2008-06-16 07:14:12 -0400 |
commit | 313348db0bff8911b1219e6338342d0527072741 (patch) | |
tree | 887c957d6c42c7e0df08532ff65151717d518d93 /arch | |
parent | 4a96db3c780f30432653f99cbff193ba3e474e0b (diff) |
[POWERPC] Turn on ATA_SFF so we get SATA_SVW back in defconfigs
This enables CONFIG_ATA_SFF in the defconfigs that are intended to
work on a G5 powermac, i.e. g5_defconfig and ppc64_defconfig. Since
the support for the SATA cell in the K2 chipset is provided by the
sata_svw.c driver, and that depends on CONFIG_ATA_SFF, we need to turn
that and CONFIG_SATA_SVW back on so we can get to the hard disk on G5s.
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/powerpc/configs/g5_defconfig | 62 | ||||
-rw-r--r-- | arch/powerpc/configs/ppc64_defconfig | 66 |
2 files changed, 122 insertions, 6 deletions
diff --git a/arch/powerpc/configs/g5_defconfig b/arch/powerpc/configs/g5_defconfig index db34909831a2..0ccc6e493dcb 100644 --- a/arch/powerpc/configs/g5_defconfig +++ b/arch/powerpc/configs/g5_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.26-rc3 | 3 | # Linux kernel version: 2.6.26-rc6 |
4 | # Tue May 20 20:01:18 2008 | 4 | # Mon Jun 16 21:08:31 2008 |
5 | # | 5 | # |
6 | CONFIG_PPC64=y | 6 | CONFIG_PPC64=y |
7 | 7 | ||
@@ -597,7 +597,61 @@ CONFIG_ATA=y | |||
597 | CONFIG_SATA_PMP=y | 597 | CONFIG_SATA_PMP=y |
598 | # CONFIG_SATA_AHCI is not set | 598 | # CONFIG_SATA_AHCI is not set |
599 | # CONFIG_SATA_SIL24 is not set | 599 | # CONFIG_SATA_SIL24 is not set |
600 | # CONFIG_ATA_SFF is not set | 600 | CONFIG_ATA_SFF=y |
601 | CONFIG_SATA_SVW=y | ||
602 | # CONFIG_ATA_PIIX is not set | ||
603 | # CONFIG_SATA_MV is not set | ||
604 | # CONFIG_SATA_NV is not set | ||
605 | # CONFIG_PDC_ADMA is not set | ||
606 | # CONFIG_SATA_QSTOR is not set | ||
607 | # CONFIG_SATA_PROMISE is not set | ||
608 | # CONFIG_SATA_SX4 is not set | ||
609 | # CONFIG_SATA_SIL is not set | ||
610 | # CONFIG_SATA_SIS is not set | ||
611 | # CONFIG_SATA_ULI is not set | ||
612 | # CONFIG_SATA_VIA is not set | ||
613 | # CONFIG_SATA_VITESSE is not set | ||
614 | # CONFIG_SATA_INIC162X is not set | ||
615 | # CONFIG_PATA_ALI is not set | ||
616 | # CONFIG_PATA_AMD is not set | ||
617 | # CONFIG_PATA_ARTOP is not set | ||
618 | # CONFIG_PATA_ATIIXP is not set | ||
619 | # CONFIG_PATA_CMD640_PCI is not set | ||
620 | # CONFIG_PATA_CMD64X is not set | ||
621 | # CONFIG_PATA_CS5520 is not set | ||
622 | # CONFIG_PATA_CS5530 is not set | ||
623 | # CONFIG_PATA_CYPRESS is not set | ||
624 | # CONFIG_PATA_EFAR is not set | ||
625 | # CONFIG_ATA_GENERIC is not set | ||
626 | # CONFIG_PATA_HPT366 is not set | ||
627 | # CONFIG_PATA_HPT37X is not set | ||
628 | # CONFIG_PATA_HPT3X2N is not set | ||
629 | # CONFIG_PATA_HPT3X3 is not set | ||
630 | # CONFIG_PATA_IT821X is not set | ||
631 | # CONFIG_PATA_IT8213 is not set | ||
632 | # CONFIG_PATA_JMICRON is not set | ||
633 | # CONFIG_PATA_TRIFLEX is not set | ||
634 | # CONFIG_PATA_MARVELL is not set | ||
635 | # CONFIG_PATA_MPIIX is not set | ||
636 | # CONFIG_PATA_OLDPIIX is not set | ||
637 | # CONFIG_PATA_NETCELL is not set | ||
638 | # CONFIG_PATA_NINJA32 is not set | ||
639 | # CONFIG_PATA_NS87410 is not set | ||
640 | # CONFIG_PATA_NS87415 is not set | ||
641 | # CONFIG_PATA_OPTI is not set | ||
642 | # CONFIG_PATA_OPTIDMA is not set | ||
643 | # CONFIG_PATA_PDC_OLD is not set | ||
644 | # CONFIG_PATA_RADISYS is not set | ||
645 | # CONFIG_PATA_RZ1000 is not set | ||
646 | # CONFIG_PATA_SC1200 is not set | ||
647 | # CONFIG_PATA_SERVERWORKS is not set | ||
648 | # CONFIG_PATA_PDC2027X is not set | ||
649 | # CONFIG_PATA_SIL680 is not set | ||
650 | # CONFIG_PATA_SIS is not set | ||
651 | # CONFIG_PATA_VIA is not set | ||
652 | # CONFIG_PATA_WINBOND is not set | ||
653 | # CONFIG_PATA_PLATFORM is not set | ||
654 | # CONFIG_PATA_SCH is not set | ||
601 | CONFIG_MD=y | 655 | CONFIG_MD=y |
602 | CONFIG_BLK_DEV_MD=y | 656 | CONFIG_BLK_DEV_MD=y |
603 | CONFIG_MD_LINEAR=y | 657 | CONFIG_MD_LINEAR=y |
@@ -1230,6 +1284,7 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y | |||
1230 | # | 1284 | # |
1231 | CONFIG_USB_ACM=m | 1285 | CONFIG_USB_ACM=m |
1232 | CONFIG_USB_PRINTER=y | 1286 | CONFIG_USB_PRINTER=y |
1287 | # CONFIG_USB_WDM is not set | ||
1233 | 1288 | ||
1234 | # | 1289 | # |
1235 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 1290 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
@@ -1345,6 +1400,7 @@ CONFIG_USB_APPLEDISPLAY=m | |||
1345 | # CONFIG_USB_TRANCEVIBRATOR is not set | 1400 | # CONFIG_USB_TRANCEVIBRATOR is not set |
1346 | # CONFIG_USB_IOWARRIOR is not set | 1401 | # CONFIG_USB_IOWARRIOR is not set |
1347 | # CONFIG_USB_TEST is not set | 1402 | # CONFIG_USB_TEST is not set |
1403 | # CONFIG_USB_ISIGHTFW is not set | ||
1348 | # CONFIG_USB_GADGET is not set | 1404 | # CONFIG_USB_GADGET is not set |
1349 | # CONFIG_MMC is not set | 1405 | # CONFIG_MMC is not set |
1350 | # CONFIG_MEMSTICK is not set | 1406 | # CONFIG_MEMSTICK is not set |
diff --git a/arch/powerpc/configs/ppc64_defconfig b/arch/powerpc/configs/ppc64_defconfig index 40f84fa2bd29..ce250bc98584 100644 --- a/arch/powerpc/configs/ppc64_defconfig +++ b/arch/powerpc/configs/ppc64_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.26-rc3 | 3 | # Linux kernel version: 2.6.26-rc6 |
4 | # Tue May 20 20:03:02 2008 | 4 | # Mon Jun 16 21:11:19 2008 |
5 | # | 5 | # |
6 | CONFIG_PPC64=y | 6 | CONFIG_PPC64=y |
7 | 7 | ||
@@ -763,7 +763,63 @@ CONFIG_ATA_NONSTANDARD=y | |||
763 | CONFIG_SATA_PMP=y | 763 | CONFIG_SATA_PMP=y |
764 | # CONFIG_SATA_AHCI is not set | 764 | # CONFIG_SATA_AHCI is not set |
765 | CONFIG_SATA_SIL24=y | 765 | CONFIG_SATA_SIL24=y |
766 | # CONFIG_ATA_SFF is not set | 766 | CONFIG_ATA_SFF=y |
767 | CONFIG_SATA_SVW=y | ||
768 | # CONFIG_ATA_PIIX is not set | ||
769 | # CONFIG_SATA_MV is not set | ||
770 | # CONFIG_SATA_NV is not set | ||
771 | # CONFIG_PDC_ADMA is not set | ||
772 | # CONFIG_SATA_QSTOR is not set | ||
773 | # CONFIG_SATA_PROMISE is not set | ||
774 | # CONFIG_SATA_SX4 is not set | ||
775 | # CONFIG_SATA_SIL is not set | ||
776 | # CONFIG_SATA_SIS is not set | ||
777 | # CONFIG_SATA_ULI is not set | ||
778 | # CONFIG_SATA_VIA is not set | ||
779 | # CONFIG_SATA_VITESSE is not set | ||
780 | # CONFIG_SATA_INIC162X is not set | ||
781 | # CONFIG_PATA_ALI is not set | ||
782 | # CONFIG_PATA_AMD is not set | ||
783 | # CONFIG_PATA_ARTOP is not set | ||
784 | # CONFIG_PATA_ATIIXP is not set | ||
785 | # CONFIG_PATA_CMD640_PCI is not set | ||
786 | # CONFIG_PATA_CMD64X is not set | ||
787 | # CONFIG_PATA_CS5520 is not set | ||
788 | # CONFIG_PATA_CS5530 is not set | ||
789 | # CONFIG_PATA_CYPRESS is not set | ||
790 | # CONFIG_PATA_EFAR is not set | ||
791 | # CONFIG_ATA_GENERIC is not set | ||
792 | # CONFIG_PATA_HPT366 is not set | ||
793 | # CONFIG_PATA_HPT37X is not set | ||
794 | # CONFIG_PATA_HPT3X2N is not set | ||
795 | # CONFIG_PATA_HPT3X3 is not set | ||
796 | # CONFIG_PATA_IT821X is not set | ||
797 | # CONFIG_PATA_IT8213 is not set | ||
798 | # CONFIG_PATA_JMICRON is not set | ||
799 | # CONFIG_PATA_TRIFLEX is not set | ||
800 | # CONFIG_PATA_MARVELL is not set | ||
801 | # CONFIG_PATA_MPIIX is not set | ||
802 | # CONFIG_PATA_OLDPIIX is not set | ||
803 | # CONFIG_PATA_NETCELL is not set | ||
804 | # CONFIG_PATA_NINJA32 is not set | ||
805 | # CONFIG_PATA_NS87410 is not set | ||
806 | # CONFIG_PATA_NS87415 is not set | ||
807 | # CONFIG_PATA_OPTI is not set | ||
808 | # CONFIG_PATA_OPTIDMA is not set | ||
809 | # CONFIG_PATA_PCMCIA is not set | ||
810 | # CONFIG_PATA_PDC_OLD is not set | ||
811 | # CONFIG_PATA_RADISYS is not set | ||
812 | # CONFIG_PATA_RZ1000 is not set | ||
813 | # CONFIG_PATA_SC1200 is not set | ||
814 | # CONFIG_PATA_SERVERWORKS is not set | ||
815 | # CONFIG_PATA_PDC2027X is not set | ||
816 | # CONFIG_PATA_SIL680 is not set | ||
817 | # CONFIG_PATA_SIS is not set | ||
818 | # CONFIG_PATA_VIA is not set | ||
819 | # CONFIG_PATA_WINBOND is not set | ||
820 | # CONFIG_PATA_PLATFORM is not set | ||
821 | # CONFIG_PATA_SCC is not set | ||
822 | # CONFIG_PATA_SCH is not set | ||
767 | CONFIG_MD=y | 823 | CONFIG_MD=y |
768 | CONFIG_BLK_DEV_MD=y | 824 | CONFIG_BLK_DEV_MD=y |
769 | CONFIG_MD_LINEAR=y | 825 | CONFIG_MD_LINEAR=y |
@@ -1478,6 +1534,7 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y | |||
1478 | # | 1534 | # |
1479 | # CONFIG_USB_ACM is not set | 1535 | # CONFIG_USB_ACM is not set |
1480 | # CONFIG_USB_PRINTER is not set | 1536 | # CONFIG_USB_PRINTER is not set |
1537 | # CONFIG_USB_WDM is not set | ||
1481 | 1538 | ||
1482 | # | 1539 | # |
1483 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 1540 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
@@ -1537,6 +1594,7 @@ CONFIG_USB_APPLEDISPLAY=m | |||
1537 | # CONFIG_USB_TRANCEVIBRATOR is not set | 1594 | # CONFIG_USB_TRANCEVIBRATOR is not set |
1538 | # CONFIG_USB_IOWARRIOR is not set | 1595 | # CONFIG_USB_IOWARRIOR is not set |
1539 | # CONFIG_USB_TEST is not set | 1596 | # CONFIG_USB_TEST is not set |
1597 | # CONFIG_USB_ISIGHTFW is not set | ||
1540 | # CONFIG_USB_GADGET is not set | 1598 | # CONFIG_USB_GADGET is not set |
1541 | # CONFIG_MMC is not set | 1599 | # CONFIG_MMC is not set |
1542 | # CONFIG_MEMSTICK is not set | 1600 | # CONFIG_MEMSTICK is not set |
@@ -1597,6 +1655,7 @@ CONFIG_RTC_DRV_DS1307=y | |||
1597 | # CONFIG_RTC_DRV_PCF8583 is not set | 1655 | # CONFIG_RTC_DRV_PCF8583 is not set |
1598 | # CONFIG_RTC_DRV_M41T80 is not set | 1656 | # CONFIG_RTC_DRV_M41T80 is not set |
1599 | # CONFIG_RTC_DRV_S35390A is not set | 1657 | # CONFIG_RTC_DRV_S35390A is not set |
1658 | # CONFIG_RTC_DRV_FM3130 is not set | ||
1600 | 1659 | ||
1601 | # | 1660 | # |
1602 | # SPI RTC drivers | 1661 | # SPI RTC drivers |
@@ -1617,6 +1676,7 @@ CONFIG_RTC_DRV_DS1307=y | |||
1617 | # | 1676 | # |
1618 | # on-CPU RTC drivers | 1677 | # on-CPU RTC drivers |
1619 | # | 1678 | # |
1679 | CONFIG_RTC_DRV_PPC=y | ||
1620 | # CONFIG_DMADEVICES is not set | 1680 | # CONFIG_DMADEVICES is not set |
1621 | # CONFIG_UIO is not set | 1681 | # CONFIG_UIO is not set |
1622 | 1682 | ||