diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-03-27 23:54:12 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-03-27 23:54:12 +0000 |
| commit | d3e71cb08747743fce908122bab08b479eb403a5 (patch) | |
| tree | cbec6948fdbdee9af81cf3ecfb504070d2745d7b /arch/i386/config.in | |
| parent | fe7ff1706e323d0e5ed83972960a1ecc1ee538b3 (diff) | |
Merge with Linux 2.3.99-pre3.
Diffstat (limited to 'arch/i386/config.in')
| -rw-r--r-- | arch/i386/config.in | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/arch/i386/config.in b/arch/i386/config.in index 2a083ad09..36f1aafda 100644 --- a/arch/i386/config.in +++ b/arch/i386/config.in @@ -30,32 +30,44 @@ choice 'Processor family' \ if [ "$CONFIG_M386" != "y" ]; then define_bool CONFIG_X86_WP_WORKS_OK y define_bool CONFIG_X86_INVLPG y + define_bool CONFIG_X86_CMPXCHG y define_bool CONFIG_X86_BSWAP y define_bool CONFIG_X86_POPAD_OK y fi -if [ "$CONFIG_M686" = "y" -o "$CONFIG_M586TSC" = "y" ]; then +if [ "$CONFIG_M386" = "y" -o "$CONFIG_M486" = "y" ]; then + define_int CONFIG_X86_L1_CACHE_BYTES 16 +else + define_int CONFIG_X86_L1_CACHE_BYTES 32 +fi +if [ "$CONFIG_M486" = "y" -o "$CONFIG_M586" = "y" ]; then + define_bool CONFIG_X86_USE_STRING_486 y + define_bool CONFIG_X86_ALIGNMENT_16 y +fi +if [ "$CONFIG_M586TSC" = "y" -o "$CONFIG_MK6" = "y" ]; then + define_bool CONFIG_X86_USE_STRING_486 y + define_bool CONFIG_X86_ALIGNMENT_16 y define_bool CONFIG_X86_TSC y fi if [ "$CONFIG_M686" = "y" ]; then + define_bool CONFIG_X86_TSC y define_bool CONFIG_X86_GOOD_APIC y define_bool CONFIG_X86_PGE y -fi -if [ "$CONFIG_MK6" = "y" ]; then - define_bool CONFIG_X86_TSC y + define_bool CONFIG_X86_USE_PPRO_CHECKSUM y fi if [ "$CONFIG_MK7" = "y" ]; then define_bool CONFIG_X86_TSC y define_bool CONFIG_X86_GOOD_APIC y define_bool CONFIG_X86_USE_3DNOW y define_bool CONFIG_X86_PGE y + define_bool CONFIG_X86_USE_PPRO_CHECKSUM y fi tristate '/dev/cpu/microcode - Intel P6 CPU microcode support' CONFIG_MICROCODE choice 'High Memory Support' \ "off CONFIG_NOHIGHMEM \ - 4GB CONFIG_HIGHMEM4G \ - 64GB CONFIG_HIGHMEM64G" off + 4GB CONFIG_HIGHMEM4G \ + 64GB CONFIG_HIGHMEM64G" off if [ "$CONFIG_HIGHMEM4G" = "y" ]; then define_bool CONFIG_HIGHMEM y fi |