summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorYann E. MORIN" <yann.morin.1998@anciens.enib.fr>2009-11-17 10:51:57 (GMT)
committerYann E. MORIN" <yann.morin.1998@anciens.enib.fr>2009-11-17 10:51:57 (GMT)
commit7ea82181db30cd437967e7bca1177f8cbd2f6fc5 (patch)
tree889200e88bc94a06a7a826575897528e90863ea1 /config
parent28b38f922241bd273f4f71823c037d4af43d96ba (diff)
arch/x86: commonalise the 32- and 64-bit x86 arch
Diffstat (limited to 'config')
-rw-r--r--config/arch/x86.in6
-rw-r--r--config/arch/x86_64.in11
2 files changed, 5 insertions, 12 deletions
diff --git a/config/arch/x86.in b/config/arch/x86.in
index 825f6c0..7657aaf 100644
--- a/config/arch/x86.in
+++ b/config/arch/x86.in
@@ -1,10 +1,14 @@
# x86 specific options
config ARCH_x86
+ select ARCH_SUPPORTS_32
+ select ARCH_SUPPORTS_64
+ select ARCH_DEFAULT_32
select ARCH_USE_MMU
select ARCH_SUPPORT_ARCH
select ARCH_SUPPORT_CPU
select ARCH_SUPPORT_TUNE
help
The x86 architecture, as defined by:
- http://www.intel.com/
+ 32-bit (ia32) : http://www.intel.com/
+ 64-bit (amd64): http://www.amd.com/us-en/Processors/DevelopWithAMD/0,,30_2252_875_7044,00.html
diff --git a/config/arch/x86_64.in b/config/arch/x86_64.in
deleted file mode 100644
index 90c831f..0000000
--- a/config/arch/x86_64.in
+++ /dev/null
@@ -1,11 +0,0 @@
-# x86_64 specific options
-
-config ARCH_x86_64
- select ARCH_64
- select ARCH_USE_MMU
- select ARCH_SUPPORT_ARCH
- select ARCH_SUPPORT_CPU
- select ARCH_SUPPORT_TUNE
- help
- The x86_64 architecture, as defined by:
- http://www.amd.com/us-en/Processors/DevelopWithAMD/0,,30_2252_875_7044,00.html