[Tinyos-beta-commits] CVS: tinyos-1.x/beta/platform/imote2 bare.x, 1.1, 1.2

[Robbie Adler]

Update of /cvsroot/tinyos/tinyos-1.x/beta/platform/imote2
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv31744

Modified Files:
	bare.x 
Log Message:
updated version of bare.x files that correctly includes sections for imote2 bootloader compatibility


Index: bare.x
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/platform/imote2/bare.x,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** bare.x	13 Nov 2004 01:11:44 -0000	1.1
--- bare.x	14 Jul 2006 19:03:39 -0000	1.2
***************
*** 1,85 ****
! OUTPUT_FORMAT("elf32-littlearm", "elf32-bigarm",
! 	      "elf32-littlearm")
! OUTPUT_ARCH(arm)
! MEMORY
! {
!   text   (rx)   : ORIGIN = 0, LENGTH = 64M
!   data   (rw!x) : ORIGIN = 0x5c000000, LENGTH = 256K
! }
! SECTIONS
! {
!   .text           :
!   {
!     *(.vectors)
!     *(.text .stub .text.* .gnu.linkonce.t.*)
!     *(.rodata.*)
!     *(.rodata)    
!     /* .gnu.warning sections are handled specially by elf32.em.  */
!     *(.gnu.warning)
!     *(.glue_7t) *(.glue_7)
!     KEEP (*(.fini))
!   } >text
!   PROVIDE (__etext = .);
!   PROVIDE (_etext = .);
!   PROVIDE (etext = .);
!   .data           : AT (ADDR(.text) + SIZEOF(.text))
!   {
!     __data_start = . ;
!     *(.data .data.* .gnu.linkonce.d.*)
!     *(.gnu.linkonce.d*)
!     _edata = .;
!     PROVIDE (edata = .);
!   } > data
!   .bss SIZEOF(.data) + ADDR(.data) :
!   {
!     __bss_start = .;
!     __bss_start__ = .;
!    *(.dynbss)
!    *(.bss .bss.* .gnu.linkonce.b.*)
!    *(COMMON)
!     _end = .;
!     _bss_end__ = . ; __bss_end__ = . ; __end__ = . ;
!     PROVIDE (end = .);
!   } >data
!    __data_load_start = LOADADDR(.data);
!    __data_load_end = __data_load_start + SIZEOF(.data);
!   /* Stabs debugging sections.  */
!   .stab          0 : { *(.stab) }
!   .stabstr       0 : { *(.stabstr) }
!   .stab.excl     0 : { *(.stab.excl) }
!   .stab.exclstr  0 : { *(.stab.exclstr) }
!   .stab.index    0 : { *(.stab.index) }
!   .stab.indexstr 0 : { *(.stab.indexstr) }
!   .comment       0 : { *(.comment) }
!   /* DWARF debug sections.
!      Symbols in the DWARF debugging sections are relative to the beginning
!      of the section so we begin them at 0.  */
!   /* DWARF 1 */
!   .debug          0 : { *(.debug) }
!   .line           0 : { *(.line) }
!   /* GNU DWARF 1 extensions */
!   .debug_srcinfo  0 : { *(.debug_srcinfo) }
!   .debug_sfnames  0 : { *(.debug_sfnames) }
!   /* DWARF 1.1 and DWARF 2 */
!   .debug_aranges  0 : { *(.debug_aranges) }
!   .debug_pubnames 0 : { *(.debug_pubnames) }
!   /* DWARF 2 */
!   .debug_info     0 : { *(.debug_info .gnu.linkonce.wi.*) }
!   .debug_abbrev   0 : { *(.debug_abbrev) }
!   .debug_line     0 : { *(.debug_line) }
!   .debug_frame    0 : { *(.debug_frame) }
!   .debug_str      0 : { *(.debug_str) }
!   .debug_loc      0 : { *(.debug_loc) }
!   .debug_macinfo  0 : { *(.debug_macinfo) }
!   /* SGI/MIPS DWARF 2 extensions */
!   .debug_weaknames 0 : { *(.debug_weaknames) }
!   .debug_funcnames 0 : { *(.debug_funcnames) }
!   .debug_typenames 0 : { *(.debug_typenames) }
!   .debug_varnames  0 : { *(.debug_varnames) }
!     .stack         0x80000 :
!   {
!     _stack = .;
!     *(.stack)
!   }
!   /DISCARD/ : { *(.note.GNU-stack) }
! }
--- 1,92 ----
! OUTPUT_FORMAT("elf32-littlearm", "elf32-bigarm",
! 	      "elf32-littlearm")
! OUTPUT_ARCH(arm)
! MEMORY
! {
!   FLASH   (rx)   : ORIGIN = 0, LENGTH = 64M
!   SRAM   (rw!x) : ORIGIN = 0x5c000000, LENGTH = 256K
! }
! SECTIONS
! {
!   .text           :
!   {
!     *(.vectors)
!     *(.tosstart)
!     *(.text .stub .text.* .gnu.linkonce.t.*)
!     *(.rodata.*)
!     *(.rodata)    
!     /* .gnu.warning sections are handled specially by elf32.em.  */
!     *(.gnu.warning)
!     *(.glue_7t) *(.glue_7)
!     KEEP (*(.fini))
!   } >FLASH
!   PROVIDE (__etext = .);
!   PROVIDE (_etext = .);
!   PROVIDE (etext = .);
!   /*data is loaded into ROM right after .text, but then is copied into memory at the beginning of SRAM */
!   .data           : AT (ADDR(.text) + SIZEOF(.text))
!   {
!     __data_start = . ;
!     *(.vectable)
!     *(.data .data.* .gnu.linkonce.d.*)
!     *(.gnu.linkonce.d*)
!     _edata = .;
!     PROVIDE (edata = .);
!   } >SRAM
!   .bss SIZEOF(.data) + ADDR(.data) :
!   {
!     __bss_start = .;
!     __bss_start__ = .;
!    *(.dynbss)
!    *(.bss .bss.* .gnu.linkonce.b.*)
!    *(COMMON)
!     _end = .;
!     _bss_end__ = . ; __bss_end__ = . ; __end__ = . ;
!     PROVIDE (end = .);
!   } >SRAM
!    __data_load_start = LOADADDR(.data);
!    __data_load_end = __data_load_start + SIZEOF(.data);
! 
!   .stack  (0x5c000000 + 256k -_TOTAL_STACK_SIZE) :
!   {
!     __stack_start = .;		
!     _stack = .;
!     *(.stack)
!      __stack_end = .;
!   } >SRAM
! 
!   /* Stabs debugging sections.  */
!   .stab          0 : { *(.stab) }
!   .stabstr       0 : { *(.stabstr) }
!   .stab.excl     0 : { *(.stab.excl) }
!   .stab.exclstr  0 : { *(.stab.exclstr) }
!   .stab.index    0 : { *(.stab.index) }
!   .stab.indexstr 0 : { *(.stab.indexstr) }
!   .comment       0 : { *(.comment) }
!   /* DWARF debug sections.
!      Symbols in the DWARF debugging sections are relative to the beginning
!      of the section so we begin them at 0.  */
!   /* DWARF 1 */
!   .debug          0 : { *(.debug) }
!   .line           0 : { *(.line) }
!   /* GNU DWARF 1 extensions */
!   .debug_srcinfo  0 : { *(.debug_srcinfo) }
!   .debug_sfnames  0 : { *(.debug_sfnames) }
!   /* DWARF 1.1 and DWARF 2 */
!   .debug_aranges  0 : { *(.debug_aranges) }
!   .debug_pubnames 0 : { *(.debug_pubnames) }
!   /* DWARF 2 */
!   .debug_info     0 : { *(.debug_info .gnu.linkonce.wi.*) }
!   .debug_abbrev   0 : { *(.debug_abbrev) }
!   .debug_line     0 : { *(.debug_line) }
!   .debug_frame    0 : { *(.debug_frame) }
!   .debug_str      0 : { *(.debug_str) }
!   .debug_loc      0 : { *(.debug_loc) }
!   .debug_macinfo  0 : { *(.debug_macinfo) }
!   /* SGI/MIPS DWARF 2 extensions */
!   .debug_weaknames 0 : { *(.debug_weaknames) }
!   .debug_funcnames 0 : { *(.debug_funcnames) }
!   .debug_typenames 0 : { *(.debug_typenames) }
!   .debug_varnames  0 : { *(.debug_varnames) }
!   /DISCARD/ : { *(.note.GNU-stack) }
! }