Ignore:
Timestamp:
Dec 4, 2013, 7:59:21 PM (11 years ago)
Author:
alain
Message:

Modify the name "boot" to "reset" to avoid confusion
between the pre-loader and the boot-loader...
Increase the size of the segment containing the stacks.

Location:
trunk/softs/tsar_boot/include
Files:
1 edited
3 moved

Legend:

Unmodified
Added
Removed

  • trunk/softs/tsar_boot/include/defs.h

    r425 r586  
    11#include <defs_platform.h>
    22
    3 #define BOOT_VERSION    0x00010001
     3#define RESET_VERSION       0x00010002
    44
    5 #define BOOT_STACK_SIZE 0x4000     /* 16 KB */
    6 #define BOOT_LOADER_LBA 2
    7 #define PHDR_ARRAY_SIZE 16
     5#define RESET_STACKS_SIZE   0x11000  /* 64 bytes * 1024 + 4 Kbytes (for P0) = 68 Kbytes */
     6#define BOOT_LOADER_LBA     2
     7#define PHDR_ARRAY_SIZE     16
    88

  • trunk/softs/tsar_boot/include/reset_ioc.h

    r570 r586  
    1 #ifndef BOOT_IOC_H
    2 #define BOOT_IOC_H
     1#ifndef RESET_IOC_H
     2#define RESET_IOC_H
    33
    44#ifndef SOCLIB_IOC
    … …  
    1111
    1212#include <defs.h>
    13 #include <boot_tty.h>
     13#include <reset_tty.h>
    1414#include <io.h>
    1515
    16 /**
    17  * boot_ioc_read()
    18  *
    19  * Transfer data from a file on the block device to a memory buffer.
    20  *
    21  * \param lba    : first block index on the disk
    22  * \param buffer : base address of the memory buffer
    23  * \param count  : number of blocks to be transfered
    24  *
    25  * \note This is a blocking function. The function returns once the transfer
    26  *       has finished
    27  */
    28 int boot_ioc_read(unsigned int lba, void* buffer, unsigned int count);
     16extern int reset_ioc_init();
    2917
    30 /**
    31  * boot_ioc_init()
    32  *
    33  * Initialize the SPI controller use to access a SD card
    34  */
    35 int boot_ioc_init();
     18extern int reset_ioc_read( unsigned int lba,
     19                           void*        buffer,
     20                           unsigned int count );
    3621
    37 /**
    38  * boot_dbuf_invalidate()
    39  *
    40  * Invalidate all data cache lines corresponding to a memory buffer.
    41  */
    42 #if (CACHE_COHERENCE == 0)
    43 void boot_dbuf_invalidate(
    44         const void * buffer,
    45         unsigned int line_size,
    46         unsigned int size);
    47 #endif
     22extern int reset_ioc_completed();
    4823
    49 /**
    50  * boot_ioc_write()
    51  *
    52  * Transfer data from a memory buffer to a file on the block_device.
    53  *
    54  * \param lba    : first block index on the disk
    55  * \param buffer : base address of the memory buffer
    56  * \param count  : number of blocks to be transfered
    57  *
    58  * \note The source buffer must be in user address space.
    59  */
    60 //int boot_ioc_write(unsigned int lba, void* buffer, unsigned int count);
     24extern void reset_buf_invalidate ( const void * buffer,
     25                                   unsigned int line_size,
     26                                   unsigned int size );
    6127
     28extern void reset_mcc_invalidate( const void * buffer,
     29                                  unsigned int size );
    6230#endif
    6331

  • trunk/softs/tsar_boot/include/reset_tty.h

    r570 r586  
    1 #ifndef BOOT_TTY_H
    2 #define BOOT_TTY_H
     1#ifndef RESET_TTY_H
     2#define RESET_TTY_H
    33
    4 #include <io.h>
    5 #include <tty.h>
     4# include <tty.h>
    65
    7 void boot_exit();
    8 int  boot_getc(char * c);
    9 void boot_putc(const char c);
    10 void boot_puts(const char *buffer);
    11 void boot_putx(unsigned int val);
    12 void boot_putd(unsigned int val);
     6void reset_exit();
     7int  reset_getc(char * c);
     8void reset_putc(const char c);
     9void reset_puts(const char *buffer);
     10void reset_putx(unsigned int val);
     11void reset_putd(unsigned int val);
    1312
    1413#endif

  • trunk/softs/tsar_boot/include/reset_utils.h

    r570 r586  
    1 /**
    2  * \file    : boot_utils.h
     1/*
     2 * \file    : reset_utils.h
    33 * \date    : August 2012
    44 * \author  : Cesar Fuguet
    5  *
    6  * Definition of some miscellaneous functions used by the
    7  * pre-loader
    85 */
    96
    … …  
    129
    1310#include <elf-types.h>
    14 #include <boot_tty.h>
     11#include <reset_tty.h>
    1512
    16 /**
    17  * memcpy( _dst, _src, size )
    18  *
    19  * Transfer data between to memory buffers.
    20  *
    21  * \param _dst   : Destination buffer base address
    22  * \param _src   : Source buffer base address
    23  * \param size   : Number of bytes to transfer
    24  *
    25  */
    26 void * memcpy(void *_dst, const void *_src, unsigned int size);
     13extern unsigned int proctime();
    2714
    28 /**
    29  * memset( _dst, value, size )
    30  *
    31  * Initialize memory buffers with predefined value.
    32  *
    33  * \param _dst   : Destination buffer base address
    34  * \param value  : Initialization value
    35  * \param size   : Number of bytes to initialize
    36  *
    37  */
    38 void * memset(void *_dst, const int value, unsigned int size);
     15extern void* memcpy(void *_dst, const void *_src, unsigned int size);
    3916
    40 /******************************************************************************
    41  * Misc functions for the ELF
    42  *****************************************************************************/
     17extern void* memset(void *_dst, const int value, unsigned int size);
    4318
    44 /**
    45  * boot_print_elf_phdr( elf_phdr_ptr )
    46  *
    47  * Print some fields of a ELF program header
    48  *
    49  * \param elf_phdr_ptr : Pointer to the ELF program header to print
    50  *
    51  */
    52 void boot_print_elf_phdr(Elf32_Phdr * elf_phdr_ptr);
     19extern void reset_print_elf_phdr(Elf32_Phdr * elf_phdr_ptr);
    5320
    5421#endif
Note: See TracChangeset for help on using the changeset viewer.