Changeset 46c20c8 in mainline for boot/arch/mips32/include


Ignore:
Timestamp:
2010-11-26T20:08:10Z (15 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
45df59a
Parents:
fb150d78 (diff), ffdd2b9 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge mainline changes.

Location:
boot/arch/mips32/include
Files:
5 moved

Legend:

Unmodified
Added
Removed

  • boot/arch/mips32/include/arch.h

    rfb150d78 r46c20c8  
    11/*
    22 * Copyright (c) 2006 Martin Decky
    3  * Copyright (c) 2006 Jakub Jermar
    43 * All rights reserved.
    54 *
    … …  
    2827 */
    2928
    30 #ifndef BOOT_sparc64_ASM_H_
    31 #define BOOT_sparc64_ASM_H_
    32 
    33 #include "types.h"
    34 #include "main.h"
     29#ifndef BOOT_mips32_ARCH_H_
     30#define BOOT_mips32_ARCH_H_
    3531
    3632#define PAGE_WIDTH  14
    3733#define PAGE_SIZE   (1 << PAGE_WIDTH)
    3834
    39 #define BALLOC_MAX_SIZE  (128 * 1024)
     35#define CPUMAP_OFFSET    0x00001000
     36#define STACK_OFFSET     0x00002000
     37#define BOOTINFO_OFFSET  0x00003000
     38#define BOOT_OFFSET      0x00100000
     39#define LOADER_OFFSET    0x1fc00000
    4040
    41 extern void halt(void);
    42 extern void jump_to_kernel(void *entry, uint64_t cfg, bootinfo_t *bootinfo,
    43     unsigned int bootinfo_size, uint8_t subarchitecture) __attribute__((noreturn));
     41#define MSIM_VIDEORAM_ADDRESS  0xb0000000
     42#define MSIM_DORDER_ADDRESS    0xb0000004
     43
     44#ifndef __ASM__
     45        #define PA2KA(addr)    (((uintptr_t) (addr)) + 0x80000000)
     46        #define KSEG2PA(addr)  (((uintptr_t) (addr)) - 0xa0000000)
     47#else
     48        #define PA2KA(addr)    ((addr) + 0x80000000)
     49        #define KSEG2PA(addr)  ((addr) - 0xa0000000)
     50#endif
    4451
    4552#endif

  • boot/arch/mips32/include/asm.h

    rfb150d78 r46c20c8  
    3030#define BOOT_mips32_ASM_H_
    3131
    32 #define PAGE_SIZE   16384
    33 #define PAGE_WIDTH  14
    34 
    35 void jump_to_kernel(void *entry, void *bootinfo) __attribute__((noreturn));
     32extern void jump_to_kernel(void *, void *) __attribute__((noreturn));
    3633
    3734#endif

  • boot/arch/mips32/include/main.h

    rfb150d78 r46c20c8  
    2727 */
    2828
    29 /** @addtogroup amd64debug
    30  * @{
    31  */
    32 /** @file
    33  */
     29#ifndef BOOT_mips32_MAIN_H_
     30#define BOOT_mips32_MAIN_H_
    3431
    35 #ifndef KERN_ia32_DEBUG_H_
    36 #define KERN_ia32_DEBUG_H_
    37 
    38 #include <arch/asm.h>
    39 
    40 #define HERE get_ip()
     32extern void bootstrap(void);
    4133
    4234#endif
    43 
    44 /** @}
    45  */

  • boot/arch/mips32/include/regname.h

    rfb150d78 r46c20c8  
    6363#define ra      31
    6464
    65 #define rindex          0
    66 #define rrandom         1
    67 #define entrylo0        2
    68 #define entrylo1        3
    69 #define context         4
    70 #define pagemask        5
    71 #define wired           6
    72 #define badvaddr        8
    73 #define count           9
    74 #define entryhi         10
    75 #define compare         11
    76 #define status          12
    77 #define cause           13
    78 #define epc             14
    79 #define rconfig         16
    80 #define lladdr          17
    81 #define watchlo         18
    82 #define watchhi         19
    83 #define xcontext        20
    84 #define rdebug          23
    85 #define depc            24
    86 #define eepc            30
     65#define rindex    0
     66#define rrandom   1
     67#define entrylo0  2
     68#define entrylo1  3
     69#define context   4
     70#define pagemask  5
     71#define wired     6
     72#define badvaddr  8
     73#define count     9
     74#define entryhi   10
     75#define compare   11
     76#define status    12
     77#define cause     13
     78#define epc       14
     79#define rconfig   16
     80#define lladdr    17
     81#define watchlo   18
     82#define watchhi   19
     83#define xcontext  20
     84#define rdebug    23
     85#define depc      24
     86#define eepc      30
    8787
    88 #endif /* _REGNAME_H_ */
     88#endif

  • boot/arch/mips32/include/types.h

    rfb150d78 r46c20c8  
    2727 */
    2828
     29#ifndef BOOT_mips32_TYPES_H_
     30#define BOOT_mips32_TYPES_H_
    2931
    30 /** @addtogroup arm32boot
    31  * @{
    32  */
    33 /** @file
    34  *  @brief Definitions of basic types like #uintptr_t.
    35  */
     32#define TASKMAP_MAX_RECORDS        32
     33#define CPUMAP_MAX_RECORDS         32
     34#define BOOTINFO_TASK_NAME_BUFLEN  32
    3635
     36typedef uint32_t size_t;
     37typedef uint32_t uintptr_t;
    3738
    38 #ifndef BOOT_arm32_TYPES_H
    39 #define BOOT_arm32_TYPES_H
     39typedef struct {
     40        /** Address where the task was placed. */
     41        void *addr;
     42        /** Size of the task's binary. */
     43        size_t size;
     44        /** Task name. */
     45        char name[BOOTINFO_TASK_NAME_BUFLEN];
     46} task_t;
    4047
    41 
    42 #include <gentypes.h>
    43 
    44 typedef signed char int8_t;
    45 
    46 typedef unsigned char uint8_t;
    47 typedef unsigned short uint16_t;
    48 typedef unsigned int uint32_t;
    49 typedef unsigned long long uint64_t;
    50 
    51 typedef uint32_t uintptr_t;
    52 typedef uint32_t unative_t;
    53 
     48typedef struct {
     49        uint32_t cpumap;
     50        size_t cnt;
     51        task_t tasks[TASKMAP_MAX_RECORDS];
     52} bootinfo_t;
    5453
    5554#endif
    56 
    57 
    58 /** @}
    59  */
Note: See TracChangeset for help on using the changeset viewer.