diff options
| author | Tom Rini <trini@konsulko.com> | 2020-11-19 10:23:50 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-11-19 10:23:50 -0500 |
| commit | b80680633dc954d32f81f3afacd3d1f2f3d290b0 (patch) | |
| tree | c551b408e9b714348c1f4f34b14a23d4641021b8 /include | |
| parent | e800d715e01daffa9a5078c974f4568d6ef9e7c3 (diff) | |
| parent | dd4866b43754b18f0c06672e341d93e16b8bf674 (diff) | |
| download | u-boot-b80680633dc954d32f81f3afacd3d1f2f3d290b0.tar.gz u-boot-b80680633dc954d32f81f3afacd3d1f2f3d290b0.tar.xz u-boot-b80680633dc954d32f81f3afacd3d1f2f3d290b0.zip | |
Merge branch '2020-11-18-assorted-fixes'
- Assorted SquashFS fixes and cleanups
- Fixes for various Coverity issues
- Various fixups to other platforms / code
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/km/keymile-common.h | 8 | ||||
| -rw-r--r-- | include/configs/kmcoge5ne.h | 2 | ||||
| -rw-r--r-- | include/squashfs.h | 1 |
3 files changed, 6 insertions, 5 deletions
diff --git a/include/configs/km/keymile-common.h b/include/configs/km/keymile-common.h index c1968048a7..851b13e063 100644 --- a/include/configs/km/keymile-common.h +++ b/include/configs/km/keymile-common.h @@ -90,12 +90,12 @@ "set_fdthigh cramfsloadkernel flashargs add_default " \ "addpanic boot\0" \ "develop=" \ - "tftp 200000 scripts/develop-${arch}.txt && " \ - "env import -t 200000 ${filesize} && " \ + "tftp ${load_addr_r} scripts/develop-${arch}.txt && " \ + "env import -t ${load_addr_r} ${filesize} && " \ "run setup_debug_env\0" \ "ramfs=" \ - "tftp 200000 scripts/ramfs-${arch}.txt && " \ - "env import -t 200000 ${filesize} && " \ + "tftp ${load_addr_r} scripts/ramfs-${arch}.txt && " \ + "env import -t ${load_addr_r} ${filesize} && " \ "run setup_debug_env\0" \ "" diff --git a/include/configs/kmcoge5ne.h b/include/configs/kmcoge5ne.h index 4d01f236c3..cdfb280aee 100644 --- a/include/configs/kmcoge5ne.h +++ b/include/configs/kmcoge5ne.h @@ -51,7 +51,7 @@ /* enable POST tests */ #define CONFIG_POST (CONFIG_SYS_POST_MEMORY|CONFIG_SYS_POST_MEM_REGIONS) #define CONFIG_POST_EXTERNAL_WORD_FUNCS /* use own functions, not generic */ -#define CPM_POST_WORD_ADDR 0x00f00000 +#define CPM_POST_WORD_ADDR CONFIG_SYS_MEMTEST_END #define CONFIG_TESTPIN_REG gprt3 /* for kmcoge5ne */ #define CONFIG_TESTPIN_MASK 0x20 /* for kmcoge5ne */ diff --git a/include/squashfs.h b/include/squashfs.h index 819cf8c2da..7489eefa1f 100644 --- a/include/squashfs.h +++ b/include/squashfs.h @@ -19,6 +19,7 @@ int sqfs_probe(struct blk_desc *fs_dev_desc, int sqfs_read(const char *filename, void *buf, loff_t offset, loff_t len, loff_t *actread); int sqfs_size(const char *filename, loff_t *size); +int sqfs_exists(const char *filename); void sqfs_close(void); void sqfs_closedir(struct fs_dir_stream *dirs); |