From 78f65778b3f2a74070723c2edbcb08c24bb446dc Mon Sep 17 00:00:00 2001 From: Andrew Scheller Date: Wed, 26 Jul 2023 12:29:49 +0100 Subject: [PATCH 1/5] Update OpenOCD branch name One that accidentally got missed from #3010 --- .../asciidoc/microcontrollers/debug-probe/installing-tools.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/documentation/asciidoc/microcontrollers/debug-probe/installing-tools.adoc b/documentation/asciidoc/microcontrollers/debug-probe/installing-tools.adoc index 9b3ce64583..69a6f7a5b0 100644 --- a/documentation/asciidoc/microcontrollers/debug-probe/installing-tools.adoc +++ b/documentation/asciidoc/microcontrollers/debug-probe/installing-tools.adoc @@ -6,7 +6,7 @@ Before we get started we need to install some tools. You need to install OpenOCD. -NOTE: SMP support for debugging on both RP2040 cores is not yet available in the release version of `openocd`. However, support is available in the `rp2040` branch and will be enabled if you build from source. +NOTE: SMP support for debugging on both RP2040 cores is not yet available in the release version of `openocd`. However, support is available in the `rp2040-v0.12.0` branch and will be enabled if you build from source. ==== Linux (and Raspberry Pi) From 25cea984f705fabf40f8afb3a86249152e19c299 Mon Sep 17 00:00:00 2001 From: Alasdair Allan Date: Wed, 26 Jul 2023 12:35:30 +0100 Subject: [PATCH 2/5] Update installing-tools.adoc --- .../microcontrollers/debug-probe/installing-tools.adoc | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/documentation/asciidoc/microcontrollers/debug-probe/installing-tools.adoc b/documentation/asciidoc/microcontrollers/debug-probe/installing-tools.adoc index 69a6f7a5b0..9b9711d1a1 100644 --- a/documentation/asciidoc/microcontrollers/debug-probe/installing-tools.adoc +++ b/documentation/asciidoc/microcontrollers/debug-probe/installing-tools.adoc @@ -45,19 +45,13 @@ Install https://brew.sh/[Homebrew] if needed, $ /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install.sh)" ---- -and then OpenOCD. - ----- -$ brew install open-ocd ----- - -Alternatively you can install needed dependencies, +install needed dependencies, ---- $ brew install libtool automake libusb wget pkg-config gcc texinfo ---- -and build OpenOCD from source. +and then build OpenOCD from source. ---- $ cd ~/pico From 888e191c19bce3bc8774859b3ce2966934430780 Mon Sep 17 00:00:00 2001 From: Alasdair Allan Date: Thu, 27 Jul 2023 13:55:29 +0100 Subject: [PATCH 3/5] Adding NOTE about building 32-bit kernel If you are attempting to compile a 32-bit kernel on the 32-bit distribution of Raspberry Pi OS you should be aware that while the userland in this distribution is 32-bit, the kernel is a 64-bit kernel. You should therefore follow the instructions for cross-compiling the kernel. --- documentation/asciidoc/computers/linux_kernel/building.adoc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/documentation/asciidoc/computers/linux_kernel/building.adoc b/documentation/asciidoc/computers/linux_kernel/building.adoc index 32181ce4ed..e09c40b691 100644 --- a/documentation/asciidoc/computers/linux_kernel/building.adoc +++ b/documentation/asciidoc/computers/linux_kernel/building.adoc @@ -12,6 +12,8 @@ The instructions below are divided into native builds and cross-compilation; cho === Building the Kernel Locally +IMPORTANT: If you are build a 32-bit kernel on the 32-bit distribution of Raspberry Pi OS you should be aware that while the user land in this distribution is 32-bit, the kernel itself is a 64-bit kernel. You therefore need to follow the <>. + On a Raspberry Pi, first install the latest version of https://www.raspberrypi.com/software/operating-systems/#raspberry-pi-os-32-bit[Raspberry Pi OS]. Then boot your Raspberry Pi, log in, and ensure you're connected to the internet to give you access to the sources. First install Git and the build dependencies: From 30408d5d393cc0fb73c396f61101d3b3e24ae256 Mon Sep 17 00:00:00 2001 From: Alasdair Allan Date: Thu, 27 Jul 2023 14:54:50 +0100 Subject: [PATCH 4/5] Update building.adoc --- documentation/asciidoc/computers/linux_kernel/building.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/documentation/asciidoc/computers/linux_kernel/building.adoc b/documentation/asciidoc/computers/linux_kernel/building.adoc index e09c40b691..4b06a8e24d 100644 --- a/documentation/asciidoc/computers/linux_kernel/building.adoc +++ b/documentation/asciidoc/computers/linux_kernel/building.adoc @@ -12,7 +12,7 @@ The instructions below are divided into native builds and cross-compilation; cho === Building the Kernel Locally -IMPORTANT: If you are build a 32-bit kernel on the 32-bit distribution of Raspberry Pi OS you should be aware that while the user land in this distribution is 32-bit, the kernel itself is a 64-bit kernel. You therefore need to follow the <>. +IMPORTANT: Building the 64-bit kernel on the 32-bit distribution of Raspberry Pi OS is a cross-compilation exercise because it requires the installation of the cross-compiler (`gcc-aarch64-linux-gnu`). Building the 32-bit kernel on the 32-bit distribution of Raspberry Pi OS — which has a 32-bit userland, and 64-bit kernel — you should set `ARCH=arm`, although it's likely that this may already be set as `arm_64bit=0` will have been set. Instructions for <> can be found later on this page. On a Raspberry Pi, first install the latest version of https://www.raspberrypi.com/software/operating-systems/#raspberry-pi-os-32-bit[Raspberry Pi OS]. Then boot your Raspberry Pi, log in, and ensure you're connected to the internet to give you access to the sources. From c7f8415a3870b77c2f3c736285bf97724aa054f0 Mon Sep 17 00:00:00 2001 From: Andrew Scheller Date: Thu, 27 Jul 2023 17:21:43 +0100 Subject: [PATCH 5/5] Wording tweak to kernel building --- documentation/asciidoc/computers/linux_kernel/building.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/documentation/asciidoc/computers/linux_kernel/building.adoc b/documentation/asciidoc/computers/linux_kernel/building.adoc index 4b06a8e24d..355f6e7cad 100644 --- a/documentation/asciidoc/computers/linux_kernel/building.adoc +++ b/documentation/asciidoc/computers/linux_kernel/building.adoc @@ -12,7 +12,7 @@ The instructions below are divided into native builds and cross-compilation; cho === Building the Kernel Locally -IMPORTANT: Building the 64-bit kernel on the 32-bit distribution of Raspberry Pi OS is a cross-compilation exercise because it requires the installation of the cross-compiler (`gcc-aarch64-linux-gnu`). Building the 32-bit kernel on the 32-bit distribution of Raspberry Pi OS — which has a 32-bit userland, and 64-bit kernel — you should set `ARCH=arm`, although it's likely that this may already be set as `arm_64bit=0` will have been set. Instructions for <> can be found later on this page. +IMPORTANT: Building the 64-bit kernel on the 32-bit distribution of Raspberry Pi OS is a cross-compilation exercise because it requires the installation of the cross-compiler (`gcc-aarch64-linux-gnu`). If you're running the 32-bit distribution of Raspberry Pi OS on a Pi 4B, Pi 400, CM4 or CM4S then you'll be running a 32-bit userland, and 64-bit kernel — so if you want to explicitly build a 32-bit kernel you should set `ARCH=arm`, and to boot this kernel you'll need to set `arm_64bit=0` in `config.txt`. Instructions for <> can be found later on this page. On a Raspberry Pi, first install the latest version of https://www.raspberrypi.com/software/operating-systems/#raspberry-pi-os-32-bit[Raspberry Pi OS]. Then boot your Raspberry Pi, log in, and ensure you're connected to the internet to give you access to the sources.