add kismet update from whiterussian, clean up uclibc++ fixes

[openwrt.git] / target / linux / linux-2.4 / config / ar7

diff --git a/target/linux/linux-2.4/config/ar7 b/target/linux/linux-2.4/config/ar7
index d312396..dae2200 100644 (file)
--- a/target/linux/linux-2.4/config/ar7
+++ b/target/linux/linux-2.4/config/ar7
@@ -26,7 +26,7 @@ CONFIG_AR7=y
 # CONFIG_AR7RD is not set
 CONFIG_AR7WRD=y
 CONFIG_AR7_FREQUENCY=150
 # CONFIG_AR7RD is not set
 CONFIG_AR7WRD=y
 CONFIG_AR7_FREQUENCY=150

-CONFIG_AR7_MEMORY=14000000
+CONFIG_AR7_MEMORY=0x14000000

 # CONFIG_MIPS_BOSPORUS is not set
 # CONFIG_MIPS_FICMMP is not set
 # CONFIG_MIPS_MIRAGE is not set
 # CONFIG_MIPS_BOSPORUS is not set
 # CONFIG_MIPS_FICMMP is not set
 # CONFIG_MIPS_MIRAGE is not set


@@ -88,7 +88,7 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y
 # CONFIG_RWSEM_XCHGADD_ALGORITHM is not set
 CONFIG_NONCOHERENT_IO=y
 CONFIG_SWAP_IO_SPACE=y
 # CONFIG_RWSEM_XCHGADD_ALGORITHM is not set
 CONFIG_NONCOHERENT_IO=y
 CONFIG_SWAP_IO_SPACE=y

-CONFIG_MIPS_AVALANCHE_PAGING=y
+CONFIG_AR7_PAGING=y

 # CONFIG_MIPS_AU1000 is not set
 
 #
 # CONFIG_MIPS_AU1000 is not set
 
 #


@@ -165,7 +165,8 @@ CONFIG_BINFMT_ELF=y
 # CONFIG_BINFMT_ELF32 is not set
 # CONFIG_BINFMT_MISC is not set
 # CONFIG_OOM_KILLER is not set
 # CONFIG_BINFMT_ELF32 is not set
 # CONFIG_BINFMT_MISC is not set
 # CONFIG_OOM_KILLER is not set

-# CONFIG_CMDLINE_BOOL is not set
+CONFIG_CMDLINE_BOOL=y
+CONFIG_CMDLINE="root=/dev/mtdblock0 console=ttyS0,38400 rootfstype=squashfs,jffs2 init=/etc/preinit noinitrd"

 
 #
 # Memory Technology Devices (MTD)
 
 #
 # Memory Technology Devices (MTD)


@@ -215,6 +216,11 @@ CONFIG_MTD_CFI_AMDSTD=y
 # Mapping drivers for chip access
 #
 # CONFIG_MTD_PHYSMAP is not set
 # Mapping drivers for chip access
 #
 # CONFIG_MTD_PHYSMAP is not set

+CONFIG_MTD_AVALANCHE=y
+CONFIG_MTD_AVALANCHE_DEFAULTS=y
+CONFIG_MTD_AVALANCHE_START=0x10000000
+CONFIG_MTD_AVALANCHE_LEN=0x400000
+CONFIG_MTD_AVALANCHE_BUSWIDTH=2

 # CONFIG_MTD_PB1000 is not set
 # CONFIG_MTD_PB1500 is not set
 # CONFIG_MTD_PB1100 is not set
 # CONFIG_MTD_PB1000 is not set
 # CONFIG_MTD_PB1500 is not set
 # CONFIG_MTD_PB1100 is not set


@@ -252,15 +258,6 @@ CONFIG_MTD_CFI_AMDSTD=y
 # Parallel port support
 #
 # CONFIG_PARPORT is not set
 # Parallel port support
 #
 # CONFIG_PARPORT is not set

