upgrade orion and sync to 2.6.26-rc6

[openwrt.git] / target / linux / ppc40x / config-default

diff --git a/target/linux/ppc40x/config-default b/target/linux/ppc40x/config-default
index 53746b7..74e2c9f 100644 (file)
--- a/target/linux/ppc40x/config-default
+++ b/target/linux/ppc40x/config-default
@@ -1,3 +1,4 @@
+CONFIG_405EX=y

 CONFIG_40x=y
 # CONFIG_44x is not set
 CONFIG_4xx=y
 CONFIG_40x=y
 # CONFIG_44x is not set
 CONFIG_4xx=y


@@ -24,11 +25,11 @@ CONFIG_CONSISTENT_SIZE=0x00200000
 CONFIG_CONSISTENT_START=0xff100000
 # CONFIG_CPM2 is not set
 # CONFIG_CPU_FREQ is not set
 CONFIG_CONSISTENT_START=0xff100000
 # CONFIG_CPM2 is not set
 # CONFIG_CPU_FREQ is not set

-# CONFIG_CRYPTO_HW is not set

 # CONFIG_DEBUG_BUGVERBOSE is not set
 # CONFIG_DEFAULT_UIMAGE is not set
 CONFIG_DEVICE_TREE=""
 CONFIG_DEVPORT=y
 # CONFIG_DEBUG_BUGVERBOSE is not set
 # CONFIG_DEFAULT_UIMAGE is not set
 CONFIG_DEVICE_TREE=""
 CONFIG_DEVPORT=y

+# CONFIG_E1000E is not set

 # CONFIG_E200 is not set
 CONFIG_EARLY_PRINTK=y
 # CONFIG_EDAC is not set
 # CONFIG_E200 is not set
 CONFIG_EARLY_PRINTK=y
 # CONFIG_EDAC is not set


@@ -58,9 +59,9 @@ CONFIG_HZ_250=y
 # CONFIG_I2C is not set
 CONFIG_IBM_NEW_EMAC=y
 # CONFIG_IBM_NEW_EMAC_DEBUG is not set
 # CONFIG_I2C is not set
 CONFIG_IBM_NEW_EMAC=y
 # CONFIG_IBM_NEW_EMAC_DEBUG is not set

-# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
+CONFIG_IBM_NEW_EMAC_EMAC4=y

 CONFIG_IBM_NEW_EMAC_POLL_WEIGHT=32
 CONFIG_IBM_NEW_EMAC_POLL_WEIGHT=32

-# CONFIG_IBM_NEW_EMAC_RGMII is not set
+CONFIG_IBM_NEW_EMAC_RGMII=y

 CONFIG_IBM_NEW_EMAC_RXB=256
 CONFIG_IBM_NEW_EMAC_RX_COPY_THRESHOLD=256
 CONFIG_IBM_NEW_EMAC_RX_SKB_HEADROOM=0
 CONFIG_IBM_NEW_EMAC_RXB=256
 CONFIG_IBM_NEW_EMAC_RX_COPY_THRESHOLD=256
 CONFIG_IBM_NEW_EMAC_RX_SKB_HEADROOM=0


@@ -69,6 +70,8 @@ CONFIG_IBM_NEW_EMAC_TXB=256
 # CONFIG_IBM_NEW_EMAC_ZMII is not set
 # CONFIG_IDE is not set
 CONFIG_INITRAMFS_SOURCE=""
 # CONFIG_IBM_NEW_EMAC_ZMII is not set
 # CONFIG_IDE is not set
 CONFIG_INITRAMFS_SOURCE=""

+# CONFIG_IP1000 is not set
+# CONFIG_IPIC is not set

 CONFIG_IRQ_PER_CPU=y
 CONFIG_ISA_DMA_API=y
 CONFIG_KERNEL_START=0xc0000000
 CONFIG_IRQ_PER_CPU=y
 CONFIG_ISA_DMA_API=y
 CONFIG_KERNEL_START=0xc0000000


