From 213db12fbf545790a86a1ca91812a26c460e5ded Mon Sep 17 00:00:00 2001 From: Peter Mitsis Date: Thu, 16 Jul 2015 15:16:56 -0400 Subject: [PATCH] Move platforms to new arch//platforms directory Change-Id: I9ad5d51329d381c091aa47b482a8e38e7c194118 Signed-off-by: Peter Mitsis --- Makefile | 2 +- arch/arc/Makefile | 4 ++-- arch/arm/Kconfig | 4 ++-- arch/arm/Makefile | 4 ++-- arch/arm/bsp/CortexM/Makefile | 2 +- arch/arm/{ => platforms}/fsl_frdm_k64f/Kconfig | 0 arch/arm/{ => platforms}/fsl_frdm_k64f/Makefile | 2 +- arch/arm/{ => platforms}/fsl_frdm_k64f/board.h | 0 arch/arm/{ => platforms}/fsl_frdm_k64f/irq_vector_table.c | 0 arch/arm/{ => platforms}/fsl_frdm_k64f/linker.cmd | 0 arch/arm/{ => platforms}/fsl_frdm_k64f/nmi_on_reset.S | 0 arch/arm/{ => platforms}/fsl_frdm_k64f/system.c | 0 arch/arm/{ => platforms}/fsl_frdm_k64f/wdog.S | 0 arch/arm/{ => platforms}/ti_lm3s6965/Kconfig | 0 arch/arm/{ => platforms}/ti_lm3s6965/Makefile | 2 +- arch/arm/{ => platforms}/ti_lm3s6965/board.h | 0 arch/arm/{ => platforms}/ti_lm3s6965/irq_vector_table.c | 0 arch/arm/{ => platforms}/ti_lm3s6965/linker.cmd | 0 arch/arm/{ => platforms}/ti_lm3s6965/nmi_on_reset.S | 0 arch/arm/{ => platforms}/ti_lm3s6965/scp.c | 0 arch/arm/{ => platforms}/ti_lm3s6965/scp.h | 0 arch/arm/{ => platforms}/ti_lm3s6965/system.c | 0 arch/x86/Kconfig | 4 ++-- arch/x86/Makefile | 4 ++-- arch/x86/{ => platforms}/generic_pc/Kconfig | 0 arch/x86/{ => platforms}/generic_pc/Makefile | 0 arch/x86/{ => platforms}/generic_pc/board.h | 0 arch/x86/{ => platforms}/generic_pc/linker.cmd | 0 arch/x86/{ => platforms}/generic_pc/system.c | 0 arch/x86/{ => platforms}/quark/Kconfig | 0 arch/x86/{ => platforms}/quark/Makefile | 0 arch/x86/{ => platforms}/quark/board.h | 0 arch/x86/{ => platforms}/quark/linker.cmd | 0 arch/x86/{ => platforms}/quark/system.c | 0 drivers/bluetooth/Makefile | 2 +- drivers/console/Makefile | 2 +- drivers/interrupt_controller/Makefile | 4 ++-- drivers/pci/Makefile | 2 +- drivers/random/Makefile | 2 +- drivers/serial/Makefile | 2 +- drivers/simple/Makefile | 2 +- drivers/timer/Makefile | 2 +- samples/microkernel/apps/nfc_hello/src/Makefile | 2 +- samples/nanokernel/test/test_context/src/Makefile | 2 +- 44 files changed, 25 insertions(+), 25 deletions(-) rename arch/arm/{ => platforms}/fsl_frdm_k64f/Kconfig (100%) rename arch/arm/{ => platforms}/fsl_frdm_k64f/Makefile (79%) rename arch/arm/{ => platforms}/fsl_frdm_k64f/board.h (100%) rename arch/arm/{ => platforms}/fsl_frdm_k64f/irq_vector_table.c (100%) rename arch/arm/{ => platforms}/fsl_frdm_k64f/linker.cmd (100%) rename arch/arm/{ => platforms}/fsl_frdm_k64f/nmi_on_reset.S (100%) rename arch/arm/{ => platforms}/fsl_frdm_k64f/system.c (100%) rename arch/arm/{ => platforms}/fsl_frdm_k64f/wdog.S (100%) rename arch/arm/{ => platforms}/ti_lm3s6965/Kconfig (100%) rename arch/arm/{ => platforms}/ti_lm3s6965/Makefile (79%) rename arch/arm/{ => platforms}/ti_lm3s6965/board.h (100%) rename arch/arm/{ => platforms}/ti_lm3s6965/irq_vector_table.c (100%) rename arch/arm/{ => platforms}/ti_lm3s6965/linker.cmd (100%) rename arch/arm/{ => platforms}/ti_lm3s6965/nmi_on_reset.S (100%) rename arch/arm/{ => platforms}/ti_lm3s6965/scp.c (100%) rename arch/arm/{ => platforms}/ti_lm3s6965/scp.h (100%) rename arch/arm/{ => platforms}/ti_lm3s6965/system.c (100%) rename arch/x86/{ => platforms}/generic_pc/Kconfig (100%) rename arch/x86/{ => platforms}/generic_pc/Makefile (100%) rename arch/x86/{ => platforms}/generic_pc/board.h (100%) rename arch/x86/{ => platforms}/generic_pc/linker.cmd (100%) rename arch/x86/{ => platforms}/generic_pc/system.c (100%) rename arch/x86/{ => platforms}/quark/Kconfig (100%) rename arch/x86/{ => platforms}/quark/Makefile (100%) rename arch/x86/{ => platforms}/quark/board.h (100%) rename arch/x86/{ => platforms}/quark/linker.cmd (100%) rename arch/x86/{ => platforms}/quark/system.c (100%) diff --git a/Makefile b/Makefile index 1c6d15a8861..65adec22855 100644 --- a/Makefile +++ b/Makefile @@ -754,7 +754,7 @@ DQUOTE = " #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_MAIN := $(bsp-y) $(drivers-y) $(core-y) $(libs-y) -export KBUILD_LDS := $(srctree)/arch/$(SRCARCH)/$(subst $(DQUOTE),,$(CONFIG_PLATFORM))/linker.cmd +export KBUILD_LDS := $(srctree)/arch/$(SRCARCH)/platforms/$(subst $(DQUOTE),,$(CONFIG_PLATFORM))/linker.cmd export LDFLAGS_zephyr # used by scripts/pacmage/Makefile export KBUILD_ALLDIRS := $(sort $(filter-out arch/%,$(zephyr-alldirs)) arch Documentation include samples scripts tools virt) diff --git a/arch/arc/Makefile b/arch/arc/Makefile index 0e6c8657ec9..2c33a78404a 100644 --- a/arch/arc/Makefile +++ b/arch/arc/Makefile @@ -1,5 +1,5 @@ -ccflags-y +=-I$(srctree)/arch/arc/$(strip $(CONFIG_PLATFORM)) -asflags-y +=-I$(srctree)/arch/arc/$(strip $(CONFIG_PLATFORM)) +ccflags-y +=-I$(srctree)/arch/arc/platforms/$(strip $(CONFIG_PLATFORM)) +asflags-y +=-I$(srctree)/arch/arc/platforms/$(strip $(CONFIG_PLATFORM)) obj-y = core/ diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 1ecf6c2bbdd..528f493c6d7 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -94,11 +94,11 @@ endmenu source "arch/arm/bsp/CortexM/Kconfig" if PLATFORM_TI_LM3S6965 -source "arch/arm/ti_lm3s6965/Kconfig" +source "arch/arm/platforms/ti_lm3s6965/Kconfig" endif if PLATFORM_FSL_FRDM_K64F -source "arch/arm/fsl_frdm_k64f/Kconfig" +source "arch/arm/platforms/fsl_frdm_k64f/Kconfig" endif source "drivers/Kconfig" diff --git a/arch/arm/Makefile b/arch/arm/Makefile index d03cbfe3a49..de69a1000f2 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -1,5 +1,5 @@ obj-y = core/ obj-y += bsp/ -obj-$(CONFIG_PLATFORM_FSL_FRDM_K64F) += fsl_frdm_k64f/ -obj-$(CONFIG_PLATFORM_TI_LM3S6965) += ti_lm3s6965/ +obj-$(CONFIG_PLATFORM_FSL_FRDM_K64F) += platforms/fsl_frdm_k64f/ +obj-$(CONFIG_PLATFORM_TI_LM3S6965) += platforms/ti_lm3s6965/ diff --git a/arch/arm/bsp/CortexM/Makefile b/arch/arm/bsp/CortexM/Makefile index 24c83427581..3d2fb1697e8 100644 --- a/arch/arm/bsp/CortexM/Makefile +++ b/arch/arm/bsp/CortexM/Makefile @@ -1,5 +1,5 @@ ccflags-y +=-I$(srctree)/include/drivers -ccflags-y +=-I$(srctree)/arch/$(ARCH)/$(strip $(CONFIG_PLATFORM)) +ccflags-y +=-I$(srctree)/arch/$(ARCH)/platforms/$(strip $(CONFIG_PLATFORM)) asflags-y = $(ccflags-y) diff --git a/arch/arm/fsl_frdm_k64f/Kconfig b/arch/arm/platforms/fsl_frdm_k64f/Kconfig similarity index 100% rename from arch/arm/fsl_frdm_k64f/Kconfig rename to arch/arm/platforms/fsl_frdm_k64f/Kconfig diff --git a/arch/arm/fsl_frdm_k64f/Makefile b/arch/arm/platforms/fsl_frdm_k64f/Makefile similarity index 79% rename from arch/arm/fsl_frdm_k64f/Makefile rename to arch/arm/platforms/fsl_frdm_k64f/Makefile index a26f0fda022..c62e1939492 100644 --- a/arch/arm/fsl_frdm_k64f/Makefile +++ b/arch/arm/platforms/fsl_frdm_k64f/Makefile @@ -1,6 +1,6 @@ ccflags-y +=-I$(srctree)/include/drivers ccflags-y +=-I$(srctree)/drivers -ccflags-y +=-I$(srctree)/arch/arm/fsl_frdm_k64f +ccflags-y +=-I$(srctree)/arch/arm/platforms/fsl_frdm_k64f asflags-y := ${ccflags-y} diff --git a/arch/arm/fsl_frdm_k64f/board.h b/arch/arm/platforms/fsl_frdm_k64f/board.h similarity index 100% rename from arch/arm/fsl_frdm_k64f/board.h rename to arch/arm/platforms/fsl_frdm_k64f/board.h diff --git a/arch/arm/fsl_frdm_k64f/irq_vector_table.c b/arch/arm/platforms/fsl_frdm_k64f/irq_vector_table.c similarity index 100% rename from arch/arm/fsl_frdm_k64f/irq_vector_table.c rename to arch/arm/platforms/fsl_frdm_k64f/irq_vector_table.c diff --git a/arch/arm/fsl_frdm_k64f/linker.cmd b/arch/arm/platforms/fsl_frdm_k64f/linker.cmd similarity index 100% rename from arch/arm/fsl_frdm_k64f/linker.cmd rename to arch/arm/platforms/fsl_frdm_k64f/linker.cmd diff --git a/arch/arm/fsl_frdm_k64f/nmi_on_reset.S b/arch/arm/platforms/fsl_frdm_k64f/nmi_on_reset.S similarity index 100% rename from arch/arm/fsl_frdm_k64f/nmi_on_reset.S rename to arch/arm/platforms/fsl_frdm_k64f/nmi_on_reset.S diff --git a/arch/arm/fsl_frdm_k64f/system.c b/arch/arm/platforms/fsl_frdm_k64f/system.c similarity index 100% rename from arch/arm/fsl_frdm_k64f/system.c rename to arch/arm/platforms/fsl_frdm_k64f/system.c diff --git a/arch/arm/fsl_frdm_k64f/wdog.S b/arch/arm/platforms/fsl_frdm_k64f/wdog.S similarity index 100% rename from arch/arm/fsl_frdm_k64f/wdog.S rename to arch/arm/platforms/fsl_frdm_k64f/wdog.S diff --git a/arch/arm/ti_lm3s6965/Kconfig b/arch/arm/platforms/ti_lm3s6965/Kconfig similarity index 100% rename from arch/arm/ti_lm3s6965/Kconfig rename to arch/arm/platforms/ti_lm3s6965/Kconfig diff --git a/arch/arm/ti_lm3s6965/Makefile b/arch/arm/platforms/ti_lm3s6965/Makefile similarity index 79% rename from arch/arm/ti_lm3s6965/Makefile rename to arch/arm/platforms/ti_lm3s6965/Makefile index 4ee453920f4..d1fa30f4fd7 100644 --- a/arch/arm/ti_lm3s6965/Makefile +++ b/arch/arm/platforms/ti_lm3s6965/Makefile @@ -1,6 +1,6 @@ ccflags-y +=-I$(srctree)/include/drivers ccflags-y +=-I$(srctree)/drivers -ccflags-y +=-I$(srctree)/arch/arm/ti_lm3s6965 +ccflags-y +=-I$(srctree)/arch/arm/platforms/ti_lm3s6965 asflags-y := ${ccflags-y} diff --git a/arch/arm/ti_lm3s6965/board.h b/arch/arm/platforms/ti_lm3s6965/board.h similarity index 100% rename from arch/arm/ti_lm3s6965/board.h rename to arch/arm/platforms/ti_lm3s6965/board.h diff --git a/arch/arm/ti_lm3s6965/irq_vector_table.c b/arch/arm/platforms/ti_lm3s6965/irq_vector_table.c similarity index 100% rename from arch/arm/ti_lm3s6965/irq_vector_table.c rename to arch/arm/platforms/ti_lm3s6965/irq_vector_table.c diff --git a/arch/arm/ti_lm3s6965/linker.cmd b/arch/arm/platforms/ti_lm3s6965/linker.cmd similarity index 100% rename from arch/arm/ti_lm3s6965/linker.cmd rename to arch/arm/platforms/ti_lm3s6965/linker.cmd diff --git a/arch/arm/ti_lm3s6965/nmi_on_reset.S b/arch/arm/platforms/ti_lm3s6965/nmi_on_reset.S similarity index 100% rename from arch/arm/ti_lm3s6965/nmi_on_reset.S rename to arch/arm/platforms/ti_lm3s6965/nmi_on_reset.S diff --git a/arch/arm/ti_lm3s6965/scp.c b/arch/arm/platforms/ti_lm3s6965/scp.c similarity index 100% rename from arch/arm/ti_lm3s6965/scp.c rename to arch/arm/platforms/ti_lm3s6965/scp.c diff --git a/arch/arm/ti_lm3s6965/scp.h b/arch/arm/platforms/ti_lm3s6965/scp.h similarity index 100% rename from arch/arm/ti_lm3s6965/scp.h rename to arch/arm/platforms/ti_lm3s6965/scp.h diff --git a/arch/arm/ti_lm3s6965/system.c b/arch/arm/platforms/ti_lm3s6965/system.c similarity index 100% rename from arch/arm/ti_lm3s6965/system.c rename to arch/arm/platforms/ti_lm3s6965/system.c diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index ee4eeae427a..700fd6be6fc 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -352,11 +352,11 @@ config PCI_DEBUG endmenu if PLATFORM_GENERIC_PC -source "arch/x86/generic_pc/Kconfig" +source "arch/x86/platforms/generic_pc/Kconfig" endif if PLATFORM_QUARK -source "arch/x86/quark/Kconfig" +source "arch/x86/platforms/quark/Kconfig" endif source "drivers/Kconfig" diff --git a/arch/x86/Makefile b/arch/x86/Makefile index e0660d2c7bc..df9acd66a50 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) += quark/ -obj-$(CONFIG_PLATFORM_GENERIC_PC) += generic_pc/ +obj-$(CONFIG_PLATFORM_QUARK) += platforms/quark/ +obj-$(CONFIG_PLATFORM_GENERIC_PC) += platforms/generic_pc/ diff --git a/arch/x86/generic_pc/Kconfig b/arch/x86/platforms/generic_pc/Kconfig similarity index 100% rename from arch/x86/generic_pc/Kconfig rename to arch/x86/platforms/generic_pc/Kconfig diff --git a/arch/x86/generic_pc/Makefile b/arch/x86/platforms/generic_pc/Makefile similarity index 100% rename from arch/x86/generic_pc/Makefile rename to arch/x86/platforms/generic_pc/Makefile diff --git a/arch/x86/generic_pc/board.h b/arch/x86/platforms/generic_pc/board.h similarity index 100% rename from arch/x86/generic_pc/board.h rename to arch/x86/platforms/generic_pc/board.h diff --git a/arch/x86/generic_pc/linker.cmd b/arch/x86/platforms/generic_pc/linker.cmd similarity index 100% rename from arch/x86/generic_pc/linker.cmd rename to arch/x86/platforms/generic_pc/linker.cmd diff --git a/arch/x86/generic_pc/system.c b/arch/x86/platforms/generic_pc/system.c similarity index 100% rename from arch/x86/generic_pc/system.c rename to arch/x86/platforms/generic_pc/system.c diff --git a/arch/x86/quark/Kconfig b/arch/x86/platforms/quark/Kconfig similarity index 100% rename from arch/x86/quark/Kconfig rename to arch/x86/platforms/quark/Kconfig diff --git a/arch/x86/quark/Makefile b/arch/x86/platforms/quark/Makefile similarity index 100% rename from arch/x86/quark/Makefile rename to arch/x86/platforms/quark/Makefile diff --git a/arch/x86/quark/board.h b/arch/x86/platforms/quark/board.h similarity index 100% rename from arch/x86/quark/board.h rename to arch/x86/platforms/quark/board.h diff --git a/arch/x86/quark/linker.cmd b/arch/x86/platforms/quark/linker.cmd similarity index 100% rename from arch/x86/quark/linker.cmd rename to arch/x86/platforms/quark/linker.cmd diff --git a/arch/x86/quark/system.c b/arch/x86/platforms/quark/system.c similarity index 100% rename from arch/x86/quark/system.c rename to arch/x86/platforms/quark/system.c diff --git a/drivers/bluetooth/Makefile b/drivers/bluetooth/Makefile index 6278ea3d76e..80cfcf77978 100644 --- a/drivers/bluetooth/Makefile +++ b/drivers/bluetooth/Makefile @@ -1,6 +1,6 @@ ccflags-y +=-I$(srctree)/include/drivers ccflags-y +=-I$(srctree)/arch/$(ARCH) -ccflags-y +=-I$(srctree)/arch/$(ARCH)/$(strip $(CONFIG_PLATFORM)) +ccflags-y +=-I$(srctree)/arch/$(ARCH)/platforms/$(strip $(CONFIG_PLATFORM)) obj-$(CONFIG_BLUETOOTH_UART)=uart.o diff --git a/drivers/console/Makefile b/drivers/console/Makefile index 12e12c4904f..daeac428c41 100644 --- a/drivers/console/Makefile +++ b/drivers/console/Makefile @@ -1,5 +1,5 @@ ccflags-y +=-I$(srctree)/include/drivers ccflags-y +=-I$(srctree)/arch/$(ARCH) -ccflags-y +=-I$(srctree)/arch/$(ARCH)/$(strip $(CONFIG_PLATFORM)) +ccflags-y +=-I$(srctree)/arch/$(ARCH)/platforms/$(strip $(CONFIG_PLATFORM)) obj-y = uart_console.o diff --git a/drivers/interrupt_controller/Makefile b/drivers/interrupt_controller/Makefile index ab49e041d78..9e594221e64 100644 --- a/drivers/interrupt_controller/Makefile +++ b/drivers/interrupt_controller/Makefile @@ -1,6 +1,6 @@ ccflags-y +=-I$(srctree)/include/drivers -ccflags-y +=-I$(srctree)/arch/$(ARCH)/$(subst $(DQUOTE),,$(CONFIG_PLATFORM)) -asflags-y +=-I$(srctree)/arch/$(ARCH)/$(subst $(DQUOTE),,$(CONFIG_PLATFORM)) +ccflags-y +=-I$(srctree)/arch/$(ARCH)/platforms/$(subst $(DQUOTE),,$(CONFIG_PLATFORM)) +asflags-y +=-I$(srctree)/arch/$(ARCH)/platforms/$(subst $(DQUOTE),,$(CONFIG_PLATFORM)) obj-${CONFIG_PIC}${CONFIG_SHUTOFF_PIC} = i8259.o diff --git a/drivers/pci/Makefile b/drivers/pci/Makefile index c24c91cba19..5e19a33ee0a 100644 --- a/drivers/pci/Makefile +++ b/drivers/pci/Makefile @@ -1,6 +1,6 @@ ccflags-y += -I$(srctree)/include/drivers ccflags-y +=-I$(srctree)/arch/$(ARCH) -ccflags-y +=-I$(srctree)/arch/$(ARCH)/$(strip $(CONFIG_PLATFORM)) +ccflags-y +=-I$(srctree)/arch/$(ARCH)/platforms/$(strip $(CONFIG_PLATFORM)) obj-$(CONFIG_PCI) = pci.o pci_config.o pci_interface.o diff --git a/drivers/random/Makefile b/drivers/random/Makefile index f0919aff1f1..b4f3d3ce448 100644 --- a/drivers/random/Makefile +++ b/drivers/random/Makefile @@ -1,5 +1,5 @@ ccflags-y +=-I$(srctree)/arch/$(ARCH) -ccflags-y +=-I$(srctree)/arch/$(ARCH)/$(strip $(CONFIG_PLATFORM)) +ccflags-y +=-I$(srctree)/arch/$(ARCH)/platforms/$(strip $(CONFIG_PLATFORM)) obj-$(CONFIG_TIMER_RANDOM_GENERATOR) = rand32-timer.o obj-$(CONFIG_X86_TSC_RANDOM_GENERATOR) += rand32-timestamp.o diff --git a/drivers/serial/Makefile b/drivers/serial/Makefile index 1fa73eefc2b..d5073373749 100644 --- a/drivers/serial/Makefile +++ b/drivers/serial/Makefile @@ -1,6 +1,6 @@ ccflags-y +=-I$(srctree)/include/drivers ccflags-y +=-I$(srctree)/arch/$(ARCH) -ccflags-y +=-I$(srctree)/arch/$(ARCH)/$(strip $(CONFIG_PLATFORM)) +ccflags-y +=-I$(srctree)/arch/$(ARCH)/platforms/$(strip $(CONFIG_PLATFORM)) obj-$(CONFIG_NS16550) = ns16550.o diff --git a/drivers/simple/Makefile b/drivers/simple/Makefile index a4d0e0b3b77..81a6b86ef70 100644 --- a/drivers/simple/Makefile +++ b/drivers/simple/Makefile @@ -1,5 +1,5 @@ ccflags-y +=-I$(srctree)/include/drivers ccflags-y +=-I$(srctree)/arch/$(ARCH) -ccflags-y +=-I$(srctree)/arch/$(ARCH)/$(strip $(CONFIG_PLATFORM)) +ccflags-y +=-I$(srctree)/arch/$(ARCH)/platforms/$(strip $(CONFIG_PLATFORM)) obj-y=uart.o diff --git a/drivers/timer/Makefile b/drivers/timer/Makefile index 614627d172c..a82a8fdee61 100644 --- a/drivers/timer/Makefile +++ b/drivers/timer/Makefile @@ -1,5 +1,5 @@ ccflags-y +=-I$(srctree)/arch/$(ARCH) -ccflags-y +=-I$(srctree)/arch/$(ARCH)/$(subst $(DQUOTE),,$(CONFIG_PLATFORM)) +ccflags-y +=-I$(srctree)/arch/$(ARCH)/platforms/$(subst $(DQUOTE),,$(CONFIG_PLATFORM)) obj-$(CONFIG_PIT) = i8253.o obj-$(CONFIG_HPET_TIMER) += hpet.o diff --git a/samples/microkernel/apps/nfc_hello/src/Makefile b/samples/microkernel/apps/nfc_hello/src/Makefile index 56598ab8fbf..801b786d329 100644 --- a/samples/microkernel/apps/nfc_hello/src/Makefile +++ b/samples/microkernel/apps/nfc_hello/src/Makefile @@ -1,3 +1,3 @@ -ccflags-y +=-I$(srctree)/arch/$(ARCH)/$(strip $(CONFIG_PLATFORM)) +ccflags-y +=-I$(srctree)/arch/$(ARCH)/platforms/$(strip $(CONFIG_PLATFORM)) obj-y = main.o diff --git a/samples/nanokernel/test/test_context/src/Makefile b/samples/nanokernel/test/test_context/src/Makefile index 057514698d4..e29bedbf53c 100644 --- a/samples/nanokernel/test/test_context/src/Makefile +++ b/samples/nanokernel/test/test_context/src/Makefile @@ -1,4 +1,4 @@ ccflags-y += ${PROJECTINCLUDE} -I${srctree}/samples/include -ccflags-y +=-I$(srctree)/arch/$(ARCH)/$(strip $(CONFIG_PLATFORM)) +ccflags-y +=-I$(srctree)/arch/$(ARCH)/platforms/$(strip $(CONFIG_PLATFORM)) obj-y = context.o