michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Rename BSP_DIR to PLATFORM

Browse source 
Updates references to CONFIG_BSP_DIR to CONFIG_PLATFORM as part of the
BSP -> platform clean up.

Note that despite the renaming, the usage of the config option remains
unchanged.

Change-Id: I2846c3f761cf09871019c0855bf1824ae03e6b3c
Signed-off-by: Peter Mitsis <peter.mitsis@windriver.com>
This commit is contained in:
Peter Mitsis 2015-06-15 16:43:35 -04:00 • committed by Anas Nashif
commit 1ffabeaf3d
36 changed files with 40 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -758,7 +758,7 @@ DQUOTE = "
#This comment line is to fix the highlighting of some editors due the quote effect." #This comment line is to fix the highlighting of some editors due the quote effect."
export KBUILD_ZEPHYR_INIT := $(head-y) $(init-y) export KBUILD_ZEPHYR_INIT := $(head-y) $(init-y)
export KBUILD_ZEPHYR_MAIN := $(bsp-y) $(drivers-y) $(core-y) $(libs-y) export KBUILD_ZEPHYR_MAIN := $(bsp-y) $(drivers-y) $(core-y) $(libs-y)
export KBUILD_LDS := $(srctree)/arch/$(SRCARCH)/$(subst $(DQUOTE),,$(CONFIG_BSP_DIR))/linker.cmd export KBUILD_LDS := $(srctree)/arch/$(SRCARCH)/$(subst $(DQUOTE),,$(CONFIG_PLATFORM))/linker.cmd
export LDFLAGS_zephyr export LDFLAGS_zephyr
# used by scripts/pacmage/Makefile # used by scripts/pacmage/Makefile
export KBUILD_ALLDIRS := $(sort $(filter-out arch/%,$(zephyr-alldirs)) arch Documentation include samples scripts tools virt) export KBUILD_ALLDIRS := $(sort $(filter-out arch/%,$(zephyr-alldirs)) arch Documentation include samples scripts tools virt)

4
arch/arc/Makefile
View file

@ -1,5 +1,5 @@
ccflags-y +=-I$(srctree)/arch/arc/$(strip $(CONFIG_BSP_DIR)) ccflags-y +=-I$(srctree)/arch/arc/$(strip $(CONFIG_PLATFORM))
asflags-y +=-I$(srctree)/arch/arc/$(strip $(CONFIG_BSP_DIR)) asflags-y +=-I$(srctree)/arch/arc/$(strip $(CONFIG_PLATFORM))
obj-y = core/ obj-y = core/

2
arch/arm/bsp/CortexM/Makefile
View file

@ -1,5 +1,5 @@
ccflags-y +=-I$(srctree)/include/drivers ccflags-y +=-I$(srctree)/include/drivers
ccflags-y +=-I$(srctree)/arch/$(ARCH)/$(strip $(CONFIG_BSP_DIR)) ccflags-y +=-I$(srctree)/arch/$(ARCH)/$(strip $(CONFIG_PLATFORM))
asflags-y = $(ccflags-y) asflags-y = $(ccflags-y)

2
arch/arm/bsp/Makefile
View file

@ -1,5 +1,5 @@
ccflags-y +=-I$(srctree)/include/drivers ccflags-y +=-I$(srctree)/include/drivers
ccflags-y +=-I$(srctree)/arch/$(ARCH)/$(strip $(CONFIG_BSP_DIR)) ccflags-y +=-I$(srctree)/arch/$(ARCH)/$(strip $(CONFIG_PLATFORM))
obj-y = CortexM/ obj-y = CortexM/
obj-y += sysFatalErrorHandler.o obj-y += sysFatalErrorHandler.o

2
arch/arm/configs/micro_fsl_frdm_k64f_defconfig
View file

