michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Rename CONFIG_BSP_xxx to CONFIG_PLATFORM_xxx

Browse source 
Updates Kconfig option names as part of transforming BSPs to platforms.

Change-Id: If397bcac8b058e5700e82c3cabbfe64588316d1d
Signed-off-by: Peter Mitsis <peter.mitsis@windriver.com>
This commit is contained in:
Peter Mitsis 2015-07-06 11:09:47 -04:00 • committed by Anas Nashif
commit a7644b86a5
26 changed files with 138 additions and 138 deletions
Download patch file Download diff file Expand all files Collapse all files

14
arch/arm/Kconfig
View file

@ -71,18 +71,18 @@ config ISA_THUMB2
architecture-based processors. architecture-based processors.
endmenu endmenu
menu "BSP General Configuration" menu "Platform General Configuration"
choice choice
prompt "Minimum BSP Configuation Selection" prompt "Minimum Platform Configuation Selection"
default BSP_FSL_FRDM_K64F default PLATFORM_FSL_FRDM_K64F
config BSP_FSL_FRDM_K64F config PLATFORM_FSL_FRDM_K64F
bool "Minimum Configuration for FSL FRDM K64F" bool "Minimum Configuration for FSL FRDM K64F"
select CPU_CORTEX_M4 select CPU_CORTEX_M4
select K20_UART select K20_UART
config BSP_TI_LM3S6965 config PLATFORM_TI_LM3S6965
bool "Minimum Configuration for a TI LM3S6965" bool "Minimum Configuration for a TI LM3S6965"
select CPU_CORTEX_M3 select CPU_CORTEX_M3
select STELLARIS_UART select STELLARIS_UART
@ -93,11 +93,11 @@ endmenu
source "arch/arm/bsp/CortexM/Kconfig" source "arch/arm/bsp/CortexM/Kconfig"
if BSP_TI_LM3S6965 if PLATFORM_TI_LM3S6965
source "arch/arm/ti_lm3s6965/Kconfig" source "arch/arm/ti_lm3s6965/Kconfig"
endif endif
if BSP_FSL_FRDM_K64F if PLATFORM_FSL_FRDM_K64F
source "arch/arm/fsl_frdm_k64f/Kconfig" source "arch/arm/fsl_frdm_k64f/Kconfig"
endif endif

4
arch/arm/Makefile
View file

@ -1,5 +1,5 @@
obj-y = core/ obj-y = core/
obj-y += bsp/ obj-y += bsp/
obj-$(CONFIG_BSP_FSL_FRDM_K64F) += fsl_frdm_k64f/ obj-$(CONFIG_PLATFORM_FSL_FRDM_K64F) += fsl_frdm_k64f/
obj-$(CONFIG_BSP_TI_LM3S6965) += ti_lm3s6965/ obj-$(CONFIG_PLATFORM_TI_LM3S6965) += ti_lm3s6965/

6
arch/arm/configs/micro_fsl_frdm_k64f_defconfig
View file

@ -77,10 +77,10 @@ CONFIG_ARM=y
CONFIG_ISA_THUMB2=y CONFIG_ISA_THUMB2=y
# #
# BSP General Configuration # Platform General Configuration
# #
CONFIG_BSP_FSL_FRDM_K64F=y CONFIG_PLATFORM_FSL_FRDM_K64F=y
# CONFIG_BSP_TI_LM3S6965 is not set # CONFIG_PLATFORM_TI_LM3S6965 is not set
# #
# ARM Cortex CPU options # ARM Cortex CPU options

8
arch/arm/configs/micro_ti_lm3s6965_defconfig
View file

@ -77,10 +77,10 @@ CONFIG_ARM=y
CONFIG_ISA_THUMB2=y CONFIG_ISA_THUMB2=y
# #
# BSP General Configuration # Platform General Configuration
# #
# CONFIG_BSP_FSL_FRDM_K64F is not set # CONFIG_PLATFORM_FSL_FRDM_K64F is not set
CONFIG_BSP_TI_LM3S6965=y CONFIG_PLATFORM_TI_LM3S6965=y
# #
# ARM Cortex CPU options # ARM Cortex CPU options
@ -114,7 +114,7 @@ CONFIG_ARCH_HAS_TASK_ABORT=y
CONFIG_ARCH_HAS_NANO_FIBER_ABORT=y CONFIG_ARCH_HAS_NANO_FIBER_ABORT=y
CONFIG_PLATFORM="ti_lm3s6965" CONFIG_PLATFORM="ti_lm3s6965"
CONFIG_NUM_IRQS=34 CONFIG_NUM_IRQS=34
CONFIG_BSP_TI_LM3S6965_QEMU=y CONFIG_PLATFORM_TI_LM3S6965_QEMU=y
# #
# Device Drivers # Device Drivers

