aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2009-10-27 13:27:48 +0000
committerFlorian Fainelli <florian@openwrt.org>2009-10-27 13:27:48 +0000
commit4177b70c8da744c46baf5f90c1e0cebc8884d306 (patch)
treef2f9f4e7cc8ec99bb6aca9381e92bbd36b3962e5
parent87b29f3ad88bcb7bcfc2748f9fbede10d3d3d9fc (diff)
downloadupstream-4177b70c8da744c46baf5f90c1e0cebc8884d306.tar.gz
upstream-4177b70c8da744c46baf5f90c1e0cebc8884d306.tar.bz2
upstream-4177b70c8da744c46baf5f90c1e0cebc8884d306.zip
resync kernel configuration, re-enable printk and make the kernel fit under 768KB
SVN-Revision: 18183
-rw-r--r--target/linux/rdc/config-2.6.3052
1 files changed, 17 insertions, 35 deletions
diff --git a/target/linux/rdc/config-2.6.30 b/target/linux/rdc/config-2.6.30
index 6678ef51e3..ff48509ae8 100644
--- a/target/linux/rdc/config-2.6.30
+++ b/target/linux/rdc/config-2.6.30
@@ -22,6 +22,7 @@ CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y
CONFIG_ARCH_SUSPEND_POSSIBLE=y
CONFIG_ARCH_WANT_FRAME_POINTERS=y
CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
+# CONFIG_ARPD is not set
# CONFIG_AUDIT_ARCH is not set
# CONFIG_BASE_FULL is not set
CONFIG_BASE_SMALL=1
@@ -37,21 +38,16 @@ CONFIG_CLOCKSOURCE_WATCHDOG=y
CONFIG_CMDLINE="console=ttyS0,38400"
CONFIG_CMDLINE_BOOL=y
# CONFIG_CMDLINE_OVERRIDE is not set
+# CONFIG_COMPAT_NET_DEV_OPS is not set
# CONFIG_COMPAT_VDSO is not set
# CONFIG_CPU5_WDT is not set
# CONFIG_CPU_FREQ is not set
-CONFIG_CPU_SUP_AMD=y
-CONFIG_CPU_SUP_CENTAUR=y
-CONFIG_CPU_SUP_CYRIX_32=y
-CONFIG_CPU_SUP_INTEL=y
-CONFIG_CPU_SUP_TRANSMETA_32=y
-CONFIG_CPU_SUP_UMC_32=y
-CONFIG_CRYPTO_AEAD2=y
-CONFIG_CRYPTO_BLKCIPHER2=y
-CONFIG_CRYPTO_HASH2=y
-CONFIG_CRYPTO_MANAGER2=y
-CONFIG_CRYPTO_RNG2=y
-CONFIG_CRYPTO_WORKQUEUE=y
+# CONFIG_CPU_SUP_AMD is not set
+# CONFIG_CPU_SUP_CENTAUR is not set
+# CONFIG_CPU_SUP_CYRIX_32 is not set
+# CONFIG_CPU_SUP_INTEL is not set
+# CONFIG_CPU_SUP_TRANSMETA_32 is not set
+# CONFIG_CPU_SUP_UMC_32 is not set
# CONFIG_CS5535_GPIO is not set
# CONFIG_DCDBAS is not set
# CONFIG_DEBUG_BUGVERBOSE is not set
@@ -61,8 +57,7 @@ CONFIG_DEFAULT_IO_DELAY_TYPE=0
# CONFIG_DELL_RBU is not set
CONFIG_DEVPORT=y
# CONFIG_DMA_API_DEBUG is not set
-CONFIG_DMI=y
-# CONFIG_DMIID is not set
+# CONFIG_DMI is not set
CONFIG_DOUBLEFAULT=y
CONFIG_EARLY_PRINTK=y
# CONFIG_EARLY_PRINTK_DBGP is not set
@@ -72,7 +67,7 @@ CONFIG_EARLY_PRINTK=y
CONFIG_FAST_CMPXCHG_LOCAL=y
# CONFIG_FIRMWARE_MEMMAP is not set
CONFIG_FIX_EARLYCON_MEM=y
-CONFIG_FRAME_POINTER=y
+# CONFIG_FRAME_POINTER is not set
# CONFIG_FTRACE_SYSCALLS is not set
CONFIG_GENERIC_BUG=y
CONFIG_GENERIC_CLOCKEVENTS=y
@@ -127,13 +122,8 @@ CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
# CONFIG_HIGH_RES_TIMERS is not set
# CONFIG_HPET_TIMER is not set
# CONFIG_HP_WATCHDOG is not set
-CONFIG_HUGETLBFS=y
-CONFIG_HUGETLB_PAGE=y
-CONFIG_HW_RANDOM=y
-# CONFIG_HW_RANDOM_AMD is not set
-# CONFIG_HW_RANDOM_GEODE is not set
-# CONFIG_HW_RANDOM_INTEL is not set
-# CONFIG_HW_RANDOM_VIA is not set
+# CONFIG_HUGETLBFS is not set
+# CONFIG_HW_RANDOM is not set
CONFIG_HZ=250
# CONFIG_HZ_100 is not set
CONFIG_HZ_250=y
@@ -142,8 +132,6 @@ CONFIG_HZ_250=y
# CONFIG_I8K is not set
# CONFIG_IB700_WDT is not set
# CONFIG_IBMASR is not set
-# CONFIG_IBM_ASM is not set
-CONFIG_ICPLUS_PHY=y
CONFIG_INITRAMFS_SOURCE=""
# CONFIG_IOMMU_API is not set
# CONFIG_IOMMU_HELPER is not set
@@ -155,16 +143,17 @@ CONFIG_IO_DELAY_TYPE_0XED=1
CONFIG_IO_DELAY_TYPE_NONE=3
CONFIG_IO_DELAY_TYPE_UDELAY=2
# CONFIG_IO_DELAY_UDELAY is not set
+# CONFIG_IP_MROUTE is not set
# CONFIG_ISA is not set
CONFIG_ISA_DMA_API=y
# CONFIG_ISCSI_IBFT_FIND is not set
# CONFIG_IT8712F_WDT is not set
# CONFIG_IT87_WDT is not set
# CONFIG_ITCO_WDT is not set
+# CONFIG_JFFS2_SUMMARY is not set
# CONFIG_KERNEL_BZIP2 is not set
# CONFIG_KERNEL_GZIP is not set
CONFIG_KERNEL_LZMA=y
-CONFIG_KEXEC=y
CONFIG_KTIME_SCALAR=y
CONFIG_LBD=y
# CONFIG_LEDS_ALIX2 is not set
@@ -197,9 +186,7 @@ CONFIG_MODULE_FORCE_UNLOAD=y
# CONFIG_MPENTIUMM is not set
# CONFIG_MPSC is not set
# CONFIG_MTD_CFI_INTELEXT is not set
-CONFIG_MTD_CMDLINE_PARTS=y
# CONFIG_MTD_COMPLEX_MAPPINGS is not set
-CONFIG_MTD_CONCAT=y
# CONFIG_MTD_NETSC520 is not set
# CONFIG_MTD_R8610 is not set
CONFIG_MTD_RDC3210=y
@@ -208,7 +195,6 @@ CONFIG_MTD_RDC3210_BUSWIDTH=2
# CONFIG_MTD_RDC3210_FACTORY_PRESENT is not set
CONFIG_MTD_RDC3210_SIZE=0x400000
# CONFIG_MTD_RDC3210_STATIC_MAP is not set
-# CONFIG_MTD_SC520CDP is not set
# CONFIG_MTD_TS5500 is not set
# CONFIG_MTRR is not set
# CONFIG_MVIAC3_2 is not set
@@ -241,12 +227,10 @@ CONFIG_PCI_GOANY=y
# CONFIG_PCI_GOOLPC is not set
# CONFIG_PCI_QUIRKS is not set
# CONFIG_PCSPKR_PLATFORM is not set
-CONFIG_PHYLIB=y
CONFIG_PHYSICAL_ALIGN=0x100000
CONFIG_PHYSICAL_START=0x100000
# CONFIG_POWER_TRACER is not set
-# CONFIG_PRINTK is not set
-# CONFIG_PROCESSOR_SELECT is not set
+CONFIG_PROCESSOR_SELECT=y
# CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
CONFIG_RDC321X_WDT=y
CONFIG_RD_GZIP=y
@@ -266,8 +250,6 @@ CONFIG_SCHED_OMIT_FRAME_POINTER=y
# CONFIG_SCx200 is not set
# CONFIG_SERIAL_8250_EXTENDED is not set
# CONFIG_SHMEM is not set
-# CONFIG_SLAB is not set
-CONFIG_SLOB=y
# CONFIG_SLOW_WORK is not set
# CONFIG_SMP is not set
# CONFIG_SMSC37B787_WDT is not set
@@ -311,10 +293,10 @@ CONFIG_X86_MINIMUM_CPU_FAMILY=4
# CONFIG_X86_PAE is not set
# CONFIG_X86_PLATFORM_DEVICES is not set
CONFIG_X86_POPAD_OK=y
-CONFIG_X86_PPRO_FENCE=y
+# CONFIG_X86_PPRO_FENCE is not set
CONFIG_X86_RDC321X=y
CONFIG_X86_REBOOTFIXUPS=y
-CONFIG_X86_RESERVE_LOW_64K=y
+# CONFIG_X86_RESERVE_LOW_64K is not set
# CONFIG_X86_UP_APIC is not set
CONFIG_X86_VERBOSE_BOOTUP=y
CONFIG_X86_WP_WORKS_OK=y