@ -112,7 +112,7 @@ CONFIG_IRQ_VECTOR_TABLE_BSP=y
# CONFIG_ZERO_LATENCY_IRQS is not set # CONFIG_ZERO_LATENCY_IRQS is not set
CONFIG_ARCH_HAS_TASK_ABORT=y CONFIG_ARCH_HAS_TASK_ABORT=y
CONFIG_ARCH_HAS_NANO_FIBER_ABORT=y CONFIG_ARCH_HAS_NANO_FIBER_ABORT=y
CONFIG_BSP_DIR="fsl_frdm_k64f" CONFIG_PLATFORM="fsl_frdm_k64f"
CONFIG_NUM_IRQS=34 CONFIG_NUM_IRQS=34
CONFIG_WDOG_INIT=y CONFIG_WDOG_INIT=y

2
arch/arm/configs/micro_ti_lm3s6965_defconfig
View file

@ -112,7 +112,7 @@ CONFIG_IRQ_VECTOR_TABLE_BSP=y
# CONFIG_ZERO_LATENCY_IRQS is not set # CONFIG_ZERO_LATENCY_IRQS is not set
CONFIG_ARCH_HAS_TASK_ABORT=y CONFIG_ARCH_HAS_TASK_ABORT=y
CONFIG_ARCH_HAS_NANO_FIBER_ABORT=y CONFIG_ARCH_HAS_NANO_FIBER_ABORT=y
CONFIG_BSP_DIR="ti_lm3s6965" CONFIG_PLATFORM="ti_lm3s6965"
CONFIG_NUM_IRQS=34 CONFIG_NUM_IRQS=34
CONFIG_BSP_TI_LM3S6965_QEMU=y CONFIG_BSP_TI_LM3S6965_QEMU=y

2
arch/arm/configs/nano_fsl_frdm_k64f_defconfig
View file

@ -91,7 +91,7 @@ CONFIG_IRQ_VECTOR_TABLE_BSP=y
# CONFIG_ZERO_LATENCY_IRQS is not set # CONFIG_ZERO_LATENCY_IRQS is not set
CONFIG_ARCH_HAS_TASK_ABORT=y CONFIG_ARCH_HAS_TASK_ABORT=y
CONFIG_ARCH_HAS_NANO_FIBER_ABORT=y CONFIG_ARCH_HAS_NANO_FIBER_ABORT=y
CONFIG_BSP_DIR="fsl_frdm_k64f" CONFIG_PLATFORM="fsl_frdm_k64f"
CONFIG_NUM_IRQS=34 CONFIG_NUM_IRQS=34
CONFIG_WDOG_INIT=y CONFIG_WDOG_INIT=y

2
arch/arm/configs/nano_ti_lm3s6965_defconfig
View file

@ -91,7 +91,7 @@ CONFIG_IRQ_VECTOR_TABLE_BSP=y
# CONFIG_ZERO_LATENCY_IRQS is not set # CONFIG_ZERO_LATENCY_IRQS is not set
CONFIG_ARCH_HAS_TASK_ABORT=y CONFIG_ARCH_HAS_TASK_ABORT=y
CONFIG_ARCH_HAS_NANO_FIBER_ABORT=y CONFIG_ARCH_HAS_NANO_FIBER_ABORT=y
CONFIG_BSP_DIR="ti_lm3s6965" CONFIG_PLATFORM="ti_lm3s6965"
CONFIG_NUM_IRQS=34 CONFIG_NUM_IRQS=34
CONFIG_BSP_TI_LM3S6965_QEMU=y CONFIG_BSP_TI_LM3S6965_QEMU=y

2
arch/arm/defconfig
View file

@ -112,7 +112,7 @@ CONFIG_IRQ_VECTOR_TABLE_BSP=y
# CONFIG_ZERO_LATENCY_IRQS is not set # CONFIG_ZERO_LATENCY_IRQS is not set
CONFIG_ARCH_HAS_TASK_ABORT=y CONFIG_ARCH_HAS_TASK_ABORT=y
CONFIG_ARCH_HAS_NANO_FIBER_ABORT=y CONFIG_ARCH_HAS_NANO_FIBER_ABORT=y
CONFIG_BSP_DIR="fsl_frdm_k64f" CONFIG_PLATFORM="fsl_frdm_k64f"
CONFIG_NUM_IRQS=34 CONFIG_NUM_IRQS=34
CONFIG_WDOG_INIT=y CONFIG_WDOG_INIT=y

