diff options
| author | Tom Rini <[email protected]> | 2022-10-26 15:24:59 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2022-10-26 15:24:59 -0400 |
| commit | 8bc87a4c55a1723728374a5643f13bced37dad6b (patch) | |
| tree | b4ace98fe43682d20639adab97778dca140149c2 /include | |
| parent | b487387226d49ba2f39757269fb95ea398e8f384 (diff) | |
| parent | 9b0b5648d6e4d89aa594022e48894e811c250d5f (diff) | |
Merge branch '2022-10-26-assorted-fixes-and-updates'
- Reduce memory usage in SPL in some cases, clarify some standalone API
license issues, fix a Kconfig dependency, pin to a specific version of
python setuptools for now, fix a signing problem in mkimage and add a
memory uclass.
Diffstat (limited to 'include')
| -rw-r--r-- | include/dm/uclass-id.h | 1 | ||||
| -rw-r--r-- | include/linux/mtd/omap_gpmc.h | 3 | ||||
| -rw-r--r-- | include/spl.h | 7 |
3 files changed, 9 insertions, 2 deletions
diff --git a/include/dm/uclass-id.h b/include/dm/uclass-id.h index c2b15881ba7..4b2c3234525 100644 --- a/include/dm/uclass-id.h +++ b/include/dm/uclass-id.h @@ -77,6 +77,7 @@ enum uclass_id { UCLASS_MASS_STORAGE, /* Mass storage device */ UCLASS_MDIO, /* MDIO bus */ UCLASS_MDIO_MUX, /* MDIO MUX/switch */ + UCLASS_MEMORY, /* Memory Controller device */ UCLASS_MISC, /* Miscellaneous device */ UCLASS_MMC, /* SD / MMC card or chip */ UCLASS_MOD_EXP, /* RSA Mod Exp device */ diff --git a/include/linux/mtd/omap_gpmc.h b/include/linux/mtd/omap_gpmc.h index 864b05e432a..f08e700a1da 100644 --- a/include/linux/mtd/omap_gpmc.h +++ b/include/linux/mtd/omap_gpmc.h @@ -8,6 +8,9 @@ #ifndef __ASM_OMAP_GPMC_H #define __ASM_OMAP_GPMC_H +/* Maximum Number of Chip Selects */ +#define GPMC_CS_NUM 8 + #define GPMC_BUF_EMPTY 0 #define GPMC_BUF_FULL 1 #define GPMC_MAX_SECTORS 8 diff --git a/include/spl.h b/include/spl.h index 0fc3686bbca..303a657bf5c 100644 --- a/include/spl.h +++ b/include/spl.h @@ -353,7 +353,8 @@ int spl_load_simple_fit(struct spl_image_info *spl_image, * spl_load_legacy_img() - Loads a legacy image from a device. * @spl_image: Image description to set up * @load: Structure containing the information required to load data. - * @header: Pointer to image header (including appended image) + * @offset: Pointer to image + * @hdr: Pointer to image header * * Reads an legacy image from the device. Loads u-boot image to * specified load address. @@ -361,7 +362,9 @@ int spl_load_simple_fit(struct spl_image_info *spl_image, */ int spl_load_legacy_img(struct spl_image_info *spl_image, struct spl_boot_device *bootdev, - struct spl_load_info *load, ulong header); + struct spl_load_info *load, ulong offset, + struct legacy_img_hdr *hdr); + /** * spl_load_imx_container() - Loads a imx container image from a device. |