Revert "Merge patch series "vbe: Series part E""
This reverts commit 1fdf53ace13f745fe8ad4d2d4e79eed98088d555, reversing
changes made to e5aef1bbf11412eebd4c242b46adff5301353c30.
I had missed that this caused too much size growth on rcar3_salvator-x.
Signed-off-by: Tom Rini <trini@konsulko.com>
diff --git a/common/spl/spl.c b/common/spl/spl.c
index ad31a2f..1ceb63d 100644
--- a/common/spl/spl.c
+++ b/common/spl/spl.c
@@ -631,13 +631,10 @@
"Unsupported Boot Device!\n");
}
}
- if (loader) {
- ret = spl_load_image(spl_image, loader);
- if (!ret) {
- spl_image->boot_device = bootdev;
- return 0;
- }
- printf("Error: %d\n", ret);
+ if (loader &&
+ !spl_load_image(spl_image, loader)) {
+ spl_image->boot_device = bootdev;
+ return 0;
}
}
}
@@ -836,7 +833,7 @@
*/
void preloader_console_init(void)
{
-#if CONFIG_IS_ENABLED(SERIAL)
+#ifdef CONFIG_SPL_SERIAL
gd->baudrate = CONFIG_BAUDRATE;
serial_init(); /* serial communications setup */
@@ -895,7 +892,7 @@
*/
ulong spl_relocate_stack_gd(void)
{
-#if CONFIG_IS_ENABLED(STACK_R)
+#ifdef CONFIG_SPL_STACK_R
gd_t *new_gd;
ulong ptr = CONFIG_SPL_STACK_R_ADDR;