From e4398c792e259be922ebbdb4245bd45825f3c29d Mon Sep 17 00:00:00 2001
From: Adrian Danis <Adrian.Danis@nicta.com.au>
Date: Thu, 28 May 2015 14:21:20 +1000
Subject: [PATCH] ia32: Make arch configs more consistent

---
 Kconfig               | 14 +++++++-------
 src/plat/pc99/Kconfig |  8 ++++----
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/Kconfig b/Kconfig
index 922c96777..9292f5892 100644
--- a/Kconfig
+++ b/Kconfig
@@ -24,20 +24,20 @@ menu "seL4 System"
 
     choice
         prompt "Architecture Type"
-        default ARCH_I386
+        default ARCH_X86
         help
             Select the architecture seL4 will be running on.
 
-        config ARCH_I386
+        config ARCH_X86
             bool "x86"
 
         config ARCH_ARM
             bool "ARM"
     endchoice
 
-config ARCH_IA32
-       bool
-       default y if ARCH_I386
+    config ARCH_IA32
+        bool
+        default y if ARCH_X86
 
     choice
         prompt "ARM CPU selection"
@@ -160,7 +160,7 @@ config ARCH_IA32
 
         config PLAT_PC99
             bool "PC99"
-            depends on ARCH_I386
+            depends on ARCH_X86
             help
                 Support for PC99 based platform
 
@@ -230,7 +230,7 @@ menu "seL4 System Parameters"
     config MAX_NUM_NODES
         int "Max number of cpu nodes"
         range 1 256
-        depends on ARCH_I386
+        depends on ARCH_X86
         default 1
 
     config MAX_NUM_PASSTHROUGH_DEVICES
diff --git a/src/plat/pc99/Kconfig b/src/plat/pc99/Kconfig
index e559ffbb5..08b12b7b0 100644
--- a/src/plat/pc99/Kconfig
+++ b/src/plat/pc99/Kconfig
@@ -10,7 +10,7 @@
 
 config PCI
     bool "PCI support"
-        depends on ARCH_IA32
+        depends on PLAT_PC99
         default y
         help
             PCI support, normal should be yes for current
@@ -18,14 +18,14 @@ config PCI
 
 config IOMMU
     bool "IOMMU support"
-        depends on ARCH_IA32
+        depends on PLAT_PC99
         default y
         help
             IOMMU support for VT-d enabled chipset
 
 choice
     prompt "IRQ Controller"
-    depends on ARCH_IA32
+    depends on PLAT_PC99
     default IRQ_PIC
     help
         Select the IRQ controller seL4 will use. Code for others may
@@ -42,7 +42,7 @@ endchoice
 
 config MAX_NUM_IOAPIC
     prompt "Max supported IOAPICs"
-    depends on ARCH_IA32
+    depends on PLAT_PC99
     int
     default 1
     help