2
arch/arm/fsl_frdm_k64f/Kconfig
View file

@ -30,7 +30,7 @@
# POSSIBILITY OF SUCH DAMAGE. # POSSIBILITY OF SUCH DAMAGE.
# #
config BSP_DIR config PLATFORM
string string
default fsl_frdm_k64f default fsl_frdm_k64f
help help

2
arch/arm/ti_lm3s6965/Kconfig
View file

@ -30,7 +30,7 @@
# POSSIBILITY OF SUCH DAMAGE. # POSSIBILITY OF SUCH DAMAGE.
# #
config BSP_DIR config PLATFORM
string string
default ti_lm3s6965 default ti_lm3s6965
help help

2
arch/arm/timer/Makefile
View file

@ -1,5 +1,5 @@
ccflags-y +=-I$(srctree)/include/drivers ccflags-y +=-I$(srctree)/include/drivers
ccflags-y +=-I$(srctree)/arch/$(ARCH)/$(strip $(CONFIG_BSP_DIR)) ccflags-y +=-I$(srctree)/arch/$(ARCH)/$(strip $(CONFIG_PLATFORM))
obj-y = systick.o obj-y = systick.o
obj-$(CONFIG_GDB_INFO) += systick_gdb.o obj-$(CONFIG_GDB_INFO) += systick_gdb.o

2
arch/x86/configs/micro_generic_pc_atom_n28xx_defconfig
View file

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

2
arch/x86/configs/micro_generic_pc_defconfig
View file

@ -138,7 +138,7 @@ CONFIG_NUM_DYNAMIC_STUBS=0
# Bus options (PCI etc.) # Bus options (PCI etc.)
# #
# CONFIG_PCI is not set # CONFIG_PCI is not set
CONFIG_BSP_DIR="generic_pc" CONFIG_PLATFORM="generic_pc"
# #
# Device Drivers # Device Drivers

2
arch/x86/configs/micro_generic_pc_minuteia_defconfig
View file

@ -135,7 +135,7 @@ CONFIG_NUM_DYNAMIC_STUBS=0
# Bus options (PCI etc.) # Bus options (PCI etc.)
# #
# CONFIG_PCI is not set # CONFIG_PCI is not set
CONFIG_BSP_DIR="generic_pc" CONFIG_PLATFORM="generic_pc"
# #
# Device Drivers # Device Drivers

2
arch/x86/configs/micro_generic_pc_pentium4_defconfig
View file

@ -138,7 +138,7 @@ CONFIG_NUM_DYNAMIC_STUBS=0
# Bus options (PCI etc.) # Bus options (PCI etc.)
# #
# CONFIG_PCI is not set # CONFIG_PCI is not set
CONFIG_BSP_DIR="generic_pc" CONFIG_PLATFORM="generic_pc"
# #
# Device Drivers # Device Drivers

2
arch/x86/configs/micro_quark_defconfig
View file

@ -137,7 +137,7 @@ CONFIG_NUM_DYNAMIC_STUBS=0
# #
CONFIG_PCI=y CONFIG_PCI=y
# CONFIG_PCI_DEBUG is not set # CONFIG_PCI_DEBUG is not set
CONFIG_BSP_DIR="quark" CONFIG_PLATFORM="quark"
# #
# Device Drivers # Device Drivers

2
arch/x86/configs/nano_generic_pc_atom_n28xx_defconfig
View file

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

2
arch/x86/configs/nano_generic_pc_defconfig
View file

@ -117,7 +117,7 @@ CONFIG_NUM_DYNAMIC_STUBS=0
# Bus options (PCI etc.) # Bus options (PCI etc.)
# #
# CONFIG_PCI is not set # CONFIG_PCI is not set
CONFIG_BSP_DIR="generic_pc" CONFIG_PLATFORM="generic_pc"
# #
# Device Drivers # Device Drivers

