Changeset 3e828ea in mainline for kernel/arch/riscv64


Ignore:
Timestamp:
2019-09-23T12:49:29Z (7 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
9be2358
Parents:
9259d20 (diff), 1a4ec93f (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.
git-author:
Jiri Svoboda <jiri@…> (2019-09-22 12:49:07)
git-committer:
Jiri Svoboda <jiri@…> (2019-09-23 12:49:29)
Message:

Merge changes from master, especially Meson build

Location:
kernel/arch/riscv64
Files:
1 deleted
3 edited
1 moved

Legend:

Unmodified
Added
Removed

  • kernel/arch/riscv64/_link.ld.in

    r9259d20 r3e828ea  
    1616        kernel_load_address = PA2KA(BOOT_OFFSET);
    1717
    18         .image (PA2KA(BOOT_OFFSET) + SIZEOF_HEADERS) : AT (SIZEOF_HEADERS) {
     18        .image (PA2KA(BOOT_OFFSET) + SIZEOF_HEADERS) : AT (BOOT_OFFSET + SIZEOF_HEADERS) {
    1919                ktext_start = .;
    2020                *(K_TEXT_START);

  • kernel/arch/riscv64/include/arch/mm/as.h

    r9259d20 r3e828ea  
    4040
    4141#define KERNEL_ADDRESS_SPACE_SHADOWED_ARCH  0
     42#define KERNEL_SEPARATE_PTL0_ARCH           0
    4243
    4344#define KERNEL_ADDRESS_SPACE_START_ARCH  UINT64_C(0xffff800000000000)

  • kernel/arch/riscv64/meson.build

    r9259d20 r3e828ea  
    2727#
    2828
    29 BFD_NAME = elf64-littleriscv
    30 BFD_OUTPUT = $(BFD_NAME)
    31 BFD_ARCH = riscv
     29arch_src += files(
     30        'src/boot/boot.S',
     31        'src/asm.S',
     32        'src/context.S',
     33        'src/debug/stacktrace.c',
     34        'src/drivers/ucb.c',
     35        'src/proc/scheduler.c',
     36        'src/proc/task.c',
     37        'src/proc/thread.c',
     38        'src/riscv64.c',
     39        'src/userspace.c',
     40        'src/smc.c',
     41        'src/cpu/cpu.c',
     42        'src/mm/km.c',
     43        'src/mm/as.c',
     44        'src/mm/frame.c',
     45        'src/mm/page.c',
     46        'src/mm/tlb.c',
     47)
    3248
    33 BITS = 64
    34 ENDIANESS = LE
    35 EXTRA_CFLAGS = -mcmodel=medany
    3649
    37 SOURCES = \
    38         arch/$(BARCH)/src/asm.S \
    39         arch/$(BARCH)/src/main.c \
    40         arch/$(BARCH)/src/ucb.c \
    41         arch/$(BARCH)/src/putchar.c \
    42         $(COMPS).o \
    43         generic/src/memstr.c \
    44         generic/src/printf_core.c \
    45         generic/src/vprintf.c \
    46         generic/src/printf.c \
    47         generic/src/str.c \
    48         generic/src/version.c \
    49         generic/src/inflate.c \
    50         generic/src/gzip.c \
    51         generic/src/tar.c \
    52         generic/src/kernel.c \
    53         generic/src/payload.c
     50_check_headers = [
     51        'include/arch/istate_struct.h',
     52        'include/arch/context_struct.h',
     53]
     54
     55foreach h : _check_headers
     56        arch_src += [ autocheck.process(h) ]
     57endforeach

  • kernel/arch/riscv64/src/riscv64.c

    r9259d20 r3e828ea  
    143143}
    144144
    145 uintptr_t memcpy_from_uspace(void *dst, const void *uspace_src, size_t size)
     145uintptr_t memcpy_from_uspace(void *dst, uspace_addr_t uspace_src, size_t size)
    146146{
    147147        return 0;
    148148}
    149149
    150 uintptr_t memcpy_to_uspace(void *uspace_dst, const void *src, size_t size)
     150uintptr_t memcpy_to_uspace(uspace_addr_t uspace_dst, const void *src, size_t size)
    151151{
    152152        return 0;
Note: See TracChangeset for help on using the changeset viewer.