Rename x86 platforms

Changes the the names of the x86 platforms so that they are more generic.
  generic_pc -> ia32
  quark -> ia32_pci

NOTE: it is expected that the two platforms will eventually be merged into one.
one. At present, the two platforms support different hardware.  For example,
the ia32 supports bluetooth whereas the ia32_pci does not, and the ia32_pci
supports both PCI and HPET whereas the ia32 does not.

Change-Id: I8a980aaef55be8c59f7d19ddeb7fafbf11253408
Signed-off-by: Peter Mitsis <peter.mitsis@windriver.com>

arch/x86/Kconfig

@@ -352,11 +352,11 @@ config PCI_DEBUG
 endmenu
 
 if PLATFORM_GENERIC_PC
-source "arch/x86/platforms/generic_pc/Kconfig"
+source "arch/x86/platforms/ia32/Kconfig"
 endif
 
 if PLATFORM_QUARK
-source "arch/x86/platforms/quark/Kconfig"
+source "arch/x86/platforms/ia32_pci/Kconfig"
 endif
 
 source "drivers/Kconfig"

arch/x86/Makefile

@@ -9,5 +9,5 @@ obj-$(CONFIG_CLFLUSH_INSTRUCTION_SUPPORTED) += cache.o
 
 obj-y += core/
 obj-$(CONFIG_MICROKERNEL) += task/
-obj-$(CONFIG_PLATFORM_QUARK) += platforms/quark/
-obj-$(CONFIG_PLATFORM_GENERIC_PC) += platforms/generic_pc/
+obj-$(CONFIG_PLATFORM_QUARK) += platforms/ia32_pci/
+obj-$(CONFIG_PLATFORM_GENERIC_PC) += platforms/ia32/

arch/x86/configs/micro_basic_atom_defconfig

@@ -137,7 +137,7 @@ CONFIG_SHUTOFF_PIC=y
 # Bus options (PCI etc.)
 #
 # CONFIG_PCI is not set
-CONFIG_PLATFORM="generic_pc"
+CONFIG_PLATFORM="ia32"
 CONFIG_LOAPIC_TIMER_FREQ=150000000
 CONFIG_UART_CONSOLE_INDEX=0
 

arch/x86/configs/micro_basic_minuteia_defconfig

@@ -133,7 +133,7 @@ CONFIG_NUM_DYNAMIC_STUBS=0
 # Bus options (PCI etc.)
 #
 # CONFIG_PCI is not set
-CONFIG_PLATFORM="generic_pc"
+CONFIG_PLATFORM="ia32"
 CONFIG_UART_CONSOLE_INDEX=0
 
 #

arch/x86/configs/micro_galileo_defconfig

@@ -135,7 +135,7 @@ CONFIG_NUM_DYNAMIC_STUBS=0
 #
 CONFIG_PCI=y
 # CONFIG_PCI_DEBUG is not set
-CONFIG_PLATFORM="quark"
+CONFIG_PLATFORM="ia32_pci"
 CONFIG_UART_CONSOLE_INDEX=1
 
 #

arch/x86/configs/nano_basic_atom_defconfig

@@ -116,7 +116,7 @@ CONFIG_SHUTOFF_PIC=y
 # Bus options (PCI etc.)
 #
 # CONFIG_PCI is not set
-CONFIG_PLATFORM="generic_pc"
+CONFIG_PLATFORM="ia32"
 CONFIG_LOAPIC_TIMER_FREQ=150000000
 CONFIG_UART_CONSOLE_INDEX=0
 

arch/x86/configs/nano_basic_minuteia_defconfig

@@ -112,7 +112,7 @@ CONFIG_NUM_DYNAMIC_STUBS=0
 # Bus options (PCI etc.)
 #
 # CONFIG_PCI is not set
-CONFIG_PLATFORM="generic_pc"
+CONFIG_PLATFORM="ia32"
 CONFIG_UART_CONSOLE_INDEX=0
 
 #

arch/x86/configs/nano_galileo_defconfig

