From 592f922261993bad8cfb96395342e25eda6776e3 Mon Sep 17 00:00:00 2001
From: Guillaume GARDET <guillaume.gardet@free.fr>
Date: Wed, 15 Oct 2014 17:53:12 +0200
Subject: spl: Add EXT support to SPL

Add EXT filesystem support to SPL.

Signed-off-by: Guillaume GARDET <guillaume.gardet@free.fr>
[trini: Fix a warning and checkpatch problems]
Signed-off-by: Tom Rini <trini@ti.com>
---
 common/spl/spl_ext.c | 139 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 139 insertions(+)
 create mode 100644 common/spl/spl_ext.c

(limited to 'common/spl/spl_ext.c')

diff --git a/common/spl/spl_ext.c b/common/spl/spl_ext.c
new file mode 100644
index 0000000..d9eba5a
--- /dev/null
+++ b/common/spl/spl_ext.c
@@ -0,0 +1,139 @@
+/*
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+#include <common.h>
+#include <spl.h>
+#include <asm/u-boot.h>
+#include <ext4fs.h>
+#include <image.h>
+
+#ifdef CONFIG_SPL_EXT_SUPPORT
+int spl_load_image_ext(block_dev_desc_t *block_dev,
+						int partition,
+						const char *filename)
+{
+	s32 err;
+	struct image_header *header;
+	int filelen;
+	disk_partition_t part_info = {};
+
+	header = (struct image_header *)(CONFIG_SYS_TEXT_BASE -
+						sizeof(struct image_header));
+
+	if (get_partition_info(block_dev,
+			       partition, &part_info)) {
+		printf("spl: no partition table found\n");
+		return -1;
+	}
+
+	ext4fs_set_blk_dev(block_dev, &part_info);
+
+	err = ext4fs_mount(0);
+	if (!err) {
+#ifdef CONFIG_SPL_LIBCOMMON_SUPPORT
+		printf("%s: ext4fs mount err - %d\n", __func__, err);
+#endif
+		goto end;
+	}
+
+	filelen = err = ext4fs_open(filename);
+	if (err < 0) {
+		puts("spl: ext4fs_open failed\n");
+		goto end;
+	}
+	err = ext4fs_read((char *)header, sizeof(struct image_header));
+	if (err <= 0) {
+		puts("spl: ext4fs_read failed\n");
+		goto end;
+	}
+
+	spl_parse_image_header(header);
+
+	err = ext4fs_read((char *)spl_image.load_addr, filelen);
+
+end:
+#ifdef CONFIG_SPL_LIBCOMMON_SUPPORT
+	if (err <= 0)
+		printf("%s: error reading image %s, err - %d\n",
+		       __func__, filename, err);
+#endif
+
+	return err <= 0;
+}
+
+#ifdef CONFIG_SPL_OS_BOOT
+int spl_load_image_ext_os(block_dev_desc_t *block_dev, int partition)
+{
+	int err;
+	int filelen;
+	disk_partition_t part_info = {};
+	__maybe_unused char *file;
+
+	if (get_partition_info(block_dev,
+			       partition, &part_info)) {
+		printf("spl: no partition table found\n");
+		return -1;
+	}
+
+	ext4fs_set_blk_dev(block_dev, &part_info);
+
+	err = ext4fs_mount(0);
+	if (!err) {
+#ifdef CONFIG_SPL_LIBCOMMON_SUPPORT
+		printf("%s: ext4fs mount err - %d\n", __func__, err);
+#endif
+		return -1;
+	}
+
+#if defined(CONFIG_SPL_ENV_SUPPORT) && defined(CONFIG_SPL_OS_BOOT)
+	file = getenv("falcon_args_file");
+	if (file) {
+		filelen = err = ext4fs_open(file);
+		if (err < 0) {
+			puts("spl: ext4fs_open failed\n");
+			goto defaults;
+		}
+		err = ext4fs_read((void *)CONFIG_SYS_SPL_ARGS_ADDR, filelen);
+		if (err <= 0) {
+			printf("spl: error reading image %s, err - %d, falling back to default\n",
+			       file, err);
+			goto defaults;
+		}
+		file = getenv("falcon_image_file");
+		if (file) {
+			err = spl_load_image_ext(block_dev, partition, file);
+			if (err != 0) {
+				puts("spl: falling back to default\n");
+				goto defaults;
+			}
+
+			return 0;
+		} else {
+			puts("spl: falcon_image_file not set in environment, falling back to default\n");
+		}
+	} else {
+		puts("spl: falcon_args_file not set in environment, falling back to default\n");
+	}
+
+defaults:
+#endif
+
+	filelen = err = ext4fs_open(CONFIG_SPL_FS_LOAD_ARGS_NAME);
+	if (err < 0)
+		puts("spl: ext4fs_open failed\n");
+
+	err = ext4fs_read((void *)CONFIG_SYS_SPL_ARGS_ADDR, filelen);
+	if (err <= 0) {
+#ifdef CONFIG_SPL_LIBCOMMON_SUPPORT
+		printf("%s: error reading image %s, err - %d\n",
+		       __func__, CONFIG_SPL_FS_LOAD_ARGS_NAME, err);
+#endif
+		return -1;
+	}
+
+	return spl_load_image_ext(block_dev, partition,
+			CONFIG_SPL_FS_LOAD_KERNEL_NAME);
+}
+#endif
+#endif
-- 
cgit v1.1