Skip to contentSkip to conversation

serial: Corrected riscv_sbi console flag to ensure it loads at first time

PATCH New Kongou Hikari 2 participants 2 messages May 20, 2020 – May 21, 2020 RISC-V

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 serial: Corrected riscv_sbi console flag to ensure it loads at first time

---
 arch/riscv/dts/nuclei-hbird.dts   | 1 -
 drivers/serial/serial_riscv_sbi.c | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)
arch/riscv/dts/nuclei-hbird.dts +0 -1
index 39d76b63ba..aea6719b24 100644
@@ -57,7 +57,6 @@
 	};
 
   console {
-		u-boot,dm-pre-reloc;
 		compatible = "sbi,console";
   };
 
drivers/serial/serial_riscv_sbi.c +1 -0
index add11be04e..5551b6fd44 100644
@@ -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,
 };
Signature · 1 line
2.17.1
#1 lore raw

PATCH 1/1 serial: Corrected riscv_sbi console flag to ensure it loads at first time

Quoted 24 lines · Kongou Hikari
---
 arch/riscv/dts/nuclei-hbird.dts   | 1 -
 drivers/serial/serial_riscv_sbi.c | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)
arch/riscv/dts/nuclei-hbird.dts +0 -1
index 39d76b63ba..aea6719b24 100644
@@ -57,7 +57,6 @@
        };
 
   console {
-               u-boot,dm-pre-reloc;
                compatible = "sbi,console";
   };
 
drivers/serial/serial_riscv_sbi.c +0 -0
index add11be04e..5551b6fd44 100644

drivers/serial/serial_riscv_sbi.c U_BOOT_DRIVER(serial_riscv_sbi) = {

Quoted 6 lines
drivers/serial/serial_riscv_sbi.c +1 -1
@@ -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