diff options
Diffstat (limited to 'common')
| -rw-r--r-- | common/bootm.c | 2 | ||||
| -rw-r--r-- | common/imd.c | 7 | ||||
| -rw-r--r-- | common/oftree.c | 4 |
3 files changed, 8 insertions, 5 deletions
diff --git a/common/bootm.c b/common/bootm.c index 4652467448..3c80e8bf94 100644 --- a/common/bootm.c +++ b/common/bootm.c @@ -113,7 +113,7 @@ int bootm_load_os(struct image_data *data, unsigned long load_address) load_address, kernel_size); if (!data->os_res) { pr_err("unable to request SDRAM region for kernel at" - "0x%08llx-0x%08llx\n", + " 0x%08llx-0x%08llx\n", (unsigned long long)load_address, (unsigned long long)load_address + kernel_size - 1); return -ENOMEM; diff --git a/common/imd.c b/common/imd.c index 9ca0248523..1100e6878a 100644 --- a/common/imd.c +++ b/common/imd.c @@ -22,7 +22,8 @@ static inline void read_file_2_free(void *buf) free(buf); } -static int imd_read_file(const char *filename, size_t *size, void **outbuf) +static int imd_read_file(const char *filename, size_t *size, void **outbuf, + bool allow_mmap) { return read_file_2(filename, size, outbuf, 0x100000); } @@ -439,6 +440,7 @@ int imd_command(int argc, char *argv[]) char *str; uint32_t checksum = 0; uint32_t verify = 0; + bool allow_mmap = true; imd_command_verbose = 0; @@ -462,6 +464,7 @@ int imd_command(int argc, char *argv[]) break; case 'c': checksum = 1; + allow_mmap = false; break; case 'V': verify = 1; @@ -478,7 +481,7 @@ int imd_command(int argc, char *argv[]) filename = argv[optind]; - ret = imd_read_file(filename, &size, &buf); + ret = imd_read_file(filename, &size, &buf, allow_mmap); if (ret && ret != -EFBIG) return -errno; diff --git a/common/oftree.c b/common/oftree.c index 0738ab6e9e..bce0ff09d6 100644 --- a/common/oftree.c +++ b/common/oftree.c @@ -405,7 +405,7 @@ int of_autoenable_device_by_path(char *path) struct device_node *node; int ret; - node = of_find_node_by_name(NULL, path); + node = of_find_node_by_name_address(NULL, path); if (!node) node = of_find_node_by_path(path); @@ -442,7 +442,7 @@ int of_autoenable_i2c_by_component(char *path) if (!IS_ENABLED(CONFIG_I2C)) return -ENODEV; - node = of_find_node_by_name(NULL, path); + node = of_find_node_by_name_address(NULL, path); if (!node) node = of_find_node_by_path(path); if (!node) |