| Message ID | 20200430030544.234289-4-amitay@ozlabs.org |
|---|---|
| State | Accepted |
| Headers | show |
| Series | Reorganization of device trees | expand |
| Context | Check | Description |
|---|---|---|
| snowpatch_ozlabs/apply_patch | warning | Failed to apply on branch master (6c10b68bf774a9fe21affd5ef0b40084cd49800d) |
| snowpatch_ozlabs/apply_patch | fail | Failed to apply to any branch |
Reviewed-by: Alistair Popple <alistair@popple.id.au> On Thursday, 30 April 2020 1:05:36 PM AEST Amitay Isaacs wrote: > Signed-off-by: Amitay Isaacs <amitay@ozlabs.org> > --- > Makefile.am | 2 +- > p9-cronus.dts.m4 => bmc-cronus.dts.m4 | 0 > libpdbg/dtb.c | 4 ++-- > 3 files changed, 3 insertions(+), 3 deletions(-) > rename p9-cronus.dts.m4 => bmc-cronus.dts.m4 (100%) > > diff --git a/Makefile.am b/Makefile.am > index 041ec01..4b53c80 100644 > --- a/Makefile.am > +++ b/Makefile.am > @@ -77,7 +77,7 @@ if TARGET_PPC > ARCH_FLAGS="-DTARGET_PPC=1" > endif > > -DT = fake.dts fake2.dts p8-cronus.dts p9-cronus.dts \ > +DT = fake.dts fake2.dts p8-cronus.dts bmc-cronus.dts \ > p8-fsi.dts p8-i2c.dts p8-kernel.dts \ > p9w-fsi.dts p9r-fsi.dts p9z-fsi.dts bmc-kernel.dts \ > p9-sbefifo.dts \ > diff --git a/p9-cronus.dts.m4 b/bmc-cronus.dts.m4 > similarity index 100% > rename from p9-cronus.dts.m4 > rename to bmc-cronus.dts.m4 > diff --git a/libpdbg/dtb.c b/libpdbg/dtb.c > index f9573a6..6a9fc73 100644 > --- a/libpdbg/dtb.c > +++ b/libpdbg/dtb.c > @@ -42,7 +42,7 @@ > #include "p8-host.dt.h" > #include "p9-host.dt.h" > #include "p8-cronus.dt.h" > -#include "p9-cronus.dt.h" > +#include "bmc-cronus.dt.h" > #include "p9-sbefifo.dt.h" > > #include "p8.dt.h" > @@ -413,7 +413,7 @@ struct pdbg_dtb *pdbg_default_dtb(void *system_fdt) > dtb->system.fdt = &_binary_p8_dtb_o_start; > } else if (!strncmp(pdbg_backend_option, "p9", 2)) { > if (!dtb->backend.fdt) > - dtb->backend.fdt = &_binary_p9_cronus_dtb_o_start; > + dtb->backend.fdt = &_binary_bmc_cronus_dtb_o_start; > if (!dtb->system.fdt) > dtb->system.fdt = &_binary_p9_dtb_o_start; > } else {
Actually this should probably just be called cronus.dts.m4 rather than bmc- cronus, as it has no dependency on the BMC. - Alistair On Wednesday, 6 May 2020 10:38:26 AM AEST Alistair Popple wrote: > Reviewed-by: Alistair Popple <alistair@popple.id.au> > > On Thursday, 30 April 2020 1:05:36 PM AEST Amitay Isaacs wrote: > > Signed-off-by: Amitay Isaacs <amitay@ozlabs.org> > > --- > > > > Makefile.am | 2 +- > > p9-cronus.dts.m4 => bmc-cronus.dts.m4 | 0 > > libpdbg/dtb.c | 4 ++-- > > 3 files changed, 3 insertions(+), 3 deletions(-) > > rename p9-cronus.dts.m4 => bmc-cronus.dts.m4 (100%) > > > > diff --git a/Makefile.am b/Makefile.am > > index 041ec01..4b53c80 100644 > > --- a/Makefile.am > > +++ b/Makefile.am > > @@ -77,7 +77,7 @@ if TARGET_PPC > > > > ARCH_FLAGS="-DTARGET_PPC=1" > > endif > > > > -DT = fake.dts fake2.dts p8-cronus.dts p9-cronus.dts \ > > +DT = fake.dts fake2.dts p8-cronus.dts bmc-cronus.dts \ > > > > p8-fsi.dts p8-i2c.dts p8-kernel.dts \ > > p9w-fsi.dts p9r-fsi.dts p9z-fsi.dts bmc-kernel.dts \ > > p9-sbefifo.dts \ > > > > diff --git a/p9-cronus.dts.m4 b/bmc-cronus.dts.m4 > > similarity index 100% > > rename from p9-cronus.dts.m4 > > rename to bmc-cronus.dts.m4 > > diff --git a/libpdbg/dtb.c b/libpdbg/dtb.c > > index f9573a6..6a9fc73 100644 > > --- a/libpdbg/dtb.c > > +++ b/libpdbg/dtb.c > > @@ -42,7 +42,7 @@ > > > > #include "p8-host.dt.h" > > #include "p9-host.dt.h" > > #include "p8-cronus.dt.h" > > > > -#include "p9-cronus.dt.h" > > +#include "bmc-cronus.dt.h" > > > > #include "p9-sbefifo.dt.h" > > > > #include "p8.dt.h" > > > > @@ -413,7 +413,7 @@ struct pdbg_dtb *pdbg_default_dtb(void *system_fdt) > > > > dtb->system.fdt = &_binary_p8_dtb_o_start; > > > > } else if (!strncmp(pdbg_backend_option, "p9", 2)) { > > > > if (!dtb->backend.fdt) > > > > - dtb->backend.fdt = &_binary_p9_cronus_dtb_o_start; > > + dtb->backend.fdt = &_binary_bmc_cronus_dtb_o_start; > > > > if (!dtb->system.fdt) > > > > dtb->system.fdt = &_binary_p9_dtb_o_start; > > > > } else {
On Wed, 2020-05-06 at 10:43 +1000, Alistair Popple wrote: > Actually this should probably just be called cronus.dts.m4 rather > than bmc- > cronus, as it has no dependency on the BMC. Well, one needs to run croserver on BMC. > > - Alistair > > On Wednesday, 6 May 2020 10:38:26 AM AEST Alistair Popple wrote: > > Reviewed-by: Alistair Popple <alistair@popple.id.au> > > > > On Thursday, 30 April 2020 1:05:36 PM AEST Amitay Isaacs wrote: > > > Signed-off-by: Amitay Isaacs <amitay@ozlabs.org> > > > --- > > > > > > Makefile.am | 2 +- > > > p9-cronus.dts.m4 => bmc-cronus.dts.m4 | 0 > > > libpdbg/dtb.c | 4 ++-- > > > 3 files changed, 3 insertions(+), 3 deletions(-) > > > rename p9-cronus.dts.m4 => bmc-cronus.dts.m4 (100%) > > > > > > diff --git a/Makefile.am b/Makefile.am > > > index 041ec01..4b53c80 100644 > > > --- a/Makefile.am > > > +++ b/Makefile.am > > > @@ -77,7 +77,7 @@ if TARGET_PPC > > > > > > ARCH_FLAGS="-DTARGET_PPC=1" > > > endif > > > > > > -DT = fake.dts fake2.dts p8-cronus.dts p9-cronus.dts \ > > > +DT = fake.dts fake2.dts p8-cronus.dts bmc-cronus.dts \ > > > > > > p8-fsi.dts p8-i2c.dts p8-kernel.dts \ > > > p9w-fsi.dts p9r-fsi.dts p9z-fsi.dts bmc-kernel.dts \ > > > p9-sbefifo.dts \ > > > > > > diff --git a/p9-cronus.dts.m4 b/bmc-cronus.dts.m4 > > > similarity index 100% > > > rename from p9-cronus.dts.m4 > > > rename to bmc-cronus.dts.m4 > > > diff --git a/libpdbg/dtb.c b/libpdbg/dtb.c > > > index f9573a6..6a9fc73 100644 > > > --- a/libpdbg/dtb.c > > > +++ b/libpdbg/dtb.c > > > @@ -42,7 +42,7 @@ > > > > > > #include "p8-host.dt.h" > > > #include "p9-host.dt.h" > > > #include "p8-cronus.dt.h" > > > > > > -#include "p9-cronus.dt.h" > > > +#include "bmc-cronus.dt.h" > > > > > > #include "p9-sbefifo.dt.h" > > > > > > #include "p8.dt.h" > > > > > > @@ -413,7 +413,7 @@ struct pdbg_dtb *pdbg_default_dtb(void > > > *system_fdt) > > > > > > dtb->system.fdt = > > > &_binary_p8_dtb_o_start; > > > > > > } else if (!strncmp(pdbg_backend_option, "p9", 2)) { > > > > > > if (!dtb->backend.fdt) > > > > > > - dtb->backend.fdt = > > > &_binary_p9_cronus_dtb_o_start; > > > + dtb->backend.fdt = > > > &_binary_bmc_cronus_dtb_o_start; > > > > > > if (!dtb->system.fdt) > > > > > > dtb->system.fdt = > > > &_binary_p9_dtb_o_start; > > > > > > } else { > > > Amitay.
On Wednesday, 6 May 2020 10:44:47 AM AEST Amitay Isaacs wrote: > On Wed, 2020-05-06 at 10:43 +1000, Alistair Popple wrote: > > Actually this should probably just be called cronus.dts.m4 rather > > than bmc- > > cronus, as it has no dependency on the BMC. > > Well, one needs to run croserver on BMC. Or the FSP :-) > > - Alistair > > > > On Wednesday, 6 May 2020 10:38:26 AM AEST Alistair Popple wrote: > > > Reviewed-by: Alistair Popple <alistair@popple.id.au> > > > > > > On Thursday, 30 April 2020 1:05:36 PM AEST Amitay Isaacs wrote: > > > > Signed-off-by: Amitay Isaacs <amitay@ozlabs.org> > > > > --- > > > > > > > > Makefile.am | 2 +- > > > > p9-cronus.dts.m4 => bmc-cronus.dts.m4 | 0 > > > > libpdbg/dtb.c | 4 ++-- > > > > 3 files changed, 3 insertions(+), 3 deletions(-) > > > > rename p9-cronus.dts.m4 => bmc-cronus.dts.m4 (100%) > > > > > > > > diff --git a/Makefile.am b/Makefile.am > > > > index 041ec01..4b53c80 100644 > > > > --- a/Makefile.am > > > > +++ b/Makefile.am > > > > @@ -77,7 +77,7 @@ if TARGET_PPC > > > > > > > > ARCH_FLAGS="-DTARGET_PPC=1" > > > > endif > > > > > > > > -DT = fake.dts fake2.dts p8-cronus.dts p9-cronus.dts \ > > > > +DT = fake.dts fake2.dts p8-cronus.dts bmc-cronus.dts \ > > > > > > > > p8-fsi.dts p8-i2c.dts p8-kernel.dts \ > > > > p9w-fsi.dts p9r-fsi.dts p9z-fsi.dts bmc-kernel.dts \ > > > > p9-sbefifo.dts \ > > > > > > > > diff --git a/p9-cronus.dts.m4 b/bmc-cronus.dts.m4 > > > > similarity index 100% > > > > rename from p9-cronus.dts.m4 > > > > rename to bmc-cronus.dts.m4 > > > > diff --git a/libpdbg/dtb.c b/libpdbg/dtb.c > > > > index f9573a6..6a9fc73 100644 > > > > --- a/libpdbg/dtb.c > > > > +++ b/libpdbg/dtb.c > > > > @@ -42,7 +42,7 @@ > > > > > > > > #include "p8-host.dt.h" > > > > #include "p9-host.dt.h" > > > > #include "p8-cronus.dt.h" > > > > > > > > -#include "p9-cronus.dt.h" > > > > +#include "bmc-cronus.dt.h" > > > > > > > > #include "p9-sbefifo.dt.h" > > > > > > > > #include "p8.dt.h" > > > > > > > > @@ -413,7 +413,7 @@ struct pdbg_dtb *pdbg_default_dtb(void > > > > *system_fdt) > > > > > > > > dtb->system.fdt = > > > > > > > > &_binary_p8_dtb_o_start; > > > > > > > > } else if (!strncmp(pdbg_backend_option, "p9", 2)) { > > > > > > > > if (!dtb->backend.fdt) > > > > > > > > - dtb->backend.fdt = > > > > &_binary_p9_cronus_dtb_o_start; > > > > + dtb->backend.fdt = > > > > &_binary_bmc_cronus_dtb_o_start; > > > > > > > > if (!dtb->system.fdt) > > > > > > > > dtb->system.fdt = > > > > > > > > &_binary_p9_dtb_o_start; > > > > > > > > } else { > > Amitay.
diff --git a/Makefile.am b/Makefile.am index 041ec01..4b53c80 100644 --- a/Makefile.am +++ b/Makefile.am @@ -77,7 +77,7 @@ if TARGET_PPC ARCH_FLAGS="-DTARGET_PPC=1" endif -DT = fake.dts fake2.dts p8-cronus.dts p9-cronus.dts \ +DT = fake.dts fake2.dts p8-cronus.dts bmc-cronus.dts \ p8-fsi.dts p8-i2c.dts p8-kernel.dts \ p9w-fsi.dts p9r-fsi.dts p9z-fsi.dts bmc-kernel.dts \ p9-sbefifo.dts \ diff --git a/p9-cronus.dts.m4 b/bmc-cronus.dts.m4 similarity index 100% rename from p9-cronus.dts.m4 rename to bmc-cronus.dts.m4 diff --git a/libpdbg/dtb.c b/libpdbg/dtb.c index f9573a6..6a9fc73 100644 --- a/libpdbg/dtb.c +++ b/libpdbg/dtb.c @@ -42,7 +42,7 @@ #include "p8-host.dt.h" #include "p9-host.dt.h" #include "p8-cronus.dt.h" -#include "p9-cronus.dt.h" +#include "bmc-cronus.dt.h" #include "p9-sbefifo.dt.h" #include "p8.dt.h" @@ -413,7 +413,7 @@ struct pdbg_dtb *pdbg_default_dtb(void *system_fdt) dtb->system.fdt = &_binary_p8_dtb_o_start; } else if (!strncmp(pdbg_backend_option, "p9", 2)) { if (!dtb->backend.fdt) - dtb->backend.fdt = &_binary_p9_cronus_dtb_o_start; + dtb->backend.fdt = &_binary_bmc_cronus_dtb_o_start; if (!dtb->system.fdt) dtb->system.fdt = &_binary_p9_dtb_o_start; } else {
Signed-off-by: Amitay Isaacs <amitay@ozlabs.org> --- Makefile.am | 2 +- p9-cronus.dts.m4 => bmc-cronus.dts.m4 | 0 libpdbg/dtb.c | 4 ++-- 3 files changed, 3 insertions(+), 3 deletions(-) rename p9-cronus.dts.m4 => bmc-cronus.dts.m4 (100%)