[U-Boot,v3,06/20] common: Generic firmware loader for file system

Message ID	1507882137-27841-7-git-send-email-tien.fong.chee@intel.com
State	Superseded
Delegated to:	Marek Vasut
Headers	show Return-Path: <u-boot-bounces@lists.denx.de> From: tien.fong.chee@intel.com To: u-boot@lists.denx.de Date: Fri, 13 Oct 2017 16:08:43 +0800 Message-Id: <1507882137-27841-7-git-send-email-tien.fong.chee@intel.com> In-Reply-To: <1507882137-27841-1-git-send-email-tien.fong.chee@intel.com> References: <1507882137-27841-1-git-send-email-tien.fong.chee@intel.com> Cc: Marek Vasut <marex@denx.de>, Tien Fong Chee <tien.fong.chee@intel.com>, Ching Liang See <chin.liang.see@intel.com>, Tien Fong <skywindctf@gmail.com>, Westergteen Dalon <dalon.westergreen@intel.com> Subject: [U-Boot] [PATCH v3 06/20] common: Generic firmware loader for file system Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" <u-boot-bounces@lists.denx.de>
Series	Add FPGA, SDRAM, SPL loadfs U-boot & booting to console \| expand [U-Boot,v3,00/20] Add FPGA, SDRAM, SPL loadfs U-boot & booting to console [U-Boot,v3,01/20] ARM: socfpga: Description on FPGA RBF properties at Arria 10 FPGA manager [U-Boot,v3,02/20] dts: Add FPGA bitstream properties to Arria 10 DTS [U-Boot,v3,03/20] arm: socfpga: Add Arria 10 SoCFPGA programming interface [U-Boot,v3,04/20] dts: Enable fpga-mgr node build for Arria 10 SPL [U-Boot,v3,05/20] fs: Enable generic filesystems interface support in SPL. [U-Boot,v3,06/20] common: Generic firmware loader for file system [U-Boot,v3,07/20] arm: socfpga: Fix with the correct polling status bit [U-Boot,v3,08/20] arm: socfpga: Add drivers for programing FPGA from flash [U-Boot,v3,09/20] arm: socfpga: Rename the gen5 sdram driver to more specific name [U-Boot,v3,10/20] arm: socfpga: Add DRAM bank size initialization function [U-Boot,v3,11/20] arm: socfpga: Add DDR driver for Arria 10 [U-Boot,v3,12/20] configs: Add DDR Kconfig support for Arria 10 [U-Boot,v3,13/20] arm: socfpga: Enable SPL memory allocation [U-Boot,v3,14/20] arm: socfpga: Improve comments for Intel SoCFPGA program header [U-Boot,v3,15/20] arm: socfpga: Enhance Intel SoCFPGA program header to support Arria 10 [U-Boot,v3,16/20] arm: socfpga: Adding clock frequency info for U-boot [U-Boot,v3,17/20] arm: socfpga: Adding SoCFPGA info for both SPL and U-boot [U-Boot,v3,18/20] arm: socfpga: Enable function visible to other file [U-Boot,v3,19/20] arm: socfpga: Enable DDR working [U-Boot,v3,20/20] arm: socfpga: Enable SPL booting U-boot

