diff --exclude '*.swp' --exclude '*.orig' --exclude '*~' -ur linux-2.4.19-16mdkcustom.virgin/arch/alpha/defconfig linux-2.4.19-16mdkcustom.memory_bus/arch/alpha/defconfig --- linux-2.4.19-16mdkcustom.virgin/arch/alpha/defconfig 2002-09-20 09:45:48.000000000 -0400 +++ linux-2.4.19-16mdkcustom.memory_bus/arch/alpha/defconfig 2002-11-01 18:50:35.000000000 -0500 @@ -51,6 +51,7 @@ # CONFIG_ALPHA_TAKARA is not set # CONFIG_ALPHA_TITAN is not set # CONFIG_ALPHA_WILDFIRE is not set +CONFIG_MEMORY_BUS=y CONFIG_ISA=y CONFIG_EISA=y # CONFIG_SBUS is not set diff --exclude '*.swp' --exclude '*.orig' --exclude '*~' -ur linux-2.4.19-16mdkcustom.virgin/arch/i386/defconfig linux-2.4.19-16mdkcustom.memory_bus/arch/i386/defconfig --- linux-2.4.19-16mdkcustom.virgin/arch/i386/defconfig 2002-09-20 09:45:04000000000 -0400 +++ linux-2.4.19-16mdkcustom.memory_bus/arch/i386/defconfig 2002-11-01 18:50:44.000000000 -0500 @@ -67,6 +67,7 @@ CONFIG_X86_LOCAL_APIC=y CONFIG_X86_IO_APIC=y CONFIG_ISA=y +CONFIG_MEMORY_BUS=y # # General setup diff --exclude '*.swp' --exclude '*.orig' --exclude '*~' -ur linux-2.4.19-16mdkcustom.virgin/arch/ia64/defconfig linux-2.4.19-16mdkcustom.memory_bus/arch/ia64/defconfig --- linux-2.4.19-16mdkcustom.virgin/arch/ia64/defconfig 2002-09-20 09:46:16.000000000 -0400 +++ linux-2.4.19-16mdkcustom.memory_bus/arch/ia64/defconfig 2002-11-01 18:50:51.000000000 -0500 @@ -18,6 +18,7 @@ # General setup # CONFIG_IA64=y +CONFIG_MEMORY_BUS=y # CONFIG_ISA is not set # CONFIG_EISA is not set # CONFIG_MCA is not set diff --exclude '*.swp' --exclude '*.orig' --exclude '*~' -ur linux-2.4.19-16mdkcustom.virgin/arch/ppc/defconfig linux-2.4.19-16mdkcustom.memory_bus/arch/ppc/defconfig --- linux-2.4.19-16mdkcustom.virgin/arch/ppc/defconfig 2002-09-20 09:46:00.000000000 -0400 +++ linux-2.4.19-16mdkcustom.memory_bus/arch/ppc/defconfig 2002-11-01 18:50:57.000000000 -0500 @@ -47,6 +47,7 @@ # CONFIG_EISA is not set # CONFIG_SBUS is not set # CONFIG_MCA is not set +CONFIG_MEMORY_BUS=y CONFIG_PCI=y CONFIG_NET=y CONFIG_SYSCTL=y diff --exclude '*.swp' --exclude '*.orig' --exclude '*~' -ur linux-2.4.19-16mdkcustom.virgin/arch/x86_64/defconfig linux-2.4.19-16mdkcustom.memory_bus/arch/x86_64/defconfig --- linux-2.4.19-16mdkcustom.virgin/arch/x86_64/defconfig 2002-09-20 09:46:34.000000000 -0400 +++ linux-2.4.19-16mdkcustom.memory_bus/arch/x86_64/defconfig 2002-11-01 18:51:03.000000000 -0500 @@ -3,6 +3,7 @@ # CONFIG_X86_64=y CONFIG_X86=y +CONFIG_MEMORY_BUS=y # CONFIG_ISA is not set # CONFIG_SBUS is not set CONFIG_UID16=y diff --exclude '*.swp' --exclude '*.orig' --exclude '*~' -ur linux-2.4.19-16mdkcustom.virgin/drivers/mtd/chips/Config.in linux-2.4.19-16mdkcustom.memory_bus/drivers/mtd/chips/Config.in --- linux-2.4.19-16mdkcustom.virgin/drivers/mtd/chips/Config.in 2001-10-04 18:13:18.000000000 -0400 +++ linux-2.4.19-16mdkcustom.memory_bus/drivers/mtd/chips/Config.in 2002-11-01 21:15:14.000000000 -0500 @@ -6,52 +6,53 @@ comment 'RAM/ROM/Flash chip drivers' -dep_tristate ' Detect flash chips by Common Flash Interface (CFI) probe' CONFIG_MTD_CFI $CONFIG_MTD -#dep_tristate ' Detect non-CFI Intel-compatible flash chips' CONFIG_MTD_INTELPROBE $CONFIG_MTD -dep_tristate ' Detect non-CFI AMD/JEDEC-compatible flash chips' CONFIG_MTD_JEDECPROBE $CONFIG_MTD - -if [ "$CONFIG_MTD_CFI" = "y" -o "$CONFIG_MTD_INTELPROBE" = "y" -o "$CONFIG_MTD_JEDECPROBE" = "y" ]; then - define_bool CONFIG_MTD_GEN_PROBE y -else - if [ "$CONFIG_MTD_CFI" = "m" -o "$CONFIG_MTD_INTELPROBE" = "m" -o "$CONFIG_MTD_JEDECPROBE" = "m" ]; then - define_bool CONFIG_MTD_GEN_PROBE m +if [ "$CONFIG_MEMORY_BUS" = "y" ]; then + dep_tristate ' Detect flash chips by Common Flash Interface (CFI) probe' CONFIG_MTD_CFI $CONFIG_MTD + #dep_tristate ' Detect non-CFI Intel-compatible flash chips' CONFIG_MTD_INTELPROBE $CONFIG_MTD + dep_tristate ' Detect non-CFI AMD/JEDEC-compatible flash chips' CONFIG_MTD_JEDECPROBE $CONFIG_MTD + + if [ "$CONFIG_MTD_CFI" = "y" -o "$CONFIG_MTD_INTELPROBE" = "y" -o "$CONFIG_MTD_JEDECPROBE" = "y" ]; then + define_bool CONFIG_MTD_GEN_PROBE y else - define_bool CONFIG_MTD_GEN_PROBE n + if [ "$CONFIG_MTD_CFI" = "m" -o "$CONFIG_MTD_INTELPROBE" = "m" -o "$CONFIG_MTD_JEDECPROBE" = "m" ]; then + define_bool CONFIG_MTD_GEN_PROBE m + else + define_bool CONFIG_MTD_GEN_PROBE n + fi fi -fi -if [ "$CONFIG_MTD_GEN_PROBE" = "y" -o "$CONFIG_MTD_GEN_PROBE" = "m" ]; then - bool ' Flash chip driver advanced configuration options' CONFIG_MTD_CFI_ADV_OPTIONS - if [ "$CONFIG_MTD_CFI_ADV_OPTIONS" = "y" ]; then - choice 'Flash cmd/query data swapping' \ - "NO CONFIG_MTD_CFI_NOSWAP \ - BIG_ENDIAN_BYTE CONFIG_MTD_CFI_BE_BYTE_SWAP \ - LITTLE_ENDIAN_BYTE CONFIG_MTD_CFI_LE_BYTE_SWAP" NO - bool ' Specific CFI Flash geometry selection' CONFIG_MTD_CFI_GEOMETRY - if [ "$CONFIG_MTD_CFI_GEOMETRY" = "y" ]; then - bool ' Support 8-bit buswidth' CONFIG_MTD_CFI_B1 - bool ' Support 16-bit buswidth' CONFIG_MTD_CFI_B2 - bool ' Support 32-bit buswidth' CONFIG_MTD_CFI_B4 - if [ "$CONFIG_MTD_CFI_B1" = "y" ]; then - define_bool CONFIG_MTD_CFI_I1 y - else - bool ' Support 1-chip flash interleave' CONFIG_MTD_CFI_I1 - fi - bool ' Support 2-chip flash interleave' CONFIG_MTD_CFI_I2 - bool ' Support 4-chip flash interleave' CONFIG_MTD_CFI_I4 + if [ "$CONFIG_MTD_GEN_PROBE" = "y" -o "$CONFIG_MTD_GEN_PROBE" = "m" ]; then + bool ' Flash chip driver advanced configuration options' CONFIG_MTD_CFI_ADV_OPTIONS + if [ "$CONFIG_MTD_CFI_ADV_OPTIONS" = "y" ]; then + choice 'Flash cmd/query data swapping' \ + "NO CONFIG_MTD_CFI_NOSWAP \ + BIG_ENDIAN_BYTE CONFIG_MTD_CFI_BE_BYTE_SWAP \ + LITTLE_ENDIAN_BYTE CONFIG_MTD_CFI_LE_BYTE_SWAP" NO + bool ' Specific CFI Flash geometry selection' CONFIG_MTD_CFI_GEOMETRY + if [ "$CONFIG_MTD_CFI_GEOMETRY" = "y" ]; then + bool ' Support 8-bit buswidth' CONFIG_MTD_CFI_B1 + bool ' Support 16-bit buswidth' CONFIG_MTD_CFI_B2 + bool ' Support 32-bit buswidth' CONFIG_MTD_CFI_B4 + if [ "$CONFIG_MTD_CFI_B1" = "y" ]; then + define_bool CONFIG_MTD_CFI_I1 y + else + bool ' Support 1-chip flash interleave' CONFIG_MTD_CFI_I1 + fi + bool ' Support 2-chip flash interleave' CONFIG_MTD_CFI_I2 + bool ' Support 4-chip flash interleave' CONFIG_MTD_CFI_I4 + fi fi - fi -fi -dep_tristate ' Support for Intel/Sharp flash chips' CONFIG_MTD_CFI_INTELEXT $CONFIG_MTD_GEN_PROBE -dep_tristate ' Support for AMD/Fujitsu flash chips' CONFIG_MTD_CFI_AMDSTD $CONFIG_MTD_GEN_PROBE - -dep_tristate ' Support for RAM chips in bus mapping' CONFIG_MTD_RAM $CONFIG_MTD -dep_tristate ' Support for ROM chips in bus mapping' CONFIG_MTD_ROM $CONFIG_MTD -dep_tristate ' Support for absent chips in bus mapping' CONFIG_MTD_ABSENT $CONFIG_MTD - -bool ' Older (theoretically obsoleted now) drivers for non-CFI chips' CONFIG_MTD_OBSOLETE_CHIPS -dep_tristate ' AMD compatible flash chip support (non-CFI)' CONFIG_MTD_AMDSTD $CONFIG_MTD $CONFIG_MTD_OBSOLETE_CHIPS -dep_tristate ' pre-CFI Sharp chip support' CONFIG_MTD_SHARP $CONFIG_MTD $CONFIG_MTD_OBSOLETE_CHIPS -dep_tristate ' JEDEC device support' CONFIG_MTD_JEDEC $CONFIG_MTD $CONFIG_MTD_OBSOLETE_CHIPS + fi + dep_tristate ' Support for Intel/Sharp flash chips' CONFIG_MTD_CFI_INTELEXT $CONFIG_MTD_GEN_PROBE + dep_tristate ' Support for AMD/Fujitsu flash chips' CONFIG_MTD_CFI_AMDSTD $CONFIG_MTD_GEN_PROBE + dep_tristate ' Support for RAM chips in bus mapping' CONFIG_MTD_RAM $CONFIG_MTD + dep_tristate ' Support for ROM chips in bus mapping' CONFIG_MTD_ROM $CONFIG_MTD + dep_tristate ' Support for absent chips in bus mapping' CONFIG_MTD_ABSENT $CONFIG_MTD + + bool ' Older (theoretically obsoleted now) drivers for non-CFI chips' CONFIG_MTD_OBSOLETE_CHIPS + dep_tristate ' AMD compatible flash chip support (non-CFI)' CONFIG_MTD_AMDSTD $CONFIG_MTD $CONFIG_MTD_OBSOLETE_CHIPS + dep_tristate ' pre-CFI Sharp chip support' CONFIG_MTD_SHARP $CONFIG_MTD $CONFIG_MTD_OBSOLETE_CHIPS + dep_tristate ' JEDEC device support' CONFIG_MTD_JEDEC $CONFIG_MTD $CONFIG_MTD_OBSOLETE_CHIPS +fi endmenu diff --exclude '*.swp' --exclude '*.orig' --exclude '*~' -ur linux-2.4.19-16mdkcustom.virgin/drivers/mtd/devices/Config.in linux-2.4.19-16mdkcustom.memory_bus/drivers/mtd/devices/Config.in --- linux-2.4.19-16mdkcustom.virgin/drivers/mtd/devices/Config.in 2002-09-20 09:44:23.000000000 -0400 +++ linux-2.4.19-16mdkcustom.memory_bus/drivers/mtd/devices/Config.in 2002-11-01 21:15:14.000000000 -0500 @@ -10,7 +10,7 @@ bool ' PMC551 256M DRAM Bugfix' CONFIG_MTD_PMC551_BUGFIX bool ' PMC551 Debugging' CONFIG_MTD_PMC551_DEBUG fi -dep_tristate ' Uncached system RAM' CONFIG_MTD_SLRAM $CONFIG_MTD +dep_tristate ' Uncached system RAM' CONFIG_MTD_SLRAM $CONFIG_MTD "$CONFIG_MEMORY_BUS" if [ "$CONFIG_SA1100_LART" = "y" ]; then dep_tristate ' 28F160xx flash driver for LART' CONFIG_MTD_LART $CONFIG_MTD fi @@ -24,7 +24,8 @@ fi dep_tristate ' MTD emulation using block device' CONFIG_MTD_BLKMTD $CONFIG_MTD -comment 'Disk-On-Chip Device Drivers' +if [ "$CONFIG_MEMORY_BUS" = "y" ]; then + comment 'Disk-On-Chip Device Drivers' if [ "$CONFIG_SMP" != "y" ]; then dep_tristate ' M-Systems Disk-On-Chip 1000' CONFIG_MTD_DOC1000 $CONFIG_MTD fi @@ -52,6 +53,7 @@ bool ' Probe for 0x55 0xAA BIOS Extension Signature' CONFIG_MTD_DOCPROBE_55AA fi fi +fi endmenu diff --exclude '*.swp' --exclude '*.orig' --exclude '*~' -ur linux-2.4.19-16mdkcustom.virgin/drivers/mtd/nand/Config.in linux-2.4.19-16mdkcustom.memory_bus/drivers/mtd/nand/Config.in --- linux-2.4.19-16mdkcustom.virgin/drivers/mtd/nand/Config.in 2001-10-04 18:13:18.000000000 -0400 +++ linux-2.4.19-16mdkcustom.memory_bus/drivers/mtd/nand/Config.in 2002-11-01 21:15:14.000000000 -0500 @@ -6,7 +6,7 @@ comment 'NAND Flash Device Drivers' -dep_tristate ' NAND Device Support' CONFIG_MTD_NAND $CONFIG_MTD +dep_tristate ' NAND Device Support' CONFIG_MTD_NAND $CONFIG_MTD "$CONFIG_MEMORY_BUS" if [ "$CONFIG_MTD_NAND" = "y" -o "$CONFIG_MTD_NAND" = "m" ]; then bool ' Enable ECC correction algorithm' CONFIG_MTD_NAND_ECC bool ' Verify NAND page writes' CONFIG_MTD_NAND_VERIFY_WRITE