#1 Leftover CVS merge conflicts

closed-fixed
None
5
2003-08-09
2002-09-15
No

There are leftover CVS merge conflicts in config/m68hc11-ebcs/memory.x

/* Fixed definition of the available memory banks.
See generic emulation script for a user defined configuration. */
MEMORY
{
page0 (rwx) : ORIGIN = 0x0, LENGTH = 256
/* Only 8Kb of RAM (well, 32K rom and 32K ram capable but I only plugged
a 6264...). */
<<<<<<< memory.x
/*
text (rx) : ORIGIN = 0xE200, LENGTH = 7680
data : ORIGIN = 0xE000, LENGTH = 512
*/
text (rx) : ORIGIN = 0xD000, LENGTH = 8192+0x1000
data : ORIGIN = 0xC000, LENGTH = 0x1000
=======
text (rx) : ORIGIN = 0xE200, LENGTH = 0xFFFF - 0xE200
data : ORIGIN = 0xE000, LENGTH = 0xE1FF - 0xE000
>>>>>>> 1.2
}
/* Setup the stack on the top of the data memory bank. */
PROVIDE (_stack = 0xC000 + 0x1000 - 1);
/*PROVIDE (_stack = 0x100 - 1);*/

Discussion

  • Stephane Carrez

    Stephane Carrez - 2002-09-16
    • assigned_to: nobody --> ciceron
     
  • Stephane Carrez

    Stephane Carrez - 2003-08-09
    • status: open --> closed-fixed
     

Log in to post a comment.