t-kernel team mailing list archive

[Du Huanpeng <d-hp@xxxxxxx>]

From: Du Huanpeng <u74147@xxxxxxxxx>

linux dir struct modify header include and compile

Signed-off-by: Du Huanpeng <u74147@xxxxxxxxx>
---
 tkernel_source/monitor/Makefile                    | 28 ++++++++++++++++
 tkernel_source/monitor/Makefile.obj                | 39 ++++++++++++++++++++++
 tkernel_source/monitor/Makefile.src                | 39 ++++++++++++++++++++++
 tkernel_source/monitor/cmdsvc/cmdsvc.h             |  2 +-
 tkernel_source/monitor/cmdsvc/command.c            |  4 +--
 tkernel_source/monitor/cmdsvc/svc.c                |  2 --
 tkernel_source/monitor/driver/sio/ns16550.c        |  2 +-
 tkernel_source/monitor/hwdepend/arm/cpu/eitent.S   |  2 +-
 tkernel_source/monitor/hwdepend/arm/cpu/monhdr.S   |  2 +-
 tkernel_source/monitor/hwdepend/arm/cpu/reset.S    |  2 +-
 .../monitor/hwdepend/arm/mach-em1d/config.c        |  2 +-
 .../monitor/hwdepend/arm/mach-em1d/system.c        |  2 +-
 .../monitor/hwdepend/arm/mach-em1d/waitusec.c      |  2 +-
 tkernel_source/monitor/include/tmonitor.h          |  2 +-
 14 files changed, 117 insertions(+), 13 deletions(-)
 create mode 100644 tkernel_source/monitor/Makefile
 create mode 100644 tkernel_source/monitor/Makefile.obj
 create mode 100644 tkernel_source/monitor/Makefile.src

