mirrors/u-boot
1
0
Fork 0
mirror of https://source.denx.de/u-boot/u-boot.git synced 2025-08-15 03:36:59 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

rockchip: rk3399: move boot_devices into soc file

Browse Source 
Move boot_devices definition into rk3399.c, so that we can
share the common code for board_spl_was_booted_from().

Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
This commit is contained in:
Kever Yang 2019-07-22 19:59:40 +08:00
parent 47b0ead21a
commit 4e1aeb89af
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/arm/mach-rockchip/rk3399-board-spl.c
View File

@ -23,11 +23,7 @@ void board_return_to_bootrom(void)
back_to_bootrom(BROM_BOOT_NEXTSTAGE); back_to_bootrom(BROM_BOOT_NEXTSTAGE);
} }
static const char * const boot_devices[BROM_LAST_BOOTSOURCE + 1] = { __weak const char * const boot_devices[BROM_LAST_BOOTSOURCE + 1] = {};
[BROM_BOOTSOURCE_EMMC] = "/sdhci@fe330000",
[BROM_BOOTSOURCE_SPINOR] = "/spi@ff1d0000",
[BROM_BOOTSOURCE_SD] = "/dwmmc@fe320000",
};
const char *board_spl_was_booted_from(void) const char *board_spl_was_booted_from(void)
{ {

7
arch/arm/mach-rockchip/rk3399/rk3399.c
View File

@ -9,6 +9,7 @@
#include <syscon.h> #include <syscon.h>
#include <asm/armv8/mmu.h> #include <asm/armv8/mmu.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/arch-rockchip/bootrom.h>
#include <asm/arch-rockchip/clock.h> #include <asm/arch-rockchip/clock.h>
#include <asm/arch-rockchip/gpio.h> #include <asm/arch-rockchip/gpio.h>
#include <asm/arch-rockchip/grf_rk3399.h> #include <asm/arch-rockchip/grf_rk3399.h>
@ -20,6 +21,12 @@ DECLARE_GLOBAL_DATA_PTR;
#define GRF_EMMCCORE_CON11 0xff77f02c #define GRF_EMMCCORE_CON11 0xff77f02c
#define GRF_BASE 0xff770000 #define GRF_BASE 0xff770000
const char * const boot_devices[BROM_LAST_BOOTSOURCE + 1] = {
[BROM_BOOTSOURCE_EMMC] = "/sdhci@fe330000",
[BROM_BOOTSOURCE_SPINOR] = "/spi@ff1d0000",
[BROM_BOOTSOURCE_SD] = "/dwmmc@fe320000",
};
static struct mm_region rk3399_mem_map[] = { static struct mm_region rk3399_mem_map[] = {
{ {
.virt = 0x0UL, .virt = 0x0UL,