diff options
| author | Tom Rini <trini@konsulko.com> | 2020-01-25 12:04:59 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-01-25 12:04:59 -0500 |
| commit | d31dd3b596190bdecbd109e404f16bd208fe32ba (patch) | |
| tree | d862bd67736079799b474d876f38b75032ade5b6 /include | |
| parent | 2c871f9e084b2c03d1961884228a6901387ab8d6 (diff) | |
| parent | 683b7c2a170a71bded99bb9e7dfd26372427ca1c (diff) | |
| download | u-boot-d31dd3b596190bdecbd109e404f16bd208fe32ba.tar.gz u-boot-d31dd3b596190bdecbd109e404f16bd208fe32ba.tar.xz u-boot-d31dd3b596190bdecbd109e404f16bd208fe32ba.zip | |
Merge branch '2020-01-24-master-imports'
- Enable fastboot on some MediaTek platforms
- DMA enchancements
- Assorted bugfixes
Diffstat (limited to 'include')
| -rw-r--r-- | include/blk.h | 8 | ||||
| -rw-r--r-- | include/configs/mt8518.h | 6 | ||||
| -rw-r--r-- | include/mtd.h | 2 |
3 files changed, 14 insertions, 2 deletions
diff --git a/include/blk.h b/include/blk.h index d0c033aece..6f541bb2ba 100644 --- a/include/blk.h +++ b/include/blk.h @@ -113,6 +113,12 @@ struct blk_desc { (PAD_SIZE(size, blk_desc->blksz)) #if CONFIG_IS_ENABLED(BLOCK_CACHE) + +/** + * blkcache_init() - initialize the block cache list pointers + */ +int blkcache_init(void); + /** * blkcache_read() - attempt to read a set of blocks from cache * @@ -123,7 +129,7 @@ struct blk_desc { * @param blksz - size in bytes of each block * @param buf - buffer to contain cached data * - * @return - '1' if block returned from cache, '0' otherwise. + * @return - 1 if block returned from cache, 0 otherwise. */ int blkcache_read(int iftype, int dev, lbaint_t start, lbaint_t blkcnt, diff --git a/include/configs/mt8518.h b/include/configs/mt8518.h index 514722be99..276fbc285f 100644 --- a/include/configs/mt8518.h +++ b/include/configs/mt8518.h @@ -11,7 +11,6 @@ #include <linux/sizes.h> -/* Machine ID */ #define CONFIG_SYS_NONCACHED_MEMORY SZ_1M #define CONFIG_CPU_ARMV8 @@ -54,10 +53,15 @@ #define ENV_BOOT_CMD \ "mtk_boot=run boot_rd_img;bootm;\0" +#define ENV_FASTBOOT \ + "serial#=1234567890ABCDEF\0" \ + "board=mt8518\0" + #define CONFIG_EXTRA_ENV_SETTINGS \ "fdt_high=0x6c000000\0" \ ENV_DEVICE_SETTINGS \ ENV_BOOT_READ_IMAGE \ + ENV_FASTBOOT \ ENV_BOOT_CMD \ "bootcmd=run mtk_boot;\0" \ diff --git a/include/mtd.h b/include/mtd.h index 65fcd3c700..b0f8693386 100644 --- a/include/mtd.h +++ b/include/mtd.h @@ -11,4 +11,6 @@ int mtd_probe(struct udevice *dev); int mtd_probe_devices(void); +void board_mtdparts_default(const char **mtdids, const char **mtdparts); + #endif /* _MTD_H_ */ |