Message ID | 20200520061103.1551-1-hikari@nucleisys.com |
---|---|
State | New |
Headers | show |
Series | serial: Corrected riscv_sbi console flag to ensure it loads at first time | expand |
On Wed, May 20, 2020 at 7:16 PM Kongou Hikari <hikari at nucleisys.com> wrote: > > Signed-off-by: Kongou Hikari <hikari at nucleisys.com> > --- > arch/riscv/dts/nuclei-hbird.dts | 1 - > drivers/serial/serial_riscv_sbi.c | 1 + > 2 files changed, 1 insertion(+), 1 deletion(-) > > diff --git a/arch/riscv/dts/nuclei-hbird.dts b/arch/riscv/dts/nuclei-hbird.dts > index 39d76b63ba..aea6719b24 100644 > --- a/arch/riscv/dts/nuclei-hbird.dts > +++ b/arch/riscv/dts/nuclei-hbird.dts > @@ -57,7 +57,6 @@ > }; > > console { > - u-boot,dm-pre-reloc; > compatible = "sbi,console"; > }; > > diff --git a/drivers/serial/serial_riscv_sbi.c b/drivers/serial/serial_riscv_sbi.c > index add11be04e..5551b6fd44 100644 > --- a/drivers/serial/serial_riscv_sbi.c > +++ b/drivers/serial/serial_riscv_sbi.c > @@ -101,4 +101,5 @@ U_BOOT_DRIVER(serial_riscv_sbi) = { > .id = UCLASS_SERIAL, > .of_match = serial_riscv_sbi_ids, > .ops = &serial_riscv_sbi_ops, > + .flags = DM_FLAG_PRE_RELOC, > }; > -- This patch should be squashed into previous patches, because both of them are new patches and none of them are merged yet. Regards, Bin
diff --git a/arch/riscv/dts/nuclei-hbird.dts b/arch/riscv/dts/nuclei-hbird.dts index 39d76b63ba..aea6719b24 100644 --- a/arch/riscv/dts/nuclei-hbird.dts +++ b/arch/riscv/dts/nuclei-hbird.dts @@ -57,7 +57,6 @@ }; console { - u-boot,dm-pre-reloc; compatible = "sbi,console"; }; diff --git a/drivers/serial/serial_riscv_sbi.c b/drivers/serial/serial_riscv_sbi.c index add11be04e..5551b6fd44 100644 --- a/drivers/serial/serial_riscv_sbi.c +++ b/drivers/serial/serial_riscv_sbi.c @@ -101,4 +101,5 @@ U_BOOT_DRIVER(serial_riscv_sbi) = { .id = UCLASS_SERIAL, .of_match = serial_riscv_sbi_ids, .ops = &serial_riscv_sbi_ops, + .flags = DM_FLAG_PRE_RELOC, };
Signed-off-by: Kongou Hikari <hikari at nucleisys.com> --- arch/riscv/dts/nuclei-hbird.dts | 1 - drivers/serial/serial_riscv_sbi.c | 1 + 2 files changed, 1 insertion(+), 1 deletion(-)