2
arch/x86/configs/nano_generic_pc_minuteia_defconfig
View file

@ -114,7 +114,7 @@ CONFIG_NUM_DYNAMIC_STUBS=0
# Bus options (PCI etc.) # Bus options (PCI etc.)
# #
# CONFIG_PCI is not set # CONFIG_PCI is not set
CONFIG_BSP_DIR="generic_pc" CONFIG_PLATFORM="generic_pc"
# #
# Device Drivers # Device Drivers

2
arch/x86/configs/nano_generic_pc_pentium4_defconfig
View file

@ -117,7 +117,7 @@ CONFIG_NUM_DYNAMIC_STUBS=0
# Bus options (PCI etc.) # Bus options (PCI etc.)
# #
# CONFIG_PCI is not set # CONFIG_PCI is not set
CONFIG_BSP_DIR="generic_pc" CONFIG_PLATFORM="generic_pc"
# #
# Device Drivers # Device Drivers

2
arch/x86/configs/nano_quark_defconfig
View file

@ -116,7 +116,7 @@ CONFIG_NUM_DYNAMIC_STUBS=0
# #
CONFIG_PCI=y CONFIG_PCI=y
# CONFIG_PCI_DEBUG is not set # CONFIG_PCI_DEBUG is not set
CONFIG_BSP_DIR="quark" CONFIG_PLATFORM="quark"
# #
# Device Drivers # Device Drivers

2
arch/x86/defconfig
View file

@ -137,7 +137,7 @@ CONFIG_NUM_DYNAMIC_STUBS=0
# #
CONFIG_PCI=y CONFIG_PCI=y
# CONFIG_PCI_DEBUG is not set # CONFIG_PCI_DEBUG is not set
CONFIG_BSP_DIR="quark" CONFIG_PLATFORM="quark"
# #
# Device Drivers # Device Drivers

2
arch/x86/generic_pc/Kconfig
View file

@ -30,7 +30,7 @@
# POSSIBILITY OF SUCH DAMAGE. # POSSIBILITY OF SUCH DAMAGE.
# #
config BSP_DIR config PLATFORM
string string
default generic_pc default generic_pc
help help

2
arch/x86/quark/Kconfig
View file

@ -31,7 +31,7 @@
# #
config BSP_DIR config PLATFORM
string string
default quark default quark
help help

2
drivers/bluetooth/Makefile
View file

@ -1,6 +1,6 @@
ccflags-y +=-I$(srctree)/include/drivers ccflags-y +=-I$(srctree)/include/drivers
ccflags-y +=-I$(srctree)/arch/$(ARCH) ccflags-y +=-I$(srctree)/arch/$(ARCH)
ccflags-y +=-I$(srctree)/arch/$(ARCH)/$(strip $(CONFIG_BSP_DIR)) ccflags-y +=-I$(srctree)/arch/$(ARCH)/$(strip $(CONFIG_PLATFORM))
obj-$(CONFIG_BLUETOOTH_UART)=uart.o obj-$(CONFIG_BLUETOOTH_UART)=uart.o

2
drivers/console/Makefile
View file

@ -1,5 +1,5 @@
ccflags-y +=-I$(srctree)/include/drivers ccflags-y +=-I$(srctree)/include/drivers
ccflags-y +=-I$(srctree)/arch/$(ARCH) ccflags-y +=-I$(srctree)/arch/$(ARCH)
ccflags-y +=-I$(srctree)/arch/$(ARCH)/$(strip $(CONFIG_BSP_DIR)) ccflags-y +=-I$(srctree)/arch/$(ARCH)/$(strip $(CONFIG_PLATFORM))
obj-y = uart_console.o obj-y = uart_console.o

5
drivers/interrupt_controller/Makefile
View file

