diff --git a/corev_apu/bootrom/ariane.dts b/corev_apu/bootrom/ariane.dts index 54c9af0e6..9b5b84f14 100644 --- a/corev_apu/bootrom/ariane.dts +++ b/corev_apu/bootrom/ariane.dts @@ -52,14 +52,17 @@ // riscv,max-priority = <7>; // riscv,ndev = <2>; // }; - debug-controller@0 { - compatible = "riscv,debug-013"; - interrupts-extended = <&CPU0_intc 65535>; - reg = <0x0 0x0 0x0 0x1000>; - reg-names = "control"; - }; + // Specifying the interrupt controller in the devicetree is not necessary. + // Furthermore, the IRQ 65535 will cause a `hwirq 0xffff is too large` during + // Linux boot (occured with mainline linux 5.14.0). + // debug-controller@0 { + // compatible = "riscv,debug-013"; + // interrupts-extended = <&CPU0_intc 65535>; + // reg = <0x0 0x0 0x0 0x1000>; + // reg-names = "control"; + // }; uart@10000000 { - compatible = "ns16750"; + compatible = "ns16550a"; reg = <0x0 0x10000000 0x0 0x1000>; clock-frequency = <50000000>; current-speed = <115200>; diff --git a/corev_apu/bootrom/bootrom.h b/corev_apu/bootrom/bootrom.h index e1419e65b..b6f65f25f 100644 --- a/corev_apu/bootrom/bootrom.h +++ b/corev_apu/bootrom/bootrom.h @@ -1,6 +1,6 @@ // Auto-generated code -const int reset_vec_size = 402; +const int reset_vec_size = 372; uint32_t reset_vec[reset_vec_size] = { 0x00100413, @@ -36,15 +36,15 @@ uint32_t reset_vec[reset_vec_size] = { 0x00000000, 0x00000000, 0xedfe0dd0, - 0xc2050000, + 0x4a050000, 0x38000000, - 0xbc040000, + 0x44040000, 0x28000000, 0x11000000, 0x10000000, 0x00000000, 0x06010000, - 0x84040000, + 0x0c040000, 0x00000000, 0x00000000, 0x00000000, @@ -235,46 +235,16 @@ uint32_t reset_vec[reset_vec_size] = { 0x006c6f72, 0x02000000, 0x01000000, - 0x75626564, - 0x6f632d67, - 0x6f72746e, - 0x72656c6c, - 0x00003040, - 0x03000000, - 0x10000000, - 0x1b000000, - 0x63736972, - 0x65642c76, - 0x2d677562, - 0x00333130, - 0x03000000, - 0x08000000, - 0xb8000000, - 0x01000000, - 0xffff0000, - 0x03000000, - 0x10000000, - 0x5b000000, - 0x00000000, - 0x00000000, - 0x00000000, - 0x00100000, - 0x03000000, - 0x08000000, - 0xcc000000, - 0x746e6f63, - 0x006c6f72, - 0x02000000, - 0x01000000, 0x74726175, 0x30303140, 0x30303030, 0x00000030, 0x03000000, - 0x08000000, + 0x09000000, 0x1b000000, 0x3631736e, - 0x00303537, + 0x61303535, + 0x00000000, 0x03000000, 0x10000000, 0x5b000000, diff --git a/corev_apu/bootrom/bootrom.sv b/corev_apu/bootrom/bootrom.sv index f71c70c7f..58ba804b8 100644 --- a/corev_apu/bootrom/bootrom.sv +++ b/corev_apu/bootrom/bootrom.sv @@ -20,7 +20,7 @@ module bootrom ( input logic [63:0] addr_i, output logic [63:0] rdata_o ); - localparam int RomSize = 201; + localparam int RomSize = 186; const logic [RomSize-1:0][63:0] mem = { 64'h00000000_00000068, @@ -88,26 +88,11 @@ module bootrom ( 64'h00000000_00000010, 64'h00000000_5b000000, 64'h10000000_03000000, - 64'h00303537_3631736e, - 64'h1b000000_08000000, - 64'h03000000_00000030, - 64'h30303030_30303140, - 64'h74726175_01000000, - 64'h02000000_006c6f72, - 64'h746e6f63_cc000000, - 64'h08000000_03000000, - 64'h00100000_00000000, - 64'h00000000_00000000, - 64'h5b000000_10000000, - 64'h03000000_ffff0000, - 64'h01000000_b8000000, - 64'h08000000_03000000, - 64'h00333130_2d677562, - 64'h65642c76_63736972, - 64'h1b000000_10000000, - 64'h03000000_00003040, - 64'h72656c6c_6f72746e, - 64'h6f632d67_75626564, + 64'h00000000_61303535, + 64'h3631736e_1b000000, + 64'h09000000_03000000, + 64'h00000030_30303030, + 64'h30303140_74726175, 64'h01000000_02000000, 64'h006c6f72_746e6f63, 64'hcc000000_08000000, @@ -203,11 +188,11 @@ module bootrom ( 64'h00000000_01000000, 64'h00000000_00000000, 64'h00000000_00000000, - 64'h84040000_06010000, + 64'h0c040000_06010000, 64'h00000000_10000000, 64'h11000000_28000000, - 64'hbc040000_38000000, - 64'hc2050000_edfe0dd0, + 64'h44040000_38000000, + 64'h4a050000_edfe0dd0, 64'h00000000_00000000, 64'h00000000_00000000, 64'h00000000_00000000, diff --git a/corev_apu/fpga/src/bootrom/bootrom_64.h b/corev_apu/fpga/src/bootrom/bootrom_64.h index 3a6caba79..303fa8f56 100644 --- a/corev_apu/fpga/src/bootrom/bootrom_64.h +++ b/corev_apu/fpga/src/bootrom/bootrom_64.h @@ -1,6 +1,6 @@ // Auto-generated code -const int reset_vec_size = 1756; +const int reset_vec_size = 1790; uint32_t reset_vec[reset_vec_size] = { 0x00800913, @@ -10,7 +10,7 @@ uint32_t reset_vec[reset_vec_size] = { 0x03249663, 0x0210011b, 0x01a11113, - 0x27f000ef, + 0x303000ef, 0x020004b7, 0x00100913, 0x0124a023, @@ -35,7 +35,7 @@ uint32_t reset_vec[reset_vec_size] = { 0xff24c6e3, 0xf1402573, 0x00001597, - 0xb8458593, + 0xc8458593, 0x0010049b, 0x01f49493, 0x00048067, @@ -105,7 +105,7 @@ uint32_t reset_vec[reset_vec_size] = { 0x0405f93f, 0x1797b7f5, 0x87930000, - 0x771396e7, + 0x7713a6e7, 0x973e00f5, 0x00074703, 0x97aa8111, @@ -115,9 +115,9 @@ uint32_t reset_vec[reset_vec_size] = { 0x71798082, 0xec26f022, 0xf406e84a, - 0x4461892a, - 0x553b54e1, - 0x002c0089, + 0x446184aa, + 0xd53b5961, + 0x002c0084, 0x0ff57513, 0xfc3ff0ef, 0x00814503, @@ -125,15 +125,15 @@ uint32_t reset_vec[reset_vec_size] = { 0x4503f43f, 0xf0ef0091, 0x10e3f3bf, - 0x70a2fe94, + 0x70a2ff24, 0x64e27402, 0x61456942, 0x71798082, 0xec26f022, 0xf406e84a, - 0x0413892a, - 0x54e10380, - 0x00895533, + 0x041384aa, + 0x59610380, + 0x0084d533, 0x7513002c, 0xf0ef0ff5, 0x4503f81f, @@ -141,7 +141,7 @@ uint32_t reset_vec[reset_vec_size] = { 0xf01ff0ef, 0x00914503, 0xef9ff0ef, - 0xfe9410e3, + 0xff2410e3, 0x740270a2, 0x694264e2, 0x80826145, @@ -150,50 +150,48 @@ uint32_t reset_vec[reset_vec_size] = { 0x4503f55f, 0xf0ef0081, 0x4503ed7f, - 0xf0ef0091, - 0x60e2ecff, - 0x80826105, + 0x60e20091, + 0xb5e96105, 0x8082c10c, - 0x25014108, - 0x15178082, - 0x11010000, - 0x61e50513, - 0xe822ec06, - 0xf0efe426, - 0x07b7f03f, - 0x47292000, - 0x47a9c3b8, - 0x37fd0001, - 0x0437fff5, - 0x07932000, - 0xd03c1040, - 0x15175064, - 0x05130000, - 0xf0ef5fe5, - 0x2481edbf, - 0x02049513, - 0xf0ef9101, - 0x1517f51f, - 0x05130000, - 0xf0ef6065, - 0x0793ec3f, - 0xd03c1660, - 0x15175064, - 0x05130000, - 0xf0ef5d25, - 0x2481eaff, - 0x02049513, - 0xf0ef9101, - 0x1517f25f, - 0x05130000, - 0xf0ef5da5, - 0x4799e97f, - 0x6442d03c, - 0x64a260e2, + 0x80824108, 0x00001517, - 0x5b450513, - 0xf06f6105, - 0x1101e7ff, + 0x05131101, + 0xec066ac5, + 0xe426e822, + 0xf09ff0ef, + 0x200007b7, + 0xc3b84729, + 0x000147a9, + 0xfff537fd, + 0x20000437, + 0x10400793, + 0x5064d03c, + 0x00001517, + 0x68c50513, + 0xee1ff0ef, + 0x95132481, + 0x91010204, + 0xf57ff0ef, + 0x00001517, + 0x69450513, + 0xec9ff0ef, + 0x16600793, + 0x5064d03c, + 0x00001517, + 0x66050513, + 0xeb5ff0ef, + 0x95132481, + 0x91010204, + 0xf2bff0ef, + 0x00001517, + 0x66850513, + 0xe9dff0ef, + 0xd03c4799, + 0x60e26442, + 0x151764a2, + 0x05130000, + 0x61056425, + 0x1101b551, 0x200007b7, 0xe822ec06, 0x5779e426, @@ -209,17 +207,17 @@ uint32_t reset_vec[reset_vec_size] = { 0x240153fc, 0xe3958b85, 0x00001517, - 0x58450513, - 0xe39ff0ef, + 0x61450513, + 0xe41ff0ef, 0x15024088, 0xf0ef9101, - 0x1517eb1f, + 0x1517eb9f, 0x05130000, - 0xf0ef5665, - 0x07b7e23f, - 0x577d2000, - 0x0ff47513, - 0x644260e2, + 0xf0ef5f65, + 0x60e2e2bf, + 0x200007b7, + 0x7513577d, + 0x64420ff4, 0x4719dbb8, 0x64a2d3b8, 0x80826105, @@ -257,13 +255,13 @@ uint32_t reset_vec[reset_vec_size] = { 0xb7d900d7, 0x8082557d, 0x0ff00513, - 0xf03ff06f, - 0xf4067179, - 0xf022e432, - 0x842eec26, - 0xf0ef84aa, - 0xe513febf, - 0xf0ef0404, + 0x1101b709, + 0xe822ec06, + 0x842ee426, + 0xe04a84b2, + 0xf0ef892a, + 0x6513febf, + 0xf0ef0409, 0x551bee9f, 0xf0ef0184, 0x551bee1f, @@ -274,47 +272,47 @@ uint32_t reset_vec[reset_vec_size] = { 0xf0ef0ff5, 0x7513ec9f, 0xf0ef0ff4, - 0x6622ec1f, + 0x8526ec1f, + 0xebbff0ef, 0x06400413, - 0xf0ef8532, - 0xf0efeb5f, - 0x179bfabf, - 0xd79b0185, - 0xd4634187, - 0x147d0007, - 0x70a2f47d, - 0x64e27402, - 0x80826145, - 0xe8221101, - 0x1517842a, + 0xfadff0ef, + 0x0185179b, + 0x4187d79b, + 0x0007d463, + 0xf47d147d, + 0x644260e2, + 0x690264a2, + 0x80826105, + 0xe4261101, + 0x151784aa, 0x05130000, - 0xec064625, - 0xf0efe42e, - 0x8522cfbf, - 0xcf5ff0ef, - 0x00001517, - 0x45c50513, - 0xce9ff0ef, - 0x852e65a2, - 0xda5ff0ef, + 0xec064f25, + 0x842ee822, + 0xd01ff0ef, + 0xf0ef8526, + 0x1517cfbf, + 0x05130000, + 0xf0ef4ea5, + 0x8522ceff, + 0xdadff0ef, 0x60e26442, - 0x00001517, - 0x41450513, - 0xf06f6105, - 0x1101ccff, + 0x151764a2, + 0x05130000, + 0x61054a25, + 0x1101b9d1, 0x6409e822, - 0xec06e426, - 0x0413e04a, - 0x44857104, + 0xec06e04a, + 0x0413e426, + 0x49057104, 0x09500613, 0x45014581, - 0xf39ff0ef, - 0x892a347d, + 0xf37ff0ef, + 0x84aa347d, 0xf29ff0ef, - 0x15e3c00d, - 0x1517fe99, + 0x95e3c00d, + 0x1517ff24, 0x05130000, - 0x458541a5, + 0x45854aa5, 0xf89ff0ef, 0x60e24505, 0x64a26442, @@ -326,7 +324,7 @@ uint32_t reset_vec[reset_vec_size] = { 0xec064521, 0xe426e822, 0xf0efe04a, - 0x892aef3f, + 0x892aef1f, 0xee5ff0ef, 0xee1ff0ef, 0xeddff0ef, @@ -335,369 +333,435 @@ uint32_t reset_vec[reset_vec_size] = { 0xed1ff0ef, 0xecdff0ef, 0x45014785, - 0x00f91b63, - 0x986388bd, - 0x051b0124, - 0x05130004, - 0x3513f565, - 0x60e20015, - 0x64a26442, - 0x61056902, - 0x11418082, - 0x06500613, - 0x05134581, - 0xe4060370, - 0xf0efe022, - 0x842ae9bf, - 0xe8dff0ef, - 0x00001517, - 0x051385a2, - 0xf0ef38c5, - 0x051bef3f, - 0x60a20004, - 0x157d6402, - 0x00153513, - 0x80820141, - 0xe4261101, - 0xe822ec06, - 0xf0ef4485, - 0x0613fbdf, - 0x05b70770, - 0x05134000, - 0xf0ef0290, - 0x842ae57f, - 0x151785aa, - 0x05130000, - 0xf0ef3525, - 0xf0efeb3f, - 0x0ce3e3bf, - 0x051bfc94, - 0x60e20004, - 0x64a26442, - 0x00153513, + 0x00f91a63, + 0x976388bd, + 0x24010124, + 0xf5640413, + 0x00143513, + 0x644260e2, + 0x690264a2, 0x80826105, - 0xe4061141, - 0xf0efe022, - 0x1517c89f, - 0x05130000, - 0xf0ef32a5, - 0x4429b8ff, - 0xf0ef347d, - 0xfc6de07f, - 0xeb7ff0ef, - 0xc91157fd, - 0xefbff0ef, - 0xc51157f9, - 0xf89ff0ef, - 0xe1114781, - 0x60a257f5, - 0x853e6402, - 0x80820141, - 0xd79b8de9, - 0xd51b0075, - 0x8d3d0045, - 0x15938d2d, - 0x8d2d0045, - 0x07f57513, - 0x579b8082, - 0x05220085, - 0x15428d5d, - 0x8da99141, + 0x06131141, + 0x45810650, + 0x03700513, + 0xe022e406, + 0xe9bff0ef, + 0xf0ef842a, + 0x1517e8ff, + 0x85a20000, + 0x41e50513, + 0xef5ff0ef, + 0x051b60a2, + 0x64020004, + 0x3513157d, + 0x01410015, + 0x11018082, + 0xec06e426, + 0x4485e822, + 0xfbdff0ef, + 0x07700613, + 0x400005b7, + 0x02900513, + 0xe57ff0ef, + 0x85aa842a, + 0x00001517, + 0x3e450513, + 0xeb5ff0ef, + 0xe3dff0ef, + 0xfc940ce3, + 0x051b60e2, + 0x64420004, + 0x351364a2, + 0x61050015, + 0x11418082, + 0xe022e406, + 0xc8dff0ef, + 0x00001517, + 0x3bc50513, + 0xb99ff0ef, + 0x347d4429, + 0xe09ff0ef, + 0xf0effc6d, + 0x57fdeb9f, + 0xf0efc911, + 0x57f9efdf, + 0xf0efc511, + 0x4781f89f, + 0x57f5e111, + 0x640260a2, + 0x0141853e, + 0x8de98082, + 0x0075d79b, 0x0045d51b, - 0x8da9893d, - 0x00c59513, - 0x151b8d2d, - 0x551b0105, - 0x179b4105, - 0xd79b0105, - 0x67090107, - 0x979b1701, - 0x8ff90057, + 0x75138d3d, + 0x8d2d0ff5, + 0x0045179b, + 0x0ff7f793, + 0x75138d3d, + 0x808207f5, + 0x0085179b, + 0x0085551b, + 0x17c28fc9, + 0x8dbd93c1, + 0x0045d51b, + 0x8d2d893d, + 0x00c5179b, + 0x171b8d3d, + 0x571b0105, + 0x67890107, + 0x0057171b, + 0x8ff91781, 0x15428d3d, 0x80829141, - 0xf54e7155, - 0x02061993, - 0xfd26e1a2, - 0xf94ae586, - 0xed56f152, - 0xe55ee95a, - 0x842e84aa, - 0x0209d993, - 0x567d4781, - 0x08000713, - 0x00f106b3, - 0x00c68023, - 0x9be30785, - 0x559bfee7, + 0xe1a27155, + 0x842ef94a, + 0x0593ed56, + 0x8aaa0ff0, + 0x02061913, + 0x0613850a, + 0xe5860800, + 0xf54efd26, + 0xe95af152, + 0x00efe55e, + 0x559b3e60, 0x45010184, - 0xf6dff0ef, + 0xf77ff0ef, 0x0104559b, 0x0ff5f593, - 0xf61ff0ef, + 0xf6bff0ef, 0x0084559b, 0x0ff5f593, - 0xf55ff0ef, + 0xf5fff0ef, 0x0ff47593, - 0xf4dff0ef, + 0xf57ff0ef, 0x0015161b, 0x00166613, 0x0ff67613, 0x454985a2, - 0xd1dff0ef, - 0x20048493, - 0x0a93e951, - 0x0b130fe0, - 0x84133e80, - 0xf0efe004, - 0x1ee3cfff, - 0x4901ff55, - 0x05938622, - 0x850a0400, - 0xc69ff0ef, - 0x0b934a01, - 0x07b30400, - 0xc5830144, - 0x854a0007, - 0xf0ef0a05, - 0x892af15f, - 0xff7a17e3, - 0x04040413, - 0xfc941ae3, - 0xcc5ff0ef, - 0x0085151b, - 0x03051413, - 0xf0ef9041, - 0x8c49cb7f, - 0x29011442, - 0x1c639041, - 0xe7b30689, - 0xe7990369, - 0x00001517, - 0x1ec50513, - 0xa19ff0ef, - 0x849319fd, - 0x46e32004, - 0x4401f930, - 0x45814605, - 0xf0ef4531, - 0xf0efc8bf, - 0xa805c7ff, - 0xc79ff0ef, - 0xc75ff0ef, - 0xc71ff0ef, - 0xc6dff0ef, - 0xc69ff0ef, - 0xc65ff0ef, - 0xc61ff0ef, - 0xc5dff0ef, - 0x00001517, - 0x18450513, - 0x9d1ff0ef, - 0x8522547d, - 0x640e60ae, - 0x794a74ea, - 0x7a0a79aa, - 0x6b4a6aea, - 0x61696baa, - 0x54798082, - 0x711db765, - 0xf05ae8a2, - 0xe4a6ec86, - 0xfc4ee0ca, - 0xf456f852, - 0xe862ec5e, - 0x1080e466, - 0xf0ef8b2a, - 0xc905df3f, - 0x00001517, - 0x16050513, - 0x985ff0ef, - 0x011354fd, - 0x60e6fa04, - 0x64468526, - 0x690664a6, - 0x7a4279e2, - 0x7b027aa2, - 0x6c426be2, - 0x61256ca2, - 0x15178082, - 0x05130000, - 0xf0ef15a5, - 0x7101957f, - 0x45854605, + 0xd27ff0ef, + 0x5913e959, + 0x09930209, + 0x0a130fe0, + 0xf0ef3e80, + 0x1ee3d0ff, + 0x8456ff35, + 0x8b134481, + 0x8622200a, + 0x04000593, 0xf0ef850a, - 0x890ae47f, - 0xc90584aa, - 0x00001517, - 0x15450513, - 0x939ff0ef, - 0x00001517, - 0x16050513, - 0x92dff0ef, - 0xf0ef8526, - 0x15179a9f, + 0x4a81c73f, + 0x04000b93, + 0x015407b3, + 0x0007c583, + 0x0a858526, + 0xf25ff0ef, + 0x97e384aa, + 0x0413ff7a, + 0x1ae30404, + 0xf0effd64, + 0x8aa2ccff, + 0x0085141b, + 0x90411442, + 0xcc1ff0ef, + 0x14428c49, + 0x24819041, + 0x06941a63, + 0x034967b3, + 0x1517e799, 0x05130000, - 0xf0ef05e5, - 0x54f991bf, - 0x1517bf59, + 0xf0ef2865, + 0x197da2bf, + 0xf92047e3, + 0x46054401, + 0x45314581, + 0xc97ff0ef, + 0xc8dff0ef, + 0xf0efa805, + 0xf0efc87f, + 0xf0efc83f, + 0xf0efc7ff, + 0xf0efc7bf, + 0xf0efc77f, + 0xf0efc73f, + 0xf0efc6ff, + 0x1517c6bf, 0x05130000, - 0xf0ef1565, - 0x151790bf, - 0x05130000, - 0xf0ef16a5, - 0x65028fff, - 0x97bff0ef, + 0xf0ef2225, + 0x547d9e7f, + 0x852260ae, + 0x74ea640e, + 0x79aa794a, + 0x6aea7a0a, + 0x6baa6b4a, + 0x80826169, + 0xb7655479, + 0xe0a2715d, + 0xe486f052, + 0xf84afc26, + 0xec56f44e, + 0xe45ee85a, + 0x0880e062, + 0xf0ef8a2a, + 0xc51de01f, 0x00001517, - 0x16850513, - 0x8edff0ef, - 0xf0ef4522, + 0x20050513, + 0x99dff0ef, + 0x011354fd, + 0x60a6fb04, + 0x64068526, + 0x794274e2, + 0x7a0279a2, + 0x6b426ae2, + 0x6c026ba2, + 0x80826161, + 0x00001517, + 0x1fc50513, + 0x971ff0ef, + 0x46057101, + 0x850a4585, + 0xe59ff0ef, + 0x84aa890a, + 0x1517c905, + 0x05130000, + 0xf0ef1f65, + 0x1517953f, + 0x05130000, + 0xf0ef2025, + 0x8526947f, + 0x9c3ff0ef, + 0x00001517, + 0x10050513, + 0x935ff0ef, + 0xbf6154f9, + 0x00001517, + 0x1f850513, + 0x925ff0ef, + 0x00001517, + 0x20c50513, + 0x919ff0ef, + 0xf0ef6502, + 0x1517995f, + 0x05130000, + 0xf0ef20a5, + 0x4522907f, + 0x943ff0ef, + 0x00001517, + 0x20850513, + 0x8f5ff0ef, + 0xf0ef4532, + 0x1517931f, + 0x05130000, + 0xf0ef2065, + 0x45428e3f, + 0x91fff0ef, + 0x00001517, + 0x20450513, + 0x8d1ff0ef, + 0xf0ef4552, + 0x151790df, + 0x05130000, + 0xf0ef2025, + 0x65628bff, + 0x93bff0ef, + 0x00001517, + 0x20850513, + 0x8adff0ef, + 0xf0ef7502, 0x1517929f, 0x05130000, - 0xf0ef1665, - 0x45328dbf, + 0xf0ef2065, + 0x652689bf, 0x917ff0ef, 0x00001517, - 0x16450513, - 0x8c9ff0ef, - 0xf0ef4542, - 0x1517905f, + 0x21450513, + 0x889ff0ef, + 0xf0ef4546, + 0x15178c5f, 0x05130000, - 0xf0ef1625, - 0x45528b7f, - 0x8f3ff0ef, + 0xf0ef2225, + 0x4556877f, + 0x8b3ff0ef, 0x00001517, - 0x16050513, - 0x8a5ff0ef, - 0xf0ef6562, - 0x1517921f, - 0x05130000, - 0xf0ef1665, - 0x7502893f, - 0x90fff0ef, + 0x03050513, + 0x865ff0ef, + 0x04892583, + 0x46057101, + 0xf0ef850a, + 0x8a8ad4bf, + 0x1004892a, + 0x10051b63, + 0x4b114bc1, 0x00001517, - 0x16450513, - 0x881ff0ef, - 0xf0ef6526, - 0x15178fdf, - 0x05130000, - 0xf0ef1725, - 0x454686ff, - 0x8abff0ef, + 0x20850513, + 0x83dff0ef, + 0x0ff97513, + 0x8f9ff0ef, 0x00001517, - 0x18050513, - 0x85dff0ef, - 0xf0ef4556, - 0x1517899f, - 0x05130000, - 0xf0eff8e5, - 0x258384bf, - 0x71010489, - 0x850a4605, - 0xd39ff0ef, - 0x84aa8a8a, - 0x08010993, - 0x02010913, - 0x10051e63, - 0x4b914c41, - 0x00001517, - 0x16050513, - 0x81dff0ef, - 0x0ff4f513, + 0x20c50513, + 0xfe048c13, + 0x825ff0ef, + 0x07b34981, + 0xc503013c, + 0x09850007, 0x8d9ff0ef, + 0xff7999e3, 0x00001517, - 0x16450513, - 0xf8098c93, + 0x20850513, 0x805ff0ef, - 0x87b34a01, - 0xc503014c, - 0x0a050007, - 0x8b9ff0ef, - 0xff8a19e3, - 0x00001517, - 0x16050513, - 0xfe4ff0ef, - 0xf9098a13, - 0x000a4503, - 0xf0ef0a05, - 0x1be389bf, - 0x1517ff2a, + 0xff048993, + 0x0009c503, + 0xf0ef0985, + 0x9be38bbf, + 0x1517ff34, 0x05130000, - 0xf0ef1625, - 0x3503fc6f, - 0x8a130009, - 0xf0effb89, - 0x151783df, - 0x05130000, - 0xf0ef15a5, - 0x3503faef, - 0xf0ef0089, - 0x1517829f, - 0x05130000, - 0xf0ef1565, - 0x3503f9af, - 0xf0ef0109, - 0x1517815f, - 0x05130000, - 0xf0ef1525, - 0x4503f86f, - 0x0a05000a, - 0x841ff0ef, - 0xff499be3, + 0xf0ef20a5, + 0x6088fe6f, + 0x01848993, + 0x06048c13, + 0x85bff0ef, 0x00001517, - 0xeb050513, - 0xf0ef2485, - 0x8993f6af, - 0x09130809, - 0x9de30809, - 0x1517f374, + 0x20050513, + 0xfccff0ef, + 0xf0ef6488, + 0x1517849f, 0x05130000, - 0xf0ef12e5, - 0xb603f52f, - 0xa583028a, - 0x855a020a, - 0x9e0d2605, - 0xc3dff0ef, - 0xc92984aa, + 0xf0ef1fe5, + 0x6888fbaf, + 0x837ff0ef, 0x00001517, - 0xf4c50513, - 0xf30ff0ef, - 0x00001517, - 0xf5850513, - 0xf24ff0ef, - 0xf0ef8526, - 0x1517fa0f, + 0x1fc50513, + 0xfa8ff0ef, + 0x0009c503, + 0xf0ef0985, + 0x9be3863f, + 0x1517ff89, 0x05130000, - 0xbbe5e565, + 0x2905f5a5, + 0xf8cff0ef, + 0x08048493, + 0xf56910e3, 0x00001517, - 0xf2450513, - 0xf08ff0ef, - 0x00001517, - 0xf3050513, - 0xefcff0ef, - 0xf0ef8526, - 0x1517f78f, + 0x1dc50513, + 0xf78ff0ef, + 0x028ab603, + 0x020aa583, + 0x26058552, + 0xf0ef9e0d, + 0x84aac5bf, + 0x1517c929, 0x05130000, - 0xbbc1e2e5, + 0xf0efffa5, + 0x1517f56f, + 0x05130000, + 0xf0ef0065, + 0x8526f4af, + 0xfc6ff0ef, 0x00001517, - 0x0d450513, - 0xee0ff0ef, - 0x65f1bbb9, + 0xf0450513, + 0x1517b511, + 0x05130000, + 0xf0effd25, + 0x1517f2ef, + 0x05130000, + 0xf0effde5, + 0x854af22f, + 0xf9eff0ef, + 0x00001517, + 0xedc50513, + 0x1517bbf1, + 0x05130000, + 0xf0ef1825, + 0xb3b5f06f, + 0x872a433d, + 0x02c37163, + 0x00f77793, + 0xe1bde3c1, + 0xff067693, + 0x96ba8a3d, + 0xe70ce30c, + 0x6de30741, + 0xe211fed7, + 0x06b38082, + 0x068a40c3, + 0x00000297, + 0x80679696, + 0x072300a6, + 0x06a300b7, + 0x062300b7, + 0x05a300b7, + 0x052300b7, + 0x04a300b7, + 0x042300b7, + 0x03a300b7, + 0x032300b7, + 0x02a300b7, + 0x022300b7, + 0x01a300b7, + 0x012300b7, + 0x00a300b7, + 0x002300b7, + 0x808200b7, + 0x0ff5f593, + 0x00859693, + 0x96938dd5, + 0x8dd50105, + 0x02059693, + 0xb7598dd5, + 0x00279693, + 0x00000297, + 0x82869696, + 0xfa2680e7, + 0x17c18096, + 0x963e8f1d, + 0xf8c371e3, + 0x65f1b79d, 0x02faf537, 0x85931141, 0x05132005, 0xe4060805, - 0xe84ff0ef, + 0xe00ff0ef, 0x00001517, - 0xdc050513, - 0xebcff0ef, + 0xdc450513, + 0xe38ff0ef, 0x65a14505, 0xf0ef057e, - 0xe911d05f, + 0xe909c6bf, 0x0010041b, - 0x01f41413, - 0x00000597, - 0x13058593, - 0xa0018402, + 0x0597047e, + 0x85930000, + 0x84021ae5, + 0x0000a001, + 0x00000000, + 0x00000000, + 0x00000000, + 0x00000000, + 0x00000000, + 0x00000000, + 0x00000000, + 0x00000000, + 0x00000000, + 0x00000000, + 0x00000000, + 0x00000000, + 0x00000000, + 0x00000000, + 0x00000000, + 0x00000000, + 0x00000000, + 0x00000000, + 0x00000000, + 0x00000000, + 0x00000000, + 0x00000000, + 0x00000000, + 0x00000000, + 0x00000000, + 0x00000000, + 0x00000000, + 0x00000000, + 0x00000000, + 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, @@ -772,15 +836,15 @@ uint32_t reset_vec[reset_vec_size] = { 0x00000000, 0x00000000, 0xedfe0dd0, - 0x6a0c0000, + 0xf20b0000, 0x38000000, - 0x98090000, + 0x20090000, 0x28000000, 0x11000000, 0x10000000, 0x00000000, 0xd2020000, - 0x60090000, + 0xe8080000, 0x00000000, 0x00000000, 0x00000000, @@ -1069,46 +1133,16 @@ uint32_t reset_vec[reset_vec_size] = { 0x03000000, 0x02000000, 0x01000000, - 0x75626564, - 0x6f632d67, - 0x6f72746e, - 0x72656c6c, - 0x00003040, - 0x03000000, - 0x10000000, - 0x1b000000, - 0x63736972, - 0x65642c76, - 0x2d677562, - 0x00333130, - 0x03000000, - 0x08000000, - 0xf7000000, - 0x02000000, - 0xffff0000, - 0x03000000, - 0x10000000, - 0x67000000, - 0x00000000, - 0x00000000, - 0x00000000, - 0x00100000, - 0x03000000, - 0x08000000, - 0x0b010000, - 0x746e6f63, - 0x006c6f72, - 0x02000000, - 0x01000000, 0x74726175, 0x30303140, 0x30303030, 0x00000030, 0x03000000, - 0x08000000, + 0x09000000, 0x1b000000, 0x3631736e, - 0x00303537, + 0x61303535, + 0x00000000, 0x03000000, 0x10000000, 0x67000000, diff --git a/corev_apu/fpga/src/bootrom/bootrom_64.sv b/corev_apu/fpga/src/bootrom/bootrom_64.sv index 2ae0777bb..3e25cf859 100644 --- a/corev_apu/fpga/src/bootrom/bootrom_64.sv +++ b/corev_apu/fpga/src/bootrom/bootrom_64.sv @@ -20,7 +20,7 @@ module bootrom_64 ( input logic [63:0] addr_i, output logic [63:0] rdata_o ); - localparam int RomSize = 878; + localparam int RomSize = 895; const logic [RomSize-1:0][63:0] mem = { 64'h00000000_00000000, @@ -348,26 +348,11 @@ module bootrom_64 ( 64'h00000000_00000010, 64'h00000000_67000000, 64'h10000000_03000000, - 64'h00303537_3631736e, - 64'h1b000000_08000000, - 64'h03000000_00000030, - 64'h30303030_30303140, - 64'h74726175_01000000, - 64'h02000000_006c6f72, - 64'h746e6f63_0b010000, - 64'h08000000_03000000, - 64'h00100000_00000000, - 64'h00000000_00000000, - 64'h67000000_10000000, - 64'h03000000_ffff0000, - 64'h02000000_f7000000, - 64'h08000000_03000000, - 64'h00333130_2d677562, - 64'h65642c76_63736972, - 64'h1b000000_10000000, - 64'h03000000_00003040, - 64'h72656c6c_6f72746e, - 64'h6f632d67_75626564, + 64'h00000000_61303535, + 64'h3631736e_1b000000, + 64'h09000000_03000000, + 64'h00000030_30303030, + 64'h30303140_74726175, 64'h01000000_02000000, 64'h03000000_b5000000, 64'h04000000_03000000, @@ -512,11 +497,11 @@ module bootrom_64 ( 64'h00000000_01000000, 64'h00000000_00000000, 64'h00000000_00000000, - 64'h60090000_d2020000, + 64'he8080000_d2020000, 64'h00000000_10000000, 64'h11000000_28000000, - 64'h98090000_38000000, - 64'h6a0c0000_edfe0dd0, + 64'h20090000_38000000, + 64'hf20b0000_edfe0dd0, 64'h00000000_00000000, 64'h00000000_00000000, 64'h00000000_00000000, @@ -553,227 +538,260 @@ module bootrom_64 ( 64'h00000000_00000000, 64'h00000000_00000000, 64'h00000000_00000000, - 64'h00000000_a0018402, - 64'h13058593_00000597, - 64'h01f41413_0010041b, - 64'he911d05f_f0ef057e, - 64'h65a14505_ebcff0ef, - 64'hdc050513_00001517, - 64'he84ff0ef_e4060805, - 64'h05132005_85931141, - 64'h02faf537_65f1bbb9, - 64'hee0ff0ef_0d450513, - 64'h00001517_bbc1e2e5, - 64'h05130000_1517f78f, - 64'hf0ef8526_efcff0ef, - 64'hf3050513_00001517, - 64'hf08ff0ef_f2450513, - 64'h00001517_bbe5e565, - 64'h05130000_1517fa0f, - 64'hf0ef8526_f24ff0ef, - 64'hf5850513_00001517, - 64'hf30ff0ef_f4c50513, - 64'h00001517_c92984aa, - 64'hc3dff0ef_9e0d2605, - 64'h855a020a_a583028a, - 64'hb603f52f_f0ef12e5, - 64'h05130000_1517f374, - 64'h9de30809_09130809, - 64'h8993f6af_f0ef2485, - 64'heb050513_00001517, - 64'hff499be3_841ff0ef, - 64'h0a05000a_4503f86f, - 64'hf0ef1525_05130000, - 64'h1517815f_f0ef0109, - 64'h3503f9af_f0ef1565, - 64'h05130000_1517829f, - 64'hf0ef0089_3503faef, - 64'hf0ef15a5_05130000, - 64'h151783df_f0effb89, - 64'h8a130009_3503fc6f, - 64'hf0ef1625_05130000, - 64'h1517ff2a_1be389bf, - 64'hf0ef0a05_000a4503, - 64'hf9098a13_fe4ff0ef, - 64'h16050513_00001517, - 64'hff8a19e3_8b9ff0ef, - 64'h0a050007_c503014c, - 64'h87b34a01_805ff0ef, - 64'hf8098c93_16450513, - 64'h00001517_8d9ff0ef, - 64'h0ff4f513_81dff0ef, - 64'h16050513_00001517, - 64'h4b914c41_10051e63, - 64'h02010913_08010993, - 64'h84aa8a8a_d39ff0ef, - 64'h850a4605_71010489, - 64'h258384bf_f0eff8e5, - 64'h05130000_1517899f, - 64'hf0ef4556_85dff0ef, - 64'h18050513_00001517, - 64'h8abff0ef_454686ff, - 64'hf0ef1725_05130000, - 64'h15178fdf_f0ef6526, - 64'h881ff0ef_16450513, - 64'h00001517_90fff0ef, - 64'h7502893f_f0ef1665, - 64'h05130000_1517921f, - 64'hf0ef6562_8a5ff0ef, - 64'h16050513_00001517, - 64'h8f3ff0ef_45528b7f, - 64'hf0ef1625_05130000, - 64'h1517905f_f0ef4542, - 64'h8c9ff0ef_16450513, + 64'h00000000_00000000, + 64'h00000000_00000000, + 64'h00000000_00000000, + 64'h00000000_00000000, + 64'h00000000_00000000, + 64'h00000000_00000000, + 64'h00000000_00000000, + 64'h00000000_00000000, + 64'h00000000_00000000, + 64'h00000000_00000000, + 64'h00000000_00000000, + 64'h00000000_00000000, + 64'h00000000_00000000, + 64'h00000000_00000000, + 64'h00000000_00000000, + 64'h00000000_00000000, + 64'h0000a001_84021ae5, + 64'h85930000_0597047e, + 64'h0010041b_e909c6bf, + 64'hf0ef057e_65a14505, + 64'he38ff0ef_dc450513, + 64'h00001517_e00ff0ef, + 64'he4060805_05132005, + 64'h85931141_02faf537, + 64'h65f1b79d_f8c371e3, + 64'h963e8f1d_17c18096, + 64'hfa2680e7_82869696, + 64'h00000297_00279693, + 64'hb7598dd5_02059693, + 64'h8dd50105_96938dd5, + 64'h00859693_0ff5f593, + 64'h808200b7_002300b7, + 64'h00a300b7_012300b7, + 64'h01a300b7_022300b7, + 64'h02a300b7_032300b7, + 64'h03a300b7_042300b7, + 64'h04a300b7_052300b7, + 64'h05a300b7_062300b7, + 64'h06a300b7_072300a6, + 64'h80679696_00000297, + 64'h068a40c3_06b38082, + 64'he211fed7_6de30741, + 64'he70ce30c_96ba8a3d, + 64'hff067693_e1bde3c1, + 64'h00f77793_02c37163, + 64'h872a433d_b3b5f06f, + 64'hf0ef1825_05130000, + 64'h1517bbf1_edc50513, + 64'h00001517_f9eff0ef, + 64'h854af22f_f0effde5, + 64'h05130000_1517f2ef, + 64'hf0effd25_05130000, + 64'h1517b511_f0450513, + 64'h00001517_fc6ff0ef, + 64'h8526f4af_f0ef0065, + 64'h05130000_1517f56f, + 64'hf0efffa5_05130000, + 64'h1517c929_84aac5bf, + 64'hf0ef9e0d_26058552, + 64'h020aa583_028ab603, + 64'hf78ff0ef_1dc50513, + 64'h00001517_f56910e3, + 64'h08048493_f8cff0ef, + 64'h2905f5a5_05130000, + 64'h1517ff89_9be3863f, + 64'hf0ef0985_0009c503, + 64'hfa8ff0ef_1fc50513, + 64'h00001517_837ff0ef, + 64'h6888fbaf_f0ef1fe5, + 64'h05130000_1517849f, + 64'hf0ef6488_fccff0ef, + 64'h20050513_00001517, + 64'h85bff0ef_06048c13, + 64'h01848993_6088fe6f, + 64'hf0ef20a5_05130000, + 64'h1517ff34_9be38bbf, + 64'hf0ef0985_0009c503, + 64'hff048993_805ff0ef, + 64'h20850513_00001517, + 64'hff7999e3_8d9ff0ef, + 64'h09850007_c503013c, + 64'h07b34981_825ff0ef, + 64'hfe048c13_20c50513, + 64'h00001517_8f9ff0ef, + 64'h0ff97513_83dff0ef, + 64'h20850513_00001517, + 64'h4b114bc1_10051b63, + 64'h1004892a_8a8ad4bf, + 64'hf0ef850a_46057101, + 64'h04892583_865ff0ef, + 64'h03050513_00001517, + 64'h8b3ff0ef_4556877f, + 64'hf0ef2225_05130000, + 64'h15178c5f_f0ef4546, + 64'h889ff0ef_21450513, 64'h00001517_917ff0ef, - 64'h45328dbf_f0ef1665, + 64'h652689bf_f0ef2065, 64'h05130000_1517929f, - 64'hf0ef4522_8edff0ef, - 64'h16850513_00001517, - 64'h97bff0ef_65028fff, - 64'hf0ef16a5_05130000, - 64'h151790bf_f0ef1565, - 64'h05130000_1517bf59, - 64'h54f991bf_f0ef05e5, - 64'h05130000_15179a9f, - 64'hf0ef8526_92dff0ef, - 64'h16050513_00001517, - 64'h939ff0ef_15450513, - 64'h00001517_c90584aa, - 64'h890ae47f_f0ef850a, - 64'h45854605_7101957f, - 64'hf0ef15a5_05130000, - 64'h15178082_61256ca2, - 64'h6c426be2_7b027aa2, - 64'h7a4279e2_690664a6, - 64'h64468526_60e6fa04, - 64'h011354fd_985ff0ef, - 64'h16050513_00001517, - 64'hc905df3f_f0ef8b2a, - 64'h1080e466_e862ec5e, - 64'hf456f852_fc4ee0ca, - 64'he4a6ec86_f05ae8a2, - 64'h711db765_54798082, - 64'h61696baa_6b4a6aea, - 64'h7a0a79aa_794a74ea, - 64'h640e60ae_8522547d, - 64'h9d1ff0ef_18450513, - 64'h00001517_c5dff0ef, - 64'hc61ff0ef_c65ff0ef, - 64'hc69ff0ef_c6dff0ef, - 64'hc71ff0ef_c75ff0ef, - 64'hc79ff0ef_a805c7ff, - 64'hf0efc8bf_f0ef4531, - 64'h45814605_4401f930, - 64'h46e32004_849319fd, - 64'ha19ff0ef_1ec50513, - 64'h00001517_e7990369, - 64'he7b30689_1c639041, - 64'h29011442_8c49cb7f, - 64'hf0ef9041_03051413, - 64'h0085151b_cc5ff0ef, - 64'hfc941ae3_04040413, - 64'hff7a17e3_892af15f, - 64'hf0ef0a05_854a0007, - 64'hc5830144_07b30400, - 64'h0b934a01_c69ff0ef, - 64'h850a0400_05938622, - 64'h4901ff55_1ee3cfff, - 64'hf0efe004_84133e80, - 64'h0b130fe0_0a93e951, - 64'h20048493_d1dff0ef, - 64'h454985a2_0ff67613, - 64'h00166613_0015161b, - 64'hf4dff0ef_0ff47593, - 64'hf55ff0ef_0ff5f593, - 64'h0084559b_f61ff0ef, - 64'h0ff5f593_0104559b, - 64'hf6dff0ef_45010184, - 64'h559bfee7_9be30785, - 64'h00c68023_00f106b3, - 64'h08000713_567d4781, - 64'h0209d993_842e84aa, - 64'he55ee95a_ed56f152, - 64'hf94ae586_fd26e1a2, - 64'h02061993_f54e7155, + 64'hf0ef7502_8adff0ef, + 64'h20850513_00001517, + 64'h93bff0ef_65628bff, + 64'hf0ef2025_05130000, + 64'h151790df_f0ef4552, + 64'h8d1ff0ef_20450513, + 64'h00001517_91fff0ef, + 64'h45428e3f_f0ef2065, + 64'h05130000_1517931f, + 64'hf0ef4532_8f5ff0ef, + 64'h20850513_00001517, + 64'h943ff0ef_4522907f, + 64'hf0ef20a5_05130000, + 64'h1517995f_f0ef6502, + 64'h919ff0ef_20c50513, + 64'h00001517_925ff0ef, + 64'h1f850513_00001517, + 64'hbf6154f9_935ff0ef, + 64'h10050513_00001517, + 64'h9c3ff0ef_8526947f, + 64'hf0ef2025_05130000, + 64'h1517953f_f0ef1f65, + 64'h05130000_1517c905, + 64'h84aa890a_e59ff0ef, + 64'h850a4585_46057101, + 64'h971ff0ef_1fc50513, + 64'h00001517_80826161, + 64'h6c026ba2_6b426ae2, + 64'h7a0279a2_794274e2, + 64'h64068526_60a6fb04, + 64'h011354fd_99dff0ef, + 64'h20050513_00001517, + 64'hc51de01f_f0ef8a2a, + 64'h0880e062_e45ee85a, + 64'hec56f44e_f84afc26, + 64'he486f052_e0a2715d, + 64'hb7655479_80826169, + 64'h6baa6b4a_6aea7a0a, + 64'h79aa794a_74ea640e, + 64'h852260ae_547d9e7f, + 64'hf0ef2225_05130000, + 64'h1517c6bf_f0efc6ff, + 64'hf0efc73f_f0efc77f, + 64'hf0efc7bf_f0efc7ff, + 64'hf0efc83f_f0efc87f, + 64'hf0efa805_c8dff0ef, + 64'hc97ff0ef_45314581, + 64'h46054401_f92047e3, + 64'h197da2bf_f0ef2865, + 64'h05130000_1517e799, + 64'h034967b3_06941a63, + 64'h24819041_14428c49, + 64'hcc1ff0ef_90411442, + 64'h0085141b_8aa2ccff, + 64'hf0effd64_1ae30404, + 64'h0413ff7a_97e384aa, + 64'hf25ff0ef_0a858526, + 64'h0007c583_015407b3, + 64'h04000b93_4a81c73f, + 64'hf0ef850a_04000593, + 64'h8622200a_8b134481, + 64'h8456ff35_1ee3d0ff, + 64'hf0ef3e80_0a130fe0, + 64'h09930209_5913e959, + 64'hd27ff0ef_454985a2, + 64'h0ff67613_00166613, + 64'h0015161b_f57ff0ef, + 64'h0ff47593_f5fff0ef, + 64'h0ff5f593_0084559b, + 64'hf6bff0ef_0ff5f593, + 64'h0104559b_f77ff0ef, + 64'h45010184_559b3e60, + 64'h00efe55e_e95af152, + 64'hf54efd26_e5860800, + 64'h0613850a_02061913, + 64'h8aaa0ff0_0593ed56, + 64'h842ef94a_e1a27155, 64'h80829141_15428d3d, - 64'h8ff90057_979b1701, - 64'h67090107_d79b0105, - 64'h179b4105_551b0105, - 64'h151b8d2d_00c59513, - 64'h8da9893d_0045d51b, - 64'h8da99141_15428d5d, - 64'h05220085_579b8082, - 64'h07f57513_8d2d0045, - 64'h15938d2d_8d3d0045, - 64'hd51b0075_d79b8de9, - 64'h80820141_853e6402, - 64'h60a257f5_e1114781, - 64'hf89ff0ef_c51157f9, - 64'hefbff0ef_c91157fd, - 64'heb7ff0ef_fc6de07f, - 64'hf0ef347d_4429b8ff, - 64'hf0ef32a5_05130000, - 64'h1517c89f_f0efe022, - 64'he4061141_80826105, - 64'h00153513_64a26442, - 64'h60e20004_051bfc94, - 64'h0ce3e3bf_f0efeb3f, - 64'hf0ef3525_05130000, - 64'h151785aa_842ae57f, - 64'hf0ef0290_05134000, - 64'h05b70770_0613fbdf, - 64'hf0ef4485_e822ec06, - 64'he4261101_80820141, - 64'h00153513_157d6402, - 64'h60a20004_051bef3f, - 64'hf0ef38c5_051385a2, - 64'h00001517_e8dff0ef, - 64'h842ae9bf_f0efe022, - 64'he4060370_05134581, - 64'h06500613_11418082, - 64'h61056902_64a26442, - 64'h60e20015_3513f565, - 64'h05130004_051b0124, - 64'h986388bd_00f91b63, + 64'h8ff91781_0057171b, + 64'h67890107_571b0105, + 64'h171b8d3d_00c5179b, + 64'h8d2d893d_0045d51b, + 64'h8dbd93c1_17c28fc9, + 64'h0085551b_0085179b, + 64'h808207f5_75138d3d, + 64'h0ff7f793_0045179b, + 64'h8d2d0ff5_75138d3d, + 64'h0045d51b_0075d79b, + 64'h8de98082_0141853e, + 64'h640260a2_57f5e111, + 64'h4781f89f_f0efc511, + 64'h57f9efdf_f0efc911, + 64'h57fdeb9f_f0effc6d, + 64'he09ff0ef_347d4429, + 64'hb99ff0ef_3bc50513, + 64'h00001517_c8dff0ef, + 64'he022e406_11418082, + 64'h61050015_351364a2, + 64'h64420004_051b60e2, + 64'hfc940ce3_e3dff0ef, + 64'heb5ff0ef_3e450513, + 64'h00001517_85aa842a, + 64'he57ff0ef_02900513, + 64'h400005b7_07700613, + 64'hfbdff0ef_4485e822, + 64'hec06e426_11018082, + 64'h01410015_3513157d, + 64'h64020004_051b60a2, + 64'hef5ff0ef_41e50513, + 64'h85a20000_1517e8ff, + 64'hf0ef842a_e9bff0ef, + 64'he022e406_03700513, + 64'h45810650_06131141, + 64'h80826105_690264a2, + 64'h644260e2_00143513, + 64'hf5640413_24010124, + 64'h976388bd_00f91a63, 64'h45014785_ecdff0ef, 64'hed1ff0ef_842aed7f, 64'hf0ef84aa_eddff0ef, 64'hee1ff0ef_ee5ff0ef, - 64'h892aef3f_f0efe04a, + 64'h892aef1f_f0efe04a, 64'he426e822_ec064521, 64'h1aa00593_08700613, 64'h1101bfcd_45018082, 64'h61056902_64a26442, 64'h60e24505_f89ff0ef, - 64'h458541a5_05130000, - 64'h1517fe99_15e3c00d, - 64'hf29ff0ef_892a347d, - 64'hf39ff0ef_45014581, - 64'h09500613_44857104, - 64'h0413e04a_ec06e426, - 64'h6409e822_1101ccff, - 64'hf06f6105_41450513, - 64'h00001517_60e26442, - 64'hda5ff0ef_852e65a2, - 64'hce9ff0ef_45c50513, - 64'h00001517_cf5ff0ef, - 64'h8522cfbf_f0efe42e, - 64'hec064625_05130000, - 64'h1517842a_e8221101, - 64'h80826145_64e27402, - 64'h70a2f47d_147d0007, - 64'hd4634187_d79b0185, - 64'h179bfabf_f0efeb5f, - 64'hf0ef8532_06400413, - 64'h6622ec1f_f0ef0ff4, + 64'h45854aa5_05130000, + 64'h1517ff24_95e3c00d, + 64'hf29ff0ef_84aa347d, + 64'hf37ff0ef_45014581, + 64'h09500613_49057104, + 64'h0413e426_ec06e04a, + 64'h6409e822_1101b9d1, + 64'h61054a25_05130000, + 64'h151764a2_60e26442, + 64'hdadff0ef_8522ceff, + 64'hf0ef4ea5_05130000, + 64'h1517cfbf_f0ef8526, + 64'hd01ff0ef_842ee822, + 64'hec064f25_05130000, + 64'h151784aa_e4261101, + 64'h80826105_690264a2, + 64'h644260e2_f47d147d, + 64'h0007d463_4187d79b, + 64'h0185179b_fadff0ef, + 64'h06400413_ebbff0ef, + 64'h8526ec1f_f0ef0ff4, 64'h7513ec9f_f0ef0ff5, 64'h75130084_551bed5f, 64'hf0ef0ff5_75130104, 64'h551bee1f_f0ef0184, - 64'h551bee9f_f0ef0404, - 64'he513febf_f0ef84aa, - 64'h842eec26_f022e432, - 64'hf4067179_f03ff06f, + 64'h551bee9f_f0ef0409, + 64'h6513febf_f0ef892a, + 64'he04a84b2_842ee426, + 64'he822ec06_1101b709, 64'h0ff00513_8082557d, 64'hb7d900d7_00230785, 64'h00f60733_06c82683, @@ -792,12 +810,12 @@ module bootrom_64 ( 64'hdbb85779_200007b7, 64'h06b7ee63_10000793, 64'h80826105_64a2d3b8, - 64'h4719dbb8_644260e2, - 64'h0ff47513_577d2000, - 64'h07b7e23f_f0ef5665, - 64'h05130000_1517eb1f, + 64'h4719dbb8_64420ff4, + 64'h7513577d_200007b7, + 64'h60e2e2bf_f0ef5f65, + 64'h05130000_1517eb9f, 64'hf0ef9101_15024088, - 64'he39ff0ef_58450513, + 64'he41ff0ef_61450513, 64'h00001517_e3958b85, 64'h240153fc_57e0ff65, 64'h8b050647_849353f8, @@ -805,51 +823,50 @@ module bootrom_64 ( 64'h07b7fff5_37fd0001, 64'h06400793_d7a8dbb8, 64'h5779e426_e822ec06, - 64'h200007b7_1101e7ff, - 64'hf06f6105_5b450513, - 64'h00001517_64a260e2, - 64'h6442d03c_4799e97f, - 64'hf0ef5da5_05130000, - 64'h1517f25f_f0ef9101, - 64'h02049513_2481eaff, - 64'hf0ef5d25_05130000, - 64'h15175064_d03c1660, - 64'h0793ec3f_f0ef6065, - 64'h05130000_1517f51f, - 64'hf0ef9101_02049513, - 64'h2481edbf_f0ef5fe5, - 64'h05130000_15175064, - 64'hd03c1040_07932000, - 64'h0437fff5_37fd0001, - 64'h47a9c3b8_47292000, - 64'h07b7f03f_f0efe426, - 64'he822ec06_61e50513, - 64'h11010000_15178082, - 64'h25014108_8082c10c, - 64'h80826105_60e2ecff, - 64'hf0ef0091_4503ed7f, + 64'h200007b7_1101b551, + 64'h61056425_05130000, + 64'h151764a2_60e26442, + 64'hd03c4799_e9dff0ef, + 64'h66850513_00001517, + 64'hf2bff0ef_91010204, + 64'h95132481_eb5ff0ef, + 64'h66050513_00001517, + 64'h5064d03c_16600793, + 64'hec9ff0ef_69450513, + 64'h00001517_f57ff0ef, + 64'h91010204_95132481, + 64'hee1ff0ef_68c50513, + 64'h00001517_5064d03c, + 64'h10400793_20000437, + 64'hfff537fd_000147a9, + 64'hc3b84729_200007b7, + 64'hf09ff0ef_e426e822, + 64'hec066ac5_05131101, + 64'h00001517_80824108, + 64'h8082c10c_b5e96105, + 64'h60e20091_4503ed7f, 64'hf0ef0081_4503f55f, 64'hf0efec06_002c1101, 64'h80826145_694264e2, - 64'h740270a2_fe9410e3, + 64'h740270a2_ff2410e3, 64'hef9ff0ef_00914503, 64'hf01ff0ef_34610081, 64'h4503f81f_f0ef0ff5, - 64'h7513002c_00895533, - 64'h54e10380_0413892a, + 64'h7513002c_0084d533, + 64'h59610380_041384aa, 64'hf406e84a_ec26f022, 64'h71798082_61456942, - 64'h64e27402_70a2fe94, + 64'h64e27402_70a2ff24, 64'h10e3f3bf_f0ef0091, 64'h4503f43f_f0ef3461, 64'h00814503_fc3ff0ef, - 64'h0ff57513_002c0089, - 64'h553b54e1_4461892a, + 64'h0ff57513_002c0084, + 64'hd53b5961_446184aa, 64'hf406e84a_ec26f022, 64'h71798082_00f58023, 64'h0007c783_00e580a3, 64'h97aa8111_00074703, - 64'h973e00f5_771396e7, + 64'h973e00f5_7713a6e7, 64'h87930000_1797b7f5, 64'h0405f93f_f0ef8082, 64'h01416402_60a2e509, @@ -884,7 +901,7 @@ module bootrom_64 ( 64'h00000000_00000000, 64'h00000000_00000000, 64'h00048067_01f49493, - 64'h0010049b_b8458593, + 64'h0010049b_c8458593, 64'h00001597_f1402573, 64'hff24c6e3_4009091b, 64'h02000937_00448493, @@ -897,7 +914,7 @@ module bootrom_64 ( 64'h4009091b_02000937, 64'h00448493_0124a023, 64'h00100913_020004b7, - 64'h27f000ef_01a11113, + 64'h303000ef_01a11113, 64'h0210011b_03249663, 64'hf1402973_00000493, 64'h30491073_00800913 diff --git a/corev_apu/fpga/src/bootrom/cv32a6.dts b/corev_apu/fpga/src/bootrom/cv32a6.dts index b94a9613b..eb1c9b1d6 100644 --- a/corev_apu/fpga/src/bootrom/cv32a6.dts +++ b/corev_apu/fpga/src/bootrom/cv32a6.dts @@ -62,14 +62,17 @@ riscv,max-priority = <7>; riscv,ndev = <30>; }; - debug-controller@0 { - compatible = "riscv,debug-013"; - interrupts-extended = <&CPU0_intc 65535>; - reg = <0x0 0x1000>; - reg-names = "control"; - }; + // Specifying the interrupt controller in the devicetree is not necessary. + // Furthermore, the IRQ 65535 will cause a `hwirq 0xffff is too large` during + // Linux boot (occured with mainline linux 5.14.0). + // debug-controller@0 { + // compatible = "riscv,debug-013"; + // interrupts-extended = <&CPU0_intc 65535>; + // reg = <0x0 0x1000>; + // reg-names = "control"; + // }; uart@10000000 { - compatible = "ns16750"; + compatible = "ns16550a"; reg = < 0x10000000 0x1000>; clock-frequency = <50000000>; current-speed = <115200>; diff --git a/corev_apu/fpga/src/bootrom/cv64a6.dts b/corev_apu/fpga/src/bootrom/cv64a6.dts index c9e11d589..52ae47bbf 100644 --- a/corev_apu/fpga/src/bootrom/cv64a6.dts +++ b/corev_apu/fpga/src/bootrom/cv64a6.dts @@ -62,14 +62,17 @@ riscv,max-priority = <7>; riscv,ndev = <30>; }; - debug-controller@0 { - compatible = "riscv,debug-013"; - interrupts-extended = <&CPU0_intc 65535>; - reg = <0x0 0x0 0x0 0x1000>; - reg-names = "control"; - }; + // Specifying the interrupt controller in the devicetree is not necessary. + // Furthermore, the IRQ 65535 will cause a `hwirq 0xffff is too large` during + // Linux boot (occured with mainline linux 5.14.0). + // debug-controller@0 { + // compatible = "riscv,debug-013"; + // interrupts-extended = <&CPU0_intc 65535>; + // reg = <0x0 0x0 0x0 0x1000>; + // reg-names = "control"; + // }; uart@10000000 { - compatible = "ns16750"; + compatible = "ns16550a"; reg = <0x0 0x10000000 0x0 0x1000>; clock-frequency = <50000000>; current-speed = <115200>;