Skip to contentSkip to conversation

rockchip: Fix spl boot order path of booting device

PATCH New Michael Trimarchi 3 participants 5 messages Nov 9, 2019 – Nov 14, 2019

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

PATCH 1/1 rockchip: Fix spl boot order path of booting device

Fix rk3288, rk3188, rk322x, rk3368

Tested on rk3288

U-Boot SPL 2019.10-rc4-00014-g0493073dc4-dirty (Nov 09 2019 - 13:04:06 +0100)
board_spl_was_booted_from: brom_bootdevice_id 2 maps to 'dwmmc at ff0f0000'
board_boot_order: could not find dwmmc at ff0f0000 in FDT

---
 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/rk3368/rk3368.c | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)
arch/arm/mach-rockchip/rk3188/rk3188.c +2 -2
index 95f0e3ccbe..1b012f7f67 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 cd0bf8a70c..562117e6c1 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 057ce92080..987b4e0d58 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/rk3368/rk3368.c +2 -2
index 7ccd417a18..20ae797794 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.17.1
#1 lore raw

PATCH 1/1 rockchip: Fix spl boot order path of booting device

Quoted 11 lines

From: Michael Trimarchi <[email protected]>
Date: Sat, 9 Nov 2019 13:26:25 +0100

Fix rk3288, rk3188, rk322x, rk3368

Tested on rk3288

U-Boot SPL 2019.10-rc4-00014-g0493073dc4-dirty (Nov 09 2019 - 13:04:06 +0100)
board_spl_was_booted_from: brom_bootdevice_id 2 maps to 'dwmmc at ff0f0000'
board_boot_order: could not find dwmmc at ff0f0000 in FDT

Quoted 7 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/rk3368/rk3368.c | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)
Quoted 67 lines
arch/arm/mach-rockchip/rk3188/rk3188.c +2 -2
index 95f0e3ccbe..1b012f7f67 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 cd0bf8a70c..562117e6c1 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 057ce92080..987b4e0d58 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/rk3368/rk3368.c +2 -2
index 7ccd417a18..20ae797794 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 · 6 lines
2.17.1

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

PATCH 1/1 rockchip: Fix spl boot order path of booting device

In reply to Michael Trimarchi
Quoted 9 lines · Michael Trimarchi

Fix rk3288, rk3188, rk322x, rk3368

Tested on rk3288

U-Boot SPL 2019.10-rc4-00014-g0493073dc4-dirty (Nov 09 2019 - 13:04:06 +0100)
board_spl_was_booted_from: brom_bootdevice_id 2 maps to 'dwmmc at ff0f0000'
board_boot_order: could not find dwmmc at ff0f0000 in FDT

Thanks,
- Kever

Quoted 67 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/rk3368/rk3368.c | 4 ++--
  4 files changed, 8 insertions(+), 8 deletions(-)
arch/arm/mach-rockchip/rk3188/rk3188.c +2 -2
index 95f0e3ccbe..1b012f7f67 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 cd0bf8a70c..562117e6c1 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 057ce92080..987b4e0d58 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/rk3368/rk3368.c +2 -2
index 7ccd417a18..20ae797794 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
#3 lore raw

PATCH 1/1 rockchip: Fix spl boot order path of booting device

In reply to Michael Trimarchi

Hi Michael,

There is a similar patch which has been applied few weeks ago:

https://patchwork.ozlabs.org/patch/1178346/

Thanks,

- Kever

Quoted 76 lines · Michael Trimarchi

Fix rk3288, rk3188, rk322x, rk3368

Tested on rk3288

U-Boot SPL 2019.10-rc4-00014-g0493073dc4-dirty (Nov 09 2019 - 13:04:06 +0100)
board_spl_was_booted_from: brom_bootdevice_id 2 maps to 'dwmmc at ff0f0000'
board_boot_order: could not find dwmmc at ff0f0000 in FDT

---
  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/rk3368/rk3368.c | 4 ++--
  4 files changed, 8 insertions(+), 8 deletions(-)
arch/arm/mach-rockchip/rk3188/rk3188.c +2 -2
index 95f0e3ccbe..1b012f7f67 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 cd0bf8a70c..562117e6c1 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 057ce92080..987b4e0d58 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/rk3368/rk3368.c +2 -2
index 7ccd417a18..20ae797794 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
#4 lore raw

PATCH 1/1 rockchip: Fix spl boot order path of booting device

Hi

Quoted 7 lines · Kever Yang

Hi Michael,

There is a similar patch which has been applied few weeks ago:

https://patchwork.ozlabs.org/patch/1178346/

Ok thank you

Michael

Quoted 84 lines

Thanks,

- Kever

Quoted 76 lines · Michael Trimarchi

Fix rk3288, rk3188, rk322x, rk3368

Tested on rk3288

U-Boot SPL 2019.10-rc4-00014-g0493073dc4-dirty (Nov 09 2019 - 13:04:06 +0100)
board_spl_was_booted_from: brom_bootdevice_id 2 maps to 'dwmmc at ff0f0000'
board_boot_order: could not find dwmmc at ff0f0000 in FDT

---
  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/rk3368/rk3368.c | 4 ++--
  4 files changed, 8 insertions(+), 8 deletions(-)
arch/arm/mach-rockchip/rk3188/rk3188.c +2 -2
index 95f0e3ccbe..1b012f7f67 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 cd0bf8a70c..562117e6c1 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 057ce92080..987b4e0d58 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/rk3368/rk3368.c +2 -2
index 7ccd417a18..20ae797794 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 · 4 lines
| Michael Nazzareno Trimarchi                     Amarula Solutions BV |
| COO  -  Founder                                      Cruquiuskade 47 |
| +31(0)851119172                                 Amsterdam 1018 AM NL |
|                  [`as] http://www.amarulasolutions.com               |