@ -1,7 +1,6 @@
ccflags-y +=-I$(srctree)/include/drivers ccflags-y +=-I$(srctree)/include/drivers
ccflags-y +=-I$(srctree)/arch/$(ARCH)/$(subst $(DQUOTE),,$(CONFIG_BSP_DIR)) ccflags-y +=-I$(srctree)/arch/$(ARCH)/$(subst $(DQUOTE),,$(CONFIG_PLATFORM))
asflags-y +=-I$(srctree)/arch/x86/$(subst $(DQUOTE),,$(CONFIG_BSP_DIR)) asflags-y +=-I$(srctree)/arch/x86/$(subst $(DQUOTE),,$(CONFIG_PLATFORM))
obj-${CONFIG_PIC}${CONFIG_SHUTOFF_PIC} = i8259.o obj-${CONFIG_PIC}${CONFIG_SHUTOFF_PIC} = i8259.o

2
drivers/pci/Makefile
View file

@ -1,6 +1,6 @@
ccflags-y += -I$(srctree)/include/drivers ccflags-y += -I$(srctree)/include/drivers
ccflags-y +=-I$(srctree)/arch/$(ARCH) ccflags-y +=-I$(srctree)/arch/$(ARCH)
ccflags-y +=-I$(srctree)/arch/$(ARCH)/$(strip $(CONFIG_BSP_DIR)) ccflags-y +=-I$(srctree)/arch/$(ARCH)/$(strip $(CONFIG_PLATFORM))
obj-$(CONFIG_PCI) = pci.o pci_config.o pci_interface.o obj-$(CONFIG_PCI) = pci.o pci_config.o pci_interface.o

2
drivers/random/Makefile
View file

@ -1,5 +1,5 @@
ccflags-y +=-I$(srctree)/arch/$(ARCH) ccflags-y +=-I$(srctree)/arch/$(ARCH)
ccflags-y +=-I$(srctree)/arch/$(ARCH)/$(strip $(CONFIG_BSP_DIR)) ccflags-y +=-I$(srctree)/arch/$(ARCH)/$(strip $(CONFIG_PLATFORM))
obj-$(CONFIG_TIMER_RANDOM_GENERATOR) = rand32-timer.o obj-$(CONFIG_TIMER_RANDOM_GENERATOR) = rand32-timer.o
obj-$(CONFIG_X86_TSC_RANDOM_GENERATOR) += rand32-timestamp.o obj-$(CONFIG_X86_TSC_RANDOM_GENERATOR) += rand32-timestamp.o

2
drivers/serial/Makefile
View file

@ -1,6 +1,6 @@
ccflags-y +=-I$(srctree)/include/drivers ccflags-y +=-I$(srctree)/include/drivers
ccflags-y +=-I$(srctree)/arch/$(ARCH) ccflags-y +=-I$(srctree)/arch/$(ARCH)
ccflags-y +=-I$(srctree)/arch/$(ARCH)/$(strip $(CONFIG_BSP_DIR)) ccflags-y +=-I$(srctree)/arch/$(ARCH)/$(strip $(CONFIG_PLATFORM))
obj-$(CONFIG_NS16550) = ns16550.o obj-$(CONFIG_NS16550) = ns16550.o

2
drivers/simple/Makefile
View file

@ -1,5 +1,5 @@
ccflags-y +=-I$(srctree)/include/drivers ccflags-y +=-I$(srctree)/include/drivers
ccflags-y +=-I$(srctree)/arch/$(ARCH) ccflags-y +=-I$(srctree)/arch/$(ARCH)
ccflags-y +=-I$(srctree)/arch/$(ARCH)/$(strip $(CONFIG_BSP_DIR)) ccflags-y +=-I$(srctree)/arch/$(ARCH)/$(strip $(CONFIG_PLATFORM))
obj-y=uart.o obj-y=uart.o

2
drivers/timer/Makefile
View file

@ -1,5 +1,5 @@
ccflags-y +=-I$(srctree)/arch/$(ARCH) ccflags-y +=-I$(srctree)/arch/$(ARCH)
ccflags-y +=-I$(srctree)/arch/$(ARCH)/$(subst $(DQUOTE),,$(CONFIG_BSP_DIR)) ccflags-y +=-I$(srctree)/arch/$(ARCH)/$(subst $(DQUOTE),,$(CONFIG_PLATFORM))
obj-$(CONFIG_PIT) = i8253.o obj-$(CONFIG_PIT) = i8253.o
obj-$(CONFIG_HPET_TIMER) += hpet.o obj-$(CONFIG_HPET_TIMER) += hpet.o