diff --git a/tkernel_source/monitor/Makefile b/tkernel_source/monitor/Makefile
new file mode 100644
index 0000000..a35b20b
--- /dev/null
+++ b/tkernel_source/monitor/Makefile
@@ -0,0 +1,28 @@
+include Makefile.src
+include Makefile.obj
+
+CC := arm-none-eabi-gcc
+LDS := "hwdepend/arm/lib/monitor.lnk"
+
+INCLUDE = \
+	-Ihwdepend/arm/mach-em1d/include \
+	-Ihwdepend/arm/include \
+	-Iinclude \
+	-Ihwdepend/arm/mach-em1d \
+	-I../include
+
+CFLAGS := -O2 -mcpu=arm1176jzf-s -msoft-float -mfpu=vfp -mthumb-interwork -mstructure-size-boundary=8 -ffreestanding -Wno-pointer-sign -D_TEF_EM1D_
+
+
+%.o: %.S
+	$(CC) $(INCLUDE) $(CFLAGS) -c $< -o $@
+
+%.o: %.c
+	$(CC) $(INCLUDE) $(CFLAGS) -c $< -o $@
+
+tmonitor: $(OBJ)
+	arm-none-eabi-gcc $^ -o $@ $(INCLUDE) -T$(LDS) -lgcc -nostdlib -static 
+	arm-none-eabi-objdump -DS $@ >tm.S
+	arm-none-eabi-objcopy -O binary $@ tm.bin
+clean:
+	rm -f $(OBJ) tmonitor tm.S tm.bin
diff --git a/tkernel_source/monitor/Makefile.obj b/tkernel_source/monitor/Makefile.obj
new file mode 100644
index 0000000..ec906c3
--- /dev/null
+++ b/tkernel_source/monitor/Makefile.obj
@@ -0,0 +1,39 @@
+OBJ := hwdepend/arm/mach-em1d/startup.o
+OBJ += hwdepend/arm/mach-em1d/hwinfo.o
+OBJ += hwdepend/arm/mach-em1d/sio.o
+OBJ += hwdepend/arm/mach-em1d/diskio.o
+OBJ += hwdepend/arm/mach-em1d/eitproc.o
+OBJ += hwdepend/arm/mach-em1d/cpuctrl.o
+OBJ += hwdepend/arm/mach-em1d/misc.o
+OBJ += hwdepend/arm/cpu/eitent.o
+OBJ += hwdepend/arm/cpu/reset.o
+OBJ += hwdepend/arm/mach-em1d/system.o
+OBJ += hwdepend/arm/mach-em1d/waitusec.o
+OBJ += hwdepend/arm/mach-em1d/config.o
+OBJ += hwdepend/arm/cpu/cpuctrl2.o
+OBJ += hwdepend/arm/mach-em1d/memattr.o
+OBJ += cmdsvc/command.o
+OBJ += cmdsvc/helpmsg.o
+OBJ += cmdsvc/svc.o
+OBJ += cmdsvc/memory.o
+OBJ += cmdsvc/console.o
+OBJ += cmdsvc/load.o
+OBJ += cmdsvc/boot.o
+OBJ += lib/string.o
+OBJ += hwdepend/arm/cpu/monhdr.o
+OBJ += hwdepend/arm/monent.o
+OBJ += hwdepend/arm/mach-em1d/chkaddr.o
+OBJ += hwdepend/arm/cpu/register.o
+OBJ += hwdepend/arm/cpu/break.o
+OBJ += hwdepend/arm/cpu/disassemble.o
+OBJ += hwdepend/arm/misc.o
+OBJ += hwdepend/arm/cpu/step.o
+OBJ += cmdsvc/wrkbuf.o
+OBJ += driver/sio/ns16550.o
+OBJ += driver/flash/main.o
+OBJ += driver/flash/setup-em1d.o
+OBJ += driver/flash/reset-em1d.o
+OBJ += driver/flash/cfi_16x1.o
+OBJ += driver/flash/cfi.o
+OBJ += driver/memdisk/memdsk.o
+OBJ += tmmain/version.o
diff --git a/tkernel_source/monitor/Makefile.src b/tkernel_source/monitor/Makefile.src
new file mode 100644
index 0000000..058e4a7
--- /dev/null
+++ b/tkernel_source/monitor/Makefile.src
@@ -0,0 +1,39 @@
+SRC := hwdepend/arm/mach-em1d/startup.c
+SRC += hwdepend/arm/mach-em1d/hwinfo.c
+SRC += hwdepend/arm/mach-em1d/sio.c
+SRC += hwdepend/arm/mach-em1d/diskio.c
+SRC += hwdepend/arm/mach-em1d/eitproc.c
+SRC += hwdepend/arm/mach-em1d/cpuctrl.c
+SRC += hwdepend/arm/mach-em1d/misc.c
+SRC += hwdepend/arm/cpu/eitent.S
+SRC += hwdepend/arm/cpu/reset.S
+SRC += hwdepend/arm/mach-em1d/system.c
+SRC += hwdepend/arm/mach-em1d/waitusec.c
+SRC += hwdepend/arm/mach-em1d/config.c
+SRC += hwdepend/arm/cpu/cpuctrl2.S
+SRC += hwdepend/arm/mach-em1d/memattr.S
+SRC += cmdsvc/command.c
+SRC += cmdsvc/helpmsg.c
+SRC += cmdsvc/svc.c
+SRC += cmdsvc/memory.c
+SRC += cmdsvc/console.c
+SRC += cmdsvc/load.c
+SRC += cmdsvc/boot.c
+SRC += lib/string.c
+SRC += hwdepend/arm/cpu/monhdr.S
+SRC += hwdepend/arm/monent.c
+SRC += hwdepend/arm/mach-em1d/chkaddr.c
+SRC += hwdepend/arm/cpu/register.c
+SRC += hwdepend/arm/cpu/break.c
+SRC += hwdepend/arm/cpu/disassemble.c
+SRC += hwdepend/arm/misc.c
+SRC += hwdepend/arm/cpu/step.c
+SRC += cmdsvc/wrkbuf.c
+SRC += driver/sio/ns16550.c
+SRC += driver/flash/main.c
+SRC += driver/flash/setup-em1d.c
+SRC += driver/flash/reset-em1d.c
+SRC += driver/flash/cfi_16x1.c
+SRC += driver/flash/cfi.c
+SRC += driver/memdisk/memdsk.c
+SRC += tmmain/version.c
diff --git a/tkernel_source/monitor/cmdsvc/cmdsvc.h b/tkernel_source/monitor/cmdsvc/cmdsvc.h
index e10e236..76963b4 100644
--- a/tkernel_source/monitor/cmdsvc/cmdsvc.h
+++ b/tkernel_source/monitor/cmdsvc/cmdsvc.h
@@ -23,7 +23,7 @@
 #include <tm/tmonitor.h>
 
 #if CPU_ARMv6