6
arch/arm/configs/nano_fsl_frdm_k64f_defconfig
View file

@ -56,10 +56,10 @@ CONFIG_ARM=y
CONFIG_ISA_THUMB2=y CONFIG_ISA_THUMB2=y
# #
# BSP General Configuration # Platform General Configuration
# #
CONFIG_BSP_FSL_FRDM_K64F=y CONFIG_PLATFORM_FSL_FRDM_K64F=y
# CONFIG_BSP_TI_LM3S6965 is not set # CONFIG_PLATFORM_TI_LM3S6965 is not set
# #
# ARM Cortex CPU options # ARM Cortex CPU options

8
arch/arm/configs/nano_ti_lm3s6965_defconfig
View file

@ -56,10 +56,10 @@ CONFIG_ARM=y
CONFIG_ISA_THUMB2=y CONFIG_ISA_THUMB2=y
# #
# BSP General Configuration # Platform General Configuration
# #
# CONFIG_BSP_FSL_FRDM_K64F is not set # CONFIG_PLATFORM_FSL_FRDM_K64F is not set
CONFIG_BSP_TI_LM3S6965=y CONFIG_PLATFORM_TI_LM3S6965=y
# #
# ARM Cortex CPU options # ARM Cortex CPU options
@ -93,7 +93,7 @@ CONFIG_ARCH_HAS_TASK_ABORT=y
CONFIG_ARCH_HAS_NANO_FIBER_ABORT=y CONFIG_ARCH_HAS_NANO_FIBER_ABORT=y
CONFIG_PLATFORM="ti_lm3s6965" CONFIG_PLATFORM="ti_lm3s6965"
CONFIG_NUM_IRQS=34 CONFIG_NUM_IRQS=34
CONFIG_BSP_TI_LM3S6965_QEMU=y CONFIG_PLATFORM_TI_LM3S6965_QEMU=y
# #
# Device Drivers # Device Drivers

6
arch/arm/defconfig
View file

@ -77,10 +77,10 @@ CONFIG_ARM=y
CONFIG_ISA_THUMB2=y CONFIG_ISA_THUMB2=y
# #
# BSP General Configuration # Platform General Configuration
# #
CONFIG_BSP_FSL_FRDM_K64F=y CONFIG_PLATFORM_FSL_FRDM_K64F=y
# CONFIG_BSP_TI_LM3S6965 is not set # CONFIG_PLATFORM_TI_LM3S6965 is not set
# #
# ARM Cortex CPU options # ARM Cortex CPU options

6
arch/arm/ti_lm3s6965/Kconfig
View file

@ -1,4 +1,4 @@
# Kconfig - TI LM3S6965 BSP configuration options # Kconfig - TI LM3S6965 platform configuration options
# #
# Copyright (c) 2014-2015 Wind River Systems, Inc. # Copyright (c) 2014-2015 Wind River Systems, Inc.
@ -47,9 +47,9 @@ config NUM_IRQS
# - include the UART interrupts # - include the UART interrupts
default 34 default 34
config BSP_TI_LM3S6965_QEMU config PLATFORM_TI_LM3S6965_QEMU
def_bool y def_bool y
# BSP has only been tested on QEMU, not on real hardware, so always # Platform has only been tested on QEMU, not on real hardware, so always
# assume it is used for a QEMU target. # assume it is used for a QEMU target.
config SYS_CLOCK_HW_CYCLES_PER_SEC config SYS_CLOCK_HW_CYCLES_PER_SEC

40
arch/x86/Kconfig
View file