2
samples/bluetooth/peripheral/src/main.c
View file

@ -473,7 +473,7 @@ static const struct bt_gatt_attr attrs[] = {
BT_GATT_PRIMARY_SERVICE(0x0016, &dis_uuid), BT_GATT_PRIMARY_SERVICE(0x0016, &dis_uuid),
BT_GATT_CHARACTERISTIC(0x0017, &model_chrc), BT_GATT_CHARACTERISTIC(0x0017, &model_chrc),
BT_GATT_DESCRIPTOR(0x0018, &model_uuid, BT_GATT_PERM_READ, BT_GATT_DESCRIPTOR(0x0018, &model_uuid, BT_GATT_PERM_READ,
read_model, NULL, CONFIG_BSP_DIR), read_model, NULL, CONFIG_PLATFORM),
BT_GATT_CHARACTERISTIC(0x0019, &manuf_chrc), BT_GATT_CHARACTERISTIC(0x0019, &manuf_chrc),
BT_GATT_DESCRIPTOR(0x001a, &manuf_uuid, BT_GATT_PERM_READ, BT_GATT_DESCRIPTOR(0x001a, &manuf_uuid, BT_GATT_PERM_READ,
read_manuf, NULL, "Manufacturer"), read_manuf, NULL, "Manufacturer"),

2
samples/nanokernel/test/test_context/src/Makefile
View file

@ -1,4 +1,4 @@
ccflags-y += ${PROJECTINCLUDE} -I${srctree}/samples/include ccflags-y += ${PROJECTINCLUDE} -I${srctree}/samples/include
ccflags-y +=-I$(srctree)/arch/$(ARCH)/$(strip $(CONFIG_BSP_DIR)) ccflags-y +=-I$(srctree)/arch/$(ARCH)/$(strip $(CONFIG_PLATFORM))
obj-y = context.o obj-y = context.o

6
scripts/Makefile.preparch
View file

@ -29,10 +29,10 @@ define filechk_prj.mdef
done; \ done; \
fi; \ fi; \
cat $(PROJECT_BASE)/$(MDEF_FILE); \ cat $(PROJECT_BASE)/$(MDEF_FILE); \
cat $(srctree)/config/$(CONFIG_BSP_DIR)/ukernel/config1p.mdef;) cat $(srctree)/config/$(CONFIG_PLATFORM)/ukernel/config1p.mdef;)
endef endef
misc/generated/sysgen/prj.mdef: $(srctree)/config/$(CONFIG_BSP_DIR)/ukernel/config1p.mdef \ misc/generated/sysgen/prj.mdef: $(srctree)/config/$(CONFIG_PLATFORM)/ukernel/config1p.mdef \
$(PROJECT_BASE)/$(MDEF_FILE) \ $(PROJECT_BASE)/$(MDEF_FILE) \
include/config/auto.conf FORCE include/config/auto.conf FORCE
$(call filechk,prj.mdef) $(call filechk,prj.mdef)
@ -108,4 +108,4 @@ cmd_cc_o_c = $(CC) $(KBUILD_CFLAGS) $(OFFSETS_INCLUDE) $(USERINCLUDE) -c -o $@ $
include/generated/offsets.o: $(srctree)/arch/$(SRCARCH)/core/offsets/offsets.c FORCE include/generated/offsets.o: $(srctree)/arch/$(SRCARCH)/core/offsets/offsets.c FORCE
$(call if_changed_rule,cc_o_c) $(call if_changed_rule,cc_o_c)
.PHONY: $(srctree)/config/$(CONFIG_BSP_DIR)/ukernel/config1p.mdef .PHONY: $(srctree)/config/$(CONFIG_PLATFORM)/ukernel/config1p.mdef