@@ -132,6 +135,7 @@ CONFIG_MTD_PHYSMAP_OF=y
 # CONFIG_MTD_SLRAM is not set
 # CONFIG_NATSEMI is not set
 # CONFIG_NE2K_PCI is not set
 # CONFIG_MTD_SLRAM is not set
 # CONFIG_NATSEMI is not set
 # CONFIG_NE2K_PCI is not set

+CONFIG_NETDEV_1000=y

 # CONFIG_NET_VENDOR_3COM is not set
 CONFIG_NOT_COHERENT_CACHE=y
 # CONFIG_NVRAM is not set
 # CONFIG_NET_VENDOR_3COM is not set
 CONFIG_NOT_COHERENT_CACHE=y
 # CONFIG_NVRAM is not set


@@ -140,10 +144,13 @@ CONFIG_OF_DEVICE=y
 CONFIG_PCIEAER=y
 CONFIG_PCIEPORTBUS=y
 # CONFIG_PCIPCWATCHDOG is not set
 CONFIG_PCIEAER=y
 CONFIG_PCIEPORTBUS=y
 # CONFIG_PCIPCWATCHDOG is not set

+CONFIG_PCI=y

 CONFIG_PCI_DOMAINS=y
 CONFIG_PCI_DOMAINS=y

+CONFIG_PCI_MSI=y

 CONFIG_PCI_SYSCALL=y
 CONFIG_PPC=y
 CONFIG_PPC32=y
 CONFIG_PCI_SYSCALL=y
 CONFIG_PPC=y
 CONFIG_PPC32=y

+CONFIG_PPC4xx_PCI_EXPRESS=y

 # CONFIG_PPC64 is not set
 # CONFIG_PPC_85xx is not set
 # CONFIG_PPC_8xx is not set
 # CONFIG_PPC64 is not set
 # CONFIG_PPC_85xx is not set
 # CONFIG_PPC_8xx is not set


@@ -165,13 +172,12 @@ CONFIG_PPC_MERGE=y
 # CONFIG_PPC_MPC52xx is not set
 CONFIG_PPC_OF=y
 # CONFIG_PPC_RTAS is not set
 # CONFIG_PPC_MPC52xx is not set
 CONFIG_PPC_OF=y
 # CONFIG_PPC_RTAS is not set

-# CONFIG_PPC_UDBG_16550 is not set
+CONFIG_PPC_UDBG_16550=y

 # CONFIG_PQ2ADS is not set
 CONFIG_PROC_DEVICETREE=y
 CONFIG_RESOURCES_64BIT=y
 CONFIG_RWSEM_XCHGADD_ALGORITHM=y
 CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
 # CONFIG_PQ2ADS is not set
 CONFIG_PROC_DEVICETREE=y
 CONFIG_RESOURCES_64BIT=y
 CONFIG_RWSEM_XCHGADD_ALGORITHM=y
 CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y

-# CONFIG_SCSI_SRP_ATTRS is not set

 CONFIG_SCSI_WAIT_SCAN=m
 # CONFIG_SERIAL_8250_DETECT_IRQ is not set
 CONFIG_SERIAL_8250_EXTENDED=y
 CONFIG_SCSI_WAIT_SCAN=m
 # CONFIG_SERIAL_8250_DETECT_IRQ is not set
 CONFIG_SERIAL_8250_EXTENDED=y


@@ -188,8 +194,7 @@ CONFIG_SSB_POSSIBLE=y
 CONFIG_SYSVIPC_SYSCTL=y
 CONFIG_TASK_SIZE=0xc0000000
 CONFIG_TICK_ONESHOT=y
 CONFIG_SYSVIPC_SYSCTL=y
 CONFIG_TASK_SIZE=0xc0000000
 CONFIG_TICK_ONESHOT=y

-# CONFIG_UCC_SLOW is not set
-# CONFIG_USB is not set
+# CONFIG_TIGON3 is not set

 # CONFIG_USER_NS is not set
 # CONFIG_VGASTATE is not set
 # CONFIG_VIA_RHINE is not set
 # CONFIG_USER_NS is not set
 # CONFIG_VGASTATE is not set
 # CONFIG_VIA_RHINE is not set