You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by xi...@apache.org on 2024/07/22 15:46:50 UTC
(nuttx) 02/04: riscv/k230: drop ld-rptun.script
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit 607948949c265b5de6e6db360e986dc0a68c7e2d
Author: Yanfeng Liu <yf...@qq.com>
AuthorDate: Mon Jul 22 13:30:02 2024 +0800
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 <yf...@qq.com>
---
boards/risc-v/k230/canmv230/scripts/Make.defs | 10 +-
.../risc-v/k230/canmv230/scripts/ld-rptun.script | 170 ---------------------
boards/risc-v/k230/canmv230/src/CMakeLists.txt | 6 +-
3 files changed, 3 insertions(+), 183 deletions(-)
diff --git a/boards/risc-v/k230/canmv230/scripts/Make.defs b/boards/risc-v/k230/canmv230/scripts/Make.defs
index f57aaf736a..4c3dfdf274 100644
--- a/boards/risc-v/k230/canmv230/scripts/Make.defs
+++ b/boards/risc-v/k230/canmv230/scripts/Make.defs
@@ -23,16 +23,10 @@ include $(TOPDIR)/tools/Config.mk
include $(TOPDIR)/arch/risc-v/src/common/Toolchain.defs
ifeq ($(CONFIG_ARCH_CHIP_K230),y)
-ifeq ($(CONFIG_BUILD_KERNEL),y)
ifeq ($(CONFIG_NUTTSBI),y)
- ifeq ($(CONFIG_RPTUN),y)
- LDSCRIPT = ld-rptun.script
- else
- LDSCRIPT = ld-nuttsbi.script
- endif
-else
+ LDSCRIPT = ld-nuttsbi.script
+else ifeq ($(CONFIG_BUILD_KERNEL),y)
LDSCRIPT = ld-kernel.script
-endif
else ifeq ($(CONFIG_BUILD_PROTECTED),y)
LDSCRIPT = ld-protected.script
else
diff --git a/boards/risc-v/k230/canmv230/scripts/ld-rptun.script b/boards/risc-v/k230/canmv230/scripts/ld-rptun.script
deleted file mode 100644
index 64a8fe8b74..0000000000
--- a/boards/risc-v/k230/canmv230/scripts/ld-rptun.script
+++ /dev/null
@@ -1,170 +0,0 @@
-/****************************************************************************
- * boards/risc-v/k230/canmv230/scripts/ld-rptun.script
- *
- * 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 <nuttx/config.h>
-
-/* Enlage kernel data size or pgpool config to reduce nuttx.bin size */
-
-#define KSRAM_SIZE (1536*1024)
-
-/* We only respect RAM and PGPOOL configs for simplicity */
-
-#define PGRAM_ADDR (CONFIG_ARCH_PGPOOL_PBASE)
-#define PGRAM_SIZE (CONFIG_ARCH_PGPOOL_SIZE)
-#define PGRAM_END (PGRAM_ADDR + PGRAM_SIZE)
-#define CFRAM_END (CONFIG_RAM_START + CONFIG_RAM_SIZE)
-
-#if (PGRAM_ADDR < CONFIG_RAM_START) || (PGRAM_END > CFRAM_END)
- #error invalid RAM or PGPOOL configuration!
-#endif
-
-#if (PGRAM_END < CFRAM_END)
- # warn are we wasting CFRAM_END-PGRAM_END bytes?
-#endif
-
-#define KTEXT_ADDR (CONFIG_RAM_START)
-#define KRAM_TOTAL (PGRAM_ADDR - KTEXT_ADDR) /* ignore space after pgpool */
-
-#define KTEXT_SIZE (KRAM_TOTAL-KSRAM_SIZE)
-#define KSRAM_ADDR (KTEXT_ADDR + KTEXT_SIZE)
-
-MEMORY
-{
- kflash (rx) : ORIGIN = KTEXT_ADDR, LENGTH = KTEXT_SIZE /* w/ cache */
- ksram (rwx) : ORIGIN = KSRAM_ADDR, LENGTH = KSRAM_SIZE /* w/ cache */
- pgram (rwx) : ORIGIN = PGRAM_ADDR, LENGTH = PGRAM_SIZE /* w/ cache */
-}
-
-OUTPUT_ARCH("riscv")
-
-/* Provide the kernel boundaries, used in board memory map */
-
-__kflash_start = ORIGIN(kflash);
-__kflash_size = LENGTH(kflash);
-__ksram_start = ORIGIN(ksram);
-__ksram_size = LENGTH(ksram);
-__ksram_end = ORIGIN(ksram) + LENGTH(ksram);
-
-/* Page heap */
-
-__pgheap_start = ORIGIN(pgram);
-__pgheap_size = LENGTH(pgram);
-
-SECTIONS
-{
- . = KTEXT_ADDR;
-
- .text :
- {
- _stext = . ;
- *(.text)
- *(.text.*)
- *(.gnu.warning)
- *(.stub)
- *(.glue_7)
- *(.glue_7t)
- *(.jcr)
-
- /* C++ support: The .init and .fini sections contain specific logic
- * to manage static constructors and destructors.
- */
-
- *(.gnu.linkonce.t.*)
- *(.init) /* Old ABI */
- *(.fini) /* Old ABI */
- _etext = . ;
- }
-
- .rodata :
- {
- _srodata = . ;
- *(.rodata)
- *(.rodata1)
- *(.rodata.*)
- *(.gnu.linkonce.r*)
- _erodata = . ;
- }
-
- .tdata : {
- _stdata = ABSOLUTE(.);
- *(.tdata .tdata.* .gnu.linkonce.td.*);
- _etdata = ABSOLUTE(.);
- }
-
- .tbss : {
- _stbss = ABSOLUTE(.);
- *(.tbss .tbss.* .gnu.linkonce.tb.* .tcommon);
- _etbss = ABSOLUTE(.);
- }
-
- _eronly = ABSOLUTE(.);
-
- .data :
- {
- _sdata = . ;
- *(.data)
- *(.data1)
- *(.data.*)
- *(.gnu.linkonce.d*)
- . = ALIGN(4);
- _edata = . ;
- }
-
- .bss :
- {
- _sbss = . ;
- *(.bss)
- *(.bss.*)
- *(.sbss)
- *(.sbss.*)
- *(.gnu.linkonce.b*)
- *(COMMON)
- _ebss = . ;
- } > ksram
-
- /* Page tables here, align to 4K boundary */
-
- .pgtables (NOLOAD) : ALIGN(0x1000) {
- *(.pgtables)
- . = ALIGN(4);
- } > ksram
-
- /* Stack top */
-
- .stack_top : {
- . = ALIGN(32);
- _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) }
-}
diff --git a/boards/risc-v/k230/canmv230/src/CMakeLists.txt b/boards/risc-v/k230/canmv230/src/CMakeLists.txt
index 8dc7db96f6..9628318bca 100644
--- a/boards/risc-v/k230/canmv230/src/CMakeLists.txt
+++ b/boards/risc-v/k230/canmv230/src/CMakeLists.txt
@@ -33,11 +33,7 @@ target_sources(board PRIVATE ${SRCS})
if(CONFIG_ARCH_CHIP_K230)
if(CONFIG_BUILD_KERNEL)
if(CONFIG_NUTTSBI)
- if(CONFIG_RPTUN)
- set(LDFILE ld-rptun.script)
- else()
- set(LDFILE ld-nuttsbi.script)
- endif()
+ set(LDFILE ld-nuttsbi.script)
else()
set(LDFILE ld-kernel.script)
endif()