diff options
author | Imre Kaloz <kaloz@openwrt.org> | 2008-02-04 07:44:14 +0000 |
---|---|---|
committer | Imre Kaloz <kaloz@openwrt.org> | 2008-02-04 07:44:14 +0000 |
commit | 389107970afa434f335e7b3c1d48e0cedd3e813e (patch) | |
tree | a2b869552d50e96def056be10c89daa1dd80938c /target/linux | |
parent | c0ffd0231b4fc304cae18dcd2d693148d31f317c (diff) | |
download | mtk-20170518-389107970afa434f335e7b3c1d48e0cedd3e813e.zip mtk-20170518-389107970afa434f335e7b3c1d48e0cedd3e813e.tar.gz mtk-20170518-389107970afa434f335e7b3c1d48e0cedd3e813e.tar.bz2 |
* disable ikconfig by default * update ppc40x default config
SVN-Revision: 10380
Diffstat (limited to 'target/linux')
-rw-r--r-- | target/linux/generic-2.6/config-2.6.24 | 4 | ||||
-rw-r--r-- | target/linux/ppc40x/config-default | 16 |
2 files changed, 13 insertions, 7 deletions
diff --git a/target/linux/generic-2.6/config-2.6.24 b/target/linux/generic-2.6/config-2.6.24 index 5848485..a80e806 100644 --- a/target/linux/generic-2.6/config-2.6.24 +++ b/target/linux/generic-2.6/config-2.6.24 @@ -446,8 +446,8 @@ CONFIG_IEEE80211_CRYPT_WEP=m CONFIG_IEEE80211_SOFTMAC=m # CONFIG_IEEE80211_SOFTMAC_DEBUG is not set CONFIG_IFB=m -CONFIG_IKCONFIG=y -CONFIG_IKCONFIG_PROC=y +# CONFIG_IKCONFIG is not set +# CONFIG_IKCONFIG_PROC is not set CONFIG_IMQ=m # CONFIG_IMQ_BEHAVIOR_AA is not set # CONFIG_IMQ_BEHAVIOR_AB is not set diff --git a/target/linux/ppc40x/config-default b/target/linux/ppc40x/config-default index 53746b7..4ef59ec 100644 --- 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 @@ -29,6 +30,7 @@ CONFIG_CONSISTENT_START=0xff100000 # 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 @@ -58,9 +60,9 @@ CONFIG_HZ_250=y # 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_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 @@ -69,6 +71,8 @@ CONFIG_IBM_NEW_EMAC_TXB=256 # 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 @@ -132,6 +136,7 @@ CONFIG_MTD_PHYSMAP_OF=y # 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 @@ -141,9 +146,11 @@ CONFIG_PCIEAER=y CONFIG_PCIEPORTBUS=y # CONFIG_PCIPCWATCHDOG is not set CONFIG_PCI_DOMAINS=y +CONFIG_PCI_MSI=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 @@ -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_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_SCSI_SRP_ATTRS is not set CONFIG_SCSI_WAIT_SCAN=m # CONFIG_SERIAL_8250_DETECT_IRQ is not set CONFIG_SERIAL_8250_EXTENDED=y @@ -188,7 +194,7 @@ CONFIG_SSB_POSSIBLE=y CONFIG_SYSVIPC_SYSCTL=y CONFIG_TASK_SIZE=0xc0000000 CONFIG_TICK_ONESHOT=y -# CONFIG_UCC_SLOW is not set +# CONFIG_TIGON3 is not set # CONFIG_USB is not set # CONFIG_USER_NS is not set # CONFIG_VGASTATE is not set |