Bring mach-bcm947xx/gpio.h into line with new SSB code, as per #1640

[openwrt.git] / target / linux / magicbox-2.6 / config / default

diff --git a/target/linux/magicbox-2.6/config/default b/target/linux/magicbox-2.6/config/default
index b7d4869..83c9d4b 100644 (file)
--- a/target/linux/magicbox-2.6/config/default
+++ b/target/linux/magicbox-2.6/config/default
@@ -9,15 +9,27 @@ CONFIG_4xx=y
 # CONFIG_AGP is not set
 CONFIG_ARCH_MAY_HAVE_PC_FDC=y
 CONFIG_ARCH_POPULATES_NODE_MAP=y
+# CONFIG_ATM_DRIVERS is not set
 # CONFIG_B44 is not set
 CONFIG_BASE_SMALL=0
 CONFIG_BIOS_FIXUP=y
 # CONFIG_BLK_DEV_FD is not set
+# CONFIG_BLK_DEV_HD is not set
+CONFIG_BLK_DEV_IDE=m
+# CONFIG_BLK_DEV_IDECD is not set
+CONFIG_BLK_DEV_IDEDISK=m
+# CONFIG_BLK_DEV_IDEDMA is not set
+# CONFIG_BLK_DEV_IDEFLOPPY is not set
+# CONFIG_BLK_DEV_IDEPCI is not set
+# CONFIG_BLK_DEV_IDESCSI is not set
+# CONFIG_BLK_DEV_IDETAPE is not set
+# CONFIG_BLK_DEV_IDE_SATA is not set
+CONFIG_BLK_DEV_MAGICBOX_IDE=y
 # CONFIG_BOOKE_WDT is not set
 CONFIG_BOOT_LOAD=0x00400000
 # CONFIG_BT is not set
 # CONFIG_BUBINGA is not set
-CONFIG_CMDLINE="console=ttyS0,115200"
+CONFIG_CMDLINE="root=/dev/mtdblock1 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200 init=/etc/preinit"
 CONFIG_CMDLINE_BOOL=y
 CONFIG_CONSISTENT_SIZE=0x00200000
 CONFIG_CONSISTENT_START=0xff100000
@@ -47,13 +59,22 @@ CONFIG_IBM_EMAC_RX_COPY_THRESHOLD=256
 CONFIG_IBM_EMAC_RX_SKB_HEADROOM=0
 CONFIG_IBM_EMAC_TXB=8
 CONFIG_IBM_OCP=y
-# CONFIG_IDE is not set
+CONFIG_IDE=m
+# CONFIG_IDEDISK_MULTI_MODE is not set
+# CONFIG_IDEDMA_AUTO is not set
+# CONFIG_IDE_ARM is not set
+CONFIG_IDE_GENERIC=m
+CONFIG_IDE_MAX_HWIFS=4
+# CONFIG_IDE_PROC_FS is not set
+# CONFIG_IDE_TASK_IOCTL is not set
 CONFIG_INITRAMFS_SOURCE=""
 CONFIG_ISA_DMA_API=y
 CONFIG_JFFS2_FS_DEBUG=0
 CONFIG_KERNEL_START=0xc0000000
 # CONFIG_KEXEC is not set
+# CONFIG_LEDS_TRIGGER_IDE_DISK is not set
 CONFIG_LOWMEM_SIZE=0x30000000
+# CONFIG_MACINTOSH_DRIVERS is not set
 CONFIG_MAGICBOX=y
 CONFIG_MATH_EMULATION=y
 CONFIG_MINI_FO=y
@@ -85,7 +106,6 @@ CONFIG_MTD_COMPLEX_MAPPINGS=y
 # CONFIG_MTD_DOC2001PLUS is not set
 CONFIG_MTD_GEN_PROBE=y
 # CONFIG_MTD_JEDECPROBE is not set
-CONFIG_MTD_MAGICMAP=y
 CONFIG_MTD_MAP_BANK_WIDTH_1=y
 # CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
 CONFIG_MTD_MAP_BANK_WIDTH_2=y
@@ -93,28 +113,31 @@ CONFIG_MTD_MAP_BANK_WIDTH_2=y
 CONFIG_MTD_MAP_BANK_WIDTH_4=y
 # CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
 # CONFIG_MTD_MTDRAM is not set
-# CONFIG_MTD_NAND is not set
 # CONFIG_MTD_OBSOLETE_CHIPS is not set
 # CONFIG_MTD_ONENAND is not set
 # CONFIG_MTD_OTP is not set
 CONFIG_MTD_PARTITIONS=y
 # CONFIG_MTD_PCI is not set
 # CONFIG_MTD_PHRAM is not set
-# CONFIG_MTD_PHYSMAP is not set
+CONFIG_MTD_PHYSMAP=y
+CONFIG_MTD_PHYSMAP_BANKWIDTH=2
+CONFIG_MTD_PHYSMAP_LEN=0
+CONFIG_MTD_PHYSMAP_START=0xffc00000
 # CONFIG_MTD_PLATRAM is not set
 # CONFIG_MTD_PMC551 is not set
 # CONFIG_MTD_RAM is not set
 # CONFIG_MTD_REDBOOT_PARTS is not set
 # CONFIG_MTD_ROM is not set
 # CONFIG_MTD_SLRAM is not set
+CONFIG_MTD_SPLIT_ROOTFS=y
 # CONFIG_NATSEMI is not set
 # CONFIG_NE2K_PCI is not set
 # CONFIG_NET_VENDOR_3COM is not set
+CONFIG_NETDEV_1000=y
 CONFIG_NOT_COHERENT_CACHE=y
 # CONFIG_NVRAM is not set
 # CONFIG_PCIPCWATCHDOG is not set
 CONFIG_PCI_DOMAINS=y
-# CONFIG_PCMCIA_ATMEL is not set
 # CONFIG_PC_KEYBOARD is not set
 # CONFIG_PM is not set
 CONFIG_PPC=y