Changeset 366 for soft/giet_vm


Ignore:
Timestamp:
Jul 23, 2014, 4:16:05 PM (10 years ago)
Author:
cfuguet
Message:

giet_boot: using boot_entry instead of boot_init as entry point

Location:
soft/giet_vm
Files:
3 edited
1 moved

Legend:

Unmodified
Added
Removed
  • soft/giet_vm/Makefile

    r364 r366  
    6969               build/kernel/ctx_handler.o \
    7070               build/kernel/switch.o      \
    71                build/boot/boot.o
     71               build/boot/boot.o          \
     72               build/boot/boot_entry.o
    7273
    7374### Objects to be linked for display.elf
     
    169170        dd if=build/boot/boot.elf of=$(DISK_IMAGE) seek=2 conv=notrunc
    170171### Checking root directory
    171         mdir -i $(DISK_IMAGE) ::/
     172        mdir -/ -b -i $(DISK_IMAGE) ::/
    172173
    173174### Disk image generation (no files in this step)
     
    338339                   giet_drivers/ioc_driver.h \
    339340                   hard_config.h             \
    340                    giet_config.h             
     341                   giet_config.h
     342        $(CC) $(GIET_INCLUDE) $(CFLAGS)  -c -o $@ $<
     343
     344build/boot/boot_entry.o: giet_boot/boot_entry.S \
     345                         hard_config.h
    341346        $(CC) $(GIET_INCLUDE) $(CFLAGS)  -c -o $@ $<
    342347
     
    500505        rm -rf build/transpose/*
    501506        rm -rf build/convol/*
    502         rm -rf hdd/virt_hdd.dmg
     507        rm -rf $(DISK_IMAGE)
  • soft/giet_vm/giet_boot/boot.c

    r359 r366  
    132132////////////////////////////////////////////////////////////////////////////
    133133
     134extern void boot_entry();
     135
    134136// This global variable is allocated in "fat32.c" file
    135137extern fat32_fs_t fat;
     
    25102512                if ( (nprocs > 0) && ((clusterid != 0) || (p != 0)) )
    25112513                {
    2512                     _xcu_send_wti( cluster_xy, p, (unsigned int)boot_init );
     2514                    _xcu_send_wti( cluster_xy, p, (unsigned int)boot_entry );
    25132515                }
    25142516            }
  • soft/giet_vm/giet_boot/boot.ld

    r321 r366  
    1212/****************************************************************************/
    1313
    14 ENTRY(boot_init)
     14ENTRY(boot_entry)
    1515
    1616/****************************************************************************/
  • soft/giet_vm/giet_boot/boot_entry.S

    r365 r366  
    4545    /* (proc_id is a "continuous" index, while proc_xyl is a "fixed format" index */
    4646
    47     mfc0   k0,      CP0_EBASE
     47    mfc0   k0,      CP0_PROCID
    4848    andi   k0,      k0,     0x3FF   /* k0 <= proc_xyl                             */
    4949    la     t7,      NB_PROCS_MAX    /* t7 <= NBPROCS                              */
Note: See TracChangeset for help on using the changeset viewer.