Move Makefile.commons.XXX to OS/platform directory

Move the OS/platform Makefile to OS/platform directory

Signed-off-by: Wendy Liang <jliang@xilinx.com>

diff --git a/Makefile.commons b/Makefile.commons
index 41075383a1e83980062f83a8c0118e24cb9d8706..c312de4d43de82897c7cc9fc35eb081a03180647 100644 (file)
--- a/Makefile.commons
+++ b/Makefile.commons
@@ -7,13 +7,16 @@ ifeq ($(PLAT),)
 export PLAT := zc702evk\r
 endif\r
 
-include $(OHOME)/Makefile.commons.$(PLAT)
+ifeq ($(OS),)
+export OS := baremetal
+endif
+
+include porting/os/$(OS)/platforms/$(PLAT)/Makefile.platform
+
 \r
-BAREMETAL_INCLUDES := -I"$(OHOME)/libs/system/$(PLAT)/baremetal"\r
 GENERAL_INCLUDES := -I"$(OHOME)/include"\r
 \r
 ifeq ($(OS),baremetal)\r
-CFLAGS += $(BAREMETAL_INCLUDES)\r
 CFLAGS +=-D"ENV=1"\r
 CFLAGS +=-D"OPENAMP_BAREMETAL=1"
 \r

diff --git a/Makefile.commons.zc702evk b/porting/os/baremetal/platforms/zc702evk/Makefile.platform
similarity index 86%
rename from Makefile.commons.zc702evk
rename to porting/os/baremetal/platforms/zc702evk/Makefile.platform
index 441788bcabe32fe828a9204bf346a780a21a832b..f3404f9587d83f5319978264d3bed33f76cedfa1 100644 (file)
--- a/Makefile.commons.zc702evk
+++ b/porting/os/baremetal/platforms/zc702evk/Makefile.platform
@@ -1,12 +1,12 @@
-CROSS            := arm-xilinx-eabi-
-CFLAGS           := -Wall -ffunction-sections -fdata-sections -O0 -g3 -MMD 
+CROSS            ?= arm-xilinx-eabi-
+CFLAGS           := -Wall -ffunction-sections -fdata-sections -O0 -g3 -MMD
 CXXFLAGS         := -Wall -fno-enforce-eh-specs -MMD
 ASFLAGS          := -gdwarf2 -meabi=4 -mcpu=cortex-a9 -mfpu=neon
-ARFLAGS          := 
+ARFLAGS          :=
 ARCH_CFLAGS      := -gdwarf-2 -mthumb-interwork -mcpu=cortex-a9
 ARCH_CXXFLAGS    := -gdwarf-2 -mthumb-interwork -mcpu=cortex-a9
 ARCH_ASFLAGS     := -gdwarf-2 -mthumb-interwork -mcpu=cortex-a9
-ARCH_ARFLAGS     := 
+ARCH_ARFLAGS     :=
 CC               = $(CROSS)gcc
 CXX              = $(CROSS)g++
 AS               = $(CROSS)as

diff --git a/Makefile.commons.zynqMP_r5 b/porting/os/baremetal/platforms/zynqMP_r5/Makefile.platform
similarity index 79%
rename from Makefile.commons.zynqMP_r5
rename to porting/os/baremetal/platforms/zynqMP_r5/Makefile.platform
index 135e460b8add5abbfc4b937c5835cc2d7ea9ca30..189b51a9c02f06814e68ff88631c8a414e17412c 100644 (file)
--- a/Makefile.commons.zynqMP_r5
+++ b/porting/os/baremetal/platforms/zynqMP_r5/Makefile.platform
@@ -1,12 +1,12 @@
-CROSS            := armr5-none-eabi-
-CFLAGS           := -Wall -O2 -g -MMD 
+CROSS            ?= armr5-none-eabi-
+CFLAGS           := -Wall -O2 -g -MMD
 CXXFLAGS         := -Wall -MMD
 ASFLAGS          := -MMD
-ARFLAGS          := 
+ARFLAGS          :=
 ARCH_CFLAGS      := -mfloat-abi=soft -mcpu=cortex-r5
 ARCH_CXXFLAGS    := -mfloat-abi=soft -mcpu=cortex-r5
 ARCH_ASFLAGS     := -mfloat-abi=soft -mcpu=cortex-r5
-ARCH_ARFLAGS     := 
+ARCH_ARFLAGS     :=
 CC               = $(CROSS)gcc
 CXX              = $(CROSS)g++
 AS               = $(CROSS)as