Remove 8250 serial driver, enable software watchdog

[openwrt/svn-archive/archive.git] / target / linux / adm5120-2.6 / config / default

diff --git a/target/linux/adm5120-2.6/config/default b/target/linux/adm5120-2.6/config/default
index e5894fc9cb8b25f69e98dfbb3ee5efc0996623b9..81117c4234a3b1f612038c341b118c0e5e811fa3 100644 (file)
--- a/target/linux/adm5120-2.6/config/default
+++ b/target/linux/adm5120-2.6/config/default
@@ -76,26 +76,10 @@ CONFIG_CRYPTO_HASH=y
 CONFIG_CRYPTO_HMAC=y
 CONFIG_CRYPTO_SHA1=y
 # CONFIG_DDB5477 is not set
 CONFIG_CRYPTO_HMAC=y
 CONFIG_CRYPTO_SHA1=y
 # CONFIG_DDB5477 is not set

-# CONFIG_DEBUG_DRIVER is not set
-# CONFIG_DEBUG_INFO is not set
-CONFIG_DEBUG_KERNEL=y
-# CONFIG_DEBUG_KOBJECT is not set
-# CONFIG_DEBUG_LIST is not set
-CONFIG_DEBUG_LOCKING_API_SELFTESTS=y
-# CONFIG_DEBUG_LOCK_ALLOC is not set
-# CONFIG_DEBUG_MUTEXES is not set
-# CONFIG_DEBUG_RT_MUTEXES is not set
-# CONFIG_DEBUG_RWSEMS is not set
-# CONFIG_DEBUG_SLAB is not set
-# CONFIG_DEBUG_SPINLOCK is not set
-# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
-# CONFIG_DEBUG_STACK_USAGE is not set
-# CONFIG_DEBUG_VM is not set

 CONFIG_DEFAULT_CFQ=y
 # CONFIG_DEFAULT_DEADLINE is not set
 CONFIG_DEFAULT_IOSCHED="cfq"
 CONFIG_DEFAULT_TCP_CONG="cubic"
 CONFIG_DEFAULT_CFQ=y
 # CONFIG_DEFAULT_DEADLINE is not set
 CONFIG_DEFAULT_IOSCHED="cfq"
 CONFIG_DEFAULT_TCP_CONG="cubic"

-CONFIG_DETECT_SOFTLOCKUP=y

 # CONFIG_DM9000 is not set
 CONFIG_DMA_NEED_PCI_MAP_STATE=y
 CONFIG_DMA_NONCOHERENT=y
 # CONFIG_DM9000 is not set
 CONFIG_DMA_NEED_PCI_MAP_STATE=y
 CONFIG_DMA_NONCOHERENT=y


@@ -103,7 +87,6 @@ CONFIG_ELF_CORE=y
 # CONFIG_EXT2_FS is not set
 # CONFIG_EXT3_FS is not set
 CONFIG_FIRMWARE_EDID=y
 # CONFIG_EXT2_FS is not set
 # CONFIG_EXT3_FS is not set
 CONFIG_FIRMWARE_EDID=y

-CONFIG_FORCED_INLINING=y

 CONFIG_FS_POSIX_ACL=y
 CONFIG_FW_LOADER=m
 CONFIG_GENERIC_ACL=y
 CONFIG_FS_POSIX_ACL=y
 CONFIG_FW_LOADER=m
 CONFIG_GENERIC_ACL=y


@@ -166,7 +149,6 @@ CONFIG_JFFS2_FS_SECURITY=y
 CONFIG_JFFS2_FS_XATTR=y
 CONFIG_JFFS2_SUMMARY=y
 # CONFIG_JFS_FS is not set
 CONFIG_JFFS2_FS_XATTR=y
 CONFIG_JFFS2_SUMMARY=y
 # CONFIG_JFS_FS is not set

-# CONFIG_KGDB is not set

 CONFIG_LEDS_CLASS=m
 CONFIG_LEDS_TRIGGER_HEARTBEAT=m
 CONFIG_LEDS_TRIGGER_TIMER=m
 CONFIG_LEDS_CLASS=m
 CONFIG_LEDS_TRIGGER_HEARTBEAT=m
 CONFIG_LEDS_TRIGGER_TIMER=m


@@ -206,7 +188,6 @@ CONFIG_MIPS_MT_DISABLED=y
 # CONFIG_MIPS_PB1550 is not set
 # CONFIG_MIPS_SEAD is not set
 # CONFIG_MIPS_SIM is not set
 # CONFIG_MIPS_PB1550 is not set
 # CONFIG_MIPS_SEAD is not set
 # CONFIG_MIPS_SIM is not set

-# CONFIG_MIPS_UNCACHED is not set

 # CONFIG_MIPS_VPE_LOADER is not set
 # CONFIG_MIPS_XXS1500 is not set
 CONFIG_MODULE_FORCE_UNLOAD=y
 # CONFIG_MIPS_VPE_LOADER is not set
 # CONFIG_MIPS_XXS1500 is not set
 CONFIG_MODULE_FORCE_UNLOAD=y


@@ -218,7 +199,7 @@ CONFIG_MODULE_FORCE_UNLOAD=y
 # CONFIG_MSDOS_FS is not set
 CONFIG_MTD=y
 # CONFIG_MTD_ABSENT is not set
 # CONFIG_MSDOS_FS is not set
 CONFIG_MTD=y
 # CONFIG_MTD_ABSENT is not set

