You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by je...@apache.org on 2018/12/06 15:30:31 UTC

[mynewt-core] 01/01: bsp/hifive1: Fix linker warning

This is an automated email from the ASF dual-hosted git repository.

jerzy pushed a commit to branch kasjer/hifive1-bsp-fix
in repository https://gitbox.apache.org/repos/asf/mynewt-core.git

commit 7da48a71fdb50d0c434b4cdb0c3d0c87086c4270
Author: Jerzy Kasenberg <je...@codecoup.pl>
AuthorDate: Thu Dec 6 16:23:16 2018 +0100

    bsp/hifive1: Fix linker warning
    
    Order of linker script entries in bsp.yml result in warning that is
    visible during build only when some other link error happens.
    repos/apache-mynewt-core/hw/bsp/hifive1/hifive1.ld:32: warning: memory region `flash' not declared
    repos/apache-mynewt-core/hw/bsp/hifive1/hifive1.ld:131: warning: memory region `ram' not declared
    repos/apache-mynewt-core/hw/bsp/hifive1/hifive1_boot.ld:22: warning: redeclaration of memory region `flash'
    repos/apache-mynewt-core/hw/bsp/hifive1/hifive1_boot.ld:23: warning: redeclaration of memory region `ram'
    Changing order of entries in bsp fixes this.
---
 hw/bsp/hifive1/bsp.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hw/bsp/hifive1/bsp.yml b/hw/bsp/hifive1/bsp.yml
index b8f96e9..d02e850 100644
--- a/hw/bsp/hifive1/bsp.yml
+++ b/hw/bsp/hifive1/bsp.yml
@@ -20,11 +20,11 @@
 bsp.arch: rv32imac
 bsp.compiler: compiler/riscv64
 bsp.linkerscript:
-    - "hw/bsp/hifive1/hifive1.ld"
     - "hw/bsp/hifive1/hifive1_app.ld"
-bsp.linkerscript.BOOT_LOADER.OVERWRITE:
     - "hw/bsp/hifive1/hifive1.ld"
+bsp.linkerscript.BOOT_LOADER.OVERWRITE:
     - "hw/bsp/hifive1/hifive1_boot.ld"
+    - "hw/bsp/hifive1/hifive1.ld"
 bsp.downloadscript: "hw/bsp/hifive1/hifive1_download.sh"
 bsp.debugscript: "hw/bsp/hifive1/hifive1_debug.sh"