Skip to contentSkip to conversation

rockchip: adding the missing "/" in entries of boot_devices

PATCH New djw at t-chip.com.cn 4 participants 4 messages Oct 17, 2019 – Oct 18, 2019

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 rockchip: adding the missing "/" in entries of boot_devices

From: Levin Du <[email protected]>

Without the prefix, "same-as-spl" in u-boot,spl-boot-order will not work as expected. When board_boot_order() spl-boot-order.c meets "same-as-spl", it gets the conf by looking the boot_devices table by boot source, and parse the node by the conf with:

   node = fdt_path_offset(blob, conf);

which will failed without the "/" indicating the path.

Currently only entries of boot_devices in rk3399 have the "/" prefix. Therefore add the missing ones in other boards.

---

 arch/arm/mach-rockchip/rk3188/rk3188.c | 4 ++--
 arch/arm/mach-rockchip/rk322x/rk322x.c | 4 ++--
 arch/arm/mach-rockchip/rk3288/rk3288.c | 4 ++--
 arch/arm/mach-rockchip/rk3328/rk3328.c | 4 ++--
 arch/arm/mach-rockchip/rk3368/rk3368.c | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)
arch/arm/mach-rockchip/rk3188/rk3188.c +2 -2
index 95f0e3ccbead..1b012f7f67ae 100644
@@ -14,8 +14,8 @@
 #define GRF_BASE	0x20008000
 
 const char * const boot_devices[BROM_LAST_BOOTSOURCE + 1] = {
-	[BROM_BOOTSOURCE_EMMC] = "dwmmc at 1021c000",
-	[BROM_BOOTSOURCE_SD] = "dwmmc at 10214000",
+	[BROM_BOOTSOURCE_EMMC] = "/dwmmc at 1021c000",
+	[BROM_BOOTSOURCE_SD] = "/dwmmc at 10214000",
 };
 
 #ifdef CONFIG_DEBUG_UART_BOARD_INIT
arch/arm/mach-rockchip/rk322x/rk322x.c +2 -2
index cd0bf8a70cc0..562117e6c13a 100644
@@ -8,8 +8,8 @@
 #include <asm/arch-rockchip/hardware.h>
 
 const char * const boot_devices[BROM_LAST_BOOTSOURCE + 1] = {
-	[BROM_BOOTSOURCE_EMMC] = "dwmmc at 30020000",
-	[BROM_BOOTSOURCE_SD] = "dwmmc at 30000000",
+	[BROM_BOOTSOURCE_EMMC] = "/dwmmc at 30020000",
+	[BROM_BOOTSOURCE_SD] = "/dwmmc at 30000000",
 };
 
 #ifdef CONFIG_DEBUG_UART_BOARD_INIT
arch/arm/mach-rockchip/rk3288/rk3288.c +2 -2
index 057ce920809e..987b4e0d58c2 100644
@@ -22,8 +22,8 @@ DECLARE_GLOBAL_DATA_PTR;
 #define GRF_BASE	0xff770000
 
 const char * const boot_devices[BROM_LAST_BOOTSOURCE + 1] = {
-	[BROM_BOOTSOURCE_EMMC] = "dwmmc at ff0f0000",
-	[BROM_BOOTSOURCE_SD] = "dwmmc at ff0c0000",
+	[BROM_BOOTSOURCE_EMMC] = "/dwmmc at ff0f0000",
+	[BROM_BOOTSOURCE_SD] = "/dwmmc at ff0c0000",
 };
 
 #ifdef CONFIG_SPL_BUILD