-CONFIG_MTD_ADM5120=y
+# CONFIG_MTD_ADM5120 is not set

 # CONFIG_MTD_BLOCK is not set
 # CONFIG_MTD_BLOCK2MTD is not set
 # CONFIG_MTD_BLOCK_RO is not set
 # CONFIG_MTD_BLOCK is not set
 # CONFIG_MTD_BLOCK2MTD is not set
 # CONFIG_MTD_BLOCK_RO is not set


@@ -319,8 +300,8 @@ CONFIG_PAGE_SIZE_4KB=y
 # CONFIG_PAGE_SIZE_8KB is not set
 # CONFIG_PARTITION_ADVANCED is not set
 # CONFIG_PCCARD is not set
 # CONFIG_PAGE_SIZE_8KB is not set
 # CONFIG_PARTITION_ADVANCED is not set
 # CONFIG_PCCARD is not set

+# CONFIG_PCIPCWATCHDOG is not set

 CONFIG_PCI_ADM5120=y
 CONFIG_PCI_ADM5120=y

-# CONFIG_PCI_DEBUG is not set

 # CONFIG_PMC_YOSEMITE is not set
 # CONFIG_PNX8550_JBS is not set
 # CONFIG_PNX8550_V2PCI is not set
 # CONFIG_PMC_YOSEMITE is not set
 # CONFIG_PNX8550_JBS is not set
 # CONFIG_PNX8550_V2PCI is not set


@@ -333,25 +314,17 @@ CONFIG_PPPOE=y
 # CONFIG_PPP_MPPE is not set
 # CONFIG_PPP_MULTILINK is not set
 # CONFIG_PPP_SYNC_TTY is not set
 # CONFIG_PPP_MPPE is not set
 # CONFIG_PPP_MULTILINK is not set
 # CONFIG_PPP_SYNC_TTY is not set

-# CONFIG_PROVE_LOCKING is not set
-# CONFIG_RCU_TORTURE_TEST is not set

 # CONFIG_REISERFS_FS is not set
 CONFIG_RELAY=y
 # CONFIG_ROMFS_FS is not set
 # CONFIG_RTC is not set
 # CONFIG_REISERFS_FS is not set
 CONFIG_RELAY=y
 # CONFIG_ROMFS_FS is not set
 # CONFIG_RTC is not set

-# CONFIG_RT_MUTEX_TESTER is not set
-# CONFIG_RUNTIME_DEBUG is not set

 CONFIG_RWSEM_GENERIC_SPINLOCK=y
 CONFIG_RWSEM_GENERIC_SPINLOCK=y

-# CONFIG_SCHEDSTATS is not set

 CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
 # CONFIG_SCSI is not set
 # CONFIG_SENSORS_ABITUGURU is not set
 # CONFIG_SENSORS_F71805F is not set
 # CONFIG_SENSORS_VT1211 is not set
 CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
 # CONFIG_SCSI is not set
 # CONFIG_SENSORS_ABITUGURU is not set
 # CONFIG_SENSORS_F71805F is not set
 # CONFIG_SENSORS_VT1211 is not set

-# CONFIG_SERIAL_8250_EXTENDED is not set
-CONFIG_SERIAL_8250_NR_UARTS=4
-CONFIG_SERIAL_8250_PCI=y
-CONFIG_SERIAL_8250_RUNTIME_UARTS=4
+# CONFIG_SERIAL_8250 is not set

 CONFIG_SERIAL_ADM5120=y
 CONFIG_SERIO=y
 # CONFIG_SERIO_I8042 is not set
 CONFIG_SERIAL_ADM5120=y
 CONFIG_SERIO=y
 # CONFIG_SERIO_I8042 is not set


@@ -372,6 +345,7 @@ CONFIG_SERIO_SERPORT=y
 # CONFIG_SIBYTE_SENTOSA is not set
 # CONFIG_SIBYTE_SWARM is not set
 CONFIG_SLHC=y
 # CONFIG_SIBYTE_SENTOSA is not set
 # CONFIG_SIBYTE_SWARM is not set
 CONFIG_SLHC=y

+CONFIG_SOFT_WATCHDOG=m

 # CONFIG_SOUND is not set
 # CONFIG_SPARSEMEM_STATIC is not set
 CONFIG_SYN_COOKIES=y
 # CONFIG_SOUND is not set
 # CONFIG_SPARSEMEM_STATIC is not set
 CONFIG_SYN_COOKIES=y


@@ -391,6 +365,7 @@ CONFIG_TRAD_SIGNALS=y
 # CONFIG_UDF_FS is not set
 # CONFIG_UNUSED_SYMBOLS is not set
 CONFIG_USB=y
 # CONFIG_UDF_FS is not set
 # CONFIG_UNUSED_SYMBOLS is not set
 CONFIG_USB=y

+# CONFIG_USBPCWATCHDOG is not set

 # CONFIG_USB_ACM is not set
 CONFIG_USB_ADM5120_HCD=y
 # CONFIG_USB_CATC is not set
 # CONFIG_USB_ACM is not set
 CONFIG_USB_ADM5120_HCD=y
 # CONFIG_USB_CATC is not set


@@ -407,7 +382,6 @@ CONFIG_USB_ADM5120_HCD=y
 CONFIG_UTS_NS=y
 # CONFIG_VFAT_FS is not set
 CONFIG_VM_EVENT_COUNTERS=y
 CONFIG_UTS_NS=y
 # CONFIG_VFAT_FS is not set
 CONFIG_VM_EVENT_COUNTERS=y

-# CONFIG_WATCHDOG is not set

 CONFIG_XFRM_SUB_POLICY=y
 CONFIG_XFRM_USER=y
 # CONFIG_XFS_FS is not set
 CONFIG_XFRM_SUB_POLICY=y
 CONFIG_XFRM_USER=y
 # CONFIG_XFS_FS is not set