diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-01-27 01:05:20 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-01-27 01:05:20 +0000 |
| commit | 546db14ee74118296f425f3b91634fb767d67290 (patch) | |
| tree | 22b613a3da8d4bf663eec5e155af01b87fdf9094 /arch/i386/config.in | |
| parent | 1e25e41c4f5474e14452094492dbc169b800e4c8 (diff) | |
Merge with Linux 2.3.23. The new bootmem stuff has broken various
platforms. At this time I've only verified that IP22 support compiles
and IP27 actually works.
Diffstat (limited to 'arch/i386/config.in')
| -rw-r--r-- | arch/i386/config.in | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/arch/i386/config.in b/arch/i386/config.in index 9d373d1ed..b8f081e65 100644 --- a/arch/i386/config.in +++ b/arch/i386/config.in @@ -42,9 +42,17 @@ if [ "$CONFIG_MK7" = "y" ]; then define_bool CONFIG_X86_USE_3DNOW y fi -choice 'Maximum Physical Memory' \ - "1GB CONFIG_1GB \ - 2GB CONFIG_2GB" 1GB +choice 'High Memory Support' \ + "off CONFIG_NOHIGHMEM \ + 4GB CONFIG_HIGHMEM4G \ + 64GB CONFIG_HIGHMEM64G" off +if [ "$CONFIG_HIGHMEM4G" = "y" ]; then + define_bool CONFIG_HIGHMEM y +fi +if [ "$CONFIG_HIGHMEM64G" = "y" ]; then + define_bool CONFIG_HIGHMEM y + define_bool CONFIG_X86_PAE y +fi bool 'Math emulation' CONFIG_MATH_EMULATION bool 'MTRR (Memory Type Range Register) support' CONFIG_MTRR @@ -63,7 +71,6 @@ endmenu mainmenu_option next_comment comment 'General setup' -bool 'BIGMEM support' CONFIG_BIGMEM bool 'Networking support' CONFIG_NET bool 'SGI Visual Workstation support' CONFIG_VISWS if [ "$CONFIG_VISWS" = "y" ]; then |