rockchip: adding the missing "/" in entries of boot_devices
Subsystems (3)
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
@@ -14,8 +14,8 @@#define GRF_BASE 0x20008000const 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
@@ -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
@@ -22,8 +22,8 @@ DECLARE_GLOBAL_DATA_PTR;#define GRF_BASE 0xff770000const 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
@@ -19,8 +19,8 @@ DECLARE_GLOBAL_DATA_PTR;#define FW_DDR_CON_REG 0xFF7C0040const 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
@@ -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
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 +0800From: Levin Du <[email protected]>
Without the prefix, "same-as-spl" in
u-boot,spl-boot-orderwill not work as expected. Whenboard_boot_order()spl-boot-order.cmeets "same-as-spl", it gets the conf by looking theboot_devicestable 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_devicesin rk3399 have the "/" prefix. Therefore add the missing ones in other boards.Signed-off-by Levin Du <[email protected]>
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@@ -14,8 +14,8 @@#define GRF_BASE 0x20008000const 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@@ -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@@ -22,8 +22,8 @@ DECLARE_GLOBAL_DATA_PTR;#define GRF_BASE 0xff770000const 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@@ -19,8 +19,8 @@ DECLARE_GLOBAL_DATA_PTR;#define FW_DDR_CON_REG 0xFF7C0040const 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@@ -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
PATCH 1/1 rockchip: adding the missing "/" in entries of boot_devices
In reply to djw at t-chip.com.cnQuoted 11 lines · djw at t-chip.com.cn
From: Levin Du <[email protected]>
Without the prefix, "same-as-spl" in
u-boot,spl-boot-orderwill not work as expected. Whenboard_boot_order()spl-boot-order.cmeets "same-as-spl", it gets the conf by looking theboot_devicestable 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_devicesin 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
Signed-off-by Levin Du <[email protected]>
PATCH 1/1 rockchip: adding the missing "/" in entries of boot_devices
In reply to djw at t-chip.com.cnQuoted 7 lines · djw at t-chip.com.cn
From: Levin Du <[email protected]>
Without the prefix, "same-as-spl" in
u-boot,spl-boot-orderwill not work as expected. Whenboard_boot_order()spl-boot-order.cmeets "same-as-spl", it gets the conf by looking theboot_devicestable 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_devicesin rk3399 have the "/" prefix. Therefore add the missing ones in other boards.Signed-off-by Levin Du <[email protected]>
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@@ -14,8 +14,8 @@#define GRF_BASE 0x20008000const 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@@ -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@@ -22,8 +22,8 @@ DECLARE_GLOBAL_DATA_PTR;#define GRF_BASE 0xff770000const 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@@ -19,8 +19,8 @@ DECLARE_GLOBAL_DATA_PTR;#define FW_DDR_CON_REG 0xFF7C0040const 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@@ -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