-#  include "armv6/cpudep.h"
+#  include <asm/cpudep.h>
 #endif
 
 /* ======================================================================== */
diff --git a/tkernel_source/monitor/cmdsvc/command.c b/tkernel_source/monitor/cmdsvc/command.c
index 1025698..74dd75c 100644
--- a/tkernel_source/monitor/cmdsvc/command.c
+++ b/tkernel_source/monitor/cmdsvc/command.c
@@ -76,7 +76,7 @@ LOCAL	UB	*lptr;			/* line pointer */
 #define	tERNUM		0x101		/* error: illegal numeric form */
 
 /* character classficiation */
-#define	isSpace(c)	isspace(c)	((c) && (c) <= ' ')
+#define	isSpace(c)		((c) && (c) <= ' ')
 #define	isNum(c)		((c) >= '0' && (c) <= '9')
 #define	isAlpha(c)		( ((c) >= 'A' && (c) <= 'Z') ||\
 					((c) >= 'a' && (c) <= 'z') )
@@ -1125,7 +1125,7 @@ typedef	struct {
 	UB		snm[4];		/* abbreviated command name */
 	FP		func;		/* processing function */
 	W		para;		/* parameter information and other */
-	HELP		*help;		/* help message */
+	const HELP	*help;		// help message
 } CMDTAB;
 
 #define	IGN_TRACE	0x1000
diff --git a/tkernel_source/monitor/cmdsvc/svc.c b/tkernel_source/monitor/cmdsvc/svc.c
index d252a76..2b77dab 100644
--- a/tkernel_source/monitor/cmdsvc/svc.c
+++ b/tkernel_source/monitor/cmdsvc/svc.c
@@ -105,8 +105,6 @@ EXPORT W procSVC( W fno, W p1, W p2, W p3, W p4 )
 	W	er = E_OK;
 	W	n;
 
