github-mirrors/neorv32
1
0
Fork 0
mirror of https://github.com/stnolting/neorv32.git synced 2025-04-23 13:47:33 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

update bootloader

Browse source 
split MISA and MXISA CSR output in bootloader intro screen
This commit is contained in:
stnolting 2023-03-07 17:27:17 +01:00
parent 6cf30e2608
commit 9de253c61a
4 changed files with 56 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

30
docs/datasheet/software_bootloader.adoc
View file

@ -88,13 +88,14 @@ following intro screen shows up:
----
<< NEORV32 Bootloader >>
BLDV: Jul 11 2022
HWV: 0x01070307
BLDV: Mar 7 2023
HWV: 0x01080107
CID: 0x00000000
CLK: 0x05f5e100
ISA: 0x40901104 + 0xc0000783
SOC: 0x7c5f400f
IMEM: 0x00004000 bytes @0x00000000
MISA: 0x40901106
XISA: 0xc0000fab
SOC: 0xffff402f
IMEM: 0x00008000 bytes @0x00000000
DMEM: 0x00002000 bytes @0x80000000
Autoboot in 8s. Press any key to abort.
@ -109,7 +110,8 @@ The start-up screen gives some brief information about the bootloader and severa
| `HWV` | Processor hardware version (the <<_mimpid>> CSR); in BCD format; example: `0x01040606` = v1.4.6.6).
| `CID` | Custom user-defined ID (via the `CUSTOM_ID` register from <<_system_configuration_information_memory_sysinfo>>; defined by the <<_custom_id>> generic).
| `CLK` | Processor clock speed in Hz (via the `CLK` register from <<_system_configuration_information_memory_sysinfo>>; defined by the <<_clock_frequency>> generic).
| `ISA` | CPU extensions (<<_misa>> CSR + <<_mxisa>> CSR).
| `MISA` | RISC-V CPU extensions (<<_misa>> CSR).
| `XISA` | NEORV32-specific CPU extensions (<<_mxisa>> CSR).
| `SOC` | Processor configuration (via the `SOC` register from the <<_system_configuration_information_memory_sysinfo>>; mainly defined by the `IO_*` and `MEM_*` configuration generics).
| `IMEM` | IMEM memory base address and size in byte (via the `IMEM_SIZE` and `ISPACE_BASE` registers from the <<_system_configuration_information_memory_sysinfo>>; defined by the <<_mem_int_imem_size>> generic).
| `DMEM` | DMEM memory base address and size in byte (via the `DMEM_SIZE` and `DSPACE_BASE` registers from the <<_system_configuration_information_memory_sysinfo>>; defined by the <<_mem_int_dmem_size>> generic).
@ -122,18 +124,20 @@ you press any key within the 8 seconds, the actual bootloader user console start
----
<< NEORV32 Bootloader >>
BLDV: Jul 11 2022
HWV: 0x01070307
BLDV: Mar 7 2023
HWV: 0x01080107
CID: 0x00000000
CLK: 0x05f5e100
ISA: 0x40901104 + 0xc0000783
SOC: 0x7c5f400f
IMEM: 0x00004000 bytes @0x00000000
MISA: 0x40901106
XISA: 0xc0000fab
SOC: 0xffff402f
IMEM: 0x00008000 bytes @0x00000000
DMEM: 0x00002000 bytes @0x80000000
Autoboot in 8s. Press any key to abort.
Aborted. <1>
Aborted.
Available commands:
Available CMDs:
h: Help
r: Restart
u: Upload

15
docs/userguide/executable_upload.adoc
View file

@ -49,23 +49,26 @@ automatic boot sequence and to start the actual bootloader user interface consol
----
<< NEORV32 Bootloader >>
BLDV: Feb 16 2022
HWV: 0x01060709
BLDV: Mar 7 2023
HWV: 0x01080107
CID: 0x00000000
CLK: 0x05f5e100
ISA: 0x40901107 + 0xc000068b
SOC: 0x7b7f402f
MISA: 0x40901106
XISA: 0xc0000fab
SOC: 0xffff402f
IMEM: 0x00008000 bytes @0x00000000
DMEM: 0x00004000 bytes @0x80000000
DMEM: 0x00002000 bytes @0x80000000
Autoboot in 8s. Press any key to abort.
Aborted.
Available commands:
Available CMDs:
h: Help
r: Restart
u: Upload
s: Store to flash
l: Load from flash
x: Boot from flash (XIP)
e: Execute
CMD:>
----

55
rtl/core/neorv32_bootloader_image.vhd
View file