@@ -114,7 +114,7 @@ CONFIG_NUM_DYNAMIC_STUBS=0
 #
 CONFIG_PCI=y
 # CONFIG_PCI_DEBUG is not set
-CONFIG_PLATFORM="quark"
+CONFIG_PLATFORM="ia32_pci"
 CONFIG_UART_CONSOLE_INDEX=1
 
 #

arch/x86/crt0.S

@@ -274,7 +274,7 @@ SECTION_FUNC(TEXT_START, __start)
 	 * bootloader is unknown, do not make the assumption that the segment
 	 * registers are set correctly.
 	 *
-	 * This is a special case for the generic_pc BSP, which must work for
+	 * This is a special case for the ia32 platform, which must work for
 	 * multiple platforms (QEMU, generic PC board, etc.). With other
 	 * BSPs the bootloader is well known so assumptions can be made.
 	 */

arch/x86/defconfig

@@ -135,7 +135,7 @@ CONFIG_NUM_DYNAMIC_STUBS=0
 #
 CONFIG_PCI=y
 # CONFIG_PCI_DEBUG is not set
-CONFIG_PLATFORM="quark"
+CONFIG_PLATFORM="ia32_pci"
 CONFIG_UART_CONSOLE_INDEX=1
 
 #

arch/x86/platforms/ia32/Kconfig

@@ -32,7 +32,7 @@
 
 config PLATFORM
 	string
-	default generic_pc
+	default ia32
 	help
 	This option holds the directory name used by the build system to locate
 	the correct linker file.

arch/x86/platforms/ia32/board.h

@@ -1,4 +1,4 @@
-/* board.h - board configuration macros for the 'generic_pc' BSP */
+/* board.h - board configuration macros for the ia32 platform */
 
 /*
  * Copyright (c) 2010-2015, Wind River Systems, Inc.
@@ -33,7 +33,7 @@
 /*
 DESCRIPTION
 This header file is used to specify and describe board-level aspects for
-the 'generic_pc' BSP.
+the 'ia32' platform.
  */
 
 #ifndef __INCboardh

arch/x86/platforms/ia32/system.c

@@ -1,4 +1,4 @@
-/* system.c - system/hardware module for the generic_pc BSP */
+/* system.c - system/hardware module for the ia32 platform */
 
 /*
  * Copyright (c) 2011-2015, Wind River Systems, Inc.
@@ -33,7 +33,7 @@
 /*
 DESCRIPTION
 This module provides routines to initialize and support board-level hardware
-for the generic_pc BSP.
+for the ia32 platform.
  */
 
 #include <nanokernel.h>

arch/x86/platforms/ia32_pci/Kconfig

@@ -1,4 +1,4 @@
-# Kconfig - quark BSP configuration options
+# Kconfig - ia32_pci platform configuration options
 
 #
 # Copyright (c) 2014-2015 Wind River Systems, Inc.
@@ -33,7 +33,7 @@
 
 config PLATFORM
 	string
-	default quark
+	default ia32_pci
 	help
 	This option holds the directory name used by the build system to locate
 	the correct linker file.

arch/x86/platforms/ia32_pci/board.h

@@ -33,7 +33,7 @@
 /*
 DESCRIPTION
 This header file is used to specify and describe board-level aspects for
-the 'Quark' BSP.
+the 'ia32_pci' platform.
  */
 
 #ifndef __INCboardh

drivers/interrupt_controller/system_apic.c

@@ -33,7 +33,7 @@
 /*
 DESCRIPTION
 This module provides routines to initialize and support board-level hardware
-for the atom_n28xx variant of generic_pc BSP.
+for the atom_n28xx configuration of ia32 platform.
  */
 
 #include <misc/__assert.h>

drivers/interrupt_controller/system_pic.c

@@ -33,7 +33,7 @@
 /*
 DESCRIPTION
 This module provides routines to initialize and support board-level hardware
-for the pentium4 and minuteia variants of the generic_pc BSP.
+for select configurations of the ia32 platform.
  */
 
 #include "board.h"