summaryrefslogtreecommitdiffstats
path: root/board/samsung/smdk5250
diff options
context:
space:
mode:
authorVivek Gautam <gautam.vivek@samsung.com>2013-01-28 00:39:59 +0000
committerMinkyu Kang <mk7.kang@samsung.com>2013-04-17 10:00:30 +0900
commit70656c79f3c85df77b65cda0237f5454851186ca (patch)
treecc187647d4b9c713270e59defc9623a1b12c3d4e /board/samsung/smdk5250
parent601795462a4e7ede97b64dc306de1002e688eef6 (diff)
downloadblackbird-obmc-uboot-70656c79f3c85df77b65cda0237f5454851186ca.tar.gz
blackbird-obmc-uboot-70656c79f3c85df77b65cda0237f5454851186ca.zip
Exynos5: Add support for USB download boot mode
Exynos5250 supports secondary USB device boot mode. If the iROM fails to download u-boot from the primary boot device (such as SD or eMMC), it will try to retrieve from the secondary boot device (such as USB). Signed-off-by: Naveen Krishna Ch <ch.naveen@samsung.com> Signed-off-by: Simon Glass <sjg@chromium.org> Signed-off-by: Vivek Gautam <gautam.vivek@samsung.com> Acked-by: Simon Glass <sjg@chromium.org> Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
Diffstat (limited to 'board/samsung/smdk5250')
-rw-r--r--board/samsung/smdk5250/spl_boot.c40
1 files changed, 38 insertions, 2 deletions
diff --git a/board/samsung/smdk5250/spl_boot.c b/board/samsung/smdk5250/spl_boot.c
index d8f3c1e184..c0bcf460f1 100644
--- a/board/samsung/smdk5250/spl_boot.c
+++ b/board/samsung/smdk5250/spl_boot.c
@@ -32,6 +32,21 @@ enum boot_mode {
};
typedef u32 (*spi_copy_func_t)(u32 offset, u32 nblock, u32 dst);
+ typedef u32 (*usb_copy_func_t)(void);
+
+/*
+ * Set/clear program flow prediction and return the previous state.
+ */
+static int config_branch_prediction(int set_cr_z)
+{
+ unsigned int cr;
+
+ /* System Control Register: 11th bit Z Branch prediction enable */
+ cr = get_cr();
+ set_cr(set_cr_z ? cr | CR_Z : cr & ~CR_Z);
+
+ return cr & CR_Z;
+}
/*
* Copy U-boot from mmc to RAM:
@@ -41,10 +56,20 @@ enum boot_mode {
void copy_uboot_to_ram(void)
{
spi_copy_func_t spi_copy;
- enum boot_mode bootmode;
+ usb_copy_func_t usb_copy;
+
+ int is_cr_z_set;
+ unsigned int sec_boot_check;
+ enum boot_mode bootmode = BOOT_MODE_OM;
u32 (*copy_bl2)(u32, u32, u32);
- bootmode = readl(EXYNOS5_POWER_BASE) & OM_STAT;
+ /* Read iRAM location to check for secondary USB boot mode */
+ sec_boot_check = readl(EXYNOS_IRAM_SECONDARY_BASE);
+ if (sec_boot_check == EXYNOS_USB_SECONDARY_BOOT)
+ bootmode = BOOT_MODE_USB;
+
+ if (bootmode == BOOT_MODE_OM)
+ bootmode = readl(EXYNOS5_POWER_BASE) & OM_STAT;
switch (bootmode) {
case BOOT_MODE_SERIAL:
@@ -57,6 +82,17 @@ void copy_uboot_to_ram(void)
copy_bl2(BL2_START_OFFSET, BL2_SIZE_BLOC_COUNT,
CONFIG_SYS_TEXT_BASE);
break;
+ case BOOT_MODE_USB:
+ /*
+ * iROM needs program flow prediction to be disabled
+ * before copy from USB device to RAM
+ */
+ is_cr_z_set = config_branch_prediction(0);
+ usb_copy = *(usb_copy_func_t *)
+ EXYNOS_COPY_USB_FNPTR_ADDR;
+ usb_copy();
+ config_branch_prediction(is_cr_z_set);
+ break;
default:
break;
}
OpenPOWER on IntegriCloud