qemu-rv: Add test target pnsh64 for BUILD_PROTECTED
This adds BUILD_PROTECTED target for rv-virt (rv-virt:pnsh64).
This commit is contained in:
Ville Juven
Xiang Xiao
parent
6ef8a73614
commit
1f928b2338
@ -89,6 +89,10 @@ to be set to the same value as ``CONFIG_SMP_NCPUS`` in the build config file.
|
|||||||
If testing with S-mode build, remove the ``-bios none`` option. S-mode build
|
If testing with S-mode build, remove the ``-bios none`` option. S-mode build
|
||||||
requires SBI to function properly.
|
requires SBI to function properly.
|
||||||
|
|
||||||
|
For BUILD_PROTECTED the user-space binary must also be loaded, which can be
|
||||||
|
done by adding ``-device loader,file=./nuttx_user.elf`` to the command line
|
||||||
|
arguments.
|
||||||
|
|
||||||
citest
|
citest
|
||||||
------
|
------
|
||||||
|
|
||||||
|
|||||||
@ -39,6 +39,7 @@
|
|||||||
#include "init/init.h"
|
#include "init/init.h"
|
||||||
#include "riscv_internal.h"
|
#include "riscv_internal.h"
|
||||||
#include "riscv_ipi.h"
|
#include "riscv_ipi.h"
|
||||||
|
#include "riscv_percpu.h"
|
||||||
|
|
||||||
#ifdef CONFIG_BUILD_KERNEL
|
#ifdef CONFIG_BUILD_KERNEL
|
||||||
# include "riscv_mmu.h"
|
# include "riscv_mmu.h"
|
||||||
|
|||||||
@ -31,6 +31,8 @@ list(
|
|||||||
|
|
||||||
if(CONFIG_BUILD_KERNEL)
|
if(CONFIG_BUILD_KERNEL)
|
||||||
list(APPEND SRCS qemu_rv_mm_init.c)
|
list(APPEND SRCS qemu_rv_mm_init.c)
|
||||||
|
elseif(CONFIG_BUILD_PROTECTED)
|
||||||
|
list(APPEND SRCS qemu_rv_userspace.c)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(CONFIG_MM_PGALLOC)
|
if(CONFIG_MM_PGALLOC)
|
||||||
|
|||||||
@ -34,3 +34,7 @@ endif
|
|||||||
ifeq ($(CONFIG_MM_PGALLOC),y)
|
ifeq ($(CONFIG_MM_PGALLOC),y)
|
||||||
CHIP_CSRCS += qemu_rv_pgalloc.c
|
CHIP_CSRCS += qemu_rv_pgalloc.c
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
ifeq ($(CONFIG_BUILD_PROTECTED),y)
|
||||||
|
CHIP_CSRCS += qemu_rv_userspace.c
|
||||||
|
endif
|
||||||
|
|||||||
@ -33,6 +33,8 @@
|
|||||||
#include "riscv_internal.h"
|
#include "riscv_internal.h"
|
||||||
#include "chip.h"
|
#include "chip.h"
|
||||||
|
|
||||||
|
#include "qemu_rv_userspace.h"
|
||||||
|
|
||||||
#ifdef CONFIG_BUILD_KERNEL
|
#ifdef CONFIG_BUILD_KERNEL
|
||||||
# include "qemu_rv_mm_init.h"
|
# include "qemu_rv_mm_init.h"
|
||||||
#endif
|
#endif
|
||||||
@ -171,6 +173,17 @@ void qemu_rv_start(int mhartid, const char *dtb)
|
|||||||
|
|
||||||
showprogress('C');
|
showprogress('C');
|
||||||
|
|
||||||
|
/* For the case of the separate user-/kernel-space build, perform whatever
|
||||||
|
* platform specific initialization of the user memory is required.
|
||||||
|
* Normally this just means initializing the user space .data and .bss
|
||||||
|
* segments.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifdef CONFIG_BUILD_PROTECTED
|
||||||
|
qemu_rv_userspace();
|
||||||
|
showprogress('D');
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifdef CONFIG_BUILD_KERNEL
|
#ifdef CONFIG_BUILD_KERNEL
|
||||||
/* Setup page tables for kernel and enable MMU */
|
/* Setup page tables for kernel and enable MMU */
|
||||||
|
|
||||||
|
|||||||
127
arch/risc-v/src/qemu-rv/qemu_rv_userspace.c
Normal file
127
arch/risc-v/src/qemu-rv/qemu_rv_userspace.c
Normal file
@ -0,0 +1,127 @@
|
|||||||
|
/****************************************************************************
|
||||||
|
* arch/risc-v/src/qemu-rv/qemu_rv_userspace.c
|
||||||
|
*
|
||||||
|
* Licensed to the Apache Software Foundation (ASF) under one or more
|
||||||
|
* contributor license agreements. See the NOTICE file distributed with
|
||||||
|
* this work for additional information regarding copyright ownership. The
|
||||||
|
* ASF licenses this file to you under the Apache License, Version 2.0 (the
|
||||||
|
* "License"); you may not use this file except in compliance with the
|
||||||
|
* License. You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
||||||
|
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||||
|
* License for the specific language governing permissions and limitations
|
||||||
|
* under the License.
|
||||||
|
*
|
||||||
|
****************************************************************************/
|
||||||
|
|
||||||
|
/****************************************************************************
|
||||||
|
* Included Files
|
||||||
|
****************************************************************************/
|
||||||
|
|
||||||
|
#include <nuttx/config.h>
|
||||||
|
|
||||||
|
#include <stdint.h>
|
||||||
|
#include <assert.h>
|
||||||
|
|
||||||
|
#include <nuttx/queue.h>
|
||||||
|
#include <nuttx/userspace.h>
|
||||||
|
|
||||||
|
#include <arch/board/board_memorymap.h>
|
||||||
|
|
||||||
|
#include "qemu_rv_userspace.h"
|
||||||
|
#include "riscv_internal.h"
|
||||||
|
|
||||||
|
#ifdef CONFIG_BUILD_PROTECTED
|
||||||
|
|
||||||
|
/****************************************************************************
|
||||||
|
* Pre-processor Definitions
|
||||||
|
****************************************************************************/
|
||||||
|
|
||||||
|
#define UFLASH_F (PMPCFG_A_NAPOT | PMPCFG_X | PMPCFG_R)
|
||||||
|
#define USRAM_F (PMPCFG_A_NAPOT | PMPCFG_W | PMPCFG_R)
|
||||||
|
|
||||||
|
/****************************************************************************
|
||||||
|
* Private Types
|
||||||
|
****************************************************************************/
|
||||||
|
|
||||||
|
/****************************************************************************
|
||||||
|
* Private Functions
|
||||||
|
****************************************************************************/
|
||||||
|
|
||||||
|
/****************************************************************************
|
||||||
|
* Name: configure_mpu
|
||||||
|
*
|
||||||
|
* Description:
|
||||||
|
* This function configures the MPU for for kernel- / userspace separation.
|
||||||
|
* It will also grant access to the page table memory for the supervisor.
|
||||||
|
*
|
||||||
|
****************************************************************************/
|
||||||
|
|
||||||
|
static void configure_mpu(void)
|
||||||
|
{
|
||||||
|
int ret;
|
||||||
|
ret = riscv_append_pmp_region(UFLASH_F, UFLASH_START, UFLASH_SIZE);
|
||||||
|
DEBUGASSERT(ret == 0);
|
||||||
|
ret = riscv_append_pmp_region(USRAM_F, USRAM_START, USRAM_SIZE);
|
||||||
|
DEBUGASSERT(ret == 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
/****************************************************************************
|
||||||
|
* Public Functions
|
||||||
|
****************************************************************************/
|
||||||
|
|
||||||
|
/****************************************************************************
|
||||||
|
* Name: qemu_rv_userspace
|
||||||
|
*
|
||||||
|
* Description:
|
||||||
|
* For the case of the separate user-/kernel-space build, perform whatever
|
||||||
|
* platform specific initialization of the user memory is required.
|
||||||
|
* Normally this just means initializing the user space .data and .bss
|
||||||
|
* segments.
|
||||||
|
*
|
||||||
|
****************************************************************************/
|
||||||
|
|
||||||
|
void qemu_rv_userspace(void)
|
||||||
|
{
|
||||||
|
uint8_t *src;
|
||||||
|
uint8_t *dest;
|
||||||
|
uint8_t *end;
|
||||||
|
|
||||||
|
/* Clear all of user-space .bss */
|
||||||
|
|
||||||
|
DEBUGASSERT(USERSPACE->us_bssstart != 0 && USERSPACE->us_bssend != 0 &&
|
||||||
|
USERSPACE->us_bssstart <= USERSPACE->us_bssend);
|
||||||
|
|
||||||
|
dest = (uint8_t *)USERSPACE->us_bssstart;
|
||||||
|
end = (uint8_t *)USERSPACE->us_bssend;
|
||||||
|
|
||||||
|
while (dest != end)
|
||||||
|
{
|
||||||
|
*dest++ = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Initialize all of user-space .data */
|
||||||
|
|
||||||
|
DEBUGASSERT(USERSPACE->us_datasource != 0 &&
|
||||||
|
USERSPACE->us_datastart != 0 && USERSPACE->us_dataend != 0 &&
|
||||||
|
USERSPACE->us_datastart <= USERSPACE->us_dataend);
|
||||||
|
|
||||||
|
src = (uint8_t *)USERSPACE->us_datasource;
|
||||||
|
dest = (uint8_t *)USERSPACE->us_datastart;
|
||||||
|
end = (uint8_t *)USERSPACE->us_dataend;
|
||||||
|
|
||||||
|
while (dest != end)
|
||||||
|
{
|
||||||
|
*dest++ = *src++;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Configure MPU / PMP to grant access to the userspace */
|
||||||
|
|
||||||
|
configure_mpu();
|
||||||
|
}
|
||||||
|
|
||||||
|
#endif /* CONFIG_BUILD_PROTECTED */
|
||||||
49
arch/risc-v/src/qemu-rv/qemu_rv_userspace.h
Normal file
49
arch/risc-v/src/qemu-rv/qemu_rv_userspace.h
Normal file
@ -0,0 +1,49 @@
|
|||||||
|
/****************************************************************************
|
||||||
|
* arch/risc-v/src/qemu-rv/qemu_rv_userspace.h
|
||||||
|
*
|
||||||
|
* Licensed to the Apache Software Foundation (ASF) under one or more
|
||||||
|
* contributor license agreements. See the NOTICE file distributed with
|
||||||
|
* this work for additional information regarding copyright ownership. The
|
||||||
|
* ASF licenses this file to you under the Apache License, Version 2.0 (the
|
||||||
|
* "License"); you may not use this file except in compliance with the
|
||||||
|
* License. You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
||||||
|
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||||
|
* License for the specific language governing permissions and limitations
|
||||||
|
* under the License.
|
||||||
|
*
|
||||||
|
****************************************************************************/
|
||||||
|
|
||||||
|
#ifndef __ARCH_RISC_V_SRC_QEMURV_QEMURV_USERSPACE_H
|
||||||
|
#define __ARCH_RISC_V_SRC_QEMURV_QEMURV_USERSPACE_H
|
||||||
|
|
||||||
|
/****************************************************************************
|
||||||
|
* Included Files
|
||||||
|
****************************************************************************/
|
||||||
|
|
||||||
|
#include <nuttx/config.h>
|
||||||
|
|
||||||
|
/****************************************************************************
|
||||||
|
* Public Functions Prototypes
|
||||||
|
****************************************************************************/
|
||||||
|
|
||||||
|
/****************************************************************************
|
||||||
|
* Name: qemu_rv_userspace
|
||||||
|
*
|
||||||
|
* Description:
|
||||||
|
* For the case of the separate user-/kernel-space build, perform whatever
|
||||||
|
* platform specific initialization of the user memory is required.
|
||||||
|
* Normally this just means initializing the user space .data and .bss
|
||||||
|
* segments.
|
||||||
|
*
|
||||||
|
****************************************************************************/
|
||||||
|
|
||||||
|
#ifdef CONFIG_BUILD_PROTECTED
|
||||||
|
void qemu_rv_userspace(void);
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#endif /* __ARCH_RISC_V_SRC_QEMURV_QEMURV_USERSPACE_H */
|
||||||
83
boards/risc-v/qemu-rv/rv-virt/configs/pnsh64/defconfig
Normal file
83
boards/risc-v/qemu-rv/rv-virt/configs/pnsh64/defconfig
Normal file
@ -0,0 +1,83 @@
|
|||||||
|
#
|
||||||
|
# This file is autogenerated: PLEASE DO NOT EDIT IT.
|
||||||
|
#
|
||||||
|
# You can use "make menuconfig" to make any modifications to the installed .config file.
|
||||||
|
# You can then do "make savedefconfig" to generate a new defconfig file that includes your
|
||||||
|
# modifications.
|
||||||
|
#
|
||||||
|
# CONFIG_DISABLE_OS_API is not set
|
||||||
|
# CONFIG_NSH_DISABLE_LOSMART is not set
|
||||||
|
CONFIG_16550_ADDRWIDTH=0
|
||||||
|
CONFIG_16550_UART0=y
|
||||||
|
CONFIG_16550_UART0_BASE=0x10000000
|
||||||
|
CONFIG_16550_UART0_CLOCK=3686400
|
||||||
|
CONFIG_16550_UART0_IRQ=37
|
||||||
|
CONFIG_16550_UART0_SERIAL_CONSOLE=y
|
||||||
|
CONFIG_16550_UART=y
|
||||||
|
CONFIG_ARCH="risc-v"
|
||||||
|
CONFIG_ARCH_BOARD="rv-virt"
|
||||||
|
CONFIG_ARCH_BOARD_QEMU_RV_VIRT=y
|
||||||
|
CONFIG_ARCH_CHIP="qemu-rv"
|
||||||
|
CONFIG_ARCH_CHIP_QEMU_RV64=y
|
||||||
|
CONFIG_ARCH_CHIP_QEMU_RV=y
|
||||||
|
CONFIG_ARCH_CHIP_QEMU_RV_ISA_A=y
|
||||||
|
CONFIG_ARCH_CHIP_QEMU_RV_ISA_C=y
|
||||||
|
CONFIG_ARCH_CHIP_QEMU_RV_ISA_M=y
|
||||||
|
CONFIG_ARCH_INTERRUPTSTACK=2048
|
||||||
|
CONFIG_ARCH_RISCV=y
|
||||||
|
CONFIG_ARCH_STACKDUMP=y
|
||||||
|
CONFIG_ARCH_USE_MMU=y
|
||||||
|
CONFIG_ARCH_USE_MPU=y
|
||||||
|
CONFIG_BCH=y
|
||||||
|
CONFIG_BOARDCTL_POWEROFF=y
|
||||||
|
CONFIG_BOARD_LOOPSPERMSEC=6366
|
||||||
|
CONFIG_BUILD_PROTECTED=y
|
||||||
|
CONFIG_BUILTIN=y
|
||||||
|
CONFIG_CANCELLATION_POINTS=y
|
||||||
|
CONFIG_DEBUG_ASSERTIONS=y
|
||||||
|
CONFIG_DEBUG_FEATURES=y
|
||||||
|
CONFIG_DEBUG_FULLOPT=y
|
||||||
|
CONFIG_DEBUG_SYMBOLS=y
|
||||||
|
CONFIG_DEFAULT_TASK_STACKSIZE=4096
|
||||||
|
CONFIG_DEV_ZERO=y
|
||||||
|
CONFIG_ELF=y
|
||||||
|
CONFIG_EXAMPLES_HELLO=y
|
||||||
|
CONFIG_FS_HOSTFS=y
|
||||||
|
CONFIG_FS_PROCFS=y
|
||||||
|
CONFIG_IDLETHREAD_STACKSIZE=2048
|
||||||
|
CONFIG_INIT_ENTRYPOINT="nsh_main"
|
||||||
|
CONFIG_INIT_STACKSIZE=3072
|
||||||
|
CONFIG_INTELHEX_BINARY=y
|
||||||
|
CONFIG_LIBC_ENVPATH=y
|
||||||
|
CONFIG_LIBC_EXECFUNCS=y
|
||||||
|
CONFIG_LIBC_PERROR_STDOUT=y
|
||||||
|
CONFIG_LIBC_STRERROR=y
|
||||||
|
CONFIG_LIBM=y
|
||||||
|
CONFIG_NFILE_DESCRIPTORS_PER_BLOCK=6
|
||||||
|
CONFIG_NSH_ARCHINIT=y
|
||||||
|
CONFIG_NSH_BUILTIN_APPS=y
|
||||||
|
CONFIG_NSH_FILEIOSIZE=512
|
||||||
|
CONFIG_NSH_READLINE=y
|
||||||
|
CONFIG_NUTTX_USERSPACE=0x80400000
|
||||||
|
CONFIG_PASS1_BUILDIR="boards/risc-v/qemu-rv/rv-virt/kernel"
|
||||||
|
CONFIG_PATH_INITIAL="/system/bin"
|
||||||
|
CONFIG_PRIORITY_INHERITANCE=y
|
||||||
|
CONFIG_RAM_SIZE=4194304
|
||||||
|
CONFIG_RAM_START=0x80000000
|
||||||
|
CONFIG_READLINE_CMD_HISTORY=y
|
||||||
|
CONFIG_RISCV_MEMCPY=y
|
||||||
|
CONFIG_RISCV_MEMSET=y
|
||||||
|
CONFIG_RISCV_SEMIHOSTING_HOSTFS=y
|
||||||
|
CONFIG_RISCV_STRCMP=y
|
||||||
|
CONFIG_RR_INTERVAL=200
|
||||||
|
CONFIG_SCHED_WAITPID=y
|
||||||
|
CONFIG_SERIAL_UART_ARCH_MMIO=y
|
||||||
|
CONFIG_STACK_COLORATION=y
|
||||||
|
CONFIG_START_MONTH=12
|
||||||
|
CONFIG_START_YEAR=2021
|
||||||
|
CONFIG_SYMTAB_ORDEREDBYNAME=y
|
||||||
|
CONFIG_SYSTEM_NSH=y
|
||||||
|
CONFIG_SYSTEM_NSH_STACKSIZE=3072
|
||||||
|
CONFIG_TESTING_GETPRIME=y
|
||||||
|
CONFIG_TESTING_OSTEST=y
|
||||||
|
CONFIG_USEC_PER_TICK=1000
|
||||||
104
boards/risc-v/qemu-rv/rv-virt/kernel/Makefile
Normal file
104
boards/risc-v/qemu-rv/rv-virt/kernel/Makefile
Normal file
@ -0,0 +1,104 @@
|
|||||||
|
############################################################################
|
||||||
|
# boards/risc-v/qemu-rv/rv-virt/kernel/Makefile
|
||||||
|
#
|
||||||
|
# Licensed to the Apache Software Foundation (ASF) under one or more
|
||||||
|
# contributor license agreements. See the NOTICE file distributed with
|
||||||
|
# this work for additional information regarding copyright ownership. The
|
||||||
|
# ASF licenses this file to you under the Apache License, Version 2.0 (the
|
||||||
|
# "License"); you may not use this file except in compliance with the
|
||||||
|
# License. You may obtain a copy of the License at
|
||||||
|
#
|
||||||
|
# http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
#
|
||||||
|
# Unless required by applicable law or agreed to in writing, software
|
||||||
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
||||||
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||||
|
# License for the specific language governing permissions and limitations
|
||||||
|
# under the License.
|
||||||
|
#
|
||||||
|
############################################################################
|
||||||
|
|
||||||
|
include $(TOPDIR)/Make.defs
|
||||||
|
|
||||||
|
# The entry point name (if none is provided in the .config file)
|
||||||
|
|
||||||
|
CONFIG_INIT_ENTRYPOINT ?= user_start
|
||||||
|
ENTRYPT = $(patsubst "%",%,$(CONFIG_INIT_ENTRYPOINT))
|
||||||
|
|
||||||
|
# The memory layout
|
||||||
|
|
||||||
|
MEM_LAYOUT = memory.ld
|
||||||
|
|
||||||
|
# Get the paths to the libraries and the links script path in format that
|
||||||
|
# is appropriate for the host OS
|
||||||
|
|
||||||
|
USER_LIBPATHS = $(addprefix -L,$(call CONVERT_PATH,$(addprefix $(TOPDIR)$(DELIM),$(dir $(USERLIBS)))))
|
||||||
|
USER_LDSCRIPT = -T $(call CONVERT_PATH,$(BOARD_DIR)$(DELIM)scripts$(DELIM)memory.ld)
|
||||||
|
USER_LDSCRIPT += -T $(call CONVERT_PATH,$(BOARD_DIR)$(DELIM)scripts$(DELIM)user-space.ld)
|
||||||
|
USER_HEXFILE += $(call CONVERT_PATH,$(TOPDIR)$(DELIM)nuttx_user.hex)
|
||||||
|
USER_SRECFILE += $(call CONVERT_PATH,$(TOPDIR)$(DELIM)nuttx_user.srec)
|
||||||
|
USER_BINFILE += $(call CONVERT_PATH,$(TOPDIR)$(DELIM)nuttx_user.bin)
|
||||||
|
|
||||||
|
USER_LDFLAGS = -melf64lriscv --undefined=$(ENTRYPT) --entry=$(ENTRYPT) $(USER_LDSCRIPT)
|
||||||
|
USER_LDLIBS = $(patsubst lib%,-l%,$(basename $(notdir $(USERLIBS))))
|
||||||
|
USER_LIBGCC = "${shell "$(CC)" $(ARCHCPUFLAGS) -print-libgcc-file-name}"
|
||||||
|
|
||||||
|
# Make a map, woo
|
||||||
|
USER_LDFLAGS += -Map=nuttx_user.map
|
||||||
|
|
||||||
|
# Source files
|
||||||
|
|
||||||
|
CSRCS = rv_virt_userspace.c
|
||||||
|
COBJS = $(CSRCS:.c=$(OBJEXT))
|
||||||
|
OBJS = $(COBJS)
|
||||||
|
|
||||||
|
# Targets:
|
||||||
|
|
||||||
|
all: $(TOPDIR)$(DELIM)nuttx_user.elf $(TOPDIR)$(DELIM)User.map $(TOPDIR)$(DELIM)nuttx_user.map
|
||||||
|
.PHONY: nuttx_user.elf depend clean distclean
|
||||||
|
|
||||||
|
$(COBJS): %$(OBJEXT): %.c
|
||||||
|
$(call COMPILE, $<, $@)
|
||||||
|
|
||||||
|
# Create the nuttx_user.elf file containing all of the user-mode code
|
||||||
|
|
||||||
|
nuttx_user.elf: $(OBJS)
|
||||||
|
$(Q) $(LD) -o $@ $(USER_LDFLAGS) $(USER_LIBPATHS) $(OBJS) --start-group $(USER_LDLIBS) --end-group $(USER_LIBGCC)
|
||||||
|
|
||||||
|
$(TOPDIR)$(DELIM)nuttx_user.elf: nuttx_user.elf
|
||||||
|
@echo "LD: nuttx_user.elf"
|
||||||
|
$(Q) cp -a nuttx_user.elf $(TOPDIR)$(DELIM)nuttx_user.elf
|
||||||
|
ifeq ($(CONFIG_INTELHEX_BINARY),y)
|
||||||
|
@echo "CP: nuttx_user.hex"
|
||||||
|
$(Q) $(OBJCOPY) $(OBJCOPYARGS) -O ihex nuttx_user.elf $(USER_HEXFILE)
|
||||||
|
endif
|
||||||
|
ifeq ($(CONFIG_MOTOROLA_SREC),y)
|
||||||
|
@echo "CP: nuttx_user.srec"
|
||||||
|
$(Q) $(OBJCOPY) $(OBJCOPYARGS) -O srec nuttx_user.elf $(USER_SRECFILE)
|
||||||
|
endif
|
||||||
|
ifeq ($(CONFIG_RAW_BINARY),y)
|
||||||
|
@echo "CP: nuttx_user.bin"
|
||||||
|
$(Q) $(OBJCOPY) $(OBJCOPYARGS) -O binary nuttx_user.elf $(USER_BINFILE)
|
||||||
|
endif
|
||||||
|
|
||||||
|
$(TOPDIR)$(DELIM)User.map: nuttx_user.elf
|
||||||
|
@echo "MK: User.map"
|
||||||
|
$(Q) $(NM) -n nuttx_user.elf >$(TOPDIR)$(DELIM)User.map
|
||||||
|
$(Q) $(CROSSDEV)size nuttx_user.elf
|
||||||
|
|
||||||
|
$(TOPDIR)$(DELIM)nuttx_user.map: nuttx_user.elf
|
||||||
|
@echo "CP: nuttx_user.map"
|
||||||
|
$(Q) cp -a nuttx_user.map $(TOPDIR)$(DELIM)nuttx_user.map
|
||||||
|
|
||||||
|
.depend:
|
||||||
|
|
||||||
|
depend: .depend
|
||||||
|
|
||||||
|
clean:
|
||||||
|
$(call DELFILE, nuttx_user.elf)
|
||||||
|
$(call DELFILE, nuttx_user.map)
|
||||||
|
$(call DELFILE, "$(TOPDIR)$(DELIM)nuttx_user.*")
|
||||||
|
$(call DELFILE, "$(TOPDIR)$(DELIM)User.map")
|
||||||
|
$(call CLEAN)
|
||||||
|
|
||||||
|
distclean: clean
|
||||||
100
boards/risc-v/qemu-rv/rv-virt/kernel/rv_virt_userspace.c
Normal file
100
boards/risc-v/qemu-rv/rv-virt/kernel/rv_virt_userspace.c
Normal file
@ -0,0 +1,100 @@
|
|||||||
|
/****************************************************************************
|
||||||
|
* boards/risc-v/qemu-rv/rv-virt/kernel/rv_virt_userspace.c
|
||||||
|
*
|
||||||
|
* Licensed to the Apache Software Foundation (ASF) under one or more
|
||||||
|
* contributor license agreements. See the NOTICE file distributed with
|
||||||
|
* this work for additional information regarding copyright ownership. The
|
||||||
|
* ASF licenses this file to you under the Apache License, Version 2.0 (the
|
||||||
|
* "License"); you may not use this file except in compliance with the
|
||||||
|
* License. You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
||||||
|
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||||
|
* License for the specific language governing permissions and limitations
|
||||||
|
* under the License.
|
||||||
|
*
|
||||||
|
****************************************************************************/
|
||||||
|
|
||||||
|
/****************************************************************************
|
||||||
|
* Included Files
|
||||||
|
****************************************************************************/
|
||||||
|
|
||||||
|
#include <nuttx/config.h>
|
||||||
|
|
||||||
|
#include <stdlib.h>
|
||||||
|
|
||||||
|
#include <nuttx/arch.h>
|
||||||
|
#include <nuttx/mm/mm.h>
|
||||||
|
#include <nuttx/wqueue.h>
|
||||||
|
#include <nuttx/userspace.h>
|
||||||
|
|
||||||
|
#if defined(CONFIG_BUILD_PROTECTED) && !defined(__KERNEL__)
|
||||||
|
|
||||||
|
/****************************************************************************
|
||||||
|
* Pre-processor Definitions
|
||||||
|
****************************************************************************/
|
||||||
|
|
||||||
|
/* Configuration ************************************************************/
|
||||||
|
|
||||||
|
#ifndef CONFIG_NUTTX_USERSPACE
|
||||||
|
# error "CONFIG_NUTTX_USERSPACE not defined"
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/****************************************************************************
|
||||||
|
* Public Data
|
||||||
|
****************************************************************************/
|
||||||
|
|
||||||
|
/* These 'addresses' of these values are setup by the linker script. */
|
||||||
|
|
||||||
|
extern uint8_t _stext[]; /* Start of .text */
|
||||||
|
extern uint8_t _etext[]; /* End_1 of .text + .rodata */
|
||||||
|
extern const uint8_t _eronly[]; /* End+1 of read only section (.text + .rodata) */
|
||||||
|
extern uint8_t _sdata[]; /* Start of .data */
|
||||||
|
extern uint8_t _edata[]; /* End+1 of .data */
|
||||||
|
extern uint8_t _sbss[]; /* Start of .bss */
|
||||||
|
extern uint8_t _ebss[]; /* End+1 of .bss */
|
||||||
|
|
||||||
|
extern uint8_t __ld_usram_end[]; /* End+1 of user ram section */
|
||||||
|
|
||||||
|
const struct userspace_s userspace locate_data(".userspace") =
|
||||||
|
{
|
||||||
|
/* General memory map */
|
||||||
|
|
||||||
|
.us_entrypoint = CONFIG_INIT_ENTRYPOINT,
|
||||||
|
.us_textstart = (uintptr_t)_stext,
|
||||||
|
.us_textend = (uintptr_t)_etext,
|
||||||
|
.us_datasource = (uintptr_t)_eronly,
|
||||||
|
.us_datastart = (uintptr_t)_sdata,
|
||||||
|
.us_dataend = (uintptr_t)_edata,
|
||||||
|
.us_bssstart = (uintptr_t)_sbss,
|
||||||
|
.us_bssend = (uintptr_t)_ebss,
|
||||||
|
|
||||||
|
.us_heapend = (uintptr_t)__ld_usram_end,
|
||||||
|
|
||||||
|
/* Memory manager heap structure */
|
||||||
|
|
||||||
|
.us_heap = &g_mmheap,
|
||||||
|
|
||||||
|
/* Task/thread startup routines */
|
||||||
|
|
||||||
|
.task_startup = nxtask_startup,
|
||||||
|
|
||||||
|
/* Signal handler trampoline */
|
||||||
|
|
||||||
|
.signal_handler = up_signal_handler,
|
||||||
|
|
||||||
|
/* User-space work queue support (declared in include/nuttx/wqueue.h) */
|
||||||
|
|
||||||
|
#ifdef CONFIG_LIBC_USRWORK
|
||||||
|
.work_usrstart = work_usrstart,
|
||||||
|
#endif
|
||||||
|
};
|
||||||
|
|
||||||
|
/****************************************************************************
|
||||||
|
* Public Functions
|
||||||
|
****************************************************************************/
|
||||||
|
|
||||||
|
#endif /* CONFIG_BUILD_PROTECTED && !__KERNEL__ */
|
||||||
@ -29,9 +29,17 @@ ifeq ($(CONFIG_BUILD_KERNEL),y)
|
|||||||
ifeq ($(CONFIG_NUTTSBI),y)
|
ifeq ($(CONFIG_NUTTSBI),y)
|
||||||
LDSCRIPT = ld-nuttsbi.script
|
LDSCRIPT = ld-nuttsbi.script
|
||||||
endif
|
endif
|
||||||
|
else ifeq ($(CONFIG_BUILD_PROTECTED),y)
|
||||||
|
LDMEMORY = memory.ld
|
||||||
|
LDSCRIPT = kernel-space.ld
|
||||||
|
else
|
||||||
|
LDSCRIPT = ld.script
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
ifneq ($(LDMEMORY),)
|
||||||
|
ARCHSCRIPT += $(BOARD_DIR)$(DELIM)scripts$(DELIM)$(LDMEMORY)
|
||||||
|
endif
|
||||||
ARCHSCRIPT += $(BOARD_DIR)$(DELIM)scripts$(DELIM)$(LDSCRIPT)
|
ARCHSCRIPT += $(BOARD_DIR)$(DELIM)scripts$(DELIM)$(LDSCRIPT)
|
||||||
ARCHPICFLAGS = -fpic -msingle-pic-base
|
ARCHPICFLAGS = -fpic -msingle-pic-base
|
||||||
|
|
||||||
|
|||||||
109
boards/risc-v/qemu-rv/rv-virt/scripts/kernel-space.ld
Normal file
109
boards/risc-v/qemu-rv/rv-virt/scripts/kernel-space.ld
Normal file
@ -0,0 +1,109 @@
|
|||||||
|
/****************************************************************************
|
||||||
|
* boards/risc-v/qemu-rv/rv-virt/scripts/kernel-space.ld
|
||||||
|
*
|
||||||
|
* Licensed to the Apache Software Foundation (ASF) under one or more
|
||||||
|
* contributor license agreements. See the NOTICE file distributed with
|
||||||
|
* this work for additional information regarding copyright ownership. The
|
||||||
|
* ASF licenses this file to you under the Apache License, Version 2.0 (the
|
||||||
|
* "License"); you may not use this file except in compliance with the
|
||||||
|
* License. You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
||||||
|
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||||
|
* License for the specific language governing permissions and limitations
|
||||||
|
* under the License.
|
||||||
|
*
|
||||||
|
****************************************************************************/
|
||||||
|
|
||||||
|
/* NOTE: This depends on the memory.ld script having been included prior to
|
||||||
|
* this script.
|
||||||
|
*/
|
||||||
|
|
||||||
|
OUTPUT_ARCH("riscv")
|
||||||
|
|
||||||
|
/* Provide these so there is no need for using config files for this */
|
||||||
|
|
||||||
|
__uflash_start = ORIGIN(uflash);
|
||||||
|
__uflash_size = LENGTH(uflash);
|
||||||
|
__usram_start = ORIGIN(usram);
|
||||||
|
__usram_size = LENGTH(usram);
|
||||||
|
|
||||||
|
/* Provide the kernel boundaries as well */
|
||||||
|
|
||||||
|
__kflash_start = ORIGIN(kflash);
|
||||||
|
__kflash_size = LENGTH(kflash);
|
||||||
|
__ksram_start = ORIGIN(ksram);
|
||||||
|
__ksram_size = LENGTH(ksram);
|
||||||
|
__ksram_end = ORIGIN(ksram) + LENGTH(ksram);
|
||||||
|
|
||||||
|
ENTRY(_stext)
|
||||||
|
EXTERN(__start)
|
||||||
|
SECTIONS
|
||||||
|
{
|
||||||
|
.text : {
|
||||||
|
_stext = ABSOLUTE(.);
|
||||||
|
*(.start .start.*)
|
||||||
|
*(.text .text.*)
|
||||||
|
*(.fixup)
|
||||||
|
*(.gnu.warning)
|
||||||
|
*(.rodata .rodata.* .srodata .srodata.*)
|
||||||
|
*(.gnu.linkonce.t.*)
|
||||||
|
*(.glue_7)
|
||||||
|
*(.glue_7t)
|
||||||
|
*(.got)
|
||||||
|
*(.gcc_except_table)
|
||||||
|
*(.gnu.linkonce.r.*)
|
||||||
|
_etext = ABSOLUTE(.);
|
||||||
|
} > kflash
|
||||||
|
|
||||||
|
.init_section : ALIGN(4) {
|
||||||
|
_sinit = ABSOLUTE(.);
|
||||||
|
KEEP(*(SORT_BY_INIT_PRIORITY(.init_array.*) SORT_BY_INIT_PRIORITY(.ctors.*)))
|
||||||
|
KEEP(*(.init_array .ctors))
|
||||||
|
_einit = ABSOLUTE(.);
|
||||||
|
} > kflash
|
||||||
|
|
||||||
|
_eronly = ABSOLUTE(.);
|
||||||
|
|
||||||
|
.data : ALIGN(4) {
|
||||||
|
_sdata = ABSOLUTE(.);
|
||||||
|
*(.data .data.*)
|
||||||
|
*(.sdata .sdata.* .sdata2.*)
|
||||||
|
*(.gnu.linkonce.d.*)
|
||||||
|
*(.gnu.linkonce.s.*)
|
||||||
|
CONSTRUCTORS
|
||||||
|
. = ALIGN(4);
|
||||||
|
_edata = ABSOLUTE(.);
|
||||||
|
} > kflash
|
||||||
|
|
||||||
|
PROVIDE(__global_pointer$ = _sdata + ((_edata - _sdata) / 2));
|
||||||
|
|
||||||
|
.bss : ALIGN(4) {
|
||||||
|
_sbss = ABSOLUTE(.);
|
||||||
|
*(.bss .bss.*)
|
||||||
|
*(.sbss .sbss.*)
|
||||||
|
*(.gnu.linkonce.b.*)
|
||||||
|
*(.gnu.linkonce.sb.*)
|
||||||
|
*(COMMON)
|
||||||
|
. = ALIGN(4);
|
||||||
|
_ebss = ABSOLUTE(.);
|
||||||
|
} > ksram
|
||||||
|
|
||||||
|
/* Stabs debugging sections. */
|
||||||
|
|
||||||
|
.stab 0 : { *(.stab) }
|
||||||
|
.stabstr 0 : { *(.stabstr) }
|
||||||
|
.stab.excl 0 : { *(.stab.excl) }
|
||||||
|
.stab.exclstr 0 : { *(.stab.exclstr) }
|
||||||
|
.stab.index 0 : { *(.stab.index) }
|
||||||
|
.stab.indexstr 0 : { *(.stab.indexstr) }
|
||||||
|
.comment 0 : { *(.comment) }
|
||||||
|
.debug_abbrev 0 : { *(.debug_abbrev) }
|
||||||
|
.debug_info 0 : { *(.debug_info) }
|
||||||
|
.debug_line 0 : { *(.debug_line) }
|
||||||
|
.debug_pubnames 0 : { *(.debug_pubnames) }
|
||||||
|
.debug_aranges 0 : { *(.debug_aranges) }
|
||||||
|
}
|
||||||
28
boards/risc-v/qemu-rv/rv-virt/scripts/memory.ld
Normal file
28
boards/risc-v/qemu-rv/rv-virt/scripts/memory.ld
Normal file
@ -0,0 +1,28 @@
|
|||||||
|
/****************************************************************************
|
||||||
|
* boards/risc-v/qemu-rv/rv-virt/scripts/memory.ld
|
||||||
|
*
|
||||||
|
* Licensed to the Apache Software Foundation (ASF) under one or more
|
||||||
|
* contributor license agreements. See the NOTICE file distributed with
|
||||||
|
* this work for additional information regarding copyright ownership. The
|
||||||
|
* ASF licenses this file to you under the Apache License, Version 2.0 (the
|
||||||
|
* "License"); you may not use this file except in compliance with the
|
||||||
|
* License. You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
||||||
|
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||||
|
* License for the specific language governing permissions and limitations
|
||||||
|
* under the License.
|
||||||
|
*
|
||||||
|
****************************************************************************/
|
||||||
|
|
||||||
|
MEMORY
|
||||||
|
{
|
||||||
|
kflash (rx) : ORIGIN = 0x80000000, LENGTH = 2M /* w/ cache */
|
||||||
|
ksram (rx) : ORIGIN = 0x80200000, LENGTH = 2M /* w/ cache */
|
||||||
|
|
||||||
|
uflash (rx) : ORIGIN = 0x80400000, LENGTH = 4M /* w/ cache */
|
||||||
|
usram (rwx) : ORIGIN = 0x80800000, LENGTH = 4M /* w/ cache */
|
||||||
|
}
|
||||||
105
boards/risc-v/qemu-rv/rv-virt/scripts/user-space.ld
Normal file
105
boards/risc-v/qemu-rv/rv-virt/scripts/user-space.ld
Normal file
@ -0,0 +1,105 @@
|
|||||||
|
/****************************************************************************
|
||||||
|
* boards/risc-v/qemu-rv/rv-virt/scripts/user-space.ld
|
||||||
|
*
|
||||||
|
* Licensed to the Apache Software Foundation (ASF) under one or more
|
||||||
|
* contributor license agreements. See the NOTICE file distributed with
|
||||||
|
* this work for additional information regarding copyright ownership. The
|
||||||
|
* ASF licenses this file to you under the Apache License, Version 2.0 (the
|
||||||
|
* "License"); you may not use this file except in compliance with the
|
||||||
|
* License. You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
||||||
|
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||||
|
* License for the specific language governing permissions and limitations
|
||||||
|
* under the License.
|
||||||
|
*
|
||||||
|
****************************************************************************/
|
||||||
|
|
||||||
|
/* NOTE: This depends on the memory.ld script having been included prior to
|
||||||
|
* this script.
|
||||||
|
*/
|
||||||
|
|
||||||
|
OUTPUT_ARCH("riscv")
|
||||||
|
|
||||||
|
SECTIONS
|
||||||
|
{
|
||||||
|
/* section info */
|
||||||
|
|
||||||
|
__ld_uflash_start = ORIGIN(uflash);
|
||||||
|
__ld_uflash_end = ORIGIN(uflash)+ LENGTH(uflash);
|
||||||
|
__ld_uflash_size = LENGTH(uflash);
|
||||||
|
|
||||||
|
__ld_usram_start = ORIGIN(usram);
|
||||||
|
__ld_usram_end = ORIGIN(usram)+ LENGTH(usram);
|
||||||
|
__ld_usram_size = LENGTH(usram);
|
||||||
|
|
||||||
|
.userspace : {
|
||||||
|
*(.userspace)
|
||||||
|
} > uflash
|
||||||
|
|
||||||
|
.text : {
|
||||||
|
_stext = ABSOLUTE(.);
|
||||||
|
*(.text .text.*)
|
||||||
|
*(.fixup)
|
||||||
|
*(.gnu.warning)
|
||||||
|
*(.rodata .rodata.* .srodata .srodata.*)
|
||||||
|
*(.gnu.linkonce.t.*)
|
||||||
|
*(.glue_7)
|
||||||
|
*(.glue_7t)
|
||||||
|
*(.got)
|
||||||
|
*(.gcc_except_table)
|
||||||
|
*(.gnu.linkonce.r.*)
|
||||||
|
_etext = ABSOLUTE(.);
|
||||||
|
} > uflash
|
||||||
|
|
||||||
|
.init_section : {
|
||||||
|
_sinit = ABSOLUTE(.);
|
||||||
|
KEEP(*(SORT_BY_INIT_PRIORITY(.init_array.*) SORT_BY_INIT_PRIORITY(.ctors.*)))
|
||||||
|
KEEP(*(.init_array .ctors))
|
||||||
|
_einit = ABSOLUTE(.);
|
||||||
|
} > uflash
|
||||||
|
|
||||||
|
__exidx_start = ABSOLUTE(.);
|
||||||
|
|
||||||
|
__exidx_end = ABSOLUTE(.);
|
||||||
|
|
||||||
|
_eronly = ABSOLUTE(.);
|
||||||
|
|
||||||
|
.data : {
|
||||||
|
_sdata = ABSOLUTE(.);
|
||||||
|
*(.data .data.*)
|
||||||
|
*(.sdata .sdata.* .sdata2.*)
|
||||||
|
*(.gnu.linkonce.d.*)
|
||||||
|
CONSTRUCTORS
|
||||||
|
. = ALIGN(4);
|
||||||
|
_edata = ABSOLUTE(.);
|
||||||
|
} > usram AT > uflash
|
||||||
|
|
||||||
|
.bss : {
|
||||||
|
_sbss = ABSOLUTE(.);
|
||||||
|
*(.bss .bss.*)
|
||||||
|
*(.sbss .sbss.*)
|
||||||
|
*(.gnu.linkonce.b.*)
|
||||||
|
*(COMMON)
|
||||||
|
. = ALIGN(4);
|
||||||
|
_ebss = ABSOLUTE(.);
|
||||||
|
} > usram
|
||||||
|
|
||||||
|
/* Stabs debugging sections */
|
||||||
|
|
||||||
|
.stab 0 : { *(.stab) }
|
||||||
|
.stabstr 0 : { *(.stabstr) }
|
||||||
|
.stab.excl 0 : { *(.stab.excl) }
|
||||||
|
.stab.exclstr 0 : { *(.stab.exclstr) }
|
||||||
|
.stab.index 0 : { *(.stab.index) }
|
||||||
|
.stab.indexstr 0 : { *(.stab.indexstr) }
|
||||||
|
.comment 0 : { *(.comment) }
|
||||||
|
.debug_abbrev 0 : { *(.debug_abbrev) }
|
||||||
|
.debug_info 0 : { *(.debug_info) }
|
||||||
|
.debug_line 0 : { *(.debug_line) }
|
||||||
|
.debug_pubnames 0 : { *(.debug_pubnames) }
|
||||||
|
.debug_aranges 0 : { *(.debug_aranges) }
|
||||||
|
}
|
||||||
Loading…
Reference in New Issue
Block a user