-# CONFIG_PARPORT_PC is not set
-# CONFIG_PARPORT_AMIGA is not set
-# CONFIG_PARPORT_MFC3 is not set
-# CONFIG_PARPORT_ATARI is not set
-# CONFIG_PARPORT_GSC is not set
-# CONFIG_PARPORT_SUNBPP is not set
-# CONFIG_PARPORT_IP22 is not set
-# CONFIG_PARPORT_OTHER is not set
-# CONFIG_PARPORT_1284 is not set

 
 #
 # Plug and Play configuration
 
 #
 # Plug and Play configuration


@@ -504,37 +501,7 @@ CONFIG_IPSEC_NAT_TRAVERSAL=y
 # ATA/IDE/MFM/RLL support
 #
 # CONFIG_IDE is not set
 # ATA/IDE/MFM/RLL support
 #
 # CONFIG_IDE is not set

-
-#
-# IDE, ATA and ATAPI Block devices
-#
-# CONFIG_BLK_DEV_IDE is not set
-# CONFIG_BLK_DEV_HD_IDE is not set

 # CONFIG_BLK_DEV_HD is not set
 # CONFIG_BLK_DEV_HD is not set

-# CONFIG_BLK_DEV_IDE_SATA is not set
-# CONFIG_BLK_DEV_IDEDISK is not set
-# CONFIG_IDEDISK_MULTI_MODE is not set
-# CONFIG_IDEDISK_STROKE is not set
-# CONFIG_BLK_DEV_IDECS is not set
-# CONFIG_BLK_DEV_DELKIN is not set
-# CONFIG_BLK_DEV_IDECD is not set
-# CONFIG_BLK_DEV_IDETAPE is not set
-# CONFIG_BLK_DEV_IDEFLOPPY is not set
-# CONFIG_BLK_DEV_IDESCSI is not set
-# CONFIG_IDE_TASK_IOCTL is not set
-# CONFIG_BLK_DEV_CMD640 is not set
-# CONFIG_BLK_DEV_CMD640_ENHANCED is not set
-# CONFIG_BLK_DEV_ISAPNP is not set
-# CONFIG_IDE_CHIPSETS is not set
-# CONFIG_IDEDMA_AUTO is not set
-# CONFIG_IDEDMA_IVB is not set
-# CONFIG_DMA_NONPCI is not set
-# CONFIG_BLK_DEV_PDC202XX is not set
-# CONFIG_BLK_DEV_ATARAID is not set
-# CONFIG_BLK_DEV_ATARAID_PDC is not set
-# CONFIG_BLK_DEV_ATARAID_HPT is not set
-# CONFIG_BLK_DEV_ATARAID_MEDLEY is not set
-# CONFIG_BLK_DEV_ATARAID_SII is not set

 
 #
 # SCSI support
 
 #
 # SCSI support


@@ -593,8 +560,6 @@ CONFIG_CHR_DEV_SG=m
 # CONFIG_SCSI_GENERIC_NCR5380 is not set
 # CONFIG_SCSI_INITIO is not set
 # CONFIG_SCSI_INIA100 is not set
 # CONFIG_SCSI_GENERIC_NCR5380 is not set
 # CONFIG_SCSI_INITIO is not set
 # CONFIG_SCSI_INIA100 is not set

-# CONFIG_SCSI_PPA is not set
-# CONFIG_SCSI_IMM is not set

 # CONFIG_SCSI_NCR53C406A is not set
 # CONFIG_SCSI_NCR53C7xx is not set
 # CONFIG_SCSI_PAS16 is not set
 # CONFIG_SCSI_NCR53C406A is not set
 # CONFIG_SCSI_NCR53C7xx is not set
 # CONFIG_SCSI_PAS16 is not set


@@ -739,10 +704,6 @@ CONFIG_SERIAL_CONSOLE=y
 # CONFIG_SERIAL_NONSTANDARD is not set
 CONFIG_UNIX98_PTYS=y
 CONFIG_UNIX98_PTY_COUNT=128
 # CONFIG_SERIAL_NONSTANDARD is not set
 CONFIG_UNIX98_PTYS=y
 CONFIG_UNIX98_PTY_COUNT=128

-CONFIG_PRINTER=m
-# CONFIG_LP_CONSOLE is not set
-# CONFIG_PPDEV is not set
-# CONFIG_TIPAR is not set

 
 #
 # I2C support
 
 #
 # I2C support