Commit dbe963ae516356395182325a032a55356d46d275
Committed by
Tom Rini
Tom Rini
1 parent
8edb21925e
Exists in
v2017.01-smarct4x
and in
40 other branches
fdt_support: delete force argument of fdt_initrd()
After all, we have realized "force" argument is completely useless. fdt_initrd() was always called with force = 1. We should always want to do the same thing (set appropriate value to the property) even if the property already exists. Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com> Acked-by: Simon Glass <sjg@chromium.org>
Showing 5 changed files with 19 additions and 24 deletions Side-by-side Diff
arch/microblaze/lib/bootm.c
common/cmd_fdt.c
| ... | ... | @@ -582,7 +582,7 @@ |
| 582 | 582 | } |
| 583 | 583 | |
| 584 | 584 | fdt_chosen(working_fdt, 1); |
| 585 | - fdt_initrd(working_fdt, initrd_start, initrd_end, 1); | |
| 585 | + fdt_initrd(working_fdt, initrd_start, initrd_end); | |
| 586 | 586 | |
| 587 | 587 | #if defined(CONFIG_FIT_SIGNATURE) |
| 588 | 588 | } else if (strncmp(argv[1], "che", 3) == 0) { |
common/fdt_support.c
| ... | ... | @@ -203,12 +203,11 @@ |
| 203 | 203 | } |
| 204 | 204 | #endif |
| 205 | 205 | |
| 206 | -int fdt_initrd(void *fdt, ulong initrd_start, ulong initrd_end, int force) | |
| 206 | +int fdt_initrd(void *fdt, ulong initrd_start, ulong initrd_end) | |
| 207 | 207 | { |
| 208 | 208 | int nodeoffset, addr_cell_len; |
| 209 | 209 | int err, j, total; |
| 210 | 210 | fdt64_t tmp; |
| 211 | - const char *path; | |
| 212 | 211 | uint64_t addr, size; |
| 213 | 212 | |
| 214 | 213 | /* find or create "/chosen" node. */ |
| 215 | 214 | |
| 216 | 215 | |
| ... | ... | @@ -242,26 +241,22 @@ |
| 242 | 241 | |
| 243 | 242 | addr_cell_len = get_cells_len(fdt, "#address-cells"); |
| 244 | 243 | |
| 245 | - path = fdt_getprop(fdt, nodeoffset, "linux,initrd-start", NULL); | |
| 246 | - if ((path == NULL) || force) { | |
| 247 | - write_cell((u8 *)&tmp, initrd_start, addr_cell_len); | |
| 248 | - err = fdt_setprop(fdt, nodeoffset, | |
| 249 | - "linux,initrd-start", &tmp, addr_cell_len); | |
| 250 | - if (err < 0) { | |
| 251 | - printf("WARNING: " | |
| 252 | - "could not set linux,initrd-start %s.\n", | |
| 253 | - fdt_strerror(err)); | |
| 254 | - return err; | |
| 255 | - } | |
| 256 | - write_cell((u8 *)&tmp, initrd_end, addr_cell_len); | |
| 257 | - err = fdt_setprop(fdt, nodeoffset, | |
| 244 | + write_cell((u8 *)&tmp, initrd_start, addr_cell_len); | |
| 245 | + err = fdt_setprop(fdt, nodeoffset, | |
| 246 | + "linux,initrd-start", &tmp, addr_cell_len); | |
| 247 | + if (err < 0) { | |
| 248 | + printf("WARNING: could not set linux,initrd-start %s.\n", | |
| 249 | + fdt_strerror(err)); | |
| 250 | + return err; | |
| 251 | + } | |
| 252 | + write_cell((u8 *)&tmp, initrd_end, addr_cell_len); | |
| 253 | + err = fdt_setprop(fdt, nodeoffset, | |
| 258 | 254 | "linux,initrd-end", &tmp, addr_cell_len); |
| 259 | - if (err < 0) { | |
| 260 | - printf("WARNING: could not set linux,initrd-end %s.\n", | |
| 261 | - fdt_strerror(err)); | |
| 255 | + if (err < 0) { | |
| 256 | + printf("WARNING: could not set linux,initrd-end %s.\n", | |
| 257 | + fdt_strerror(err)); | |
| 262 | 258 | |
| 263 | - return err; | |
| 264 | - } | |
| 259 | + return err; | |
| 265 | 260 | } |
| 266 | 261 | |
| 267 | 262 | return 0; |
common/image-fdt.c
include/fdt_support.h
| ... | ... | @@ -17,7 +17,7 @@ |
| 17 | 17 | u32 fdt_getprop_u32_default(const void *fdt, const char *path, |
| 18 | 18 | const char *prop, const u32 dflt); |
| 19 | 19 | int fdt_chosen(void *fdt, int force); |
| 20 | -int fdt_initrd(void *fdt, ulong initrd_start, ulong initrd_end, int force); | |
| 20 | +int fdt_initrd(void *fdt, ulong initrd_start, ulong initrd_end); | |
| 21 | 21 | void do_fixup_by_path(void *fdt, const char *path, const char *prop, |
| 22 | 22 | const void *val, int len, int create); |
| 23 | 23 | void do_fixup_by_path_u32(void *fdt, const char *path, const char *prop, |