@ -43,14 +43,14 @@ source "misc/Kconfig"
source "arch/x86/core/Kconfig" source "arch/x86/core/Kconfig"
menu "BSP General Configuration" menu "Platform General Configuration"
choice choice
prompt "BSP Configuration" prompt "Platform Configuration"
default BSP_PCPENTIUM4 default PLATFORM_PCPENTIUM4
config BSP_ATOM_N28XX config PLATFORM_ATOM_N28XX
bool "Minimum configuration for ATOM N28XX BSP" bool "Minimum configuration for ATOM N28XX platform"
select CPU_ATOM select CPU_ATOM
select IOAPIC select IOAPIC
select LOAPIC select LOAPIC
@ -60,10 +60,10 @@ config BSP_ATOM_N28XX
select EXTRA_SERIAL_PORT select EXTRA_SERIAL_PORT
select SERIAL_INTERRUPT_LEVEL select SERIAL_INTERRUPT_LEVEL
select CUSTOM_RANDOM_GENERATOR select CUSTOM_RANDOM_GENERATOR
select BSP_GENERIC_PC select PLATFORM_GENERIC_PC
config BSP_PCMINUTEIA config PLATFORM_PCMINUTEIA
bool "Minimum configuration for MINUTE IA BSP" bool "Minimum configuration for MINUTE IA platform"
select CPU_MINUTEIA select CPU_MINUTEIA
select PIC select PIC
select PIT select PIT
@ -71,10 +71,10 @@ config BSP_PCMINUTEIA
select EOI_HANDLER_SUPPORTED select EOI_HANDLER_SUPPORTED
select BOOTLOADER_UNKNOWN select BOOTLOADER_UNKNOWN
select EXTRA_SERIAL_PORT select EXTRA_SERIAL_PORT
select BSP_GENERIC_PC select PLATFORM_GENERIC_PC
config BSP_PCPENTIUM4 config PLATFORM_PCPENTIUM4
bool "Minimum configuration for PENTIUM 4 BSP" bool "Minimum configuration for PENTIUM 4 platform"
select CPU_PENTIUM4 select CPU_PENTIUM4
select PIC select PIC
select PIT select PIT
@ -82,10 +82,10 @@ config BSP_PCPENTIUM4
select EOI_HANDLER_SUPPORTED select EOI_HANDLER_SUPPORTED
select BOOTLOADER_UNKNOWN select BOOTLOADER_UNKNOWN
select EXTRA_SERIAL_PORT select EXTRA_SERIAL_PORT
select BSP_GENERIC_PC select PLATFORM_GENERIC_PC
config BSP_QUARK config PLATFORM_QUARK
bool "Minimum configuration for QUARK BSP" bool "Minimum configuration for QUARK platform"
select CPU_MINUTEIA select CPU_MINUTEIA
select IOAPIC select IOAPIC
select HPET_TIMER select HPET_TIMER
@ -98,7 +98,7 @@ config BSP_QUARK
endchoice endchoice
config BSP_GENERIC_PC config PLATFORM_GENERIC_PC
bool bool
default n default n
select NS16550 select NS16550
@ -152,8 +152,8 @@ config CPU_MIGHT_SUPPORT_CLFLUSH
bool bool
default n default n
help help
If a BSP uses a processor that possibly implements CLFLUSH, change If a platform uses a processor that possibly implements CLFLUSH, change
the default in that BSP's config file. the default in that platform's config file.
#FIXME This options is not being used in the current code base. #FIXME This options is not being used in the current code base.
config CLFLUSH_INSTRUCTION_SUPPORTED config CLFLUSH_INSTRUCTION_SUPPORTED
@ -222,7 +222,7 @@ config CACHE_LINE_SIZE
endmenu endmenu
menu "Specific BSP Capability Support" menu "Specific Platform Capability Support"
config NUM_DYNAMIC_STUBS config NUM_DYNAMIC_STUBS
int "Number of dynamic int stubs" int "Number of dynamic int stubs"
@ -367,11 +367,11 @@ config PCI_DEBUG
endmenu endmenu
if BSP_GENERIC_PC if PLATFORM_GENERIC_PC
source "arch/x86/generic_pc/Kconfig" source "arch/x86/generic_pc/Kconfig"
endif endif
if BSP_QUARK if PLATFORM_QUARK
source "arch/x86/quark/Kconfig" source "arch/x86/quark/Kconfig"
endif endif

4
arch/x86/Makefile
View file

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

14
arch/x86/configs/micro_generic_pc_atom_n28xx_defconfig
View file

@ -101,13 +101,13 @@ CONFIG_EOI_HANDLER_SUPPORTED=y
# CONFIG_LOCK_INSTRUCTION_UNSUPPORTED is not set # CONFIG_LOCK_INSTRUCTION_UNSUPPORTED is not set
# #
# BSP General Configuration # Platform General Configuration
# #
CONFIG_BSP_ATOM_N28XX=y CONFIG_PLATFORM_ATOM_N28XX=y
# CONFIG_BSP_PCMINUTEIA is not set # CONFIG_PLATFORM_PCMINUTEIA is not set
# CONFIG_BSP_PCPENTIUM4 is not set # CONFIG_PLATFORM_PCPENTIUM4 is not set
# CONFIG_BSP_QUARK is not set # CONFIG_PLATFORM_QUARK is not set
CONFIG_BSP_GENERIC_PC=y CONFIG_PLATFORM_GENERIC_PC=y
CONFIG_CPU_ATOM=y CONFIG_CPU_ATOM=y
# CONFIG_CPU_MINUTEIA is not set # CONFIG_CPU_MINUTEIA is not set
# CONFIG_CPU_PENTIUM4 is not set # CONFIG_CPU_PENTIUM4 is not set
@ -123,7 +123,7 @@ CONFIG_HARDWARE_BP_SUPPORTED=y
CONFIG_CACHE_LINE_SIZE=64 CONFIG_CACHE_LINE_SIZE=64
# #
# Specific BSP Capability Support # Specific Platform Capability Support
# #
CONFIG_NUM_DYNAMIC_STUBS=0 CONFIG_NUM_DYNAMIC_STUBS=0
# CONFIG_PROT_MODE_SWITCH_PROMPT is not set # CONFIG_PROT_MODE_SWITCH_PROMPT is not set

