diff --git a/hugo/content/devapp/_index.md b/hugo/content/devapp/_index.md index 45c8c25..02dcc3f 100644 --- a/hugo/content/devapp/_index.md +++ b/hugo/content/devapp/_index.md @@ -45,7 +45,7 @@ We also provide a linker script there in `apps.lds` which shows the linker the memory layout. Minimal compilation of the above program would look something like -this if `tkey-libs` is cloned in the directory next to this one: +this if `tkey-libs` is in the directory next to this one: ``` clang -g -target riscv32-unknown-none-elf -march=rv32iczmmul -mabi=ilp32 \ diff --git a/hugo/content/tools/_index.md b/hugo/content/tools/_index.md index e8d808d..244c8c7 100644 --- a/hugo/content/tools/_index.md +++ b/hugo/content/tools/_index.md @@ -88,6 +88,10 @@ choco install make llvm clang go We provide a container image which has all the above packages and tools already installed for use with Podman or Docker. +You should probably always use the image with the tag "latest", but if +you're trying to do a reproducible build you should of course use the +tag possibly mentioned in the release. + {{< tabs >}} {{< tab "Linux" >}} @@ -136,7 +140,7 @@ https://github.com/containers/podman/blob/main/docs/tutorials/podman-for-windows You can use the following command to fetch the image: ``` -podman pull ghcr.io/tillitis/tkey-builder:2 +podman pull ghcr.io/tillitis/tkey-builder ``` **Note well**: This image is really large (~ 2 GiB) because it also @@ -149,7 +153,25 @@ Libraries for development of TKey device apps are available in: https://github.com/tillitis/tkey-libs -Build the tkey-libs first, typically just: +Pre-compiled versions are available under: + +https://github.com/tillitis/tkey-libs/releases + +Unpack the tar file somewhere and point clang to where they are, +typically with `-L tkey-libs` and `-I tkey-libs/include.` + +In many device app projects it will be sufficient to set `LIBDIR`: + +``` +make LIBDIR=/path/to/tkey-libs +``` + +Note that your `lld` might complain if it's not the same version that +was used to produce the libraries. You might want to build the +libraries yourself if that happens, or use the tkey-builder container +image. + +To build tkey-libs, typically you just: ``` git clone https://github.com/tillitis/tkey-libs.git @@ -226,7 +248,7 @@ Or use podman directly if you haven't got `make` installed, typically specifying where your `tkey-libs` are: ``` -podman run --rm --mount type=bind,source=.,target=/src --mount type=bind,source=../tkey-libs,target=/tkey-libs -w /src -it ghcr.io/tillitis/tkey-builder:1 make -j +podman run --rm --mount type=bind,source=.,target=/src --mount type=bind,source=../tkey-libs,target=/tkey-libs -w /src -it ghcr.io/tillitis/tkey-builder make -j ``` ## QEMU Emulator @@ -272,13 +294,10 @@ repository](https://github.com/tillitis/qemu): git clone -b tk1 https://github.com/tillitis/qemu mkdir qemu/build cd qemu/build -../configure --target-list=riscv32-softmmu --disable-werror -make -j $(nproc) +../configure --target-list=riscv32-softmmu +make -j $(nproc) qemu-system-riscv32 ``` -(Built with warnings-as-errors disabled, see [this -issue](https://github.com/tillitis/qemu/issues/3).) - Then execute the following commands to fetch and build the firmware: ``` diff --git a/hugo/content/unlocked/build.md b/hugo/content/unlocked/build.md index 276534e..5059b2f 100644 --- a/hugo/content/unlocked/build.md +++ b/hugo/content/unlocked/build.md @@ -64,7 +64,7 @@ make -C contrib run ``` or use this podman command ``` -podman run --rm --mount type=bind,source="$(pwd)",target=/src -w /src -it ghcr.io/tillitis/tkey-builder:4 /usr/bin/bash +podman run --rm --mount type=bind,source="$(pwd)",target=/src -w /src -it ghcr.io/tillitis/tkey-builder /usr/bin/bash ``` {{< /tab >}} @@ -77,13 +77,13 @@ make -C contrib run ``` or use this podman command ``` -podman run --rm --mount type=bind,source="$(pwd)",target=/src -w /src -it ghcr.io/tillitis/tkey-builder:4 /usr/bin/bash +podman run --rm --mount type=bind,source="$(pwd)",target=/src -w /src -it ghcr.io/tillitis/tkey-builder /usr/bin/bash ``` {{< /tab >}} {{< tab "Windows" >}} ``` -podman run --rm --mount type=bind,source="./",target=/src -w /src -it ghcr.io/tillitis/tkey-builder:4 /usr/bin/bash +podman run --rm --mount type=bind,source="./",target=/src -w /src -it ghcr.io/tillitis/tkey-builder /usr/bin/bash ``` {{< /tab >}} diff --git a/hugo/content/unlocked/spiflash.md b/hugo/content/unlocked/spiflash.md index 3e6d6ad..8b318d6 100644 --- a/hugo/content/unlocked/spiflash.md +++ b/hugo/content/unlocked/spiflash.md @@ -73,7 +73,7 @@ this succeeds you are done and can skip the remaining steps. Otherwise start the container using: ``` -podman run --rm --device /dev/bus/usb/$(lsusb | grep -m 1 1209:8886 | awk '{ printf "%s/%s", $2, substr($4,1,3) }') -v .:/build:Z -w /build -it ghcr.io/tillitis/tkey-builder:4 /usr/bin/bash +podman run --rm --device /dev/bus/usb/$(lsusb | grep -m 1 1209:8886 | awk '{ printf "%s/%s", $2, substr($4,1,3) }') -v .:/build:Z -w /build -it ghcr.io/tillitis/tkey-builder /usr/bin/bash ``` ### Programming diff --git a/hugo/themes/hugo-book-9/layouts/404.html b/hugo/themes/hugo-book-9/layouts/404.html index 3f76ed4..909430e 100644 --- a/hugo/themes/hugo-book-9/layouts/404.html +++ b/hugo/themes/hugo-book-9/layouts/404.html @@ -29,7 +29,6 @@

{{ partial "docs/inject/body" . }} - {{ template "_internal/google_analytics_async.html" . }} diff --git a/hugo/themes/hugo-book-9/layouts/partials/docs/html-head.html b/hugo/themes/hugo-book-9/layouts/partials/docs/html-head.html index 905904f..702246b 100644 --- a/hugo/themes/hugo-book-9/layouts/partials/docs/html-head.html +++ b/hugo/themes/hugo-book-9/layouts/partials/docs/html-head.html @@ -30,8 +30,6 @@ {{ end -}} -{{- template "_internal/google_analytics_async.html" . -}} - {{- with .OutputFormats.Get "rss" -}} {{ printf `` .Rel .MediaType.Type .Permalink $.Site.Title | safeHTML }}