[LinksOS CVS Commit]linksos/main Makefile,1.2,1.3 kernel.ls,1.1,1.2 main.c,1.1,1.2

[<bg...@us...>]

Update of /cvsroot/linksos/linksos/main
In directory sc8-pr-cvs1:/tmp/cvs-serv31411/main

Modified Files:
	Makefile kernel.ls main.c 
Log Message:
Realised that some parameters I was passing to the linker in the Makefile were already taken care of by the linker script :o


Index: Makefile
===================================================================
RCS file: /cvsroot/linksos/linksos/main/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Makefile	25 Dec 2002 08:49:30 -0000	1.2
--- Makefile	28 Dec 2002 16:53:16 -0000	1.3
***************
*** 22,26 ****
  
  $(KERNELFN): $(OBJS)
! 	$(LD)  -Bstatic -o $(KERNELFN) $(OBJS) -Ttext 0x100000 --oformat binary -Map kernel.map -T kernel.ls
  
  .c.o:
--- 22,26 ----
  
  $(KERNELFN): $(OBJS)
! 	$(LD)  -Bstatic -o $(KERNELFN) $(OBJS) -Map kernel.map -T kernel.ls
  
  .c.o:

Index: kernel.ls
===================================================================
RCS file: /cvsroot/linksos/linksos/main/kernel.ls,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** kernel.ls	22 Dec 2002 18:42:12 -0000	1.1
--- kernel.ls	28 Dec 2002 16:53:16 -0000	1.2
***************
*** 14,16 ****
   *(COMMON)
   . = ALIGN(4096);
!  end = .; _end = .; }}
\ No newline at end of file
--- 14,16 ----
   *(COMMON)
   . = ALIGN(4096);
!  end = .; _end = .; }}

Index: main.c
===================================================================
RCS file: /cvsroot/linksos/linksos/main/main.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** main.c	22 Dec 2002 18:42:12 -0000	1.1
--- main.c	28 Dec 2002 16:53:16 -0000	1.2
***************
*** 16,19 ****
  void main(void)
  {
! 	kprintf("LinksOS v0.0.1a kernel booted.");
  }
--- 16,20 ----
  void main(void)
  {
!   while(1);
!   kprintf("LinksOS v0.0.1a kernel booted.");
  }