14
arch/x86/configs/micro_generic_pc_defconfig
View file

@ -101,13 +101,13 @@ CONFIG_EOI_HANDLER_SUPPORTED=y
# CONFIG_LOCK_INSTRUCTION_UNSUPPORTED is not set # CONFIG_LOCK_INSTRUCTION_UNSUPPORTED is not set
# #
# BSP General Configuration # Platform General Configuration
# #
# CONFIG_BSP_ATOM_N28XX is not set # CONFIG_PLATFORM_ATOM_N28XX is not set
# CONFIG_BSP_PCMINUTEIA is not set # CONFIG_PLATFORM_PCMINUTEIA is not set
CONFIG_BSP_PCPENTIUM4=y CONFIG_PLATFORM_PCPENTIUM4=y
# CONFIG_BSP_QUARK is not set # CONFIG_PLATFORM_QUARK is not set
CONFIG_BSP_GENERIC_PC=y CONFIG_PLATFORM_GENERIC_PC=y
# CONFIG_CPU_ATOM is not set # CONFIG_CPU_ATOM is not set
# CONFIG_CPU_MINUTEIA is not set # CONFIG_CPU_MINUTEIA is not set
CONFIG_CPU_PENTIUM4=y CONFIG_CPU_PENTIUM4=y
@ -123,7 +123,7 @@ CONFIG_HARDWARE_BP_SUPPORTED=y
CONFIG_CACHE_LINE_SIZE=64 CONFIG_CACHE_LINE_SIZE=64
# #
# Specific BSP Capability Support # Specific Platform Capability Support
# #
CONFIG_NUM_DYNAMIC_STUBS=0 CONFIG_NUM_DYNAMIC_STUBS=0
# CONFIG_PROT_MODE_SWITCH_PROMPT is not set # CONFIG_PROT_MODE_SWITCH_PROMPT is not set

14
arch/x86/configs/micro_generic_pc_minuteia_defconfig
View file

@ -101,13 +101,13 @@ CONFIG_EOI_HANDLER_SUPPORTED=y
# CONFIG_LOCK_INSTRUCTION_UNSUPPORTED is not set # CONFIG_LOCK_INSTRUCTION_UNSUPPORTED is not set
# #
# BSP General Configuration # Platform General Configuration
# #
# CONFIG_BSP_ATOM_N28XX is not set # CONFIG_PLATFORM_ATOM_N28XX is not set
CONFIG_BSP_PCMINUTEIA=y CONFIG_PLATFORM_PCMINUTEIA=y
# CONFIG_BSP_PCPENTIUM4 is not set # CONFIG_PLATFORM_PCPENTIUM4 is not set
# CONFIG_BSP_QUARK is not set # CONFIG_PLATFORM_QUARK is not set
CONFIG_BSP_GENERIC_PC=y CONFIG_PLATFORM_GENERIC_PC=y
# CONFIG_CPU_ATOM is not set # CONFIG_CPU_ATOM is not set
CONFIG_CPU_MINUTEIA=y CONFIG_CPU_MINUTEIA=y
# CONFIG_CPU_PENTIUM4 is not set # CONFIG_CPU_PENTIUM4 is not set
@ -125,7 +125,7 @@ CONFIG_CPU_SSE_UNSUPPORTED=y
CONFIG_CACHE_LINE_SIZE=0 CONFIG_CACHE_LINE_SIZE=0
# #
# Specific BSP Capability Support # Specific Platform Capability Support
# #
CONFIG_NUM_DYNAMIC_STUBS=0 CONFIG_NUM_DYNAMIC_STUBS=0
# CONFIG_PROT_MODE_SWITCH_PROMPT is not set # CONFIG_PROT_MODE_SWITCH_PROMPT is not set

14
arch/x86/configs/micro_generic_pc_pentium4_defconfig
View file