-	ret = svcmap[fno](fno, p1, p2, p3, p4);
-
 	switch ( fno ) {
 	  case TM_MONITOR:	/* void tm_monitor( void ) */
 		procCommand(NULL, 0);
diff --git a/tkernel_source/monitor/driver/sio/ns16550.c b/tkernel_source/monitor/driver/sio/ns16550.c
index 12c16b0..6de8d4f 100644
--- a/tkernel_source/monitor/driver/sio/ns16550.c
+++ b/tkernel_source/monitor/driver/sio/ns16550.c
@@ -34,7 +34,7 @@ typedef struct {
 
 /* ----------------------------------------------------------------------- */
 #elif _TEF_EM1D_
-#  include <arm/em1d512.h>
+#  include <mach/em1d512.h>
    LOCAL const DEFSIO	DefSIO[3] = {
 			{ UARTnBase(UART0) },
 			{ UARTnBase(UART1) },
diff --git a/tkernel_source/monitor/hwdepend/arm/cpu/eitent.S b/tkernel_source/monitor/hwdepend/arm/cpu/eitent.S
index c37c818..846f70c 100644
--- a/tkernel_source/monitor/hwdepend/arm/cpu/eitent.S
+++ b/tkernel_source/monitor/hwdepend/arm/cpu/eitent.S
@@ -22,7 +22,7 @@
 
 #include <machine.h>
 #include <tk/sysdef.h>
-#include <arm/em1d512.h>
+#include <mach/em1d512.h>
 #include <sys/sysinfo.h>
 
 #define	base(n)		( (n) & 0xfffff000 )
diff --git a/tkernel_source/monitor/hwdepend/arm/cpu/monhdr.S b/tkernel_source/monitor/hwdepend/arm/cpu/monhdr.S
index 6acee3e..77cc10e 100644
--- a/tkernel_source/monitor/hwdepend/arm/cpu/monhdr.S
+++ b/tkernel_source/monitor/hwdepend/arm/cpu/monhdr.S
@@ -22,7 +22,7 @@
 
 #include <machine.h>
 #include <sys/sysinfo.h>
-#include "cpudep.h"
+#include <asm/cpudep.h>
 
 /*
  * Monitor entry (registered as default handler)
diff --git a/tkernel_source/monitor/hwdepend/arm/cpu/reset.S b/tkernel_source/monitor/hwdepend/arm/cpu/reset.S
index 50e90ee..3cd3fc5 100644
--- a/tkernel_source/monitor/hwdepend/arm/cpu/reset.S
+++ b/tkernel_source/monitor/hwdepend/arm/cpu/reset.S
@@ -22,7 +22,7 @@
 
 #include <machine.h>
 #include <tk/sysdef.h>
-#include <arm/em1d512.h>
+#include <mach/em1d512.h>
 #include <sys/sysinfo.h>
 
 #include "setup_em1d512.h"
diff --git a/tkernel_source/monitor/hwdepend/arm/mach-em1d/config.c b/tkernel_source/monitor/hwdepend/arm/mach-em1d/config.c
index d6fda24..5b96651 100644
--- a/tkernel_source/monitor/hwdepend/arm/mach-em1d/config.c
+++ b/tkernel_source/monitor/hwdepend/arm/mach-em1d/config.c
@@ -22,7 +22,7 @@
  */
 
 #include "sysdepend.h"
-#include <arm/em1d512.h>
+#include <mach/em1d512.h>
 
 /* used device driver */
 IMPORT	ER	initSIO_ns16550(SIOCB *, const CFGSIO *, W speed);
diff --git a/tkernel_source/monitor/hwdepend/arm/mach-em1d/system.c b/tkernel_source/monitor/hwdepend/arm/mach-em1d/system.c
index fb541a0..f415953 100644
--- a/tkernel_source/monitor/hwdepend/arm/mach-em1d/system.c
+++ b/tkernel_source/monitor/hwdepend/arm/mach-em1d/system.c
@@ -23,7 +23,7 @@
  */
 
 #include "sysdepend.h"
-#include <arm/em1d512.h>
+#include <mach/em1d512.h>
 
 EXPORT	UW	DipSw;		/* DipSw status */
 
diff --git a/tkernel_source/monitor/hwdepend/arm/mach-em1d/waitusec.c b/tkernel_source/monitor/hwdepend/arm/mach-em1d/waitusec.c
index 8ffac07..d76e1ff 100644
--- a/tkernel_source/monitor/hwdepend/arm/mach-em1d/waitusec.c
+++ b/tkernel_source/monitor/hwdepend/arm/mach-em1d/waitusec.c
@@ -19,7 +19,7 @@
  */
 
 #include "sysdepend.h"
-#include <arm/em1d512.h>
+#include <mach/em1d512.h>
 
 LOCAL	UW	delay64us;		 /* wait for 64 microsec */
 
diff --git a/tkernel_source/monitor/include/tmonitor.h b/tkernel_source/monitor/include/tmonitor.h
index 9a25baa..e00bd38 100644
--- a/tkernel_source/monitor/include/tmonitor.h
+++ b/tkernel_source/monitor/include/tmonitor.h
@@ -28,7 +28,7 @@
 
 /* CPU-dependent definitions */
 #if CPU_ARM
-#  include "arm/cpudepend.h"
+#  include <mach/cpudepend.h>
 #endif
 
 /*
-- 
1.9.1