diff options
| -rw-r--r-- | target/linux/x86/config-2.6.30 | 48 | ||||
| -rw-r--r-- | target/linux/x86/image/Config.in | 3 | ||||
| -rw-r--r-- | target/linux/x86/patches-2.6.30/100-pata_sc1200-wrap.patch | 11 |
3 files changed, 27 insertions, 35 deletions
diff --git a/target/linux/x86/config-2.6.30 b/target/linux/x86/config-2.6.30 index 972852458..6cc268590 100644 --- a/target/linux/x86/config-2.6.30 +++ b/target/linux/x86/config-2.6.30 @@ -26,28 +26,17 @@ CONFIG_ARCH_SUSPEND_POSSIBLE=y CONFIG_ARCH_WANT_FRAME_POINTERS=y CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y # CONFIG_AT1700 is not set +CONFIG_ATA=y +CONFIG_ATA_GENERIC=y +# CONFIG_ATA_NONSTANDARD is not set +CONFIG_ATA_PIIX=y +CONFIG_ATA_SFF=y # CONFIG_AUDIT_ARCH is not set CONFIG_BASE_SMALL=0 # CONFIG_BINARY_PRINTF is not set CONFIG_BINFMT_MISC=y CONFIG_BITREVERSE=y -# CONFIG_BLK_DEV_4DRIVES is not set -# CONFIG_BLK_DEV_ALI14XX is not set -CONFIG_BLK_DEV_AMD74XX=y -# CONFIG_BLK_DEV_CS5536 is not set -# CONFIG_BLK_DEV_DTC2278 is not set -CONFIG_BLK_DEV_GENERIC=y -# CONFIG_BLK_DEV_HT6560B is not set -CONFIG_BLK_DEV_IDEDMA=y -CONFIG_BLK_DEV_IDEDMA_PCI=y -CONFIG_BLK_DEV_IDEDMA_SFF=y -CONFIG_BLK_DEV_IDEPCI=y -# CONFIG_BLK_DEV_IT8172 is not set -CONFIG_BLK_DEV_PIIX=y -# CONFIG_BLK_DEV_QD65XX is not set -CONFIG_BLK_DEV_SC1200=y -# CONFIG_BLK_DEV_UMC8672 is not set -CONFIG_BLK_DEV_VIA82CXXX=y +CONFIG_BLK_DEV_SD=y # CONFIG_BLK_DEV_XD is not set CONFIG_BOUNCE=y # CONFIG_CC_STACKPROTECTOR is not set @@ -183,15 +172,6 @@ CONFIG_HW_RANDOM_VIA=y # CONFIG_IB700_WDT is not set # CONFIG_IBMASR is not set # CONFIG_IBM_ASM is not set -CONFIG_IDE=y -CONFIG_IDEPCI_PCIBUS_ORDER=y -CONFIG_IDE_GD=y -CONFIG_IDE_GD_ATA=y -# CONFIG_IDE_GD_ATAPI is not set -CONFIG_IDE_GENERIC=y -# CONFIG_IDE_PROC_FS is not set -CONFIG_IDE_TIMINGS=y -CONFIG_IDE_XFER_MODE=y CONFIG_INITRAMFS_SOURCE="" CONFIG_INPUT=y CONFIG_INPUT_KEYBOARD=y @@ -233,17 +213,12 @@ CONFIG_KTIME_SCALAR=y # CONFIG_LANCE is not set # CONFIG_LEDS_ALIX2 is not set # CONFIG_LEDS_CLEVO_MAIL is not set -# CONFIG_LIB80211 is not set CONFIG_M386=y # CONFIG_M486 is not set # CONFIG_M586 is not set # CONFIG_M586MMX is not set # CONFIG_M586TSC is not set # CONFIG_M686 is not set -CONFIG_MAC80211_RC_DEFAULT="minstrel" -CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y -# CONFIG_MAC80211_RC_DEFAULT_PID is not set -CONFIG_MAC80211_RC_MINSTREL=y # CONFIG_MACHZ_WDT is not set # CONFIG_MACINTOSH_DRIVERS is not set CONFIG_MATH_EMULATION=y @@ -297,7 +272,6 @@ CONFIG_NAMESPACES=y CONFIG_NET_VENDOR_3COM=y # CONFIG_NET_VENDOR_RACAL is not set # CONFIG_NET_VENDOR_SMC is not set -CONFIG_NLATTR=y CONFIG_NOHIGHMEM=y CONFIG_NR_CPUS=1 # CONFIG_NSC_GPIO is not set @@ -307,6 +281,12 @@ CONFIG_NVRAM=y CONFIG_PAGEFLAGS_EXTENDED=y CONFIG_PAGE_OFFSET=0xC0000000 # CONFIG_PARAVIRT_GUEST is not set +CONFIG_PATA_AMD=y +# CONFIG_PATA_CS5536 is not set +CONFIG_PATA_MPIIX=y +CONFIG_PATA_OLDPIIX=y +CONFIG_PATA_SC1200=y +CONFIG_PATA_VIA=y # CONFIG_PC8736x_GPIO is not set # CONFIG_PC87413_WDT is not set CONFIG_PCI=y @@ -319,7 +299,6 @@ CONFIG_PCI_GOANY=y # CONFIG_PCI_GODIRECT is not set # CONFIG_PCI_GOMMCONFIG is not set # CONFIG_PCI_GOOLPC is not set -# CONFIG_PCI_STUB is not set CONFIG_PCSPKR_PLATFORM=y # CONFIG_PCWATCHDOG is not set CONFIG_PHYSICAL_ALIGN=0x100000 @@ -343,7 +322,8 @@ CONFIG_RTC=y # CONFIG_SC520_WDT is not set # CONFIG_SCHED_HRTICK is not set CONFIG_SCHED_OMIT_FRAME_POINTER=y -# CONFIG_SCSI_DMA is not set +CONFIG_SCSI=y +# CONFIG_SCSI_LOWLEVEL is not set CONFIG_SCx200=y CONFIG_SCx200HR_TIMER=y # CONFIG_SCx200_GPIO is not set diff --git a/target/linux/x86/image/Config.in b/target/linux/x86/image/Config.in index ef7d0cd85..bf1426723 100644 --- a/target/linux/x86/image/Config.in +++ b/target/linux/x86/image/Config.in @@ -22,7 +22,8 @@ config X86_GRUB_KERNELPART config X86_GRUB_ROOTPART string prompt "Root partition on target device" if X86_GRUB_IMAGES - default "/dev/hda2" + default "/dev/hda2" if LINUX_2_6_28 + default "/dev/sda2" help The root partition on the final device. If you don't know, you probably want the default (/dev/hda2). diff --git a/target/linux/x86/patches-2.6.30/100-pata_sc1200-wrap.patch b/target/linux/x86/patches-2.6.30/100-pata_sc1200-wrap.patch new file mode 100644 index 000000000..691d1ca85 --- /dev/null +++ b/target/linux/x86/patches-2.6.30/100-pata_sc1200-wrap.patch @@ -0,0 +1,11 @@ +--- a/drivers/ata/pata_sc1200.c ++++ b/drivers/ata/pata_sc1200.c +@@ -236,7 +236,7 @@ + .port_ops = &sc1200_port_ops + }; + /* Can't enable port 2 yet, see top comments */ +- const struct ata_port_info *ppi[] = { &info, }; ++ const struct ata_port_info *ppi[] = { &info, &ata_dummy_port_info }; + + return ata_pci_sff_init_one(dev, ppi, &sc1200_sht, NULL); + } |