@ -101,13 +101,13 @@ CONFIG_EOI_HANDLER_SUPPORTED=y
# CONFIG_LOCK_INSTRUCTION_UNSUPPORTED is not set # CONFIG_LOCK_INSTRUCTION_UNSUPPORTED is not set
# #
# BSP General Configuration # Platform General Configuration
# #
# CONFIG_BSP_ATOM_N28XX is not set # CONFIG_PLATFORM_ATOM_N28XX is not set
# CONFIG_BSP_PCMINUTEIA is not set # CONFIG_PLATFORM_PCMINUTEIA is not set
CONFIG_BSP_PCPENTIUM4=y CONFIG_PLATFORM_PCPENTIUM4=y
# CONFIG_BSP_QUARK is not set # CONFIG_PLATFORM_QUARK is not set
CONFIG_BSP_GENERIC_PC=y CONFIG_PLATFORM_GENERIC_PC=y
# CONFIG_CPU_ATOM is not set # CONFIG_CPU_ATOM is not set
# CONFIG_CPU_MINUTEIA is not set # CONFIG_CPU_MINUTEIA is not set
CONFIG_CPU_PENTIUM4=y CONFIG_CPU_PENTIUM4=y
@ -123,7 +123,7 @@ CONFIG_HARDWARE_BP_SUPPORTED=y
CONFIG_CACHE_LINE_SIZE=64 CONFIG_CACHE_LINE_SIZE=64
# #
# Specific BSP Capability Support # Specific Platform Capability Support
# #
CONFIG_NUM_DYNAMIC_STUBS=0 CONFIG_NUM_DYNAMIC_STUBS=0
# CONFIG_PROT_MODE_SWITCH_PROMPT is not set # CONFIG_PROT_MODE_SWITCH_PROMPT is not set

14
arch/x86/configs/micro_quark_defconfig
View file

@ -101,13 +101,13 @@ CONFIG_EOI_HANDLER_SUPPORTED=y
# CONFIG_LOCK_INSTRUCTION_UNSUPPORTED is not set # CONFIG_LOCK_INSTRUCTION_UNSUPPORTED is not set
# #
# BSP General Configuration # Platform General Configuration
# #
# CONFIG_BSP_ATOM_N28XX is not set # CONFIG_PLATFORM_ATOM_N28XX is not set
# CONFIG_BSP_PCMINUTEIA is not set # CONFIG_PLATFORM_PCMINUTEIA is not set
# CONFIG_BSP_PCPENTIUM4 is not set # CONFIG_PLATFORM_PCPENTIUM4 is not set
CONFIG_BSP_QUARK=y CONFIG_PLATFORM_QUARK=y
# CONFIG_BSP_GENERIC_PC is not set # CONFIG_PLATFORM_GENERIC_PC is not set
# CONFIG_CPU_ATOM is not set # CONFIG_CPU_ATOM is not set
CONFIG_CPU_MINUTEIA=y CONFIG_CPU_MINUTEIA=y
# CONFIG_CPU_PENTIUM4 is not set # CONFIG_CPU_PENTIUM4 is not set
@ -125,7 +125,7 @@ CONFIG_CPU_SSE_UNSUPPORTED=y
CONFIG_CACHE_LINE_SIZE=0 CONFIG_CACHE_LINE_SIZE=0
# #
# Specific BSP Capability Support # Specific Platform Capability Support
# #
CONFIG_NUM_DYNAMIC_STUBS=0 CONFIG_NUM_DYNAMIC_STUBS=0
# CONFIG_PROT_MODE_SWITCH_PROMPT is not set # CONFIG_PROT_MODE_SWITCH_PROMPT is not set

14
arch/x86/configs/nano_generic_pc_atom_n28xx_defconfig
View file

@ -80,13 +80,13 @@ CONFIG_EOI_HANDLER_SUPPORTED=y
# CONFIG_LOCK_INSTRUCTION_UNSUPPORTED is not set # CONFIG_LOCK_INSTRUCTION_UNSUPPORTED is not set
# #
# BSP General Configuration # Platform General Configuration
# #
CONFIG_BSP_ATOM_N28XX=y CONFIG_PLATFORM_ATOM_N28XX=y
# CONFIG_BSP_PCMINUTEIA is not set # CONFIG_PLATFORM_PCMINUTEIA is not set
# CONFIG_BSP_PCPENTIUM4 is not set # CONFIG_PLATFORM_PCPENTIUM4 is not set
# CONFIG_BSP_QUARK is not set # CONFIG_PLATFORM_QUARK is not set
CONFIG_BSP_GENERIC_PC=y CONFIG_PLATFORM_GENERIC_PC=y
CONFIG_CPU_ATOM=y CONFIG_CPU_ATOM=y
# CONFIG_CPU_MINUTEIA is not set # CONFIG_CPU_MINUTEIA is not set
# CONFIG_CPU_PENTIUM4 is not set # CONFIG_CPU_PENTIUM4 is not set
@ -102,7 +102,7 @@ CONFIG_HARDWARE_BP_SUPPORTED=y
CONFIG_CACHE_LINE_SIZE=64 CONFIG_CACHE_LINE_SIZE=64
# #
# Specific BSP Capability Support # Specific Platform Capability Support
# #
CONFIG_NUM_DYNAMIC_STUBS=0 CONFIG_NUM_DYNAMIC_STUBS=0
# CONFIG_PROT_MODE_SWITCH_PROMPT is not set # CONFIG_PROT_MODE_SWITCH_PROMPT is not set

