From 2871ca32d386db458febad908484dc50cd7595fc Mon Sep 17 00:00:00 2001 From: Peter Mitsis Date: Thu, 16 Jul 2015 15:47:25 -0400 Subject: [PATCH] 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 --- arch/x86/Kconfig | 4 ++-- arch/x86/Makefile | 4 ++-- arch/x86/configs/micro_basic_atom_defconfig | 2 +- arch/x86/configs/micro_basic_minuteia_defconfig | 2 +- arch/x86/configs/micro_galileo_defconfig | 2 +- arch/x86/configs/nano_basic_atom_defconfig | 2 +- arch/x86/configs/nano_basic_minuteia_defconfig | 2 +- arch/x86/configs/nano_galileo_defconfig | 2 +- arch/x86/crt0.S | 2 +- arch/x86/defconfig | 2 +- arch/x86/platforms/{generic_pc => ia32}/Kconfig | 2 +- arch/x86/platforms/{generic_pc => ia32}/Makefile | 0 arch/x86/platforms/{generic_pc => ia32}/board.h | 4 ++-- arch/x86/platforms/{generic_pc => ia32}/linker.cmd | 0 arch/x86/platforms/{generic_pc => ia32}/system.c | 4 ++-- arch/x86/platforms/{quark => ia32_pci}/Kconfig | 4 ++-- arch/x86/platforms/{quark => ia32_pci}/Makefile | 0 arch/x86/platforms/{quark => ia32_pci}/board.h | 2 +- arch/x86/platforms/{quark => ia32_pci}/linker.cmd | 0 arch/x86/platforms/{quark => ia32_pci}/system.c | 0 drivers/interrupt_controller/system_apic.c | 2 +- drivers/interrupt_controller/system_pic.c | 2 +- 22 files changed, 22 insertions(+), 22 deletions(-) rename arch/x86/platforms/{generic_pc => ia32}/Kconfig (98%) rename arch/x86/platforms/{generic_pc => ia32}/Makefile (100%) rename arch/x86/platforms/{generic_pc => ia32}/board.h (98%) rename arch/x86/platforms/{generic_pc => ia32}/linker.cmd (100%) rename arch/x86/platforms/{generic_pc => ia32}/system.c (98%) rename arch/x86/platforms/{quark => ia32_pci}/Kconfig (96%) rename arch/x86/platforms/{quark => ia32_pci}/Makefile (100%) rename arch/x86/platforms/{quark => ia32_pci}/board.h (99%) rename arch/x86/platforms/{quark => ia32_pci}/linker.cmd (100%) rename arch/x86/platforms/{quark => ia32_pci}/system.c (100%) diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 700fd6be6fc..5e9a20312fb 100644 --- a/arch/x86/Kconfig +++ b/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" diff --git a/arch/x86/Makefile b/arch/x86/Makefile index df9acd66a50..441c7774f4f 100644 --- a/arch/x86/Makefile +++ b/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/ diff --git a/arch/x86/configs/micro_basic_atom_defconfig b/arch/x86/configs/micro_basic_atom_defconfig index ab489462d36..4d9cb08da32 100644 --- a/arch/x86/configs/micro_basic_atom_defconfig +++ b/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 diff --git a/arch/x86/configs/micro_basic_minuteia_defconfig b/arch/x86/configs/micro_basic_minuteia_defconfig index 2ab20670ab7..2e8327757d4 100644 --- a/arch/x86/configs/micro_basic_minuteia_defconfig +++ b/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 # diff --git a/arch/x86/configs/micro_galileo_defconfig b/arch/x86/configs/micro_galileo_defconfig index 40e34b703dc..c1b3915d67e 100644 --- a/arch/x86/configs/micro_galileo_defconfig +++ b/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 # diff --git a/arch/x86/configs/nano_basic_atom_defconfig b/arch/x86/configs/nano_basic_atom_defconfig index 284eee33f74..2447a6ba3cf 100644 --- a/arch/x86/configs/nano_basic_atom_defconfig +++ b/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 diff --git a/arch/x86/configs/nano_basic_minuteia_defconfig b/arch/x86/configs/nano_basic_minuteia_defconfig index 9b1eb15d6f9..71de5feb82e 100644 --- a/arch/x86/configs/nano_basic_minuteia_defconfig +++ b/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 # diff --git a/arch/x86/configs/nano_galileo_defconfig b/arch/x86/configs/nano_galileo_defconfig index 32c12deb5a3..e0b7670e230 100644 --- a/arch/x86/configs/nano_galileo_defconfig +++ b/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 # diff --git a/arch/x86/crt0.S b/arch/x86/crt0.S index 7a52b9d8779..a704b40fed3 100644 --- a/arch/x86/crt0.S +++ b/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. */ diff --git a/arch/x86/defconfig b/arch/x86/defconfig index 40e34b703dc..c1b3915d67e 100644 --- a/arch/x86/defconfig +++ b/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 # diff --git a/arch/x86/platforms/generic_pc/Kconfig b/arch/x86/platforms/ia32/Kconfig similarity index 98% rename from arch/x86/platforms/generic_pc/Kconfig rename to arch/x86/platforms/ia32/Kconfig index 6fe87c040e2..8afbabebaba 100644 --- a/arch/x86/platforms/generic_pc/Kconfig +++ b/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. diff --git a/arch/x86/platforms/generic_pc/Makefile b/arch/x86/platforms/ia32/Makefile similarity index 100% rename from arch/x86/platforms/generic_pc/Makefile rename to arch/x86/platforms/ia32/Makefile diff --git a/arch/x86/platforms/generic_pc/board.h b/arch/x86/platforms/ia32/board.h similarity index 98% rename from arch/x86/platforms/generic_pc/board.h rename to arch/x86/platforms/ia32/board.h index f667483fa99..20254be7cf7 100644 --- a/arch/x86/platforms/generic_pc/board.h +++ b/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 diff --git a/arch/x86/platforms/generic_pc/linker.cmd b/arch/x86/platforms/ia32/linker.cmd similarity index 100% rename from arch/x86/platforms/generic_pc/linker.cmd rename to arch/x86/platforms/ia32/linker.cmd diff --git a/arch/x86/platforms/generic_pc/system.c b/arch/x86/platforms/ia32/system.c similarity index 98% rename from arch/x86/platforms/generic_pc/system.c rename to arch/x86/platforms/ia32/system.c index fa6ac987b9b..ce612f71f0c 100644 --- a/arch/x86/platforms/generic_pc/system.c +++ b/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 diff --git a/arch/x86/platforms/quark/Kconfig b/arch/x86/platforms/ia32_pci/Kconfig similarity index 96% rename from arch/x86/platforms/quark/Kconfig rename to arch/x86/platforms/ia32_pci/Kconfig index 3a1fc84efcb..b65ac2d38a9 100644 --- a/arch/x86/platforms/quark/Kconfig +++ b/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. diff --git a/arch/x86/platforms/quark/Makefile b/arch/x86/platforms/ia32_pci/Makefile similarity index 100% rename from arch/x86/platforms/quark/Makefile rename to arch/x86/platforms/ia32_pci/Makefile diff --git a/arch/x86/platforms/quark/board.h b/arch/x86/platforms/ia32_pci/board.h similarity index 99% rename from arch/x86/platforms/quark/board.h rename to arch/x86/platforms/ia32_pci/board.h index 316bb362b6f..0b0bbf87312 100644 --- a/arch/x86/platforms/quark/board.h +++ b/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 diff --git a/arch/x86/platforms/quark/linker.cmd b/arch/x86/platforms/ia32_pci/linker.cmd similarity index 100% rename from arch/x86/platforms/quark/linker.cmd rename to arch/x86/platforms/ia32_pci/linker.cmd diff --git a/arch/x86/platforms/quark/system.c b/arch/x86/platforms/ia32_pci/system.c similarity index 100% rename from arch/x86/platforms/quark/system.c rename to arch/x86/platforms/ia32_pci/system.c diff --git a/drivers/interrupt_controller/system_apic.c b/drivers/interrupt_controller/system_apic.c index 41a89ce8c4f..c6ffb1221f7 100644 --- a/drivers/interrupt_controller/system_apic.c +++ b/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 diff --git a/drivers/interrupt_controller/system_pic.c b/drivers/interrupt_controller/system_pic.c index c68dcb17cdc..065f83544bc 100644 --- a/drivers/interrupt_controller/system_pic.c +++ b/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"