From 599422192ed7ad5460a4ac5e30683854eb0a137c Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Tue, 14 May 2024 14:07:19 +0100 Subject: [PATCH 1/4] Revert "arm: dts: bcm283x: Add minimal smbios information" This reverts commit 33041972727e84d3f95e26c83322521f61827584. With the ability to generate this SMBIOS details autmotically the small amount of details that this patch provided are generated automatically so this is now obsolete so we can just drop it. Signed-off-by: Peter Robinson Acked-by: Ilias Apalodimas Acked-by: Matthias Brugger --- arch/arm/dts/bcm283x-u-boot.dtsi | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/arch/arm/dts/bcm283x-u-boot.dtsi b/arch/arm/dts/bcm283x-u-boot.dtsi index 8c17c6f6a52..ec0f93dd850 100644 --- a/arch/arm/dts/bcm283x-u-boot.dtsi +++ b/arch/arm/dts/bcm283x-u-boot.dtsi @@ -6,25 +6,6 @@ * (C) Copyright 2016 Fabian Vogt */ -/ { - smbios { - compatible = "u-boot,sysinfo-smbios"; - smbios { - system { - manufacturer = "raspberrypi"; - product = "rpi"; - }; - baseboard { - manufacturer = "raspberrypi"; - product = "rpi"; - }; - chassis { - manufacturer = "raspberrypi"; - }; - }; - }; -}; - &uart0 { skip-init; bootph-all; From c06687aa0649d1ecdf42f3d09e2612b228554b4b Mon Sep 17 00:00:00 2001 From: Francois Berder Date: Tue, 9 Jul 2024 14:20:48 +0200 Subject: [PATCH 2/4] 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(-) 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); From 6c399b31c6362c1683735adaab8070c734a7866c Mon Sep 17 00:00:00 2001 From: Rasmus Villemoes Date: Fri, 12 Jul 2024 11:07:24 +0200 Subject: [PATCH 3/4] arm: bcm283x: remove unused empty hw_watchdog_disable This empty stub was originally added as one branch of an #ifdef in commit 45a6d231b2f (bcm2835_wdt: support for the BCM2835/2836 watchdog). That incarnation of the rpi watchdog driver was later removed in c7adc0b5f98 (watchdog: bcm2835_wdt: Remove unused BCM283x watchdog driver and its references), but this now unused stub was left behind. The later (re-)added rpi watchdog driver does not define a hw_watchdog_disable() function, as that is properly integrated in the watchdog framework. Reviewed-by: Stefan Roese Signed-off-by: Rasmus Villemoes Reviewed-by: Peter Robinson --- arch/arm/mach-bcm283x/reset.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/arch/arm/mach-bcm283x/reset.c b/arch/arm/mach-bcm283x/reset.c index f13ac0c6375..808a87daa88 100644 --- a/arch/arm/mach-bcm283x/reset.c +++ b/arch/arm/mach-bcm283x/reset.c @@ -25,8 +25,6 @@ /* max ticks timeout */ #define BCM2835_WDOG_MAX_TIMEOUT 0x000fffff -void hw_watchdog_disable(void) {} - __efi_runtime_data struct bcm2835_wdog_regs *wdog_regs; static void __efi_runtime @@ -34,10 +32,9 @@ __reset_cpu(struct bcm2835_wdog_regs *wdog_regs, ulong ticks) { uint32_t rstc, timeout; - if (ticks == 0) { - hw_watchdog_disable(); + if (ticks == 0) timeout = RESET_TIMEOUT; - } else + else timeout = ticks & BCM2835_WDOG_MAX_TIMEOUT; rstc = readl(&wdog_regs->rstc); From 7c503e14fbb8acdb5d85d47c1709ad31b7cf13b5 Mon Sep 17 00:00:00 2001 From: Rasmus Villemoes Date: Fri, 12 Jul 2024 11:07:25 +0200 Subject: [PATCH 4/4] 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(-) 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;