From c06687aa0649d1ecdf42f3d09e2612b228554b4b Mon Sep 17 00:00:00 2001 From: Francois Berder Date: Tue, 9 Jul 2024 14:20:48 +0200 Subject: board: raspberrypi: Fix format specifier for printing rev_scheme rev_scheme is an unsigned integer and must not be printed as a signed integer. Signed-off-by: Francois Berder Reviewed-by: Peter Robinson --- board/raspberrypi/rpi/rpi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'board') diff --git a/board/raspberrypi/rpi/rpi.c b/board/raspberrypi/rpi/rpi.c index 2851ebc9853..5db60554b6f 100644 --- a/board/raspberrypi/rpi/rpi.c +++ b/board/raspberrypi/rpi/rpi.c @@ -382,7 +382,7 @@ static void set_board_info(void) snprintf(s, sizeof(s), "0x%X", revision); env_set("board_revision", s); - snprintf(s, sizeof(s), "%d", rev_scheme); + snprintf(s, sizeof(s), "%u", rev_scheme); env_set("board_rev_scheme", s); /* Can't rename this to board_rev_type since it's an ABI for scripts */ snprintf(s, sizeof(s), "0x%X", rev_type); -- cgit v1.2.3 From 7c503e14fbb8acdb5d85d47c1709ad31b7cf13b5 Mon Sep 17 00:00:00 2001 From: Rasmus Villemoes Date: Fri, 12 Jul 2024 11:07:25 +0200 Subject: board: rpi: remove leftover CONFIG_HW_WATCHDOG block This was added in commit 45a6d231b2f (bcm2835_wdt: support for the BCM2835/2836 watchdog), which did do 'select HW_WATCHDOG'. That incarnation of the watchdog driver later got removed in c7adc0b5f98 (watchdog: bcm2835_wdt: Remove unused BCM283x watchdog driver and its references), but this block was left behind. Another rpi watchdog driver has since been added, but that does not select HW_WATCHDOG, so this remains dead and unused. Remove it. Reviewed-by: Stefan Roese Signed-off-by: Rasmus Villemoes Reviewed-by: Peter Robinson --- board/raspberrypi/rpi/rpi.c | 4 ---- 1 file changed, 4 deletions(-) (limited to 'board') diff --git a/board/raspberrypi/rpi/rpi.c b/board/raspberrypi/rpi/rpi.c index 5db60554b6f..64b8bac8941 100644 --- a/board/raspberrypi/rpi/rpi.c +++ b/board/raspberrypi/rpi/rpi.c @@ -494,10 +494,6 @@ static void get_board_revision(void) int board_init(void) { -#ifdef CONFIG_HW_WATCHDOG - hw_watchdog_init(); -#endif - get_board_revision(); gd->bd->bi_boot_params = 0x100; -- cgit v1.2.3