@ -1,8 +1,8 @@
-- The NEORV32 RISC-V Processor: https://github.com/stnolting/neorv32
-- Auto-generated memory initialization file (for BOOTLOADER) from source file <bootloader/main.bin>
-- Size: 4024 bytes
-- Size: 4028 bytes
-- MARCH: default
-- Built: 05.03.2023 12:52:43
-- Built: 07.03.2023 17:02:47
-- prototype defined in 'neorv32_package.vhd'
package body neorv32_bootloader_image is
@ -40,7 +40,7 @@ x"00000e93",
x"00000f13",
x"00000f93",
x"00001597",
x"f3c58593",
x"f4058593",
x"80010617",
x"f7c60613",
x"80010697",
@ -212,27 +212,27 @@ x"650000ef",
x"fc002573",
x"5d4000ef",
x"ffff1537",
x"e0850513",
x"e0c50513",
x"63c000ef",
x"fe802503",
x"ffff1437",
x"ffff1937",
x"5b8000ef",
x"ffff1537",
x"e1050513",
x"e1450513",
x"620000ef",
x"ff802503",
x"5a4000ef",
x"e1840513",
x"e1c40513",
x"610000ef",
x"ff002503",
x"594000ef",
x"ffff1537",
x"e2450513",
x"e2850513",
x"5fc000ef",
x"ffc02503",
x"580000ef",
x"e1840513",
x"e1c40513",
x"5ec000ef",
x"ff402503",
x"570000ef",
@ -243,7 +243,7 @@ x"00020737",
x"00e7f7b3",
x"04078c63",
x"ffff1537",
x"e2c50513",
x"e3050513",
x"5c0000ef",
x"2bc000ef",
x"fe002403",
@ -261,17 +261,17 @@ x"0157f7b3",
x"0a078063",
x"ffff1537",
x"fa402783",
x"e5850513",
x"e5c50513",
x"578000ef",
x"ffff1a37",
x"e64a0513",
x"e68a0513",
x"56c000ef",
x"06c00a93",
x"07800b93",
x"07300c13",
x"06500c93",
x"ffff17b7",
x"ee478513",
x"ee878513",
x"550000ef",
x"fa002783",
x"00010737",
@ -312,12 +312,12 @@ x"19540863",
x"028ae463",
x"19940863",
x"06800793",
x"e64a0513",
x"e68a0513",
x"02f40c63",
x"03f00793",
x"18f40c63",
x"ffff1537",
x"f8850513",
x"f8c50513",
x"0240006f",
x"07500793",
x"02f40263",
@ -326,24 +326,24 @@ x"ff8414e3",
x"0044a403",
x"02041063",
x"ffff1537",
x"eec50513",
x"ef050513",
x"474000ef",
x"f19ff06f",
x"00000513",
x"69c000ef",
x"f0dff06f",
x"ffff1537",
x"f0850513",
x"f0c50513",
x"458000ef",
x"00040513",
x"3dc000ef",
x"ffff1537",
x"f1050513",
x"f1450513",
x"444000ef",
x"00400537",
x"3c8000ef",
x"ffff1537",
x"f2850513",
x"f2c50513",
x"430000ef",
x"00010737",
x"fa002783",
@ -360,7 +360,7 @@ x"00050663",
x"00300513",
x"450000ef",
x"ffff1537",
x"f3450513",
x"f3850513",
x"3ec000ef",
x"01045b13",
x"004009b7",
@ -413,12 +413,12 @@ x"ec5ff06f",
x"0044a783",
x"e4079ee3",
x"ffff1537",
x"f4450513",
x"f4850513",
x"ea5ff06f",
x"00100513",
x"e4dff06f",
x"ffff1537",
x"f5450513",
x"f5850513",
x"e91ff06f",
x"f9402583",
x"f9002503",
@ -596,7 +596,7 @@ x"07800513",
x"ffff14b7",
x"fbdff0ef",
x"01c00413",
x"f9448493",
x"f9848493",
x"ffc00993",
x"008957b3",
x"00f7f793",
@ -644,7 +644,7 @@ x"f91ff0ef",
x"00241793",
x"ffff1537",
x"008787b3",
x"fa450513",
x"fa850513",
x"00f50533",
x"f79ff0ef",
x"00800793",
@ -895,7 +895,7 @@ x"0a3e3e20",
x"444c420a",
x"4d203a56",
x"20207261",
x"30322035",
x"30322037",
x"480a3332",
x"203a5657",
x"00000020",
@ -903,9 +903,10 @@ x"4449430a",
x"0020203a",
x"4b4c430a",
x"0020203a",
x"4153490a",
x"0020203a",
x"00202b20",
x"53494d0a",
x"00203a41",
x"5349580a",
x"00203a41",
x"434f530a",
x"0020203a",
x"454d490a",

4
sw/bootloader/bootloader.c
View file

@ -324,9 +324,9 @@ int main(void) {
PRINT_XNUM(NEORV32_SYSINFO->CUSTOM_ID);
PRINT_TEXT("\nCLK: ");
PRINT_XNUM(NEORV32_SYSINFO->CLK);
PRINT_TEXT("\nISA: ");
PRINT_TEXT("\nMISA: ");
PRINT_XNUM(neorv32_cpu_csr_read(CSR_MISA));
PRINT_TEXT(" + ");
PRINT_TEXT("\nXISA: ");
PRINT_XNUM(neorv32_cpu_csr_read(CSR_MXISA));
PRINT_TEXT("\nSOC: ");
PRINT_XNUM(NEORV32_SYSINFO->SOC);