arch/arm/mach-rockchip/rk3328/rk3328.c +2 -2
index c2448d727302..8c81242e5d4b 100644
@@ -19,8 +19,8 @@ DECLARE_GLOBAL_DATA_PTR;
 #define FW_DDR_CON_REG		0xFF7C0040
 
 const char * const boot_devices[BROM_LAST_BOOTSOURCE + 1] = {
-	[BROM_BOOTSOURCE_EMMC] = "rksdmmc at ff520000",
-	[BROM_BOOTSOURCE_SD] = "rksdmmc at ff500000",
+	[BROM_BOOTSOURCE_EMMC] = "/rksdmmc at ff520000",
+	[BROM_BOOTSOURCE_SD] = "/rksdmmc at ff500000",
 };
 
 static struct mm_region rk3328_mem_map[] = {
arch/arm/mach-rockchip/rk3368/rk3368.c +2 -2
index 7ccd417a18ce..20ae79779473 100644
@@ -54,8 +54,8 @@ static struct mm_region rk3368_mem_map[] = {
 struct mm_region *mem_map = rk3368_mem_map;
 
 const char * const boot_devices[BROM_LAST_BOOTSOURCE + 1] = {
-	[BROM_BOOTSOURCE_EMMC] = "dwmmc at ff0f0000",
-	[BROM_BOOTSOURCE_SD] = "dwmmc at ff0c0000",
+	[BROM_BOOTSOURCE_EMMC] = "/dwmmc at ff0f0000",
+	[BROM_BOOTSOURCE_SD] = "/dwmmc at ff0c0000",
 };
 
 #ifdef CONFIG_ARCH_EARLY_INIT_R
Signature · 1 line
2.23.0.37.g745f6812895b
#1 lore raw

PATCH 1/1 rockchip: adding the missing "/" in entries of boot_devices

Quoted 10 lines

From: djw at t-chip.com.cn
Date: Thu, 17 Oct 2019 15:22:38 +0800

From: Levin Du <[email protected]>

Without the prefix, "same-as-spl" in u-boot,spl-boot-order will not work as expected. When board_boot_order() spl-boot-order.c meets "same-as-spl", it gets the conf by looking the boot_devices table by boot source, and parse the node by the conf with:

Quoted 8 lines
   node = fdt_path_offset(blob, conf);

which will failed without the "/" indicating the path.

Currently only entries of boot_devices in rk3399 have the "/" prefix. Therefore add the missing ones in other boards.

I have a very similar diff in my tree that I didn't manage to send out yet.

Reviewed by: Mark Kettenis <[email protected]>

Quoted 93 lines

---

 arch/arm/mach-rockchip/rk3188/rk3188.c | 4 ++--
 arch/arm/mach-rockchip/rk322x/rk322x.c | 4 ++--
 arch/arm/mach-rockchip/rk3288/rk3288.c | 4 ++--
 arch/arm/mach-rockchip/rk3328/rk3328.c | 4 ++--
 arch/arm/mach-rockchip/rk3368/rk3368.c | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)
arch/arm/mach-rockchip/rk3188/rk3188.c +2 -2
index 95f0e3ccbead..1b012f7f67ae 100644
@@ -14,8 +14,8 @@
 #define GRF_BASE	0x20008000
 
 const char * const boot_devices[BROM_LAST_BOOTSOURCE + 1] = {
-	[BROM_BOOTSOURCE_EMMC] = "dwmmc at 1021c000",
-	[BROM_BOOTSOURCE_SD] = "dwmmc at 10214000",
+	[BROM_BOOTSOURCE_EMMC] = "/dwmmc at 1021c000",
+	[BROM_BOOTSOURCE_SD] = "/dwmmc at 10214000",
 };
 
 #ifdef CONFIG_DEBUG_UART_BOARD_INIT
arch/arm/mach-rockchip/rk322x/rk322x.c +2 -2
index cd0bf8a70cc0..562117e6c13a 100644
@@ -8,8 +8,8 @@
 #include <asm/arch-rockchip/hardware.h>
 
 const char * const boot_devices[BROM_LAST_BOOTSOURCE + 1] = {
-	[BROM_BOOTSOURCE_EMMC] = "dwmmc at 30020000",
-	[BROM_BOOTSOURCE_SD] = "dwmmc at 30000000",
+	[BROM_BOOTSOURCE_EMMC] = "/dwmmc at 30020000",
+	[BROM_BOOTSOURCE_SD] = "/dwmmc at 30000000",
 };
 
 #ifdef CONFIG_DEBUG_UART_BOARD_INIT
arch/arm/mach-rockchip/rk3288/rk3288.c +2 -2
index 057ce920809e..987b4e0d58c2 100644
@@ -22,8 +22,8 @@ DECLARE_GLOBAL_DATA_PTR;
 #define GRF_BASE	0xff770000
 
 const char * const boot_devices[BROM_LAST_BOOTSOURCE + 1] = {
-	[BROM_BOOTSOURCE_EMMC] = "dwmmc at ff0f0000",
-	[BROM_BOOTSOURCE_SD] = "dwmmc at ff0c0000",
+	[BROM_BOOTSOURCE_EMMC] = "/dwmmc at ff0f0000",
+	[BROM_BOOTSOURCE_SD] = "/dwmmc at ff0c0000",
 };
 
 #ifdef CONFIG_SPL_BUILD
arch/arm/mach-rockchip/rk3328/rk3328.c +2 -2
index c2448d727302..8c81242e5d4b 100644
@@ -19,8 +19,8 @@ DECLARE_GLOBAL_DATA_PTR;
 #define FW_DDR_CON_REG		0xFF7C0040
 
 const char * const boot_devices[BROM_LAST_BOOTSOURCE + 1] = {
-	[BROM_BOOTSOURCE_EMMC] = "rksdmmc at ff520000",
-	[BROM_BOOTSOURCE_SD] = "rksdmmc at ff500000",
+	[BROM_BOOTSOURCE_EMMC] = "/rksdmmc at ff520000",
+	[BROM_BOOTSOURCE_SD] = "/rksdmmc at ff500000",
 };
 
 static struct mm_region rk3328_mem_map[] = {
arch/arm/mach-rockchip/rk3368/rk3368.c +2 -2
index 7ccd417a18ce..20ae79779473 100644
@@ -54,8 +54,8 @@ static struct mm_region rk3368_mem_map[] = {
 struct mm_region *mem_map = rk3368_mem_map;
 
 const char * const boot_devices[BROM_LAST_BOOTSOURCE + 1] = {
-	[BROM_BOOTSOURCE_EMMC] = "dwmmc at ff0f0000",
-	[BROM_BOOTSOURCE_SD] = "dwmmc at ff0c0000",
+	[BROM_BOOTSOURCE_EMMC] = "/dwmmc at ff0f0000",
+	[BROM_BOOTSOURCE_SD] = "/dwmmc at ff0c0000",
 };
 
 #ifdef CONFIG_ARCH_EARLY_INIT_R
Signature · 8 lines
2.23.0.37.g745f6812895b



_______________________________________________
U-Boot mailing list
U-Boot at lists.denx.de
https://lists.denx.de/listinfo/u-boot
#2 lore raw

PATCH 1/1 rockchip: adding the missing "/" in entries of boot_devices

In reply to djw at t-chip.com.cn
Quoted 11 lines · djw at t-chip.com.cn

From: Levin Du <[email protected]>

Without the prefix, "same-as-spl" in u-boot,spl-boot-order will not work as expected. When board_boot_order() spl-boot-order.c meets "same-as-spl", it gets the conf by looking the boot_devices table by boot source, and parse the node by the conf with:

Quoted 6 lines
  node = fdt_path_offset(blob, conf);

which will failed without the "/" indicating the path.

Currently only entries of boot_devices in rk3399 have the "/" prefix. Therefore add the missing ones in other boards.

Good catch. One can thus tell what platform I originally tested this on ;-)

Quoted 1 line
#3 lore raw

PATCH 1/1 rockchip: adding the missing "/" in entries of boot_devices

In reply to djw at t-chip.com.cn
Quoted 7 lines · djw at t-chip.com.cn

From: Levin Du <[email protected]>

Without the prefix, "same-as-spl" in u-boot,spl-boot-order will not work as expected. When board_boot_order() spl-boot-order.c meets "same-as-spl", it gets the conf by looking the boot_devices table by boot source, and parse the node by the conf with:

Quoted 8 lines
    node = fdt_path_offset(blob, conf);

which will failed without the "/" indicating the path.

Currently only entries of boot_devices in rk3399 have the "/" prefix. Therefore add the missing ones in other boards.

Thanks,
- Kever

Quoted 85 lines

---

  arch/arm/mach-rockchip/rk3188/rk3188.c | 4 ++--
  arch/arm/mach-rockchip/rk322x/rk322x.c | 4 ++--
  arch/arm/mach-rockchip/rk3288/rk3288.c | 4 ++--
  arch/arm/mach-rockchip/rk3328/rk3328.c | 4 ++--
  arch/arm/mach-rockchip/rk3368/rk3368.c | 4 ++--
  5 files changed, 10 insertions(+), 10 deletions(-)
arch/arm/mach-rockchip/rk3188/rk3188.c +2 -2
index 95f0e3ccbead..1b012f7f67ae 100644
@@ -14,8 +14,8 @@
  #define GRF_BASE	0x20008000
 
  const char * const boot_devices[BROM_LAST_BOOTSOURCE + 1] = {
-	[BROM_BOOTSOURCE_EMMC] = "dwmmc at 1021c000",
-	[BROM_BOOTSOURCE_SD] = "dwmmc at 10214000",
+	[BROM_BOOTSOURCE_EMMC] = "/dwmmc at 1021c000",
+	[BROM_BOOTSOURCE_SD] = "/dwmmc at 10214000",
  };
 
  #ifdef CONFIG_DEBUG_UART_BOARD_INIT
arch/arm/mach-rockchip/rk322x/rk322x.c +2 -2
index cd0bf8a70cc0..562117e6c13a 100644
@@ -8,8 +8,8 @@
  #include <asm/arch-rockchip/hardware.h>
 
  const char * const boot_devices[BROM_LAST_BOOTSOURCE + 1] = {
-	[BROM_BOOTSOURCE_EMMC] = "dwmmc at 30020000",
-	[BROM_BOOTSOURCE_SD] = "dwmmc at 30000000",
+	[BROM_BOOTSOURCE_EMMC] = "/dwmmc at 30020000",
+	[BROM_BOOTSOURCE_SD] = "/dwmmc at 30000000",
  };
 
  #ifdef CONFIG_DEBUG_UART_BOARD_INIT
arch/arm/mach-rockchip/rk3288/rk3288.c +2 -2
index 057ce920809e..987b4e0d58c2 100644
@@ -22,8 +22,8 @@ DECLARE_GLOBAL_DATA_PTR;
  #define GRF_BASE	0xff770000
 
  const char * const boot_devices[BROM_LAST_BOOTSOURCE + 1] = {
-	[BROM_BOOTSOURCE_EMMC] = "dwmmc at ff0f0000",
-	[BROM_BOOTSOURCE_SD] = "dwmmc at ff0c0000",
+	[BROM_BOOTSOURCE_EMMC] = "/dwmmc at ff0f0000",
+	[BROM_BOOTSOURCE_SD] = "/dwmmc at ff0c0000",
  };
 
  #ifdef CONFIG_SPL_BUILD
arch/arm/mach-rockchip/rk3328/rk3328.c +2 -2
index c2448d727302..8c81242e5d4b 100644
@@ -19,8 +19,8 @@ DECLARE_GLOBAL_DATA_PTR;
  #define FW_DDR_CON_REG		0xFF7C0040
 
  const char * const boot_devices[BROM_LAST_BOOTSOURCE + 1] = {
-	[BROM_BOOTSOURCE_EMMC] = "rksdmmc at ff520000",
-	[BROM_BOOTSOURCE_SD] = "rksdmmc at ff500000",
+	[BROM_BOOTSOURCE_EMMC] = "/rksdmmc at ff520000",
+	[BROM_BOOTSOURCE_SD] = "/rksdmmc at ff500000",
  };
 
  static struct mm_region rk3328_mem_map[] = {
arch/arm/mach-rockchip/rk3368/rk3368.c +2 -2
index 7ccd417a18ce..20ae79779473 100644
@@ -54,8 +54,8 @@ static struct mm_region rk3368_mem_map[] = {
  struct mm_region *mem_map = rk3368_mem_map;
 
  const char * const boot_devices[BROM_LAST_BOOTSOURCE + 1] = {
-	[BROM_BOOTSOURCE_EMMC] = "dwmmc at ff0f0000",
-	[BROM_BOOTSOURCE_SD] = "dwmmc at ff0c0000",
+	[BROM_BOOTSOURCE_EMMC] = "/dwmmc at ff0f0000",
+	[BROM_BOOTSOURCE_SD] = "/dwmmc at ff0c0000",
  };
 
  #ifdef CONFIG_ARCH_EARLY_INIT_R