diff --git a/common/Makefile b/common/Makefile index 801ea31..0e591c0 100644 --- a/common/Makefile +++ b/common/Makefile @@ -130,3 +130,5 @@ obj-$(CONFIG_CMD_DFU) += dfu.o obj-y += command.o obj-y += s_record.o obj-y += xyzModem.o + +obj-y += load_fs.o diff --git a/common/load_fs.c b/common/load_fs.c new file mode 100644 index 0000000..9f9ca88 --- /dev/null +++ b/common/load_fs.c @@ -0,0 +1,163 @@ +/* + * Copyright (C) 2017 Intel Corporation <www.intel.com> + * + * SPDX-License-Identifier: GPL-2.0 + */ + +#include <common.h> +#include <errno.h> +#include <fs.h> +#include <fdt_support.h> +#include <load_fs.h> +#include <nand.h> +#include <sata.h> +#include <spi.h> +#include <spi_flash.h> +#include <usb.h> + +int flash_select_fs_dev(struct flash_location *location) +{ + int res; + + switch (location->storage) { + case FLASH_STORAGE_MMC: + res = fs_set_blk_dev("mmc", location->devpart, FS_TYPE_ANY); + break; + case FLASH_STORAGE_USB: + res = fs_set_blk_dev("usb", location->devpart, FS_TYPE_ANY); + break; + case FLASH_STORAGE_SATA: + res = fs_set_blk_dev("sata", location->devpart, FS_TYPE_ANY); + break; + case FLASH_STORAGE_NAND: + if (location->ubivol != NULL) + res = fs_set_blk_dev("ubi", NULL, FS_TYPE_UBIFS); + else + res = -ENODEV; + break; + default: + printf("Error: unsupported location storage.\n"); + return -ENODEV; + } + + if (res) + printf("Error: could not access storage.\n"); + + return res; +} +#ifndef CONFIG_SPL_BUILD +#ifdef CONFIG_USB_STORAGE +static int flash_init_usb(void) +{ + int err; + + err = usb_init(); + if (err) + return err; + +#ifndef CONFIG_DM_USB + err = usb_stor_scan(1) < 0 ? -ENODEV : 0; +#endif + + return err; +} +#else +static inline int flash_init_usb(void) +{ + printf("Cannot load flash image: no USB support\n"); + return -ENOSYS; +} +#endif +#endif + +#ifdef CONFIG_SATA +static int flash_init_sata(void) +{ + return sata_probe(0); +} +#else +static inline int flash_init_sata(void) +{ + printf("Cannot load flash image: no SATA support\n"); + return -ENOSYS; +} +#endif + +#ifdef CONFIG_CMD_UBIFS +static int flash_mount_ubifs(struct flash_location *location) +{ + int res; + char cmd[32]; + + sprintf(cmd, "ubi part %s", location->mtdpart); + res = run_command(cmd, 0); + if (res) + return res; + + sprintf(cmd, "ubifsmount %s", location->ubivol); + res = run_command(cmd, 0); + + return res; +} + +static inline int flash_umount_ubifs(void) +{ + return run_command("ubifsumount", 0); +} +#else +static inline int flash_mount_ubifs(struct flash_location *location) +{ + printf("Cannot load flash image: no UBIFS support\n"); + return -ENOSYS; +} + +static inline int flash_umount_ubifs(void) +{ + printf("Cannot unmount UBIFS: no UBIFS support\n"); + return -ENOSYS; +} +#endif + +__weak char *get_file(void *file_info) +{ + return NULL; +} + +__weak int fs_loading(void *file_info, const void *load_addr, size_t bsize) +{ + return 0; +} + +int load_fs(struct flash_location *location, void *file_info, + const void *load_addr, size_t bsize) +{ + int res = 0; + char *flash_file; + + flash_file = get_file(file_info); + if (!flash_file) { + printf("no filename specified.\n"); + return -EINVAL; + } + +#ifndef CONFIG_SPL_BUILD + if (location->storage == FLASH_STORAGE_USB) + res = flash_init_usb(); +#endif + + if (location->storage == FLASH_STORAGE_SATA) + res = flash_init_sata(); + + if (location->ubivol != NULL) + res = flash_mount_ubifs(location); + + if (res) + return res; + + res = fs_loading(file_info, load_addr, bsize); + + if (location->ubivol != NULL) + flash_umount_ubifs(); + + return res; +} diff --git a/include/load_fs.h b/include/load_fs.h new file mode 100644 index 0000000..a26d630 --- /dev/null +++ b/include/load_fs.h @@ -0,0 +1,40 @@ +/* + * Copyright (C) 2017 Intel Corporation <www.intel.com> + * + * SPDX-License-Identifier: GPL-2.0 + */ + + +#ifndef _LOAD_FS_H_ +#define _LOAD_FS_H_ + +#include <errno.h> + +enum flash_storage { + FLASH_STORAGE_NAND, + FLASH_STORAGE_SF, + FLASH_STORAGE_MMC, + FLASH_STORAGE_USB, + FLASH_STORAGE_SATA, +}; + +enum flash_flags { + FLASH_STORAGE_RAW, /* Stored in raw memory */ + FLASH_STORAGE_FS, /* Stored within a file system */ + FLASH_STORAGE_FIT, /* Stored inside a FIT image */ +}; + +struct flash_location { + char *name; + enum flash_storage storage; + enum flash_flags flags; + u32 offset; /* offset from start of storage */ + char *devpart; /* Use the load command dev:part conventions */ + char *mtdpart; /* MTD partition for ubi part */ + char *ubivol; /* UBI volume-name for ubifsmount */ +}; + +int load_fs(struct flash_location *location, void *file_info, + const void *load_addr, size_t bsize); +int flash_select_fs_dev(struct flash_location *location); +#endif

[U-Boot,v3,06/20] common: Generic firmware loader for file system

Commit Message

Comments

Patch