sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
1aab457b4c
nuttx/boards/risc-v/k230/canmv230/scripts/Make.defs

85 lines
2.7 KiB
Plaintext
Raw Normal View History

risc-v: Initial support for CanMV-k230 board and K230 chip The code is mainly derived from the NuttX qemu-rv/rv-virt codebase. Major changes: - boards/Kconfig: add new BOARD_K230_CANMV - arch/risc-v/Kconfig: add new CHIP_K230 chip and ARCH_RV_MMIO_BITS - arch/risc-v/src/common/riscv_mtimer.c: use ARCH_RV_MMIO_BITS to select MMIO access width New additions: - arch/risc-v/include/k230/: k230 SoC definitions - arch/risc-v/src/k230/: k230 SoC sources - boards/risc-v/k230/canmv230/: CanMV-K230 board sources and configs - Documentation/platforms/risc-v/k230/: simple doc Note that only FLAT build works for canmv230 now. This PR has changes in RiscV common layer thus may affect other RiscV ports It changes the mtime/mtimecmp access control from using config ARCH_RV64 to newly intorduced config ARCH_RV_MMIO_BITS. Original design uses ARCH_RV64 to select 64bit MMIO in riscv_mtimer.c, this can't cope with the situation with K230 --- it has ARCH_RV64 but only can do 32bit MMIO. So a new ARCH_RV_MMIO_BITS config has been introduced. Its value depicts the MMIO width in bits. The MMIO_BITS defaults to 32/64 for RV32/ RV64 respectively. This allows the macro to replace current use of ARCH_RV64 in riscv_mtimer.c. The new MMIO_BITS config is a derived one, and for RiscV chips with equal CPU and MMIO widths there is no need to explicitly set it as the default rule will do that. Only chips with different CPU and MMIO widths need set it in Kconfig. So by design this change should be safe but RiscV ports should be checked. "ostest" verification has been done for: - canmv230/nsh - rv-vivt/nsh - rv-virt/nsh64 configuration generation and manual check of derived RV_MMIO_BITS has been done for: - star64/nsh - arty_a7/nsh - bl602evb/nsh Signed-off-by: Yanfeng Liu <yfliu2008@qq.com>
2023-12-13 03:59:21 +01:00
############################################################################
# boards/risc-v/k230/canmv230/scripts/Make.defs
#
# 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)/.config
include $(TOPDIR)/tools/Config.mk
include $(TOPDIR)/arch/risc-v/src/common/Toolchain.defs
ifeq ($(CONFIG_ARCH_CHIP_K230),y)
risc-v/k230: add NUTTSBI based kernel build support Previously k230 kernel build needs OpenSBI wrapping for use on target, thus leading to larger program and memory overheads. This patch adds alternative small overhead kernel build support. Changes: - in arch/risc-v/src/k230: - k230_head.S entrance renamed for sake of NUTTSBI - k230_irq.c add M-mode handling for NUTTSBI case - k230_mm_init.c add L3 table for smaller RAM case - hardware/k230_plic.h add PLIC_CTRL definition - Make.defs use CHIP_ASRCS to fix entrance selection - in boards/risc-v/canmv230/scripts: - Make.defs add support for NUTTSBI case Additions: - in boards/riscv/canmv230/: - scripts/ld-nuttsbi.script link script for NUTTSBI case - configs/nsbi/defconfig config for NUTTSBI case The artifact nuttx.bin from this configuration can be used directly on target as OpenSBI wrapping is not needed. Signed-off-by: Yanfeng Liu <yfliu2008@qq.com> fix typo
2024-01-17 08:19:50 +01:00
ifeq ($(CONFIG_NUTTSBI),y)
riscv/k230: drop ld-rptun.script This drops the ld-rptun.script as the it can be replaced by ld-nuttsbi.script now. Signed-off-by: Yanfeng Liu <yfliu2008@qq.com>
2024-07-22 07:30:02 +02:00
LDSCRIPT = ld-nuttsbi.script
else ifeq ($(CONFIG_BUILD_KERNEL),y)
risc-v: Initial support for CanMV-k230 board and K230 chip The code is mainly derived from the NuttX qemu-rv/rv-virt codebase. Major changes: - boards/Kconfig: add new BOARD_K230_CANMV - arch/risc-v/Kconfig: add new CHIP_K230 chip and ARCH_RV_MMIO_BITS - arch/risc-v/src/common/riscv_mtimer.c: use ARCH_RV_MMIO_BITS to select MMIO access width New additions: - arch/risc-v/include/k230/: k230 SoC definitions - arch/risc-v/src/k230/: k230 SoC sources - boards/risc-v/k230/canmv230/: CanMV-K230 board sources and configs - Documentation/platforms/risc-v/k230/: simple doc Note that only FLAT build works for canmv230 now. This PR has changes in RiscV common layer thus may affect other RiscV ports It changes the mtime/mtimecmp access control from using config ARCH_RV64 to newly intorduced config ARCH_RV_MMIO_BITS. Original design uses ARCH_RV64 to select 64bit MMIO in riscv_mtimer.c, this can't cope with the situation with K230 --- it has ARCH_RV64 but only can do 32bit MMIO. So a new ARCH_RV_MMIO_BITS config has been introduced. Its value depicts the MMIO width in bits. The MMIO_BITS defaults to 32/64 for RV32/ RV64 respectively. This allows the macro to replace current use of ARCH_RV64 in riscv_mtimer.c. The new MMIO_BITS config is a derived one, and for RiscV chips with equal CPU and MMIO widths there is no need to explicitly set it as the default rule will do that. Only chips with different CPU and MMIO widths need set it in Kconfig. So by design this change should be safe but RiscV ports should be checked. "ostest" verification has been done for: - canmv230/nsh - rv-vivt/nsh - rv-virt/nsh64 configuration generation and manual check of derived RV_MMIO_BITS has been done for: - star64/nsh - arty_a7/nsh - bl602evb/nsh Signed-off-by: Yanfeng Liu <yfliu2008@qq.com>
2023-12-13 03:59:21 +01:00
LDSCRIPT = ld-kernel.script
risc-v/canmv230: add PROTECTED build support Additions: - In arch/risc-v/src/k230/ - k230_userspace.c add user space initialization - k230_userspace.h headers for user space initialization - In boards/risc-v/k230/canmv230/kernel/ - k230_userspace.c userspace_s const data definition - Makefile pass1 Makefile - In boards/risc-v/k230/canmv230/scripts/ - ld-protected.script linker script for protected build kernel - ld-userland.script linker script for protected build userspace - In boards/risc-v/k230/canmv230/configs - pnsh/defconfig defconfig for protected build Changes: - In arch/risc-v/src/k230/ - k230_start.c add protected build handling logic - Make.defs add protected build support - In boards/risc-v/k230/canmv230/scripts/ - Make.defs add protected build support - In Documentation/platforms/risc-v/k230/boards/canmv230/ - index.rst add protected build usage Signed-off-by: Yanfeng Liu <yfliu2008@qq.com>
2024-01-08 07:33:53 +01:00
else ifeq ($(CONFIG_BUILD_PROTECTED),y)
LDSCRIPT = ld-protected.script
risc-v: Initial support for CanMV-k230 board and K230 chip The code is mainly derived from the NuttX qemu-rv/rv-virt codebase. Major changes: - boards/Kconfig: add new BOARD_K230_CANMV - arch/risc-v/Kconfig: add new CHIP_K230 chip and ARCH_RV_MMIO_BITS - arch/risc-v/src/common/riscv_mtimer.c: use ARCH_RV_MMIO_BITS to select MMIO access width New additions: - arch/risc-v/include/k230/: k230 SoC definitions - arch/risc-v/src/k230/: k230 SoC sources - boards/risc-v/k230/canmv230/: CanMV-K230 board sources and configs - Documentation/platforms/risc-v/k230/: simple doc Note that only FLAT build works for canmv230 now. This PR has changes in RiscV common layer thus may affect other RiscV ports It changes the mtime/mtimecmp access control from using config ARCH_RV64 to newly intorduced config ARCH_RV_MMIO_BITS. Original design uses ARCH_RV64 to select 64bit MMIO in riscv_mtimer.c, this can't cope with the situation with K230 --- it has ARCH_RV64 but only can do 32bit MMIO. So a new ARCH_RV_MMIO_BITS config has been introduced. Its value depicts the MMIO width in bits. The MMIO_BITS defaults to 32/64 for RV32/ RV64 respectively. This allows the macro to replace current use of ARCH_RV64 in riscv_mtimer.c. The new MMIO_BITS config is a derived one, and for RiscV chips with equal CPU and MMIO widths there is no need to explicitly set it as the default rule will do that. Only chips with different CPU and MMIO widths need set it in Kconfig. So by design this change should be safe but RiscV ports should be checked. "ostest" verification has been done for: - canmv230/nsh - rv-vivt/nsh - rv-virt/nsh64 configuration generation and manual check of derived RV_MMIO_BITS has been done for: - star64/nsh - arty_a7/nsh - bl602evb/nsh Signed-off-by: Yanfeng Liu <yfliu2008@qq.com>
2023-12-13 03:59:21 +01:00
else
LDSCRIPT = ld-flat.script
endif
endif
ARCHSCRIPT += $(BOARD_DIR)$(DELIM)scripts$(DELIM)$(LDSCRIPT)
ARCHPICFLAGS = -fpic -msingle-pic-base
CFLAGS := $(ARCHCFLAGS) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRAFLAGS) -pipe
CPICFLAGS = $(ARCHPICFLAGS) $(CFLAGS)
CXXFLAGS := $(ARCHCXXFLAGS) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(ARCHXXINCLUDES) $(ARCHDEFINES) $(EXTRAFLAGS) -pipe
CXXPICFLAGS = $(ARCHPICFLAGS) $(CXXFLAGS)
CPPFLAGS := $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRAFLAGS)
AFLAGS += $(CFLAGS) -D__ASSEMBLY__
# ELF module definitions
CELFFLAGS = $(CFLAGS)
CXXELFFLAGS = $(CXXFLAGS)
LDELFFLAGS = --oformat elf64-littleriscv
risc-v/canmv230: enable fully linked apps for kernel build Previously apps in kernel build are partially linked, thus are big and inefficient. This enables full link for kernel mode apps to reduce size and speed up loading. Changes: - arch/risc-v/Kconfig select HAVE_ELF_EXECUTABLE for K230 - boards/../scripts/Make.defs adjust LDELFLAGS - boards/../knsh/defconfig enable BINFMT_ELF_EXECUTABLE Additions: - boards/../scripts/gnu-elf.ld apps linker script Signed-off-by: Yanfeng Liu <yfliu2008@qq.com>
2024-01-09 13:29:38 +01:00
ifeq ($(CONFIG_BINFMT_ELF_RELOCATABLE),y)
LDELFFLAGS += -r
endif
risc-v/k230: revise CanMV230 kernel build support changes: - under boards/risc-v/k230/canmv230/scripts/: - Make.defs add POSTBUILD actions - ld-flat.script minor reformating - ld-kernel.script minor reformating - under boards/risc-v/k230/canmv230/src/: - Makefile add clean of generated ROMFS source - canmv_init.c use `ferr` and drop too late runtime warning - romfs_stub.c use const for romfs_img_len The POSTBULD actions can warn stub ROMFS usage at build time, thus the too late warning in canmv_init.c can be removed. The cleaning of `libboard.a` in POSTBUILD can also ensure real ROMFS is in use, as some times weak_data is still in use. Signed-off-by: Yanfeng Liu <yfliu2008@qq.com>
2024-01-05 05:44:57 +01:00
# POSTBUILD management
risc-v/k230: add NUTTSBI based kernel build support Previously k230 kernel build needs OpenSBI wrapping for use on target, thus leading to larger program and memory overheads. This patch adds alternative small overhead kernel build support. Changes: - in arch/risc-v/src/k230: - k230_head.S entrance renamed for sake of NUTTSBI - k230_irq.c add M-mode handling for NUTTSBI case - k230_mm_init.c add L3 table for smaller RAM case - hardware/k230_plic.h add PLIC_CTRL definition - Make.defs use CHIP_ASRCS to fix entrance selection - in boards/risc-v/canmv230/scripts: - Make.defs add support for NUTTSBI case Additions: - in boards/riscv/canmv230/: - scripts/ld-nuttsbi.script link script for NUTTSBI case - configs/nsbi/defconfig config for NUTTSBI case The artifact nuttx.bin from this configuration can be used directly on target as OpenSBI wrapping is not needed. Signed-off-by: Yanfeng Liu <yfliu2008@qq.com> fix typo
2024-01-17 08:19:50 +01:00
# KERNEL builds need real ROMFS and even OpenSBI wrapping
risc-v/canmv230: add PROTECTED build support Additions: - In arch/risc-v/src/k230/ - k230_userspace.c add user space initialization - k230_userspace.h headers for user space initialization - In boards/risc-v/k230/canmv230/kernel/ - k230_userspace.c userspace_s const data definition - Makefile pass1 Makefile - In boards/risc-v/k230/canmv230/scripts/ - ld-protected.script linker script for protected build kernel - ld-userland.script linker script for protected build userspace - In boards/risc-v/k230/canmv230/configs - pnsh/defconfig defconfig for protected build Changes: - In arch/risc-v/src/k230/ - k230_start.c add protected build handling logic - Make.defs add protected build support - In boards/risc-v/k230/canmv230/scripts/ - Make.defs add protected build support - In Documentation/platforms/risc-v/k230/boards/canmv230/ - index.rst add protected build usage Signed-off-by: Yanfeng Liu <yfliu2008@qq.com>
2024-01-08 07:33:53 +01:00
risc-v/k230: revise CanMV230 kernel build support changes: - under boards/risc-v/k230/canmv230/scripts/: - Make.defs add POSTBUILD actions - ld-flat.script minor reformating - ld-kernel.script minor reformating - under boards/risc-v/k230/canmv230/src/: - Makefile add clean of generated ROMFS source - canmv_init.c use `ferr` and drop too late runtime warning - romfs_stub.c use const for romfs_img_len The POSTBULD actions can warn stub ROMFS usage at build time, thus the too late warning in canmv_init.c can be removed. The cleaning of `libboard.a` in POSTBUILD can also ensure real ROMFS is in use, as some times weak_data is still in use. Signed-off-by: Yanfeng Liu <yfliu2008@qq.com>
2024-01-05 05:44:57 +01:00
ifeq ($(CONFIG_BUILD_KERNEL),y)
ifeq ($(wildcard $(BOARD_DIR)$(DELIM)src$(DELIM)romfs_boot.c),)
define POSTBUILD
risc-v/k230: add NUTTSBI based kernel build support Previously k230 kernel build needs OpenSBI wrapping for use on target, thus leading to larger program and memory overheads. This patch adds alternative small overhead kernel build support. Changes: - in arch/risc-v/src/k230: - k230_head.S entrance renamed for sake of NUTTSBI - k230_irq.c add M-mode handling for NUTTSBI case - k230_mm_init.c add L3 table for smaller RAM case - hardware/k230_plic.h add PLIC_CTRL definition - Make.defs use CHIP_ASRCS to fix entrance selection - in boards/risc-v/canmv230/scripts: - Make.defs add support for NUTTSBI case Additions: - in boards/riscv/canmv230/: - scripts/ld-nuttsbi.script link script for NUTTSBI case - configs/nsbi/defconfig config for NUTTSBI case The artifact nuttx.bin from this configuration can be used directly on target as OpenSBI wrapping is not needed. Signed-off-by: Yanfeng Liu <yfliu2008@qq.com> fix typo
2024-01-17 08:19:50 +01:00
$(Q) echo "Please replace stub ROMFS with real one."
risc-v/k230: revise CanMV230 kernel build support changes: - under boards/risc-v/k230/canmv230/scripts/: - Make.defs add POSTBUILD actions - ld-flat.script minor reformating - ld-kernel.script minor reformating - under boards/risc-v/k230/canmv230/src/: - Makefile add clean of generated ROMFS source - canmv_init.c use `ferr` and drop too late runtime warning - romfs_stub.c use const for romfs_img_len The POSTBULD actions can warn stub ROMFS usage at build time, thus the too late warning in canmv_init.c can be removed. The cleaning of `libboard.a` in POSTBUILD can also ensure real ROMFS is in use, as some times weak_data is still in use. Signed-off-by: Yanfeng Liu <yfliu2008@qq.com>
2024-01-05 05:44:57 +01:00
$(Q) rm $(BOARD_DIR)$(DELIM)src$(DELIM)libboard.a
endef
risc-v/k230: add NUTTSBI based kernel build support Previously k230 kernel build needs OpenSBI wrapping for use on target, thus leading to larger program and memory overheads. This patch adds alternative small overhead kernel build support. Changes: - in arch/risc-v/src/k230: - k230_head.S entrance renamed for sake of NUTTSBI - k230_irq.c add M-mode handling for NUTTSBI case - k230_mm_init.c add L3 table for smaller RAM case - hardware/k230_plic.h add PLIC_CTRL definition - Make.defs use CHIP_ASRCS to fix entrance selection - in boards/risc-v/canmv230/scripts: - Make.defs add support for NUTTSBI case Additions: - in boards/riscv/canmv230/: - scripts/ld-nuttsbi.script link script for NUTTSBI case - configs/nsbi/defconfig config for NUTTSBI case The artifact nuttx.bin from this configuration can be used directly on target as OpenSBI wrapping is not needed. Signed-off-by: Yanfeng Liu <yfliu2008@qq.com> fix typo
2024-01-17 08:19:50 +01:00
else ifneq ($(CONFIG_NUTTSBI),y)
define POSTBUILD
$(Q) echo "Please wrap nuttx.bin with OpenSBI to run on target."
endef
risc-v/k230: revise CanMV230 kernel build support changes: - under boards/risc-v/k230/canmv230/scripts/: - Make.defs add POSTBUILD actions - ld-flat.script minor reformating - ld-kernel.script minor reformating - under boards/risc-v/k230/canmv230/src/: - Makefile add clean of generated ROMFS source - canmv_init.c use `ferr` and drop too late runtime warning - romfs_stub.c use const for romfs_img_len The POSTBULD actions can warn stub ROMFS usage at build time, thus the too late warning in canmv_init.c can be removed. The cleaning of `libboard.a` in POSTBUILD can also ensure real ROMFS is in use, as some times weak_data is still in use. Signed-off-by: Yanfeng Liu <yfliu2008@qq.com>
2024-01-05 05:44:57 +01:00
else
define POSTBUILD
risc-v/k230: add NUTTSBI based kernel build support Previously k230 kernel build needs OpenSBI wrapping for use on target, thus leading to larger program and memory overheads. This patch adds alternative small overhead kernel build support. Changes: - in arch/risc-v/src/k230: - k230_head.S entrance renamed for sake of NUTTSBI - k230_irq.c add M-mode handling for NUTTSBI case - k230_mm_init.c add L3 table for smaller RAM case - hardware/k230_plic.h add PLIC_CTRL definition - Make.defs use CHIP_ASRCS to fix entrance selection - in boards/risc-v/canmv230/scripts: - Make.defs add support for NUTTSBI case Additions: - in boards/riscv/canmv230/: - scripts/ld-nuttsbi.script link script for NUTTSBI case - configs/nsbi/defconfig config for NUTTSBI case The artifact nuttx.bin from this configuration can be used directly on target as OpenSBI wrapping is not needed. Signed-off-by: Yanfeng Liu <yfliu2008@qq.com> fix typo
2024-01-17 08:19:50 +01:00
$(Q) echo "Please try nuttx.bin on target."
risc-v/k230: revise CanMV230 kernel build support changes: - under boards/risc-v/k230/canmv230/scripts/: - Make.defs add POSTBUILD actions - ld-flat.script minor reformating - ld-kernel.script minor reformating - under boards/risc-v/k230/canmv230/src/: - Makefile add clean of generated ROMFS source - canmv_init.c use `ferr` and drop too late runtime warning - romfs_stub.c use const for romfs_img_len The POSTBULD actions can warn stub ROMFS usage at build time, thus the too late warning in canmv_init.c can be removed. The cleaning of `libboard.a` in POSTBUILD can also ensure real ROMFS is in use, as some times weak_data is still in use. Signed-off-by: Yanfeng Liu <yfliu2008@qq.com>
2024-01-05 05:44:57 +01:00
endef
endif
endif
risc-v/canmv230: add PROTECTED build support Additions: - In arch/risc-v/src/k230/ - k230_userspace.c add user space initialization - k230_userspace.h headers for user space initialization - In boards/risc-v/k230/canmv230/kernel/ - k230_userspace.c userspace_s const data definition - Makefile pass1 Makefile - In boards/risc-v/k230/canmv230/scripts/ - ld-protected.script linker script for protected build kernel - ld-userland.script linker script for protected build userspace - In boards/risc-v/k230/canmv230/configs - pnsh/defconfig defconfig for protected build Changes: - In arch/risc-v/src/k230/ - k230_start.c add protected build handling logic - Make.defs add protected build support - In boards/risc-v/k230/canmv230/scripts/ - Make.defs add protected build support - In Documentation/platforms/risc-v/k230/boards/canmv230/ - index.rst add protected build usage Signed-off-by: Yanfeng Liu <yfliu2008@qq.com>
2024-01-08 07:33:53 +01:00
# PROTECTED build needs pad-combine operations
ifeq ($(CONFIG_BUILD_PROTECTED),y)
define POSTBUILD
$(Q) echo "pad-combine nuttx.bin and nuttx_user.bin to try on target."
endef
endif
Reference in New Issue Copy Permalink