summaryrefslogtreecommitdiffstatsabout
diff options
context:
space:
mode:
authorJiaojinxing <jiaojinxing1987@gmail.com>2015-05-07 06:16:33 (GMT)
committer Jiaojinxing <jiaojinxing1987@gmail.com>2015-05-07 06:16:33 (GMT)
commitd86ab38fe7795eb7e965f0cfd37cc2ca733e5742 (patch)
treeb4798ffb466fab81e5ec60b34ca3cc8f5a2adfb1
parent37ab02a51d52a985455f9fd3795f06f8fede5eed (diff)
downloadbspam335x-d86ab38fe7795eb7e965f0cfd37cc2ca733e5742.zip
bspam335x-d86ab38fe7795eb7e965f0cfd37cc2ca733e5742.tar.gz
bspam335x-d86ab38fe7795eb7e965f0cfd37cc2ca733e5742.tar.bz2
Adjusted the directory structure.
-rw-r--r--Makefile37
-rw-r--r--SylixOS/bsp/beaglebone/bspBeaglebone.c (renamed from SylixOS/bsp/bspBeaglebone.c)0
-rw-r--r--SylixOS/bsp/beaglebone/config_beaglebone.h (renamed from SylixOS/bsp/config_beaglebone.h)0
-rw-r--r--SylixOS/bsp/config.h10
-rw-r--r--SylixOS/bsp/forlinx/bspForlinx.c (renamed from SylixOS/bsp/bspForlinx.c)0
-rw-r--r--SylixOS/bsp/forlinx/config_ok335xd.h (renamed from SylixOS/bsp/config_ok335xd.h)0
-rw-r--r--SylixOS/bsp/forlinx/config_ok335xs.h (renamed from SylixOS/bsp/config_ok335xs.h)0
-rw-r--r--SylixOS/bsp/ti/config_evmAM335x.h (renamed from SylixOS/bsp/config_evmAM335x.h)0
-rw-r--r--SylixOS/bsp/ti/config_evmskAM335x.h (renamed from SylixOS/bsp/config_evmskAM335x.h)0
9 files changed, 11 insertions, 36 deletions
diff --git a/Makefile b/Makefile
index c8bdecd..de39d72 100644
--- a/Makefile
+++ b/Makefile
@@ -65,27 +65,27 @@ SylixOS/bsp/bspLib.c \
SylixOS/bsp/startup.S
ifeq ($(PLATFORM), ok335xd)
-BSP_SRCS += SylixOS/bsp/bspForlinx.c
+BSP_SRCS += SylixOS/bsp/forlinx/bspForlinx.c
endif
ifeq ($(PLATFORM), ok335xs)
-BSP_SRCS += SylixOS/bsp/bspForlinx.c
+BSP_SRCS += SylixOS/bsp/forlinx/bspForlinx.c
endif
ifeq ($(PLATFORM), ok335xs2)
-BSP_SRCS += SylixOS/bsp/bspForlinx.c
+BSP_SRCS += SylixOS/bsp/forlinx/bspForlinx.c
endif
ifeq ($(PLATFORM), beaglebone)
-BSP_SRCS += SylixOS/bsp/bspBeaglebone.c
+BSP_SRCS += SylixOS/bsp/beaglebone/bspBeaglebone.c
endif
ifeq ($(PLATFORM), evmAM335x)
-BSP_SRCS += SylixOS/bsp/bspEvmAM335x.c
+BSP_SRCS += SylixOS/bsp/ti/bspEvmAM335x.c
endif
ifeq ($(PLATFORM), evmskAM335x)
-BSP_SRCS += SylixOS/bsp/bspEvmAM335x.c
+BSP_SRCS += SylixOS/bsp/ti/bspEvmAM335x.c
endif
#*********************************************************************************************************
# drivers src(s) file
@@ -315,31 +315,6 @@ OPTIMIZE = -O2 -g1 -gdwarf-2 # Do NOT use -O3 and -Os
endif # -Os is not align for function
# loop and jump.
#*********************************************************************************************************
-# rm command parameter
-#*********************************************************************************************************
-UNAME = $(shell uname -sm)
-
-ifneq (,$(findstring Linux, $(UNAME)))
-HOST_OS = linux
-endif
-ifneq (,$(findstring Darwin, $(UNAME)))
-HOST_OS = darwin
-endif
-ifneq (,$(findstring Macintosh, $(UNAME)))
-HOST_OS = darwin
-endif
-ifneq (,$(findstring CYGWIN, $(UNAME)))
-HOST_OS = windows
-endif
-ifneq (,$(findstring windows, $(UNAME)))
-HOST_OS = windows
-endif
-
-ifeq ($(HOST_OS),)
-$(error Unable to determine HOST_OS from uname -sm: $(UNAME)!)
-endif
-
-#*********************************************************************************************************
# depends and compiler parameter (cplusplus in kernel MUST NOT use exceptions and rtti)
#*********************************************************************************************************
DEPENDFLAG = -MM
diff --git a/SylixOS/bsp/bspBeaglebone.c b/SylixOS/bsp/beaglebone/bspBeaglebone.c
index c8d377d..c8d377d 100644
--- a/SylixOS/bsp/bspBeaglebone.c
+++ b/SylixOS/bsp/beaglebone/bspBeaglebone.c
diff --git a/SylixOS/bsp/config_beaglebone.h b/SylixOS/bsp/beaglebone/config_beaglebone.h
index 20a8408..20a8408 100644
--- a/SylixOS/bsp/config_beaglebone.h
+++ b/SylixOS/bsp/beaglebone/config_beaglebone.h
diff --git a/SylixOS/bsp/config.h b/SylixOS/bsp/config.h
index fa7f7b8..883c0db 100644
--- a/SylixOS/bsp/config.h
+++ b/SylixOS/bsp/config.h
@@ -91,15 +91,15 @@
*********************************************************************************************************/
#if defined(evmAM335x)
-#include "config_evmAM335x.h"
+#include "ti/config_evmAM335x.h"
#elif defined(evmskAM335x)
-#include "config_evmskAM335x.h"
+#include "ti/config_evmskAM335x.h"
#elif defined(beaglebone)
-#include "config_beaglebone.h"
+#include "beaglebone/config_beaglebone.h"
#elif defined(ok335xd)
-#include "config_ok335xd.h"
+#include "forlinx/config_ok335xd.h"
#elif defined(ok335xs)
-#include "config_ok335xs.h"
+#include "forlinx/config_ok335xs.h"
#else
#error "Please define your platform in Makefile PLATFORM variable!"
#endif
diff --git a/SylixOS/bsp/bspForlinx.c b/SylixOS/bsp/forlinx/bspForlinx.c
index c467d12..c467d12 100644
--- a/SylixOS/bsp/bspForlinx.c
+++ b/SylixOS/bsp/forlinx/bspForlinx.c
diff --git a/SylixOS/bsp/config_ok335xd.h b/SylixOS/bsp/forlinx/config_ok335xd.h
index 18d52b5..18d52b5 100644
--- a/SylixOS/bsp/config_ok335xd.h
+++ b/SylixOS/bsp/forlinx/config_ok335xd.h
diff --git a/SylixOS/bsp/config_ok335xs.h b/SylixOS/bsp/forlinx/config_ok335xs.h
index 405c581..405c581 100644
--- a/SylixOS/bsp/config_ok335xs.h
+++ b/SylixOS/bsp/forlinx/config_ok335xs.h
diff --git a/SylixOS/bsp/config_evmAM335x.h b/SylixOS/bsp/ti/config_evmAM335x.h
index fc6c40e..fc6c40e 100644
--- a/SylixOS/bsp/config_evmAM335x.h
+++ b/SylixOS/bsp/ti/config_evmAM335x.h
diff --git a/SylixOS/bsp/config_evmskAM335x.h b/SylixOS/bsp/ti/config_evmskAM335x.h
index 1f3b086..1f3b086 100644
--- a/SylixOS/bsp/config_evmskAM335x.h
+++ b/SylixOS/bsp/ti/config_evmskAM335x.h