summaryrefslogtreecommitdiffstats
path: root/board/LaCie
diff options
context:
space:
mode:
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>2015-01-31 22:55:38 +0100
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2015-02-25 07:59:50 +0100
commit9608e7de6ac13626e8a2809b0350add57c1343ac (patch)
tree2ba3415bbcac8a8cd39c7d6056c7d347a3bbda4d /board/LaCie
parentc1b0fad9b655e0251c686cd129eb2f933fcc6b3a (diff)
downloadblackbird-obmc-uboot-9608e7de6ac13626e8a2809b0350add57c1343ac.tar.gz
blackbird-obmc-uboot-9608e7de6ac13626e8a2809b0350add57c1343ac.zip
edminiv2: switch to SPL
ED Mini V2 is based on Orion 5x which boots at fixed address 0xFFFF0000 in NOR Flash. Place SPL there, and switch U-Boot from .bin to .img format, stored in NOR Flash at 0xFFF90000. Note: this patch was tested on HW and works, i.e. it boots U-Boot properly, but SPL console output currently does not appear, due to GD being trashed by arch/arm/lib/spl.c. This trashing is soon to be removed, and then ED Mini V2 SPL console output will become visible. Signed-off-by: Albert ARIBAUD <albert.u.boot@aribaud.net>
Diffstat (limited to 'board/LaCie')
-rw-r--r--board/LaCie/edminiv2/edminiv2.c20
1 files changed, 20 insertions, 0 deletions
diff --git a/board/LaCie/edminiv2/edminiv2.c b/board/LaCie/edminiv2/edminiv2.c
index 80ec7faa04..2983201801 100644
--- a/board/LaCie/edminiv2/edminiv2.c
+++ b/board/LaCie/edminiv2/edminiv2.c
@@ -12,6 +12,8 @@
#include <miiphy.h>
#include <asm/arch/orion5x.h>
#include "../common/common.h"
+#include <spl.h>
+#include <ns16550.h>
DECLARE_GLOBAL_DATA_PTR;
@@ -83,3 +85,21 @@ void reset_phy(void)
mv_phy_88e1116_init("egiga0", 8);
}
#endif /* CONFIG_RESET_PHY_R */
+
+/*
+ * SPL serial setup and NOR boot device selection
+ */
+
+#ifdef CONFIG_SPL_BUILD
+
+void spl_board_init(void)
+{
+ preloader_console_init();
+}
+
+u32 spl_boot_device(void)
+{
+ return BOOT_DEVICE_NOR;
+}
+
+#endif /* CONFIG_SPL_BUILD */
OpenPOWER on IntegriCloud