14
arch/x86/configs/nano_generic_pc_defconfig
View file

@ -80,13 +80,13 @@ CONFIG_EOI_HANDLER_SUPPORTED=y
# CONFIG_LOCK_INSTRUCTION_UNSUPPORTED is not set # CONFIG_LOCK_INSTRUCTION_UNSUPPORTED is not set
# #
# BSP General Configuration # Platform General Configuration
# #
# CONFIG_BSP_ATOM_N28XX is not set # CONFIG_PLATFORM_ATOM_N28XX is not set
# CONFIG_BSP_PCMINUTEIA is not set # CONFIG_PLATFORM_PCMINUTEIA is not set
CONFIG_BSP_PCPENTIUM4=y CONFIG_PLATFORM_PCPENTIUM4=y
# CONFIG_BSP_QUARK is not set # CONFIG_PLATFORM_QUARK is not set
CONFIG_BSP_GENERIC_PC=y CONFIG_PLATFORM_GENERIC_PC=y
# CONFIG_CPU_ATOM is not set # CONFIG_CPU_ATOM is not set
# CONFIG_CPU_MINUTEIA is not set # CONFIG_CPU_MINUTEIA is not set
CONFIG_CPU_PENTIUM4=y CONFIG_CPU_PENTIUM4=y
@ -102,7 +102,7 @@ CONFIG_HARDWARE_BP_SUPPORTED=y
CONFIG_CACHE_LINE_SIZE=64 CONFIG_CACHE_LINE_SIZE=64
# #
# Specific BSP Capability Support # Specific Platform Capability Support
# #
CONFIG_NUM_DYNAMIC_STUBS=0 CONFIG_NUM_DYNAMIC_STUBS=0
# CONFIG_PROT_MODE_SWITCH_PROMPT is not set # CONFIG_PROT_MODE_SWITCH_PROMPT is not set

14
arch/x86/configs/nano_generic_pc_minuteia_defconfig
View file

@ -80,13 +80,13 @@ CONFIG_EOI_HANDLER_SUPPORTED=y
# CONFIG_LOCK_INSTRUCTION_UNSUPPORTED is not set # CONFIG_LOCK_INSTRUCTION_UNSUPPORTED is not set
# #
# BSP General Configuration # Platform General Configuration
# #
# CONFIG_BSP_ATOM_N28XX is not set # CONFIG_PLATFORM_ATOM_N28XX is not set
CONFIG_BSP_PCMINUTEIA=y CONFIG_PLATFORM_PCMINUTEIA=y
# CONFIG_BSP_PCPENTIUM4 is not set # CONFIG_PLATFORM_PCPENTIUM4 is not set
# CONFIG_BSP_QUARK is not set # CONFIG_PLATFORM_QUARK is not set
CONFIG_BSP_GENERIC_PC=y CONFIG_PLATFORM_GENERIC_PC=y
# CONFIG_CPU_ATOM is not set # CONFIG_CPU_ATOM is not set
CONFIG_CPU_MINUTEIA=y CONFIG_CPU_MINUTEIA=y
# CONFIG_CPU_PENTIUM4 is not set # CONFIG_CPU_PENTIUM4 is not set
@ -104,7 +104,7 @@ CONFIG_CPU_SSE_UNSUPPORTED=y
CONFIG_CACHE_LINE_SIZE=0 CONFIG_CACHE_LINE_SIZE=0
# #
# Specific BSP Capability Support # Specific Platform Capability Support
# #
CONFIG_NUM_DYNAMIC_STUBS=0 CONFIG_NUM_DYNAMIC_STUBS=0
# CONFIG_PROT_MODE_SWITCH_PROMPT is not set # CONFIG_PROT_MODE_SWITCH_PROMPT is not set

14
arch/x86/configs/nano_generic_pc_pentium4_defconfig
View file

@ -80,13 +80,13 @@ CONFIG_EOI_HANDLER_SUPPORTED=y
# CONFIG_LOCK_INSTRUCTION_UNSUPPORTED is not set # CONFIG_LOCK_INSTRUCTION_UNSUPPORTED is not set
# #
# BSP General Configuration # Platform General Configuration
# #
# CONFIG_BSP_ATOM_N28XX is not set # CONFIG_PLATFORM_ATOM_N28XX is not set
# CONFIG_BSP_PCMINUTEIA is not set # CONFIG_PLATFORM_PCMINUTEIA is not set
CONFIG_BSP_PCPENTIUM4=y CONFIG_PLATFORM_PCPENTIUM4=y
# CONFIG_BSP_QUARK is not set # CONFIG_PLATFORM_QUARK is not set
CONFIG_BSP_GENERIC_PC=y CONFIG_PLATFORM_GENERIC_PC=y
# CONFIG_CPU_ATOM is not set # CONFIG_CPU_ATOM is not set
# CONFIG_CPU_MINUTEIA is not set # CONFIG_CPU_MINUTEIA is not set
CONFIG_CPU_PENTIUM4=y CONFIG_CPU_PENTIUM4=y
@ -102,7 +102,7 @@ CONFIG_HARDWARE_BP_SUPPORTED=y
CONFIG_CACHE_LINE_SIZE=64 CONFIG_CACHE_LINE_SIZE=64
# #
# Specific BSP Capability Support # Specific Platform Capability Support
# #
CONFIG_NUM_DYNAMIC_STUBS=0 CONFIG_NUM_DYNAMIC_STUBS=0
# CONFIG_PROT_MODE_SWITCH_PROMPT is not set # CONFIG_PROT_MODE_SWITCH_PROMPT is not set

