Move platforms to new arch/<arch>/platforms directory

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

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)

arch/arc/Makefile

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

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"

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_FSL_FRDM_K64F) += platforms/fsl_frdm_k64f/
-obj-$(CONFIG_PLATFORM_TI_LM3S6965) += ti_lm3s6965/
+obj-$(CONFIG_PLATFORM_TI_LM3S6965) += platforms/ti_lm3s6965/

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)
 

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}
 

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}
 

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"

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_QUARK) += platforms/quark/
-obj-$(CONFIG_PLATFORM_GENERIC_PC) += generic_pc/
+obj-$(CONFIG_PLATFORM_GENERIC_PC) += platforms/generic_pc/

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

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

drivers/interrupt_controller/Makefile

@@ -1,6 +1,6 @@
 ccflags-y +=-I$(srctree)/include/drivers
-ccflags-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)/$(subst $(DQUOTE),,$(CONFIG_PLATFORM))
+asflags-y +=-I$(srctree)/arch/$(ARCH)/platforms/$(subst $(DQUOTE),,$(CONFIG_PLATFORM))
 
 obj-${CONFIG_PIC}${CONFIG_SHUTOFF_PIC} = i8259.o
 

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

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

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

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

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

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

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