misc fixes: Pulled from the dk-tmc4c1296x commit

Signed-off-by: Paul Osmialowski <[email protected]>
yubinees2 · Jul 10, 2021 · 587521f · 587521f
1 parent 549193f
commit 587521f
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -20,4 +20,5 @@ cscope.*
 size.report
 # Build system output
 .obj
+*.elf
 bin
diff --git a/Kernel/Makefile b/Kernel/Makefile
@@ -273,6 +273,9 @@ syscall_exec16.o: include/version.h include/kdata.h include/printf.h
 syscall_exec32.o: include/kernel.h include/panic.h include/sysinfoblk.h
 syscall_exec32.o: include/kernel32.h include/version.h include/kdata.h
 syscall_exec32.o: include/printf.h
+syscall_execelf32.o: include/kernel.h include/panic.h include/sysinfoblk.h
+syscall_execelf32.o: include/kernel32.h include/version.h include/kdata.h
+syscall_execelf32.o: include/printf.h
 syscall_fs2.o: include/kernel.h include/panic.h include/sysinfoblk.h
 syscall_fs2.o: include/version.h include/kdata.h include/printf.h
 syscall_fs3.o: include/kernel.h include/panic.h include/sysinfoblk.h

diff --git a/Kernel/include/tty.h b/Kernel/include/tty.h
@@ -300,7 +300,7 @@ static uint8_t pbuff[TTYSIZ];\
     {pbuf4, pubf4, pubf4, TTYSIZ, 0, TTYSIZ/2}, \
     {pbuf5, pubf5, pubf5, TTYSIZ, 0, TTYSIZ/2}, \
     {pbuf6, pubf6, pubf6, TTYSIZ, 0, TTYSIZ/2}, \
-    {pbuf7, pubf7, pubf7, TTYSIZ, 0, TTYSIZ/2}
+    {pbuf7, pubf7, pubf7, TTYSIZ, 0, TTYSIZ/2}, \
     {pbuf8, pubf8, pubf8, TTYSIZ, 0, TTYSIZ/2}, \
     {pbuf9, pubf9, pubf9, TTYSIZ, 0, TTYSIZ/2}, \
     {pbufa, pubfa, pubfa, TTYSIZ, 0, TTYSIZ/2}, \

diff --git a/Standalone/elf2flt.c b/Standalone/elf2flt.c
@@ -188,7 +188,7 @@ int main(int argc, char* const* argv)
 		.rev = htonl(FLAT_VERSION),
 		.flags = htonl(FLAT_FLAG_RAM),
 		.entry = htonl(elffile->e_entry + sizeof(flatheader)),
-		.data_start = htonl(textlo + sizeof(flatheader)),
+		.data_start = htonl(datalo + sizeof(flatheader)),
 		.data_end = htonl(datahi + sizeof(flatheader)),
 		.bss_end = htonl(bsshi + sizeof(flatheader)),
 		.reloc_start = htonl(datahi + sizeof(flatheader)),
-Original file line number
+Diff line change
@@ Expand Up / @@ -20,4 +20,5 @@ cscope.* @@
     size.report
     # Build system output
     .obj
+    *.elf
     bin