Resync kernel configuration for amcc

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@9967 3c298f89-4303-0410-b956-a3cf2f4a3e73

1 files changed, 32 insertions, 42 deletions

diff --git a/target/linux/amcc/config-2.6.21 b/target/linux/amcc/config-2.6.21
index 00c535e03..716294559 100644
--- a/target/linux/amcc/config-2.6.21
+++ b/target/linux/amcc/config-2.6.21
@@ -1,48 +1,40 @@
 # CONFIG_40x is not set
+CONFIG_440A=y
+CONFIG_440GX=y
 CONFIG_44x=y
 CONFIG_4xx=y
 # CONFIG_6xx is not set
 # CONFIG_8139TOO is not set
 # CONFIG_8xx is not set
-# CONFIG_ATM_DRIVERS is not set
-# CONFIG_BAMBOO is not set
-# CONFIG_E200 is not set
-# CONFIG_E500 is not set
-# CONFIG_EBONY is not set
-# CONFIG_LUAN is not set
-# CONFIG_YUCCA is not set
-# CONFIG_OCOTEA is not set
-CONFIG_TAISHAN=y
-CONFIG_440GX=y
-CONFIG_440A=y
-CONFIG_PTE_64BIT=y
-CONFIG_PHYS_64BIT=y
 # CONFIG_ADVANCED_OPTIONS is not set
 # CONFIG_AGP is not set
+CONFIG_ARCH_HAS_ILOG2_U32=y
+# CONFIG_ARCH_HAS_ILOG2_U64 is not set
 CONFIG_ARCH_MAY_HAVE_PC_FDC=y
 CONFIG_ARCH_POPULATES_NODE_MAP=y
-# CONFIG_B44 is not set
+# CONFIG_BAMBOO is not set
 CONFIG_BASE_SMALL=0
-CONFIG_BIOS_FIXUP=y
-# CONFIG_BLK_DEV_FD is not set
+CONFIG_BITREVERSE=y
+CONFIG_BOOKE=y
 # CONFIG_BOOKE_WDT is not set
 CONFIG_BOOT_LOAD=0x01000000
 # CONFIG_BT is not set
-# CONFIG_BUBINGA is not set
 CONFIG_CMDLINE="console=ttyS1,115200 init=/etc/preinit"
 CONFIG_CMDLINE_BOOL=y
 CONFIG_CONSISTENT_SIZE=0x00200000
 CONFIG_CONSISTENT_START=0xff100000
-# CONFIG_CPCI405 is not set
 # CONFIG_CPU_FREQ is not set
+# CONFIG_DEBUG_BUGVERBOSE is not set
 # CONFIG_E200 is not set
 # CONFIG_E500 is not set
-# CONFIG_EP405 is not set
-# CONFIG_FIRMWARE_EDID is not set
+# CONFIG_EBONY is not set
 CONFIG_FS_POSIX_ACL=y
+CONFIG_GENERIC_BUG=y
 CONFIG_GENERIC_FIND_NEXT_BIT=y
 CONFIG_GENERIC_NVRAM=y
 # CONFIG_GEN_RTC is not set
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT=y
 # CONFIG_HIGHMEM is not set
 CONFIG_HIGHMEM_START=0xfe000000
 CONFIG_HW_RANDOM=y
@@ -51,25 +43,28 @@ CONFIG_HZ=250
 CONFIG_HZ_250=y
 # CONFIG_I2C is not set
 CONFIG_IBM_EMAC=y
+CONFIG_IBM_EMAC4=y
 # CONFIG_IBM_EMAC_DEBUG is not set
 CONFIG_IBM_EMAC_PHY_RX_CLK_FIX=y
 CONFIG_IBM_EMAC_POLL_WEIGHT=32
+CONFIG_IBM_EMAC_RGMII=y
 CONFIG_IBM_EMAC_RXB=128
 CONFIG_IBM_EMAC_RX_COPY_THRESHOLD=256
 CONFIG_IBM_EMAC_RX_SKB_HEADROOM=0
+CONFIG_IBM_EMAC_TAH=y
 CONFIG_IBM_EMAC_TXB=128
+CONFIG_IBM_EMAC_ZMII=y
 CONFIG_IBM_OCP=y
 # CONFIG_IDE is not set
 CONFIG_INITRAMFS_SOURCE=""
 CONFIG_ISA_DMA_API=y
 CONFIG_KERNEL_START=0xc0000000
