[BACK]Return to bootinfo.c CVS log [TXT][DIR] Up to [local] / prex-old / boot / arm / cats

Diff for /prex-old/boot/arm/cats/bootinfo.c between version 1.1 and 1.2

version 1.1, 2008/07/17 19:10:36 version 1.2, 2008/07/17 22:00:25
Line 29 
Line 29 
   
 #include <boot.h>  #include <boot.h>
 #include <platform.h>  #include <platform.h>
   #include "cyclone_boot.h"
   
   extern uint32_t ebsabootaddr;
   
 /*  /*
  * Setup boot information.   * Setup boot information.
  */   */
Line 37 
Line 40 
 setup_bootinfo(struct boot_info **bpp)  setup_bootinfo(struct boot_info **bpp)
 {  {
         struct boot_info *bp;          struct boot_info *bp;
           struct ebsaboot *ebp;
   
         bp = (struct boot_info *)BOOT_INFO;          bp = (struct boot_info *)BOOT_INFO;
         memset(bp, 0, BOOT_INFO_SIZE);          memset(bp, 0, BOOT_INFO_SIZE);
Line 46 
Line 50 
         bp->video.text_x = 30;          bp->video.text_x = 30;
         bp->video.text_y = 20;          bp->video.text_y = 20;
   
         /* printk("hi_mem=%x lo_mem=%x\n", hi_mem, lo_mem); */          ebp = (struct ebsaboot *)ebsabootaddr;
         bp->main_mem.start = 0x00000000;          if (ebp->bt_magic != BT_MAGIC_NUMBER_CATS &&
         bp->main_mem.size  = 0x2000000; /* 32MB */                  ebp->bt_magic != BT_MAGIC_NUMBER_EBSA) {
                   panic("Incorrect firmware signature");
           }
   
           printk("phys_start=0x%x phys_end=0x%x free_start=0x%x bootstring='%s' pciclk=%u mhz, %s firmware\n",
                                   ebp->bt_memstart, ebp->bt_memend, ebp->bt_memavail,
                                   (char *)ebp->bt_args, ebp->bt_pciclk / 1000000,
                                   ebp->bt_magic == BT_MAGIC_NUMBER_CATS ? "cats" : "ebsa");
   
           bp->main_mem.start = ebp->bt_memavail;
           bp->main_mem.size  = ebp->bt_memend - ebp->bt_memavail;
   
         *bpp = bp;          *bpp = bp;
 }  }

Legend:
Removed from v.1.1  
changed lines
  Added in v.1.2

CVSweb