diff --git a/precursors/rom.db b/precursors/rom.db index de1d0bb53..7a903bbf2 100755 --- a/precursors/rom.db +++ b/precursors/rom.db @@ -1,128 +1,128 @@ -KEYROM 0 A SLICE_X36Y50 b'39bfb9a9befb32ea' -KEYROM 0 B SLICE_X36Y50 b'251f744b97184533' -KEYROM 0 C SLICE_X36Y50 b'5088f6b3ece699d3' -KEYROM 0 D SLICE_X36Y50 b'060b5c9899928e8a' -KEYROM 1 A SLICE_X37Y50 b'7f4b6bd5aff262ab' -KEYROM 1 B SLICE_X37Y50 b'cc56474068e84a75' -KEYROM 1 C SLICE_X37Y50 b'7661db943389ddcb' -KEYROM 1 D SLICE_X37Y50 b'e3d02ea97b9c0601' -KEYROM 2 A SLICE_X36Y51 b'60c80e9a2753cc42' -KEYROM 2 B SLICE_X36Y51 b'e728b7c6406818ac' -KEYROM 2 C SLICE_X36Y51 b'18be5e075fa0ef09' -KEYROM 2 D SLICE_X36Y51 b'8fdfa26e19d0b7a6' -KEYROM 3 A SLICE_X37Y51 b'523707b03676328c' -KEYROM 3 B SLICE_X37Y51 b'1219d5f75fd76f2c' -KEYROM 3 C SLICE_X37Y51 b'e69d8ef9f0d352c0' -KEYROM 3 D SLICE_X37Y51 b'd57a8107c6f2a161' -KEYROM 4 A SLICE_X36Y52 b'26cf3aac54efbdc0' -KEYROM 4 B SLICE_X36Y52 b'56a7e1893197d6be' -KEYROM 4 C SLICE_X36Y52 b'079b50de1ee8d00d' -KEYROM 4 D SLICE_X36Y52 b'10e3a9f0350938e9' -KEYROM 5 A SLICE_X37Y52 b'e99832eaad64443b' -KEYROM 5 B SLICE_X37Y52 b'96b8ce8f7e5dca70' -KEYROM 5 C SLICE_X37Y52 b'c113e3c3f1fba21a' -KEYROM 5 D SLICE_X37Y52 b'e895dfe31a810058' -KEYROM 6 A SLICE_X36Y53 b'2ad7ad771eaa3ab1' -KEYROM 6 B SLICE_X36Y53 b'3a20b91bbad180b9' -KEYROM 6 C SLICE_X36Y53 b'ca1a48ed919e7cc0' -KEYROM 6 D SLICE_X36Y53 b'6c002c67a28224fe' -KEYROM 7 A SLICE_X37Y53 b'82b163c45679a8cb' -KEYROM 7 B SLICE_X37Y53 b'33071d2bb3b94038' -KEYROM 7 C SLICE_X37Y53 b'080371b0c28e6a5f' -KEYROM 7 D SLICE_X37Y53 b'f136018824b78509' -KEYROM 8 A SLICE_X36Y54 b'57d7aadbe250bc31' -KEYROM 8 B SLICE_X36Y54 b'566cf26001fae556' -KEYROM 8 C SLICE_X36Y54 b'49482edb9adfa50a' -KEYROM 8 D SLICE_X36Y54 b'd9170762cfd9e4bb' -KEYROM 9 A SLICE_X37Y54 b'ed98ff551abc7de6' -KEYROM 9 B SLICE_X37Y54 b'fe744c59e84e90bb' -KEYROM 9 C SLICE_X37Y54 b'60635908c045c2b1' -KEYROM 9 D SLICE_X37Y54 b'18d5bec70f3225dd' -KEYROM 10 A SLICE_X36Y55 b'8a62be73c9a18425' -KEYROM 10 B SLICE_X36Y55 b'5dffb51e42092c48' -KEYROM 10 C SLICE_X36Y55 b'c2b68bdab8e14daf' -KEYROM 10 D SLICE_X36Y55 b'a087d6362c33dc46' -KEYROM 11 A SLICE_X37Y55 b'98b0963536e5fda8' -KEYROM 11 B SLICE_X37Y55 b'c27a491ca6c62230' -KEYROM 11 C SLICE_X37Y55 b'a713d50a8e567d36' -KEYROM 11 D SLICE_X37Y55 b'6e4ca68e4c9b8e49' -KEYROM 12 A SLICE_X36Y56 b'd1ea2e9ee808fdfa' -KEYROM 12 B SLICE_X36Y56 b'354699e1bcb2a034' -KEYROM 12 C SLICE_X36Y56 b'037bab580d9484cd' -KEYROM 12 D SLICE_X36Y56 b'079054e0218d3b9c' -KEYROM 13 A SLICE_X37Y56 b'c7b4a06dfe6fea50' -KEYROM 13 B SLICE_X37Y56 b'906bd7c2cca62194' -KEYROM 13 C SLICE_X37Y56 b'9b77b287ec25c013' -KEYROM 13 D SLICE_X37Y56 b'731f5d42e03c1d91' -KEYROM 14 A SLICE_X36Y57 b'83181e5f85fd57cc' -KEYROM 14 B SLICE_X36Y57 b'3d82418483882105' -KEYROM 14 C SLICE_X36Y57 b'f91fc764a840ab6d' -KEYROM 14 D SLICE_X36Y57 b'307d6b4e6512d962' -KEYROM 15 A SLICE_X37Y57 b'039b708a120d5b02' -KEYROM 15 B SLICE_X37Y57 b'2149ee1c56d5d104' -KEYROM 15 C SLICE_X37Y57 b'4dde1ace5d4f79e2' -KEYROM 15 D SLICE_X37Y57 b'590bd768facfa05f' -KEYROM 16 A SLICE_X36Y58 b'7df4c772b5d15a96' -KEYROM 16 B SLICE_X36Y58 b'50412a32aa21ad7d' -KEYROM 16 C SLICE_X36Y58 b'f483d64bebbfd090' -KEYROM 16 D SLICE_X36Y58 b'6a88d2a08d0da53c' -KEYROM 17 A SLICE_X37Y58 b'e7c3bc42918789be' -KEYROM 17 B SLICE_X37Y58 b'50febb5dbd41fb03' -KEYROM 17 C SLICE_X37Y58 b'23dc32d25e484c38' -KEYROM 17 D SLICE_X37Y58 b'45bc92795ba17426' -KEYROM 18 A SLICE_X36Y59 b'b0c5743c0a6cc031' -KEYROM 18 B SLICE_X36Y59 b'84d981cc38878ea4' -KEYROM 18 C SLICE_X36Y59 b'4a4d2abf88daf7e1' -KEYROM 18 D SLICE_X36Y59 b'baad907454348c70' -KEYROM 19 A SLICE_X37Y59 b'93ab779450bc2bf2' -KEYROM 19 B SLICE_X37Y59 b'0aa274e95e71bf64' -KEYROM 19 C SLICE_X37Y59 b'9d76f5f872e73e37' -KEYROM 19 D SLICE_X37Y59 b'9a195b34a86f3c61' -KEYROM 20 A SLICE_X36Y60 b'5d8ef899fad40873' -KEYROM 20 B SLICE_X36Y60 b'a012cf7967e7d211' -KEYROM 20 C SLICE_X36Y60 b'b197a57059396247' -KEYROM 20 D SLICE_X36Y60 b'db1381808c6aacfa' -KEYROM 21 A SLICE_X37Y60 b'd8bee63a92722568' -KEYROM 21 B SLICE_X37Y60 b'c53b93f721e27e5e' -KEYROM 21 C SLICE_X37Y60 b'f1f14560426f1cb9' -KEYROM 21 D SLICE_X37Y60 b'b764ef1c14c56fbb' -KEYROM 22 A SLICE_X36Y61 b'9273c3d230db3cd5' -KEYROM 22 B SLICE_X36Y61 b'baadc9c23514cfe8' -KEYROM 22 C SLICE_X36Y61 b'0b697169f8f500a2' -KEYROM 22 D SLICE_X36Y61 b'10553736cabd55af' -KEYROM 23 A SLICE_X37Y61 b'69434f4cf1cb034e' -KEYROM 23 B SLICE_X37Y61 b'1931126c227044d3' -KEYROM 23 C SLICE_X37Y61 b'48186dc422b44899' -KEYROM 23 D SLICE_X37Y61 b'f3d6e30ce57a18d7' -KEYROM 24 A SLICE_X36Y62 b'4e6eb65c3683fd24' -KEYROM 24 B SLICE_X36Y62 b'2e3f33d93d54a1ed' -KEYROM 24 C SLICE_X36Y62 b'98e1274147f8a25e' -KEYROM 24 D SLICE_X36Y62 b'fdcd7926c0110247' -KEYROM 25 A SLICE_X37Y62 b'0e942f7bb16935b5' -KEYROM 25 B SLICE_X37Y62 b'ec3cf9390bc3d1ba' -KEYROM 25 C SLICE_X37Y62 b'708c43c154e7826e' -KEYROM 25 D SLICE_X37Y62 b'14cb66762a91fdb7' -KEYROM 26 A SLICE_X36Y63 b'116ae34dde1344ee' -KEYROM 26 B SLICE_X36Y63 b'f1679fe5c9f41907' -KEYROM 26 C SLICE_X36Y63 b'13afd5723d575653' -KEYROM 26 D SLICE_X36Y63 b'4f2ca1d01dd243f5' -KEYROM 27 A SLICE_X37Y63 b'cc6399a2eb6e1bc7' -KEYROM 27 B SLICE_X37Y63 b'b4f8c215f4273fa4' -KEYROM 27 C SLICE_X37Y63 b'6efbb1d0c104db8e' -KEYROM 27 D SLICE_X37Y63 b'6257b029c62417f6' -KEYROM 28 A SLICE_X36Y64 b'0cca7866e23c174b' -KEYROM 28 B SLICE_X36Y64 b'c16495ee61f80ccd' -KEYROM 28 C SLICE_X36Y64 b'6c409449baef9162' -KEYROM 28 D SLICE_X36Y64 b'34f1c0cd504b2767' -KEYROM 29 A SLICE_X37Y64 b'a5a95571bec722ea' -KEYROM 29 B SLICE_X37Y64 b'ca9aa68f526310e9' -KEYROM 29 C SLICE_X37Y64 b'7c36a393232bf3ad' -KEYROM 29 D SLICE_X37Y64 b'07d516fa066113b7' -KEYROM 30 A SLICE_X36Y65 b'f60e6b46b93839ac' -KEYROM 30 B SLICE_X36Y65 b'cdd2b21e8f1ae2ac' -KEYROM 30 C SLICE_X36Y65 b'519063c237cb2d75' -KEYROM 30 D SLICE_X36Y65 b'c3dd1fdf13e8974b' -KEYROM 31 A SLICE_X37Y65 b'f8f936a2cd71ee2a' -KEYROM 31 B SLICE_X37Y65 b'3fe496e2360dc020' -KEYROM 31 C SLICE_X37Y65 b'df7ada111111e0bc' -KEYROM 31 D SLICE_X37Y65 b'134427240005b0b5' +KEYROM 0 A SLICE_X36Y50 b'3a0c998caf6733da' +KEYROM 0 B SLICE_X36Y50 b'362744b1b9a16c3a' +KEYROM 0 C SLICE_X36Y50 b'3bf6399258be0d30' +KEYROM 0 D SLICE_X36Y50 b'c29b8227b25c47fe' +KEYROM 1 A SLICE_X37Y50 b'4013d7ffbea93520' +KEYROM 1 B SLICE_X37Y50 b'148aa9947e5500f3' +KEYROM 1 C SLICE_X37Y50 b'61169bf6de06e75d' +KEYROM 1 D SLICE_X37Y50 b'94f7cf498bee76d8' +KEYROM 2 A SLICE_X36Y51 b'c0b1e38184126532' +KEYROM 2 B SLICE_X36Y51 b'ab348c798617128b' +KEYROM 2 C SLICE_X36Y51 b'64107cacf07a33e3' +KEYROM 2 D SLICE_X36Y51 b'695df8e3fab6e561' +KEYROM 3 A SLICE_X37Y51 b'8e4037b2fbcfb4fd' +KEYROM 3 B SLICE_X37Y51 b'f11216ea2eb45a57' +KEYROM 3 C SLICE_X37Y51 b'c7c08d070a021ca7' +KEYROM 3 D SLICE_X37Y51 b'a652ba49f9e57422' +KEYROM 4 A SLICE_X36Y52 b'748511da786001fa' +KEYROM 4 B SLICE_X36Y52 b'bd9e996989343a6c' +KEYROM 4 C SLICE_X36Y52 b'b28d7e778133e18c' +KEYROM 4 D SLICE_X36Y52 b'1c7407e251e5a0e3' +KEYROM 5 A SLICE_X37Y52 b'ad7447192c49bd22' +KEYROM 5 B SLICE_X37Y52 b'4dbaa5ad71789979' +KEYROM 5 C SLICE_X37Y52 b'd1e7c34f854ee714' +KEYROM 5 D SLICE_X37Y52 b'cd66cce7981b2b21' +KEYROM 6 A SLICE_X36Y53 b'd80f976d0ccc9f2a' +KEYROM 6 B SLICE_X36Y53 b'38676a5f356a95bc' +KEYROM 6 C SLICE_X36Y53 b'4cc275bd4e6130e4' +KEYROM 6 D SLICE_X36Y53 b'1db99ff5596907e6' +KEYROM 7 A SLICE_X37Y53 b'c78217a7faa05375' +KEYROM 7 B SLICE_X37Y53 b'69edce4bee5391c1' +KEYROM 7 C SLICE_X37Y53 b'4b84330eb83fc1ff' +KEYROM 7 D SLICE_X37Y53 b'ac36c23ea84e8733' +KEYROM 8 A SLICE_X36Y54 b'7c8b201b8f3b562f' +KEYROM 8 B SLICE_X36Y54 b'ea237f24d799ba48' +KEYROM 8 C SLICE_X36Y54 b'741540dae054f64a' +KEYROM 8 D SLICE_X36Y54 b'd11f535cd92a57e9' +KEYROM 9 A SLICE_X37Y54 b'c16fb77dff73a7cf' +KEYROM 9 B SLICE_X37Y54 b'36ab0319b656c506' +KEYROM 9 C SLICE_X37Y54 b'393e31f4f6f04a8a' +KEYROM 9 D SLICE_X37Y54 b'664e13891fbae961' +KEYROM 10 A SLICE_X36Y55 b'9e63b77d443114ae' +KEYROM 10 B SLICE_X36Y55 b'e23443961d25340f' +KEYROM 10 C SLICE_X36Y55 b'de33b0418f1c854d' +KEYROM 10 D SLICE_X36Y55 b'2bdec0ca8db9c92c' +KEYROM 11 A SLICE_X37Y55 b'06087079df8ae289' +KEYROM 11 B SLICE_X37Y55 b'cd59d84612b8c65a' +KEYROM 11 C SLICE_X37Y55 b'63782a93a3de9167' +KEYROM 11 D SLICE_X37Y55 b'47e932fcc4453a0a' +KEYROM 12 A SLICE_X36Y56 b'c001b7d2368d9da1' +KEYROM 12 B SLICE_X36Y56 b'16c7ea9c9c84a438' +KEYROM 12 C SLICE_X36Y56 b'dcedb3e2dea7e8ec' +KEYROM 12 D SLICE_X36Y56 b'ef2974a2b8170234' +KEYROM 13 A SLICE_X37Y56 b'083d212cfe1131b5' +KEYROM 13 B SLICE_X37Y56 b'd86db06c0c29c96f' +KEYROM 13 C SLICE_X37Y56 b'2709fd478856e90a' +KEYROM 13 D SLICE_X37Y56 b'6a29075b1bf0772d' +KEYROM 14 A SLICE_X36Y57 b'a0fc395ed2e6ff84' +KEYROM 14 B SLICE_X36Y57 b'd377ad17e4f1acb1' +KEYROM 14 C SLICE_X36Y57 b'082e9a8c9d5ecff1' +KEYROM 14 D SLICE_X36Y57 b'48d4c00173b32f79' +KEYROM 15 A SLICE_X37Y57 b'343b63088a66c156' +KEYROM 15 B SLICE_X37Y57 b'294a41b3d3221505' +KEYROM 15 C SLICE_X37Y57 b'04a1b3d3fbc1c0ea' +KEYROM 15 D SLICE_X37Y57 b'4d1055fc644f2803' +KEYROM 16 A SLICE_X36Y58 b'cfecea772a9413ad' +KEYROM 16 B SLICE_X36Y58 b'31fe6f7faa92c384' +KEYROM 16 C SLICE_X36Y58 b'662fa0a6cbb618ad' +KEYROM 16 D SLICE_X36Y58 b'8f1dc52b96d63432' +KEYROM 17 A SLICE_X37Y58 b'0e35b0c62d1d62e7' +KEYROM 17 B SLICE_X37Y58 b'c91f2fec23afb02b' +KEYROM 17 C SLICE_X37Y58 b'a1efc01c44a5ab16' +KEYROM 17 D SLICE_X37Y58 b'cf15c548c48b39d5' +KEYROM 18 A SLICE_X36Y59 b'5bc4cd9de8ce9910' +KEYROM 18 B SLICE_X36Y59 b'ea5b975aae263c7b' +KEYROM 18 C SLICE_X36Y59 b'ae578f441a2905a6' +KEYROM 18 D SLICE_X36Y59 b'432f40ef6d2b0ea8' +KEYROM 19 A SLICE_X37Y59 b'309d35e2e0aa98ed' +KEYROM 19 B SLICE_X37Y59 b'9fd933d65bb9758b' +KEYROM 19 C SLICE_X37Y59 b'5858464d2d6ee6f1' +KEYROM 19 D SLICE_X37Y59 b'90dace7a09142d29' +KEYROM 20 A SLICE_X36Y60 b'017d7639cf8e4bb1' +KEYROM 20 B SLICE_X36Y60 b'9f185f72c51980e1' +KEYROM 20 C SLICE_X36Y60 b'290e875240d26f7c' +KEYROM 20 D SLICE_X36Y60 b'4e00ae733596ab99' +KEYROM 21 A SLICE_X37Y60 b'458ed319b26b9244' +KEYROM 21 B SLICE_X37Y60 b'6b550d51fae7118e' +KEYROM 21 C SLICE_X37Y60 b'816b19c63d879603' +KEYROM 21 D SLICE_X37Y60 b'a98440bca8187b57' +KEYROM 22 A SLICE_X36Y61 b'68561b506fd3ceee' +KEYROM 22 B SLICE_X36Y61 b'0cfef8165d60fbe6' +KEYROM 22 C SLICE_X36Y61 b'15822f6053d334f4' +KEYROM 22 D SLICE_X36Y61 b'0b5897223a0dfaea' +KEYROM 23 A SLICE_X37Y61 b'c7ef1bb43cee6394' +KEYROM 23 B SLICE_X37Y61 b'7029baab9058c9cf' +KEYROM 23 C SLICE_X37Y61 b'a7ec24ff2a499987' +KEYROM 23 D SLICE_X37Y61 b'1f9b47fd0dabc335' +KEYROM 24 A SLICE_X36Y62 b'2435abeefc8e2cf4' +KEYROM 24 B SLICE_X36Y62 b'730789bebe891f53' +KEYROM 24 C SLICE_X36Y62 b'2f8e1e848acb83ed' +KEYROM 24 D SLICE_X36Y62 b'2c18eadde73bd4b7' +KEYROM 25 A SLICE_X37Y62 b'c5a076806139254c' +KEYROM 25 B SLICE_X37Y62 b'2da65b2e7a24a34f' +KEYROM 25 C SLICE_X37Y62 b'70f3d878c0e7a76e' +KEYROM 25 D SLICE_X37Y62 b'2b2553a405e10d28' +KEYROM 26 A SLICE_X36Y63 b'49e2b7d078b01e4c' +KEYROM 26 B SLICE_X36Y63 b'900d2322e7bb001c' +KEYROM 26 C SLICE_X36Y63 b'231cc00cc62149a6' +KEYROM 26 D SLICE_X36Y63 b'37d713bc574a0439' +KEYROM 27 A SLICE_X37Y63 b'843b4e1482f1d5e3' +KEYROM 27 B SLICE_X37Y63 b'8522d2b257eb4fd4' +KEYROM 27 C SLICE_X37Y63 b'eda0a97b9c731b0b' +KEYROM 27 D SLICE_X37Y63 b'd809ff566f666539' +KEYROM 28 A SLICE_X36Y64 b'ef704409eb5fd099' +KEYROM 28 B SLICE_X36Y64 b'1b42f8882794a889' +KEYROM 28 C SLICE_X36Y64 b'2012a36c76d7d477' +KEYROM 28 D SLICE_X36Y64 b'05ca78d1aee9c2fc' +KEYROM 29 A SLICE_X37Y64 b'4f77167e3e8650ce' +KEYROM 29 B SLICE_X37Y64 b'f9a6e32d8fe6d5ef' +KEYROM 29 C SLICE_X37Y64 b'887070d3bfce9cac' +KEYROM 29 D SLICE_X37Y64 b'1fb453dd9aaf69ee' +KEYROM 30 A SLICE_X36Y65 b'2a591ca5452b99a8' +KEYROM 30 B SLICE_X36Y65 b'6f6e79f5007d5f68' +KEYROM 30 C SLICE_X36Y65 b'c13c371ab53daa18' +KEYROM 30 D SLICE_X36Y65 b'f35bb8aac06c24f3' +KEYROM 31 A SLICE_X37Y65 b'6fac8e46f6d6d011' +KEYROM 31 B SLICE_X37Y65 b'd3c9d0b0424060ab' +KEYROM 31 C SLICE_X37Y65 b'3ffd52bd03508063' +KEYROM 31 D SLICE_X37Y65 b'da933541f09b3371' diff --git a/precursors/soc.svd b/precursors/soc.svd index b7a334456..18f2ec14b 100755 --- a/precursors/soc.svd +++ b/precursors/soc.svd @@ -3,7 +3,7 @@ litex SOC - + 8 32 @@ -1238,10 +1238,10 @@ register to disable individual events.]]> GIT_GITREV 0x0014 - 0x94b0064b + 0xcac0c7a5 32 @@ -3584,7 +3584,7 @@ inject too fast.]]> SEED1 0x0000 - 0x543b6ef + 0x3055ce23 32 @@ -3599,7 +3599,7 @@ inject too fast.]]> SEED0 0x0004 - 0x66e4b81 + 0x24d49879 32 diff --git a/precursors/soc_csr.bin b/precursors/soc_csr.bin index 2df67438c..4c1422430 100755 Binary files a/precursors/soc_csr.bin and b/precursors/soc_csr.bin differ diff --git a/services/root-keys/src/main.rs b/services/root-keys/src/main.rs index 4c28f278c..a2afa3833 100644 --- a/services/root-keys/src/main.rs +++ b/services/root-keys/src/main.rs @@ -642,12 +642,20 @@ fn xmain() -> ! { }, Some(Opcode::UxUpdateGwShowInfo) => { let gw_info = keys.fetch_gw_metadata(GatewareRegion::Staging); - let info = format!("v{}.{}.{}+{}\ncommit: g{:x}\n@{}\n{}", - gw_info.git_maj, gw_info.git_min, gw_info.git_rev, gw_info.git_additional, - gw_info.git_commit, - str::from_utf8(&gw_info.host_str[..gw_info.host_len as usize]).unwrap(), - str::from_utf8(&gw_info.date_str[..gw_info.date_len as usize]).unwrap() - ); + let info = if gw_info.git_commit == 0 && gw_info.git_additional == 0 { + format!("v{}.{}.{}+{}\nClean tag\n@{}\n{}", + gw_info.git_maj, gw_info.git_min, gw_info.git_rev, gw_info.git_additional, + str::from_utf8(&gw_info.host_str[..gw_info.host_len as usize]).unwrap(), + str::from_utf8(&gw_info.date_str[..gw_info.date_len as usize]).unwrap() + ) + } else { + format!("v{}.{}.{}+{}\ncommit: g{:x}\n@{}\n{}", + gw_info.git_maj, gw_info.git_min, gw_info.git_rev, gw_info.git_additional, + gw_info.git_commit, + str::from_utf8(&gw_info.host_str[..gw_info.host_len as usize]).unwrap(), + str::from_utf8(&gw_info.date_str[..gw_info.date_len as usize]).unwrap() + ) + }; let buffer = unsafe { Buffer::from_memory_message(msg.body.memory_message().unwrap()) }; let payload = buffer.to_original::().unwrap(); if payload.as_str() == t!("rootkeys.gwup.short", xous::LANG) {