projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "ARM64: zynqmp: Add serdes address space dp driver"
[oweals/u-boot.git]
/
arch
/
arm
/
mach-rockchip
/
rk3288-board-spl.c
diff --git
a/arch/arm/mach-rockchip/rk3288-board-spl.c
b/arch/arm/mach-rockchip/rk3288-board-spl.c
index e133cca57ac918523fa6f40c8980a8353a682ad5..0f40351769e658c18e2934d6f276797cf7764d2d 100644
(file)
--- a/
arch/arm/mach-rockchip/rk3288-board-spl.c
+++ b/
arch/arm/mach-rockchip/rk3288-board-spl.c
@@
-29,6
+29,7
@@
DECLARE_GLOBAL_DATA_PTR;
u32 spl_boot_device(void)
{
u32 spl_boot_device(void)
{
+#if !CONFIG_IS_ENABLED(OF_PLATDATA)
const void *blob = gd->fdt_blob;
struct udevice *dev;
const char *bootdev;
const void *blob = gd->fdt_blob;
struct udevice *dev;
const char *bootdev;
@@
-63,10
+64,11
@@
u32 spl_boot_device(void)
}
fallback:
}
fallback:
+#endif
return BOOT_DEVICE_MMC1;
}
return BOOT_DEVICE_MMC1;
}
-u32 spl_boot_mode(
void
)
+u32 spl_boot_mode(
const u32 boot_device
)
{
return MMCSD_MODE_RAW;
}
{
return MMCSD_MODE_RAW;
}
@@
-114,7
+116,8
@@
static void configure_l2ctlr(void)
#ifdef CONFIG_SPL_MMC_SUPPORT
static int configure_emmc(struct udevice *pinctrl)
{
#ifdef CONFIG_SPL_MMC_SUPPORT
static int configure_emmc(struct udevice *pinctrl)
{
-#if !defined(CONFIG_TARGET_ROCK2) && !defined(CONFIG_TARGET_FIREFLY_RK3288)
+#if defined(CONFIG_TARGET_CHROMEBOOK_JERRY)
+
struct gpio_desc desc;
int ret;
struct gpio_desc desc;
int ret;
@@
-145,11
+148,10
@@
static int configure_emmc(struct udevice *pinctrl)
return ret;
}
#endif
return ret;
}
#endif
-
return 0;
}
#endif
return 0;
}
#endif
-
+extern void back_to_bootrom(void);
void board_init_f(ulong dummy)
{
struct udevice *pinctrl;
void board_init_f(ulong dummy)
{
struct udevice *pinctrl;
@@
-187,7
+189,7
@@
void board_init_f(ulong dummy)
rockchip_timer_init();
configure_l2ctlr();
rockchip_timer_init();
configure_l2ctlr();
- ret =
uclass_get_device(UCLASS_CLK, 0,
&dev);
+ ret =
rockchip_get_clk(
&dev);
if (ret) {
debug("CLK init failed: %d\n", ret);
return;
if (ret) {
debug("CLK init failed: %d\n", ret);
return;
@@
-204,6
+206,9
@@
void board_init_f(ulong dummy)
debug("DRAM init failed: %d\n", ret);
return;
}
debug("DRAM init failed: %d\n", ret);
return;
}
+#if defined(CONFIG_ROCKCHIP_SPL_BACK_TO_BROM) && !defined(CONFIG_SPL_BOARD_INIT)
+ back_to_bootrom();
+#endif
}
static int setup_led(void)
}
static int setup_led(void)
@@
-246,6
+251,7
@@
void spl_board_init(void)
debug("%s: Cannot find pinctrl device\n", __func__);
goto err;
}
debug("%s: Cannot find pinctrl device\n", __func__);
goto err;
}
+
#ifdef CONFIG_SPL_MMC_SUPPORT
ret = pinctrl_request_noflags(pinctrl, PERIPH_ID_SDCARD);
if (ret) {
#ifdef CONFIG_SPL_MMC_SUPPORT
ret = pinctrl_request_noflags(pinctrl, PERIPH_ID_SDCARD);
if (ret) {
@@
-267,6
+273,9
@@
void spl_board_init(void)
}
preloader_console_init();
}
preloader_console_init();
+#ifdef CONFIG_ROCKCHIP_SPL_BACK_TO_BROM
+ back_to_bootrom();
+#endif
return;
err:
printf("spl_board_init: Error %d\n", ret);
return;
err:
printf("spl_board_init: Error %d\n", ret);
@@
-274,7
+283,3
@@
err:
/* No way to report error here */
hang();
}
/* No way to report error here */
hang();
}
-
-void lowlevel_init(void)
-{
-}