14
arch/x86/configs/nano_quark_defconfig
View file

@ -80,13 +80,13 @@ CONFIG_EOI_HANDLER_SUPPORTED=y
# CONFIG_LOCK_INSTRUCTION_UNSUPPORTED is not set # CONFIG_LOCK_INSTRUCTION_UNSUPPORTED is not set
# #
# BSP General Configuration # Platform General Configuration
# #
# CONFIG_BSP_ATOM_N28XX is not set # CONFIG_PLATFORM_ATOM_N28XX is not set
# CONFIG_BSP_PCMINUTEIA is not set # CONFIG_PLATFORM_PCMINUTEIA is not set
# CONFIG_BSP_PCPENTIUM4 is not set # CONFIG_PLATFORM_PCPENTIUM4 is not set
CONFIG_BSP_QUARK=y CONFIG_PLATFORM_QUARK=y
# CONFIG_BSP_GENERIC_PC is not set # CONFIG_PLATFORM_GENERIC_PC is not set
# CONFIG_CPU_ATOM is not set # CONFIG_CPU_ATOM is not set
CONFIG_CPU_MINUTEIA=y CONFIG_CPU_MINUTEIA=y
# CONFIG_CPU_PENTIUM4 is not set # CONFIG_CPU_PENTIUM4 is not set
@ -104,7 +104,7 @@ CONFIG_CPU_SSE_UNSUPPORTED=y
CONFIG_CACHE_LINE_SIZE=0 CONFIG_CACHE_LINE_SIZE=0
# #
# Specific BSP Capability Support # Specific Platform Capability Support
# #
CONFIG_NUM_DYNAMIC_STUBS=0 CONFIG_NUM_DYNAMIC_STUBS=0
# CONFIG_PROT_MODE_SWITCH_PROMPT is not set # CONFIG_PROT_MODE_SWITCH_PROMPT is not set

14
arch/x86/defconfig
View file

@ -101,13 +101,13 @@ CONFIG_EOI_HANDLER_SUPPORTED=y
# CONFIG_LOCK_INSTRUCTION_UNSUPPORTED is not set # CONFIG_LOCK_INSTRUCTION_UNSUPPORTED is not set
# #
# BSP General Configuration # Platform General Configuration
# #
# CONFIG_BSP_ATOM_N28XX is not set # CONFIG_PLATFORM_ATOM_N28XX is not set
# CONFIG_BSP_PCMINUTEIA is not set # CONFIG_PLATFORM_PCMINUTEIA is not set
# CONFIG_BSP_PCPENTIUM4 is not set # CONFIG_PLATFORM_PCPENTIUM4 is not set
CONFIG_BSP_QUARK=y CONFIG_PLATFORM_QUARK=y
# CONFIG_BSP_GENERIC_PC is not set # CONFIG_PLATFORM_GENERIC_PC is not set
# CONFIG_CPU_ATOM is not set # CONFIG_CPU_ATOM is not set
CONFIG_CPU_MINUTEIA=y CONFIG_CPU_MINUTEIA=y
# CONFIG_CPU_PENTIUM4 is not set # CONFIG_CPU_PENTIUM4 is not set
@ -125,7 +125,7 @@ CONFIG_CPU_SSE_UNSUPPORTED=y
CONFIG_CACHE_LINE_SIZE=0 CONFIG_CACHE_LINE_SIZE=0
# #
# Specific BSP Capability Support # Specific Platform Capability Support
# #
CONFIG_NUM_DYNAMIC_STUBS=0 CONFIG_NUM_DYNAMIC_STUBS=0
# CONFIG_PROT_MODE_SWITCH_PROMPT is not set # CONFIG_PROT_MODE_SWITCH_PROMPT is not set

10
arch/x86/generic_pc/Kconfig
View file

