Merge pull request #580 from tock/qemu-rv32-linker

build: fix addresses for qemu_rv32, rename rv32 archs

Author: alevy

Makefile

@@ -193,8 +193,13 @@ $(call fixed-target, F=0x00048000 R=0x20010000 T=thumbv7em-none-eabi A=cortex-m4
 $(call fixed-target, F=0x00080000 R=0x20006000 T=thumbv7em-none-eabi A=cortex-m4)
 $(call fixed-target, F=0x00088000 R=0x2000e000 T=thumbv7em-none-eabi A=cortex-m4)
 
-$(call fixed-target, F=0x403b0000 R=0x3fca2000 T=riscv32imc-unknown-none-elf A=riscv32imc)
-$(call fixed-target, F=0x40440000 R=0x3fcaa000 T=riscv32imc-unknown-none-elf A=riscv32imc)
+$(call fixed-target, F=0x403b0000 R=0x3fca2000 T=riscv32imc-unknown-none-elf A=rv32imc)
+$(call fixed-target, F=0x40440000 R=0x3fcaa000 T=riscv32imc-unknown-none-elf A=rv32imc)
+
+$(call fixed-target, F=0x80100000 R=0x80300000 T=riscv32imac-unknown-none-elf A=rv32imac)
+$(call fixed-target, F=0x80110000 R=0x80310000 T=riscv32imac-unknown-none-elf A=rv32imac)
+$(call fixed-target, F=0x80130000 R=0x80330000 T=riscv32imac-unknown-none-elf A=rv32imac)
+$(call fixed-target, F=0x80180000 R=0x80380000 T=riscv32imac-unknown-none-elf A=rv32imac)
 
 $(call fixed-target, F=0x10020000 R=0x20004000 T=thumbv6m-none-eabi A=cortex-m0)
 $(call fixed-target, F=0x10028000 R=0x2000c000 T=thumbv6m-none-eabi A=cortex-m0)

build_scripts/src/lib.rs

@@ -20,7 +20,7 @@ const PLATFORMS: &[(&str, &str, &str, &str, &str)] = &[
     ("nucleo_f446re"      , "0x08040000", "255K"     , "0x20004000", "176K"   ),
     ("opentitan"          , "0x20030000", "32M"      , "0x10006000", "126K"   ),
     ("pico_explorer_base" , "0x10040000", "256K"     , "0x20012000", "192K"   ),
-    ("qemu_rv32_virt"     , "0x80100000", "0x0100000", "0x8020a000", "0xf6000"),
+    ("qemu_rv32_virt"     , "0x80100000", "0x0100000", "0x80300000", "1024K"  ),
     ("raspberry_pi_pico"  , "0x10040000", "256K"     , "0x20012000", "192K"   ),
     ("stm32f3discovery"   , "0x08020000", "0x0020000", "0x20004000", "48K"    ),
     ("stm32f412gdiscovery", "0x08030000", "256K"     , "0x20004000", "112K"   ),