[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 05/15] ppc/ppc405: Drop flag parameter in ppc405_set_bootinfo()
From: |
Cédric Le Goater |
Subject: |
[PATCH 05/15] ppc/ppc405: Drop flag parameter in ppc405_set_bootinfo() |
Date: |
Mon, 6 Dec 2021 11:37:02 +0100 |
It was introduced in commit b8d3f5d12642 ("Add flags to support
PowerPC 405 bootinfos variations.") but since its value has always
been set to '1'.
Signed-off-by: Cédric Le Goater <clg@kaod.org>
---
hw/ppc/ppc405.h | 3 +--
hw/ppc/ppc405_boards.c | 2 +-
hw/ppc/ppc405_uc.c | 8 +++-----
3 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/hw/ppc/ppc405.h b/hw/ppc/ppc405.h
index c58f739886a6..4cb77aca5690 100644
--- a/hw/ppc/ppc405.h
+++ b/hw/ppc/ppc405.h
@@ -56,8 +56,7 @@ struct ppc4xx_bd_info_t {
};
/* PowerPC 405 core */
-ram_addr_t ppc405_set_bootinfo (CPUPPCState *env, ppc4xx_bd_info_t *bd,
- uint32_t flags);
+ram_addr_t ppc405_set_bootinfo(CPUPPCState *env, ppc4xx_bd_info_t *bd);
void ppc4xx_plb_init(CPUPPCState *env);
void ppc405_ebc_init(CPUPPCState *env);
diff --git a/hw/ppc/ppc405_boards.c b/hw/ppc/ppc405_boards.c
index f1623aa622a6..2ac38c86a643 100644
--- a/hw/ppc/ppc405_boards.c
+++ b/hw/ppc/ppc405_boards.c
@@ -261,7 +261,7 @@ static void ref405ep_init(MachineState *machine)
bd.bi_plb_busfreq = 33333333;
bd.bi_pci_busfreq = 33333333;
bd.bi_opbfreq = 33333333;
- bdloc = ppc405_set_bootinfo(env, &bd, 0x00000001);
+ bdloc = ppc405_set_bootinfo(env, &bd);
env->gpr[3] = bdloc;
kernel_base = KERNEL_LOAD_ADDR;
/* now we can load the kernel */
diff --git a/hw/ppc/ppc405_uc.c b/hw/ppc/ppc405_uc.c
index e14d61e9b899..6806d6be31d5 100644
--- a/hw/ppc/ppc405_uc.c
+++ b/hw/ppc/ppc405_uc.c
@@ -41,8 +41,7 @@
#include "qapi/error.h"
#include "trace.h"
-ram_addr_t ppc405_set_bootinfo (CPUPPCState *env, ppc4xx_bd_info_t *bd,
- uint32_t flags)
+ram_addr_t ppc405_set_bootinfo(CPUPPCState *env, ppc4xx_bd_info_t *bd)
{
CPUState *cs = env_cpu(env);
ram_addr_t bdloc;
@@ -81,9 +80,8 @@ ram_addr_t ppc405_set_bootinfo (CPUPPCState *env,
ppc4xx_bd_info_t *bd,
stb_phys(cs->as, bdloc + 0x64 + i, bd->bi_pci_enetaddr[i]);
}
n = 0x6A;
- if (flags & 0x00000001) {
- for (i = 0; i < 6; i++)
- stb_phys(cs->as, bdloc + n++, bd->bi_pci_enetaddr2[i]);
+ for (i = 0; i < 6; i++) {
+ stb_phys(cs->as, bdloc + n++, bd->bi_pci_enetaddr2[i]);
}
stl_be_phys(cs->as, bdloc + n, bd->bi_opbfreq);
n += 4;
--
2.31.1
- Re: [PATCH 03/15] ppc: Add trace-events for DCR accesses, (continued)
- [PATCH 06/15] ppc/ppc405: Change ppc405ep_init() return value, Cédric Le Goater, 2021/12/06
- [PATCH 13/15] ppc/ppc405: Fix bi_pci_enetaddr2 field in U-Boot board information, Cédric Le Goater, 2021/12/06
- [PATCH 14/15] ppc/ppc405: Add update of bi_procfreq field, Cédric Le Goater, 2021/12/06
- [PATCH 08/15] ppc/ppc405: Remove flash support, Cédric Le Goater, 2021/12/06
- [PATCH 11/15] ppc/ppc405: Fix boot from kernel, Cédric Le Goater, 2021/12/06
- [PATCH 09/15] ppc/ppc405: Rework FW load, Cédric Le Goater, 2021/12/06
- [PATCH 05/15] ppc/ppc405: Drop flag parameter in ppc405_set_bootinfo(),
Cédric Le Goater <=
- [PATCH 07/15] ppc/ppc405: Add some address space definitions, Cédric Le Goater, 2021/12/06
- [PATCH 15/15] ppc/ppc405: Update U-Boot board information for hotfoot, Cédric Le Goater, 2021/12/06