[PATCH v2 0/2] Trivial fixes for Rockchip SPL boot order
This series contains some trivial fixes for the Rockchip SPL boot order driver.
The first patch fixes a typo in a comment.
The second patch prints the full devicetree node path (rather than just the node ID) in the debug message when a boot device can't be found.
This series may be found at [0].
[0]: https://gitlab.collabora.com/obbardc/u-boot/-/tree/wip/obbardc/rockchip-spl-...
Changes in v2: - Print node path instead of node ID (suggested by Quentin S). - Improve patch subjects (suggested by Dragan S). - Improve cover letter a little. - Collect Reviewed-by tags. - Rebase series on top of rockchip/for-next. - v1: https://lists.denx.de/pipermail/u-boot/2024-March/547175.html
Christopher Obbard (2): rockchip: spl-boot-order: fix typo in comment succes→success rockchip: spl-boot-order: show DT path for missing device
arch/arm/mach-rockchip/spl-boot-order.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
Fix a simple spelling mistake in a comment.
Reviewed-by: Dragan Simic dsimic@manjaro.org Reviewed-by: Quentin Schulz quentin.schulz@theobroma-systems.com Signed-off-by: Christopher Obbard chris.obbard@collabora.com ---
Changes in v2: - Improve patch subject (suggested by Dragan S). - Collect Reviewed-by tags from Dragan S and Quentin S.
arch/arm/mach-rockchip/spl-boot-order.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/mach-rockchip/spl-boot-order.c b/arch/arm/mach-rockchip/spl-boot-order.c index 79c856d2a0a..8f479ac0ec0 100644 --- a/arch/arm/mach-rockchip/spl-boot-order.c +++ b/arch/arm/mach-rockchip/spl-boot-order.c @@ -29,7 +29,7 @@ * -ENOSYS, if the device matching the node can not be mapped onto a * SPL boot device (e.g. the third MMC device) * -1, for unspecified failures - * a positive integer (from the BOOT_DEVICE_... family) on succes. + * a positive integer (from the BOOT_DEVICE_... family) on success. */
static int spl_node_to_boot_device(int node)
When debugging the SPL boot order, the node ID of a device which hasn't been found is printed but it can be quite hard to relate that to the specific devicetree node. To aid debugging, print the node path instead of the cryptic node ID.
Original debug message:
board_boot_order: could not map node @73c to a boot-device
With this patch applied this becomes e.g:
board_boot_order: could not map node /spi@ff1d0000/flash@0 to a boot-device
Reviewed-by: Dragan Simic dsimic@manjaro.org Signed-off-by: Christopher Obbard chris.obbard@collabora.com ---
Changes in v2: - Improve patch subject (suggested by Dragan S). - Print node path instead of node ID (suggested by Quentin S). - Collect Reviewed-by tag from Dragan S.
arch/arm/mach-rockchip/spl-boot-order.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mach-rockchip/spl-boot-order.c b/arch/arm/mach-rockchip/spl-boot-order.c index 8f479ac0ec0..3543267aa57 100644 --- a/arch/arm/mach-rockchip/spl-boot-order.c +++ b/arch/arm/mach-rockchip/spl-boot-order.c @@ -148,8 +148,8 @@ void board_boot_order(u32 *spl_boot_list) /* Try to map this back onto SPL boot devices */ boot_device = spl_node_to_boot_device(node); if (boot_device < 0) { - debug("%s: could not map node @%x to a boot-device\n", - __func__, node); + debug("%s: could not map node %s to a boot-device\n", + __func__, conf); continue; }
On Thu, 14 Mar 2024 at 12:58, Christopher Obbard chris.obbard@collabora.com wrote:
When debugging the SPL boot order, the node ID of a device which hasn't been found is printed but it can be quite hard to relate that to the specific devicetree node. To aid debugging, print the node path instead of the cryptic node ID.
Original debug message:
board_boot_order: could not map node @73c to a boot-deviceWith this patch applied this becomes e.g:
board_boot_order: could not map node /spi@ff1d0000/flash@0 to a boot-device
Reviewed-by: Dragan Simic dsimic@manjaro.org Signed-off-by: Christopher Obbard chris.obbard@collabora.com
Reviewed-by: Philipp Tomsich philipp.tomsich@vrull.eu
Hi Christopher,
On 3/14/24 12:57, Christopher Obbard wrote:
When debugging the SPL boot order, the node ID of a device which hasn't been found is printed but it can be quite hard to relate that to the specific devicetree node. To aid debugging, print the node path instead of the cryptic node ID.
Original debug message:
board_boot_order: could not map node @73c to a boot-deviceWith this patch applied this becomes e.g:
board_boot_order: could not map node /spi@ff1d0000/flash@0 to a boot-deviceReviewed-by: Dragan Simic dsimic@manjaro.org Signed-off-by: Christopher Obbard chris.obbard@collabora.com
Reviewed-by: Quentin Schulz quentin.schulz@theobroma-systems.com
Thanks, Quentin
participants (3)
-
Christopher Obbard -
Philipp Tomsich -
Quentin Schulz