summaryrefslogtreecommitdiff
path: root/board/broadcom
diff options
context:
space:
mode:
authorHarald Seiler <hws@denx.de>2020-12-15 18:47:52 +0300
committerTom Rini <trini@konsulko.com>2021-03-02 22:03:02 +0300
commit35b65dd8ef3d37a088ee9169763a4d891aed618d (patch)
treec99fa5faa4f958d693f1deb2de9356064e78e437 /board/broadcom
parent3394f398b5f37d930b9ae1b6638fe26b0cc735d8 (diff)
downloadu-boot-35b65dd8ef3d37a088ee9169763a4d891aed618d.tar.xz
reset: Remove addr parameter from reset_cpu()
Historically, the reset_cpu() function had an `addr` parameter which was meant to pass in an address of the reset vector location, where the CPU should reset to. This feature is no longer used anywhere in U-Boot as all reset_cpu() implementations now ignore the passed value. Generic code has been added which always calls reset_cpu() with `0` which means this feature can no longer be used easily anyway. Over time, many implementations seem to have "misunderstood" the existence of this parameter as a way to customize/parameterize the reset (e.g. COLD vs WARM resets). As this is not properly supported, the code will almost always not do what it is intended to (because all call-sites just call reset_cpu() with 0). To avoid confusion and to clean up the codebase from unused left-overs of the past, remove the `addr` parameter entirely. Code which intends to support different kinds of resets should be rewritten as a sysreset driver instead. This transformation was done with the following coccinelle patch: @@ expression argvalue; @@ - reset_cpu(argvalue) + reset_cpu() @@ identifier argname; type argtype; @@ - reset_cpu(argtype argname) + reset_cpu(void) { ... } Signed-off-by: Harald Seiler <hws@denx.de> Reviewed-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'board/broadcom')
-rw-r--r--board/broadcom/bcmns2/northstar2.c2
-rw-r--r--board/broadcom/bcmns3/ns3.c2
-rw-r--r--board/broadcom/bcmstb/bcmstb.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/board/broadcom/bcmns2/northstar2.c b/board/broadcom/bcmns2/northstar2.c
index 494e457ff6..ee586d5660 100644
--- a/board/broadcom/bcmns2/northstar2.c
+++ b/board/broadcom/bcmns2/northstar2.c
@@ -57,7 +57,7 @@ int dram_init_banksize(void)
return 0;
}
-void reset_cpu(ulong addr)
+void reset_cpu(void)
{
psci_system_reset();
}
diff --git a/board/broadcom/bcmns3/ns3.c b/board/broadcom/bcmns3/ns3.c
index 8e6b006518..758a358f54 100644
--- a/board/broadcom/bcmns3/ns3.c
+++ b/board/broadcom/bcmns3/ns3.c
@@ -185,7 +185,7 @@ ulong board_get_usable_ram_top(ulong total_size)
return BCM_NS3_MEM_END;
}
-void reset_cpu(ulong level)
+void reset_cpu(void)
{
/* Perform a level 3 reset */
psci_system_reset2(3, 0);
diff --git a/board/broadcom/bcmstb/bcmstb.c b/board/broadcom/bcmstb/bcmstb.c
index f6bdf1f5f4..ee0a341077 100644
--- a/board/broadcom/bcmstb/bcmstb.c
+++ b/board/broadcom/bcmstb/bcmstb.c
@@ -43,7 +43,7 @@ u32 get_board_rev(void)
return 0;
}
-void reset_cpu(ulong ignored)
+void reset_cpu(void)
{
}