t-kernel team mailing list archive

[Du Huanpeng <d-hp@xxxxxxx>]

From: Du Huanpeng <u74147@xxxxxxxxx>

Signed-off-by: Du Huanpeng <u74147@xxxxxxxxx>
---
 tkernel_source/Makefile                                | 2 +-
 tkernel_source/kernel/sysdepend/cpu/em1d/cpu_support.S | 6 +++---
 tkernel_source/kernel/sysmain/src/usermain.c           | 1 +
 tkernel_source/scripts/link-vmtronx.sh                 | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/tkernel_source/Makefile b/tkernel_source/Makefile
index 9a00d53..1f37271 100644
--- a/tkernel_source/Makefile
+++ b/tkernel_source/Makefile
@@ -1225,7 +1225,7 @@ clean: archclean vmtronxclean
 #
 mrproper: rm-dirs  := $(wildcard $(MRPROPER_DIRS))
 mrproper: rm-files := $(wildcard $(MRPROPER_FILES))
-mrproper-dirs      := $(addprefix _mrproper_,Documentation/DocBook scripts)
+mrproper-dirs      := $(addprefix _mrproper_,scripts)
 
 PHONY += $(mrproper-dirs) mrproper archmrproper
 $(mrproper-dirs):
diff --git a/tkernel_source/kernel/sysdepend/cpu/em1d/cpu_support.S b/tkernel_source/kernel/sysdepend/cpu/em1d/cpu_support.S
index d0cb7db..15028d7 100644
--- a/tkernel_source/kernel/sysdepend/cpu/em1d/cpu_support.S
+++ b/tkernel_source/kernel/sysdepend/cpu/em1d/cpu_support.S
@@ -390,7 +390,7 @@ Csym(inthdr_startup):
 	str	lr, [ip]
 
 	ldmfd	sp!, {r0-r2}		// restore registers
-	swp	r3, r3, [sp]		// restore r3, R14_svc is saved
+@	swp	r3, r3, [sp]		// restore r3, R14_svc is saved
 	swi	SWI_RETINT		// tk_ret_int()
 
 
@@ -790,7 +790,7 @@ hook_enter:
 
 hook_leave:
 	sub	sp, fp, #6*4		// sp = saved position of exinf
-	swp	r2, r0, [sp]		// save ret and , restore exinf
+@	swp	r2, r0, [sp]		// save ret and , restore exinf
 	mov	r1, r0			// ret
 	ldr	r0, [fp, #0*4]		// fncd
 
@@ -943,7 +943,7 @@ Csym(timer_handler_startup):
 	mov	sp, fp
 	ldmfd	sp!, {r0-r2, r4-r5, fp, lr}	// restore registers
 
-	TK_RET_INT_FIQ PSR_IRQ		// tk_ret_int()
+@ 	TK_RET_INT_FIQ PSR_IRQ		// tk_ret_int()
 
 /* ------------------------------------------------------------------------ */
 /*
diff --git a/tkernel_source/kernel/sysmain/src/usermain.c b/tkernel_source/kernel/sysmain/src/usermain.c
index ca3f833..4522dad 100644
--- a/tkernel_source/kernel/sysmain/src/usermain.c
+++ b/tkernel_source/kernel/sysmain/src/usermain.c
@@ -129,6 +129,7 @@ EXPORT	INT	usermain( void )
 {
 	ER	ercd;
 
+	ercd = 0;
 	/* Start the device drivers */
 #ifdef DRV_CONSOLE
 	ercd = ConsoleIO(0, NULL);
diff --git a/tkernel_source/scripts/link-vmtronx.sh b/tkernel_source/scripts/link-vmtronx.sh
index 32a67c5..b961e64 100755
--- a/tkernel_source/scripts/link-vmtronx.sh
+++ b/tkernel_source/scripts/link-vmtronx.sh
@@ -166,7 +166,7 @@ info LD vmtronx.o
 modpost_link vmtronx.o
 
 # modpost vmtronx.o to check for section mismatches
-${MAKE} -f "${srctree}/scripts/Makefile.modpost" vmtronx.o
+# ${MAKE} -f "${srctree}/scripts/Makefile.modpost" vmtronx.o
 
 # Update version
 info GEN .version
-- 
1.9.1