summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorTeo Hall <teo.hall@nxp.com>2018-10-15 17:03:45 -0500
committerNitin Garg <nitin.garg@nxp.com>2018-11-02 20:50:08 -0500
commitfe6af144930a0a32cbc4599635a96c8a629432a1 (patch)
tree235a4f9b3319e44c7fb280bace6a17eba52021ab /common
parent56c9ac9734a59c68cb85125b7047087d00d141e8 (diff)
MLK-19877-1: iMX8QXP: Add NAND SPL support
Add implementation necessary for supporting SPL on QXP ARM2 board with dynamic offset detection from container header. Signed-off-by: Teo Hall <teo.hall@nxp.com>
Diffstat (limited to 'common')
-rw-r--r--common/spl/spl_nand.c16
1 files changed, 12 insertions, 4 deletions
diff --git a/common/spl/spl_nand.c b/common/spl/spl_nand.c
index d075985374..93d4774fff 100644
--- a/common/spl/spl_nand.c
+++ b/common/spl/spl_nand.c
@@ -13,15 +13,23 @@
#include <fdt.h>
#if defined(CONFIG_SPL_NAND_RAW_ONLY)
+uint32_t __weak spl_nand_get_uboot_raw_page(void)
+{
+ return CONFIG_SYS_NAND_U_BOOT_OFFS;
+}
+
int spl_nand_load_image(struct spl_image_info *spl_image,
struct spl_boot_device *bootdev)
{
nand_init();
-
- nand_spl_load_image(CONFIG_SYS_NAND_U_BOOT_OFFS,
- CONFIG_SYS_NAND_U_BOOT_SIZE,
- (void *)CONFIG_SYS_NAND_U_BOOT_DST);
+ nand_spl_load_image(spl_nand_get_uboot_raw_page(),
+ CONFIG_SYS_NAND_U_BOOT_SIZE,
+ (void *)CONFIG_SYS_NAND_U_BOOT_DST);
+#if defined(CONFIG_SPL_RAW_IMAGE_ARM_TRUSTED_FIRMWARE)
+ spl_set_header_raw_atf(spl_image);
+#else
spl_set_header_raw_uboot(spl_image);
+#endif
nand_deselect();
return 0;