diff options
| author | Tom Rini <[email protected]> | 2024-07-12 11:06:10 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2024-07-12 11:06:10 -0600 |
| commit | 1ca216522d41caa250c19dcb96d1f4c165556d90 (patch) | |
| tree | f89aac1714ac5fda53ded53e318c8ee720efed9e /board/raspberrypi | |
| parent | 780b99040bc1d5c3658532fd2f22d703a4acab04 (diff) | |
| parent | 7c503e14fbb8acdb5d85d47c1709ad31b7cf13b5 (diff) | |
Merge tag 'rpi-2024.10-rc1' of https://source.denx.de/u-boot/custodians/u-boot-raspberrypi
Updates for RPi for 2024.10:
- board: rpi: remove leftover CONFIG_HW_WATCHDOG block
- arm: bcm283x: remove unused empty hw_watchdog_disable
- board: raspberrypi: Fix format specifier for printing rev_scheme
- Revert "arm: dts: bcm283x: Add minimal smbios information"
Diffstat (limited to 'board/raspberrypi')
| -rw-r--r-- | board/raspberrypi/rpi/rpi.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/board/raspberrypi/rpi/rpi.c b/board/raspberrypi/rpi/rpi.c index d996eb0cf69..ab5ea85cf9f 100644 --- a/board/raspberrypi/rpi/rpi.c +++ b/board/raspberrypi/rpi/rpi.c @@ -381,7 +381,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); @@ -493,10 +493,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; |