-# CONFIG_KEXEC is not set
 CONFIG_LOWMEM_SIZE=0x30000000
-# CONFIG_MACINTOSH_DRIVERS is not set
+# CONFIG_LUAN is not set
 CONFIG_MATH_EMULATION=y
-CONFIG_MINI_FO=y
 CONFIG_MTD=y
 # CONFIG_MTD_ABSENT is not set
+CONFIG_MTD_BLKDEVS=y
 CONFIG_MTD_BLOCK=y
 # CONFIG_MTD_BLOCK2MTD is not set
 CONFIG_MTD_CFI=y
@@ -103,7 +98,6 @@ 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
@@ -111,9 +105,9 @@ CONFIG_MTD_PARTITIONS=y
 # CONFIG_MTD_PCI is not set
 # CONFIG_MTD_PHRAM is not set
 CONFIG_MTD_PHYSMAP=y
-CONFIG_MTD_PHYSMAP_START=0x8000000
-CONFIG_MTD_PHYSMAP_LEN=0x0
 CONFIG_MTD_PHYSMAP_BANKWIDTH=2
+CONFIG_MTD_PHYSMAP_LEN=0x0
+CONFIG_MTD_PHYSMAP_START=0x8000000
 # CONFIG_MTD_PLATRAM is not set
 # CONFIG_MTD_PMC551 is not set
 # CONFIG_MTD_RAM is not set
@@ -122,50 +116,46 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=2
 # CONFIG_MTD_SLRAM is not set
 # CONFIG_NATSEMI is not set
 # CONFIG_NE2K_PCI is not set
+CONFIG_NET_SCH_FIFO=y
 # CONFIG_NET_VENDOR_3COM is not set
-CONFIG_NETDEV_1000=y
 CONFIG_NOT_COHERENT_CACHE=y
 # CONFIG_NVRAM is not set
+# CONFIG_OCOTEA 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_PHYS_64BIT=y
+# CONFIG_PNPACPI is not set
 CONFIG_PPC=y
 CONFIG_PPC32=y
 CONFIG_PPC4xx_DMA=y
 CONFIG_PPC4xx_EDMA=y
+CONFIG_PPC_DCR=y
+CONFIG_PPC_DCR_NATIVE=y
 CONFIG_PPC_GEN550=y
 # CONFIG_PPC_I8259 is not set
 CONFIG_PPC_INDIRECT_PCI=y
 CONFIG_PPC_OCP=y
-# CONFIG_REDWOOD_5 is not set
-# CONFIG_REDWOOD_6 is not set
+CONFIG_PTE_64BIT=y
 CONFIG_RESOURCES_64BIT=y
 CONFIG_RWSEM_XCHGADD_ALGORITHM=y
 CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
-# CONFIG_SCSI_BUSLOGIC is not set
-# CONFIG_SCSI_EATA is not set
-# CONFIG_SCSI_GDTH is not set
 # CONFIG_SECCOMP is not set
-# CONFIG_SERIAL_8250_EXTENDED is not set
+# CONFIG_SERIAL_8250_DETECT_IRQ is not set
 CONFIG_SERIAL_8250_EXTENDED=y
 # CONFIG_SERIAL_8250_MANY_PORTS is not set
-CONFIG_SERIAL_8250_SHARE_IRQ=y
-# CONFIG_SERIAL_8250_DETECT_IRQ is not set
 # CONFIG_SERIAL_8250_RSA is not set
+CONFIG_SERIAL_8250_SHARE_IRQ=y
 # CONFIG_SERIAL_TEXT_DEBUG is not set
 # CONFIG_SOFT_WATCHDOG is not set
 # CONFIG_SOUND is not set
 # CONFIG_SPARSEMEM_STATIC is not set
-# CONFIG_SYCAMORE is not set
+CONFIG_SYSVIPC_SYSCTL=y
+CONFIG_TAISHAN=y
 CONFIG_TASK_SIZE=0x80000000
-CONFIG_UART0_TTYS0=y
-# CONFIG_UART0_TTYS1 is not set
 # CONFIG_UNUSED_SYMBOLS is not set
 # CONFIG_USB is not set
 # CONFIG_VIA_RHINE is not set
 CONFIG_WANT_EARLY_SERIAL=y
 # CONFIG_WINDFARM is not set
-# CONFIG_XILINX_ML300 is not set
-# CONFIG_XILINX_ML403 is not set
+# CONFIG_YUCCA is not set