@ -1,4 +1,4 @@
# Kconfig - generic PC BSP configuration options # Kconfig - generic PC platform configuration options
# #
# Copyright (c) 2014-2015 Wind River Systems, Inc. # Copyright (c) 2014-2015 Wind River Systems, Inc.
@ -42,10 +42,10 @@ config PHYS_LOAD_ADDR
config LOAPIC_TIMER_FREQ config LOAPIC_TIMER_FREQ
default 150000000 default 150000000
depends on BSP_ATOM_N28XX depends on PLATFORM_ATOM_N28XX
config SYS_CLOCK_HW_CYCLES_PER_SEC config SYS_CLOCK_HW_CYCLES_PER_SEC
default 1193180 if BSP_PCPENTIUM4 default 1193180 if PLATFORM_PCPENTIUM4
default 150000000 if BSP_ATOM_N28XX default 150000000 if PLATFORM_ATOM_N28XX
default 1193180 if BSP_PCMINUTEIA default 1193180 if PLATFORM_PCMINUTEIA

2
include/arch/arm/CortexM/nvic.h
View file

@ -224,7 +224,7 @@ static inline uint32_t _NvicIrqPrioGet(unsigned int irq /* IRQ number */
static inline void _NvicSwInterruptTrigger(unsigned int irq /* IRQ number */ static inline void _NvicSwInterruptTrigger(unsigned int irq /* IRQ number */
) )
{ {
#if defined(CONFIG_BSP_TI_LM3S6965_QEMU) #if defined(CONFIG_PLATFORM_TI_LM3S6965_QEMU)
/* the QEMU does not simulate the STIR register: this is a workaround */ /* the QEMU does not simulate the STIR register: this is a workaround */
_NvicIrqPend(irq); _NvicIrqPend(irq);
#else #else

2
samples/microkernel/test/test_tickless/src/test_tickless.c
View file

@ -66,7 +66,7 @@ typedef uint64_t _timer_res_t;
#elif defined(CONFIG_ARM) #elif defined(CONFIG_ARM)
# if defined(CONFIG_BSP_TI_LM3S6965_QEMU) # if defined(CONFIG_PLATFORM_TI_LM3S6965_QEMU)
/* A bug in the QEMU ARMv7-M sysTick timer prevents tickless idle support */ /* A bug in the QEMU ARMv7-M sysTick timer prevents tickless idle support */
#error "This QEMU target does not support tickless idle!" #error "This QEMU target does not support tickless idle!"
# endif # endif

4
samples/microkernel/test/test_tickless/src/timestamps.c
View file

@ -38,7 +38,7 @@ BSP-specific timestamp support for the tickless idle test.
#include <tc_util.h> #include <tc_util.h>
#include <stddef.h> #include <stddef.h>
#if defined(CONFIG_BSP_TI_LM3S6965_QEMU) #if defined(CONFIG_PLATFORM_TI_LM3S6965_QEMU)
/* /*
* @brief Use a General Purpose Timer in * @brief Use a General Purpose Timer in
* 32-bit periodic timer mode (down-counter) * 32-bit periodic timer mode (down-counter)
@ -161,7 +161,7 @@ void _TimestampClose(void)
_CLKGATECTRL &= ~_CLKGATECTRL_TIMESTAMP_EN; _CLKGATECTRL &= ~_CLKGATECTRL_TIMESTAMP_EN;
} }
#elif defined(CONFIG_BSP_FSL_FRDM_K64F) #elif defined(CONFIG_PLATFORM_FSL_FRDM_K64F)
/* Freescale FRDM-K64F target - use RTC (prescale value) */ /* Freescale FRDM-K64F target - use RTC (prescale value) */
#define _COUNTDOWN_TIMER false #define _COUNTDOWN_TIMER false

2
scripts/Makefile.x86.preparch
View file

@ -6,7 +6,7 @@ PERF_OPT=$(if $(filter -Os,$(DEFAULTFLAGS)),,y)
PERF_OPT_FLAG = $(PERF_OPT_FLAG-$(PERF_OPT)) PERF_OPT_FLAG = $(PERF_OPT_FLAG-$(PERF_OPT))
ALIGN_STACK_FLAG = $(ALIGN_STACK_FLAG-$(PERF_OPT)) ALIGN_STACK_FLAG = $(ALIGN_STACK_FLAG-$(PERF_OPT))
LTO_FLAG = $(LTO_FLAG-$(CONFIG_LTO)) LTO_FLAG = $(LTO_FLAG-$(CONFIG_LTO))
ifneq ($(CONFIG_BSP_QUARK),y) ifneq ($(CONFIG_PLATFORM_QUARK),y)
iSSE_FP_MATH_ ?= -mno-sse iSSE_FP_MATH_ ?= -mno-sse
iSSE_FP_MATH ?= ${iSSE_FP_MATH_${CONFIG_SSE_FP_MATH}} iSSE_FP_MATH ?= ${iSSE_FP_MATH_${CONFIG_SSE_FP_MATH}}
endif endif