Message ID | 20240606163326.386950-3-marek.mojik@nic.cz |
---|---|
State | Accepted |
Commit | 07928d4fec0e07ee57707011e799c9933afbc1c1 |
Delegated to: | Tom Rini |
Headers | show |
Series | Add Turris 1.x board | expand |
On 6/7/24 1:32 AM, Sinan Akman wrote: > > On 2024-06-06 12:33 p.m., Marek Mojík wrote: >> From: Pali Rohár <pali@kernel.org> >> >> This allows boards to fixup / overwrite DT model string when booting OS. >> >> Signed-off-by: Pali Rohár <pali@kernel.org> >> Signed-off-by: Marek Mojík <marek.mojik@nic.cz> >> --- >> board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c | 4 ++++ >> 1 file changed, 4 insertions(+) >> >> diff --git a/board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c >> b/board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c >> index 399ff72072..336d274cdb 100644 >> --- a/board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c >> +++ b/board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c >> @@ -364,6 +364,8 @@ int board_early_init_r(void) >> return 0; >> } >> >> +__weak void p1_p2_rdb_pc_fix_fdt_model(void *blob) {} >> + >> #if defined(CONFIG_OF_BOARD_SETUP) || defined(CONFIG_OF_BOARD_FIXUP) >> static void fix_max6370_watchdog(void *blob) >> { >> @@ -407,6 +409,7 @@ int ft_board_setup(void *blob, struct bd_info *bd) >> sizeof("okay"), 0); >> #endif >> >> + p1_p2_rdb_pc_fix_fdt_model(blob); >> fix_max6370_watchdog(blob); >> >> #if defined(CONFIG_HAS_FSL_DR_USB) >> @@ -464,6 +467,7 @@ int ft_board_setup(void *blob, struct bd_info *bd) >> #ifdef CONFIG_OF_BOARD_FIXUP >> int board_fix_fdt(void *blob) >> { >> + p1_p2_rdb_pc_fix_fdt_model(blob); >> fix_max6370_watchdog(blob); >> return 0; >> } > > > Hi Marek > > I have a P2020-RDB board and last time I tried to test ToT (couple > months ago) > > I needed to remove a watchdog patch that was added by Pali (a year+ ago). I > > believe because of the differences in CPLD that patch kept resetting on > my board. > > > I am traveling (again) but when I am back on July 10th I can give a try to > > test this if you prefer. > > > Best regards > > Sinan Akman > Hi Sinan, What do you mean by ToT? Regardless, I don't have access to P2020-RDB, so you will have to test it yourself. Best regards, Marek
On 2024-06-17 8:16 a.m., Marek Mojík wrote: > > > On 6/7/24 1:32 AM, Sinan Akman wrote: >> >> On 2024-06-06 12:33 p.m., Marek Mojík wrote: >>> From: Pali Rohár <pali@kernel.org> >>> >>> This allows boards to fixup / overwrite DT model string when booting OS. >>> >>> Signed-off-by: Pali Rohár <pali@kernel.org> >>> Signed-off-by: Marek Mojík <marek.mojik@nic.cz> >>> --- >>> board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c | 4 ++++ >>> 1 file changed, 4 insertions(+) >>> >>> diff --git a/board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c >>> b/board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c >>> index 399ff72072..336d274cdb 100644 >>> --- a/board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c >>> +++ b/board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c >>> @@ -364,6 +364,8 @@ int board_early_init_r(void) >>> return 0; >>> } >>> >>> +__weak void p1_p2_rdb_pc_fix_fdt_model(void *blob) {} >>> + >>> #if defined(CONFIG_OF_BOARD_SETUP) || defined(CONFIG_OF_BOARD_FIXUP) >>> static void fix_max6370_watchdog(void *blob) >>> { >>> @@ -407,6 +409,7 @@ int ft_board_setup(void *blob, struct bd_info *bd) >>> sizeof("okay"), 0); >>> #endif >>> >>> + p1_p2_rdb_pc_fix_fdt_model(blob); >>> fix_max6370_watchdog(blob); >>> >>> #if defined(CONFIG_HAS_FSL_DR_USB) >>> @@ -464,6 +467,7 @@ int ft_board_setup(void *blob, struct bd_info *bd) >>> #ifdef CONFIG_OF_BOARD_FIXUP >>> int board_fix_fdt(void *blob) >>> { >>> + p1_p2_rdb_pc_fix_fdt_model(blob); >>> fix_max6370_watchdog(blob); >>> return 0; >>> } >> >> >> Hi Marek >> >> I have a P2020-RDB board and last time I tried to test ToT (couple >> months ago) >> >> I needed to remove a watchdog patch that was added by Pali (a year+ >> ago). I >> >> believe because of the differences in CPLD that patch kept resetting on >> my board. >> >> >> I am traveling (again) but when I am back on July 10th I can give a >> try to >> >> test this if you prefer. >> >> >> Best regards >> >> Sinan Akman >> > > > Hi Sinan, Hi Marek > > What do you mean by ToT? I meant tip of the tree. > ... Regardless, I don't have access to P2020-RDB, > so you will have to test it yourself. Will do. Thanks Sinan Akman
Reviewed-by: Marek Behún <kabel@kernel.org>
diff --git a/board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c b/board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c index 399ff72072..336d274cdb 100644 --- a/board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c +++ b/board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c @@ -364,6 +364,8 @@ int board_early_init_r(void) return 0; } +__weak void p1_p2_rdb_pc_fix_fdt_model(void *blob) {} + #if defined(CONFIG_OF_BOARD_SETUP) || defined(CONFIG_OF_BOARD_FIXUP) static void fix_max6370_watchdog(void *blob) { @@ -407,6 +409,7 @@ int ft_board_setup(void *blob, struct bd_info *bd) sizeof("okay"), 0); #endif + p1_p2_rdb_pc_fix_fdt_model(blob); fix_max6370_watchdog(blob); #if defined(CONFIG_HAS_FSL_DR_USB) @@ -464,6 +467,7 @@ int ft_board_setup(void *blob, struct bd_info *bd) #ifdef CONFIG_OF_BOARD_FIXUP int board_fix_fdt(void *blob) { + p1_p2_rdb_pc_fix_fdt_model(blob); fix_max6370_watchdog(blob); return 0; }