From 0bf7a3a73da7ef2442f1f3c0ebf244199e7175bf Mon Sep 17 00:00:00 2001 From: Chris Andreae Date: Wed, 31 Jan 2024 18:40:28 +0900 Subject: [PATCH] Update zephyr manifest --- nix/manifest.json | 283 +++++++++++++++---------- nix/update-manifest/update-manifest.sh | 2 +- 2 files changed, 168 insertions(+), 117 deletions(-) diff --git a/nix/manifest.json b/nix/manifest.json index 89545734d368..4a942ef65896 100644 --- a/nix/manifest.json +++ b/nix/manifest.json @@ -1,81 +1,183 @@ [ { "name": "zephyr", - "url": "https://github.com/zmkfirmware/zephyr", - "revision": "1ae0eb5ce8adafcec993e6fb8f4eeb6f818a7772", + "url": "https://github.com/petejohanson/zephyr", + "revision": "339570e2393b108bf8f9241018ecaf5615c25469", "clone-depth": 1, "west-commands": "scripts/west-commands.yml", - "sha256": "184wg98wqa6l8xxsk72rcp91prm49h7lna7w6zfmdflv58nmyrla" - }, - { - "name": "canopennode", - "url": "https://github.com/zephyrproject-rtos/canopennode", - "revision": "53d3415c14d60f8f4bfca54bfbc5d5a667d7e724", - "path": "modules/lib/canopennode", - "sha256": "1vqrx1zi2wbvnwza4z39nrd33j9dxpp9j9rnn12r1gdwxfjazbw0" + "sha256": "0m4hcp2017zg8c637siv941976lc377hp4z5kkijxznlb4c3xi8s" }, { "name": "chre", "url": "https://github.com/zephyrproject-rtos/chre", "revision": "ef76d3456db07e4959df555047d6962279528c8d", "path": "modules/lib/chre", + "groups": ["optional"], "sha256": "00jnv58slzgp4srmsamd7x34yf0hj1c6agmws4csv7w28013bwfm" }, + { + "name": "lz4", + "url": "https://github.com/zephyrproject-rtos/lz4", + "revision": "8e303c264fc21c2116dc612658003a22e933124d", + "path": "modules/lib/lz4", + "groups": ["optional"], + "sha256": "1kqs7gxg17gvws01rir8p6gmzp54y12s1898lflhsb418122v8nf" + }, + { + "name": "nanopb", + "url": "https://github.com/zephyrproject-rtos/nanopb", + "revision": "dc4deed54fd4c7e1935e3b6387eedf21bb45dc38", + "path": "modules/lib/nanopb", + "groups": ["optional"], + "sha256": "0kmzh65hyhnl88w9x0rcdypj4nl1brbxrnzhy3flgxmhr564y05s" + }, + { + "name": "psa-arch-tests", + "url": "https://github.com/zephyrproject-rtos/psa-arch-tests", + "revision": "f4fc2442b8e29e2a03d9899e46e5a3ea3df8c2c9", + "path": "modules/tee/tf-m/psa-arch-tests", + "groups": ["optional"], + "sha256": "015qan6qfqyfc1lwpqb29zk1wxx02b6ng5wc1nfpfvknvhiwifay" + }, + { + "name": "sof", + "url": "https://github.com/zephyrproject-rtos/sof", + "revision": "c0f20b69daa44e3563f970b366e49ccfcfa1b71c", + "path": "modules/audio/sof", + "groups": ["optional"], + "sha256": "1ijad7xp9a5j5fc0sdmdrf0l2k3fc4dnw8ka3glp4ay52dhy04zx" + }, + { + "name": "tf-m-tests", + "url": "https://github.com/zephyrproject-rtos/tf-m-tests", + "revision": "c99a86b295c4887520da9d8402566d7f225c974e", + "path": "modules/tee/tf-m/tf-m-tests", + "groups": ["optional"], + "sha256": "0cc4029i9qfzq4vply9l2yjigaf9rq1zc6a44b8dc779kx31qx36" + }, + { + "name": "tflite-micro", + "url": "https://github.com/zephyrproject-rtos/tflite-micro", + "revision": "1a34dcab41e7e0e667db72d6a40999c1ec9c510c", + "path": "optional/modules/lib/tflite-micro", + "groups": ["optional"], + "sha256": "194k1wh4fx49vymc3dhmmsg8wfq4jjhsp00rsrmax5vfhy7fjsi6" + }, + { + "name": "thrift", + "url": "https://github.com/zephyrproject-rtos/thrift", + "revision": "10023645a0e6cb7ce23fcd7fd3dbac9f18df6234", + "path": "optional/modules/lib/thrift", + "groups": ["optional"], + "sha256": "1bpi64lk7sdidjqsq7rspbqk9k7z8s26mgg17c8sv6cr4h007raq" + }, + { + "name": "zscilib", + "url": "https://github.com/zephyrproject-rtos/zscilib", + "revision": "ca070ddabdaf67175a2da901d0bd62e8899371c5", + "path": "modules/lib/zscilib", + "groups": ["optional"], + "sha256": "1ss33lfz2xzz8b3fcnibz109x09lj9ajw3na8lsmhvn7mhg6zh3v" + }, + { + "name": "acpica", + "url": "https://github.com/zephyrproject-rtos/acpica", + "revision": "0333c2af13179f9b33d495cf7cb9a509f751cbb1", + "path": "modules/lib/acpica", + "sha256": "04864is6iisjfasvlwgfsmgnlihdg43cfcc3hpqkzb446x2ix4iw" + }, + { + "name": "canopennode", + "url": "https://github.com/zephyrproject-rtos/canopennode", + "revision": "dec12fa3f0d790cafa8414a4c2930ea71ab72ffd", + "path": "modules/lib/canopennode", + "sha256": "0x6l56q5zdrz78iarfwxiwc05wwq4krg9xhx1z8kjarkwf6q9f85" + }, { "name": "cmsis", "url": "https://github.com/zephyrproject-rtos/cmsis", - "revision": "093de61c2a7d12dc9253daf8692f61f793a9254a", + "revision": "5a00331455dd74e31e80efa383a489faea0590e3", "path": "modules/hal/cmsis", "groups": ["hal"], - "sha256": "0354fz5lb2vg3zj0ciwjmz4slh3s5rnvkmixikn36m51wk8vcq1j" + "sha256": "00zqyin7bn6jwp7kq51dfs7sinwj5dhx4s981gdm171mmx7rx06n" + }, + { + "name": "cmsis-dsp", + "url": "https://github.com/zephyrproject-rtos/cmsis-dsp", + "revision": "ff7b5fd1ea5f094665c090c343ec44e74dc0b193", + "path": "modules/lib/cmsis-dsp", + "sha256": "0ycznb30fmh35sz3gsg3gzdh9shk8ad90k4849lmx21jzxr6jrai" + }, + { + "name": "cmsis-nn", + "url": "https://github.com/zephyrproject-rtos/cmsis-nn", + "revision": "0c8669d81381ccf3b1a01d699f3b68b50134a99f", + "path": "modules/lib/cmsis-nn", + "sha256": "1bnlyklzlhjrx8b66y6fy9im9wipx4shkq3mla5k7iw7kn3kqs7z" }, { "name": "fatfs", "url": "https://github.com/zephyrproject-rtos/fatfs", - "revision": "a30531af3a95a9a3ea7d771ea8a578ebfed45514", + "revision": "427159bf95ea49b7680facffaa29ad506b42709b", "path": "modules/fs/fatfs", "groups": ["fs"], - "sha256": "04c33x1am766sdszmsmxd2rii6snyld68ca17qhg3ml2xiqy1z31" + "sha256": "1pj6ik1bdyn07zsm0006n818mjzpbhhpsca4cw5imw66mhjy2pg6" }, { - "name": "fff", - "url": "https://github.com/zephyrproject-rtos/fff", - "revision": "6ce5ba26486e93d5b7696a3e23f0585932c14b16", - "path": "modules/lib/fff", - "groups": ["ci"], - "sha256": "1wwrsicibk5nrzj7arxd4a22qr596vnc1ygp9zi409ygqvmzayzy" + "name": "hal_ambiq", + "url": "https://github.com/zephyrproject-rtos/hal_ambiq", + "revision": "0a7c99325aa73a1ef777501da91c2c6608661e56", + "path": "modules/hal/ambiq", + "groups": ["hal"], + "sha256": "1s1xv746p7c1ccyp2j1b36hrm9pp7dlpb8v4fclpd6wl3jcdjj74" }, { "name": "hal_atmel", "url": "https://github.com/zephyrproject-rtos/hal_atmel", - "revision": "1d237f2e2f262751975b6da6e03af569b2b49b2b", + "revision": "5ab43007eda3f380c125f957f03638d2e8d1144d", "path": "modules/hal/atmel", "groups": ["hal"], - "sha256": "1p5qbcqn8adf7jrrpkkc6wjfxmdg9nan370r3pgsamgasyg2h31l" + "sha256": "0csnr0npgfraf4g11dn4f77ywm2qd80y65a12kx68f7bfm8flf9j" + }, + { + "name": "hal_ethos_u", + "url": "https://github.com/zephyrproject-rtos/hal_ethos_u", + "revision": "90ada2ea5681b2a2722a10d2898eac34c2510791", + "path": "modules/hal/ethos_u", + "groups": ["hal"], + "sha256": "12nv46xhi8v6k36l7qgmlsp58vc1d0zw5wqizv30acj5si2bz3y3" }, { "name": "hal_gigadevice", "url": "https://github.com/zephyrproject-rtos/hal_gigadevice", - "revision": "dd0e0322474462b58059e6fedaf1d67d2a0864d0", + "revision": "2994b7dde8b0b0fa9b9c0ccb13474b6a486cddc3", "path": "modules/hal/gigadevice", "groups": ["hal"], - "sha256": "0lqx861f39wkf26n9n0bxa3mlfx6l2idjg69hyi6g6b3xlqmnyh2" + "sha256": "16h3l09ikbb4sqql7nlnfdxqvsgcdywrwckf83r4mjs9pgxiq1qa" + }, + { + "name": "hal_intel", + "url": "https://github.com/zephyrproject-rtos/hal_intel", + "revision": "b3b43d4e3da7ba483611bbbea7ef8af92c69df31", + "path": "modules/hal/intel", + "groups": ["hal"], + "sha256": "1m2d0vwa2iip80rfzip8av41lga2p8zm0gzxhd6x11b3lq05vkb2" }, { "name": "hal_nordic", "url": "https://github.com/zephyrproject-rtos/hal_nordic", - "revision": "249199ec5a5c31d170659921048764e96d05cc0e", + "revision": "d054a315eb888ba70e09e5f6decd4097b0276d1f", "path": "modules/hal/nordic", "groups": ["hal"], - "sha256": "1qiqw0hi3lvfgwl1g5phpzc2j2gvj3ccyrvxw3mvgnbvkvvliv2j" + "sha256": "0ypny416ylb2w5jg4bg55xvfg0yhqlbrakzvm0w23lnamg49kd6j" }, { "name": "hal_nuvoton", "url": "https://github.com/zephyrproject-rtos/hal_nuvoton", - "revision": "b4d31f33238713a568e23618845702fadd67386f", + "revision": "3e0a4c4d3328b2f72b164219add19d5308b53cb5", "path": "modules/hal/nuvoton", "groups": ["hal"], - "sha256": "0942ainpvf64878vkwh9sx4bgwzmf98d40wqa125qmczlbb0d7my" + "sha256": "1xc1cr4c0d0zzmbdrfb7xr8zzq0aifki1l50wcrn9dsi9c1ww12g" }, { "name": "hal_quicklogic", @@ -88,26 +190,26 @@ { "name": "hal_renesas", "url": "https://github.com/zephyrproject-rtos/hal_renesas", - "revision": "468d3f2146d18c7f86a4640fc641cc1d20a4a100", + "revision": "a6cf2af9140e014fbbc48d2b6deb802231dd369f", "path": "modules/hal/renesas", "groups": ["hal"], - "sha256": "10wk12myrz1rd6vyxbk4cfm7sj44ad4j7f49x043lfsma60ss402" + "sha256": "000dmd1z72n9blw1pdjskkpz978k3pa6fzg60lhcaj9y24kl9y6z" }, { "name": "hal_rpi_pico", "url": "https://github.com/zephyrproject-rtos/hal_rpi_pico", - "revision": "a094c060e0c2d43c7f9d8f5c06cc0665117e0c18", + "revision": "fba7162cc7bee06d0149622bbcaac4e41062d368", "path": "modules/hal/rpi_pico", "groups": ["hal"], - "sha256": "0lxf3d0fanzhwzg68scqzyyv70gwg94gzpc4cx7kxic228832v8v" + "sha256": "01q3rf427vvfl0hn3af84hmb3g78dnd8n6saddy7mljha0z0dzda" }, { "name": "hal_stm32", "url": "https://github.com/zephyrproject-rtos/hal_stm32", - "revision": "642e199c59828137dc6b1c7044a289d4269886d1", + "revision": "89ef0a3383edebf661073073bcdf6e2836fe90ee", "path": "modules/hal/stm32", "groups": ["hal"], - "sha256": "1lp54hxcq1wazh2ls2hk3nmshssl4ia857i4qgw7nf3l0a5zw4ia" + "sha256": "0z7q5xg1rn9c3anjvi2kl0hgik3y3r25svwf97w1cjhjx1rhqmpv" }, { "name": "hal_telink", @@ -128,10 +230,10 @@ { "name": "libmetal", "url": "https://github.com/zephyrproject-rtos/libmetal", - "revision": "2f586b4f1276fb075ee145421bdf6cbe5403aa41", + "revision": "b91611a6f47dd29fb24c46e5621e797557f80ec6", "path": "modules/hal/libmetal", "groups": ["hal"], - "sha256": "1r0k3yxa50x0627fr61k6ahmfwyjg9zqiagfjv62a8jpwc134mw4" + "sha256": "0pj0g6zaxiylpdiizf03jil4q2sq1z9px7cfxlv95ddnbv6rjjcz" }, { "name": "liblc3", @@ -150,83 +252,63 @@ }, { "name": "lvgl", - "url": "https://github.com/zmkfirmware/lvgl", - "revision": "70a7849726be8375e3d941153dc417823ea7f355", + "url": "https://github.com/zephyrproject-rtos/lvgl", + "revision": "8a6a2d1d29d17d1e4bdc94c243c146a39d635fdd", "path": "modules/lib/gui/lvgl", - "sha256": "147mykkb72nwbjhrw4z7h0kkxw4p7kvy0w001s44rgplxhqqsg98" - }, - { - "name": "lz4", - "url": "https://github.com/zephyrproject-rtos/lz4", - "revision": "8e303c264fc21c2116dc612658003a22e933124d", - "path": "modules/lib/lz4", - "sha256": "1kqs7gxg17gvws01rir8p6gmzp54y12s1898lflhsb418122v8nf" + "sha256": "0rsmlh358f4g2yidak916pxhkgckfrnck2a5hcsh9larsdnsnf24" }, { "name": "mbedtls", "url": "https://github.com/zephyrproject-rtos/mbedtls", - "revision": "7fed49c9b9f983ad6416986661ef637459723bcb", + "revision": "c38dc78d9a8dcbe43b898cc1171ab33ba3e6fc26", "path": "modules/crypto/mbedtls", "groups": ["crypto"], - "sha256": "084m54xgqqqfixj7h9zigh98l06c2g5ybwbs6y7yji22x0v5dx7f" + "sha256": "0661myy0wjz38nypbyfw51x10mzg57syb5c28irblgjm2w25wbi7" }, { "name": "mipi-sys-t", "url": "https://github.com/zephyrproject-rtos/mipi-sys-t", - "revision": "0d521d8055f3b2b4842f728b0365d3f0ece9c37f", + "revision": "a819419603a2dfcb47f7f39092e1bc112e45d1ef", "path": "modules/debug/mipi-sys-t", "groups": ["debug"], - "sha256": "05yl16qbnj1xxngdyisd5c25aa88zgi6wd5ylqsgz419l0zrgrm6" - }, - { - "name": "nanopb", - "url": "https://github.com/zephyrproject-rtos/nanopb", - "revision": "dc4deed54fd4c7e1935e3b6387eedf21bb45dc38", - "path": "modules/lib/nanopb", - "sha256": "0kmzh65hyhnl88w9x0rcdypj4nl1brbxrnzhy3flgxmhr564y05s" + "sha256": "1ba0h4p3n0ldk5pjilj7z2i62b09vjq6ma668rqpr3w2hrg6941v" }, { "name": "nrf_hw_models", "url": "https://github.com/zephyrproject-rtos/nrf_hw_models", - "revision": "65bc5305d432c08e24a3f343006d1e7deaff4908", + "revision": "f4595802d32d103718bf50b3d390b7a450895843", "path": "modules/bsim_hw_models/nrf_hw_models", - "sha256": "12xzqk22zc4g0j3xcmnz00c56pk6hiydsfgnh7gqm2ap2q3p90zm" + "sha256": "04p6nfyrv38vq0dhdz0g11zqlrqhw43lydyyr06vlrijm0zja8p5" }, { "name": "open-amp", "url": "https://github.com/zephyrproject-rtos/open-amp", - "revision": "8d53544871e1f300c478224faca6be8384ab0d04", + "revision": "42b7c577714b8f22ce82a901e19c1814af4609a8", "path": "modules/lib/open-amp", - "sha256": "00lynjr3vj8a3gj3vh557gjwp7v7kzj7py0vxwvq8y349kh1ga50" + "sha256": "0ch1iv4c3v3zx1l2clm4mawyd83kvxl3b5sd6m7r2sn6wpr456w9" + }, + { + "name": "percepio", + "url": "https://github.com/zephyrproject-rtos/percepio", + "revision": "a3728efccc47dd372f40e6313589ca4c5cc7d5e9", + "path": "modules/debug/percepio", + "groups": ["debug"], + "sha256": "0fhz6jwsni7s79p5pwmynxn4yzrr40yd8m51y20d8jf1ka6dh4gw" }, { "name": "picolibc", "url": "https://github.com/zephyrproject-rtos/picolibc", - "revision": "04ada5951cbaf8e7b17f8226ce31cb6837c28ba7", + "revision": "d07c38ff051386f8e09a143ea0a6c1d6d66dd1d8", "path": "modules/lib/picolibc", - "sha256": "0sv6hv1bfcc7ys310bgifq7jk3r5zlq866wiq6qklmysjgrhva5h" + "sha256": "1pb4piwyib1mmqjyycq8xanvx9aps6mz4w2ijgrn1fjgfh5f7zpq" }, { "name": "segger", "url": "https://github.com/zephyrproject-rtos/segger", - "revision": "d4e568a920b4bd087886170a5624c167b2d0665e", + "revision": "9d0191285956cef43daf411edc2f1a7788346def", "path": "modules/debug/segger", "groups": ["debug"], - "sha256": "0a1rk0b2l1n2zkhlp1ia4cy2mijiaynk6qirw1gddnryj4qqr0nq" - }, - { - "name": "tflite-micro", - "url": "https://github.com/zephyrproject-rtos/tflite-micro", - "revision": "9156d050927012da87079064db59d07f03b8baf6", - "path": "modules/lib/tflite-micro", - "sha256": "1przq51rrhl032n831b2bl35f7kw22ypi9di2wxpfww5q4b6dbh1" - }, - { - "name": "tinycbor", - "url": "https://github.com/zephyrproject-rtos/tinycbor", - "revision": "9e1f34bc08123aaad7666d3652aaa839e8178b3b", - "path": "modules/lib/tinycbor", - "sha256": "0yqmbiqx4www3rfc1ym42j8gqwi1b8hkw27gjps25xz22zrh4a1p" + "sha256": "11wbzyd2n006ygh72ixhqcmgn1yrzk3kq3c0piqvrfgqmv7p8yzn" }, { "name": "tinycrypt", @@ -236,57 +318,26 @@ "groups": ["crypto"], "sha256": "19d2q9y23yzz9i383q3cldjl3k5mryx9762cab23zy3ijdnmj2z6" }, - { - "name": "TraceRecorderSource", - "url": "https://github.com/zephyrproject-rtos/TraceRecorderSource", - "revision": "9893bf1cf649a2c4ee2e27293f887994f3d0da5b", - "path": "modules/debug/TraceRecorder", - "groups": ["debug"], - "sha256": "00lghqq3n7qln6kq2ikwgswap62z81fqw0k28j975nnc1z932flg" - }, { "name": "trusted-firmware-a", "url": "https://github.com/zephyrproject-rtos/trusted-firmware-a", - "revision": "d29cddecde614d81cbec1fb0086cdaebd77d3575", + "revision": "421dc050278287839f5c70019bd6aec617f2bbdb", "path": "modules/tee/tf-a/trusted-firmware-a", "groups": ["tee"], - "sha256": "1xca872xx9wds8lgjxppg8zbcm01pf47al127hljkwzi6g4wcr69" - }, - { - "name": "tf-m-tests", - "url": "https://github.com/zephyrproject-rtos/tf-m-tests", - "revision": "c99a86b295c4887520da9d8402566d7f225c974e", - "path": "modules/tee/tf-m/tf-m-tests", - "groups": ["tee"], - "sha256": "0cc4029i9qfzq4vply9l2yjigaf9rq1zc6a44b8dc779kx31qx36" - }, - { - "name": "psa-arch-tests", - "url": "https://github.com/zephyrproject-rtos/psa-arch-tests", - "revision": "f4fc2442b8e29e2a03d9899e46e5a3ea3df8c2c9", - "path": "modules/tee/tf-m/psa-arch-tests", - "groups": ["tee"], - "sha256": "015qan6qfqyfc1lwpqb29zk1wxx02b6ng5wc1nfpfvknvhiwifay" + "sha256": "029sha3dpagbvfnk5h6ad69pvs5ahwps3cxkzbfrdbq2xm8x3j2y" }, { "name": "uoscore-uedhoc", "url": "https://github.com/zephyrproject-rtos/uoscore-uedhoc", - "revision": "e8920192b66db4f909eb9cd3f155d5245c1ae825", + "revision": "5fe2cb613bd7e4590bd1b00c2adf181ac0229379", "path": "modules/lib/uoscore-uedhoc", - "sha256": "0ngs6ad6lm47gqy5i5h47cr4b7k3qb85cnbidkk1092xban0ai0g" + "sha256": "0z31lbibkvhw5dfps4l7049gggfczh5qqfjb4s3csnr447m81gdd" }, { "name": "zcbor", "url": "https://github.com/zephyrproject-rtos/zcbor", - "revision": "a0d6981f14d4001d6f0d608d1a427f9bc6bb6d02", + "revision": "67fd8bb88d3136738661fa8bb5f9989103f4599e", "path": "modules/lib/zcbor", - "sha256": "03xz79pi210kny55ks9cyr8i9m68f7kla3nv5zk2afg59ms0nwdc" - }, - { - "name": "zscilib", - "url": "https://github.com/zephyrproject-rtos/zscilib", - "revision": "ca070ddabdaf67175a2da901d0bd62e8899371c5", - "path": "modules/lib/zscilib", - "sha256": "1ss33lfz2xzz8b3fcnibz109x09lj9ajw3na8lsmhvn7mhg6zh3v" + "sha256": "16138k7xlahf63dfvplm8c2m0kxs1g17gcx1fa31y4gcfbi3b0k7" } ] diff --git a/nix/update-manifest/update-manifest.sh b/nix/update-manifest/update-manifest.sh index 54de8a3baf8b..1f717a5a2b6c 100755 --- a/nix/update-manifest/update-manifest.sh +++ b/nix/update-manifest/update-manifest.sh @@ -2,7 +2,7 @@ set -euo pipefail -ignored_modules=(hal_espressif bsim babblesim babblesim_base \ +ignored_modules=(hal_espressif sof tflite-micro thrift bsim babblesim babblesim_base \ babblesim_ext_2G4_libPhyComv1 babblesim_ext_2G4_channel_NtNcable \ babblesim_ext_2G4_channel_multiatt babblesim_ext_2G4_modem_magic \ babblesim_ext_2G4_modem_BLE_simple babblesim_ext_2G4_device_burst_interferer \