fdt: Rename fdt_resize() to fdt_shrink_to_minimum()
Since libfdt now has an fdt_resize() function, we need to rename the U-Boot one. Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
		
							parent
							
								
									0b6cc51e98
								
							
						
					
					
						commit
						5bf58ccc8e
					
				| 
						 | 
					@ -621,7 +621,7 @@ static int do_fdt(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
	/* resize the fdt */
 | 
						/* resize the fdt */
 | 
				
			||||||
	else if (strncmp(argv[1], "re", 2) == 0) {
 | 
						else if (strncmp(argv[1], "re", 2) == 0) {
 | 
				
			||||||
		fdt_resize(working_fdt);
 | 
							fdt_shrink_to_minimum(working_fdt);
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
	else {
 | 
						else {
 | 
				
			||||||
		/* Unrecognized command */
 | 
							/* Unrecognized command */
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -508,7 +508,7 @@ void fdt_fixup_ethernet(void *fdt)
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/* Resize the fdt to its actual size + a bit of padding */
 | 
					/* Resize the fdt to its actual size + a bit of padding */
 | 
				
			||||||
int fdt_resize(void *blob)
 | 
					int fdt_shrink_to_minimum(void *blob)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
	int i;
 | 
						int i;
 | 
				
			||||||
	uint64_t addr, size;
 | 
						uint64_t addr, size;
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -479,7 +479,7 @@ int image_setup_libfdt(bootm_headers_t *images, void *blob,
 | 
				
			||||||
	lmb_free(lmb, (phys_addr_t)(u32)(uintptr_t)blob,
 | 
						lmb_free(lmb, (phys_addr_t)(u32)(uintptr_t)blob,
 | 
				
			||||||
		 (phys_size_t)fdt_totalsize(blob));
 | 
							 (phys_size_t)fdt_totalsize(blob));
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	ret = fdt_resize(blob);
 | 
						ret = fdt_shrink_to_minimum(blob);
 | 
				
			||||||
	if (ret < 0)
 | 
						if (ret < 0)
 | 
				
			||||||
		return ret;
 | 
							return ret;
 | 
				
			||||||
	of_size = ret;
 | 
						of_size = ret;
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -76,7 +76,7 @@ void ft_cpu_setup(void *blob, bd_t *bd);
 | 
				
			||||||
void ft_pci_setup(void *blob, bd_t *bd);
 | 
					void ft_pci_setup(void *blob, bd_t *bd);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
void set_working_fdt_addr(void *addr);
 | 
					void set_working_fdt_addr(void *addr);
 | 
				
			||||||
int fdt_resize(void *blob);
 | 
					int fdt_shrink_to_minimum(void *blob);
 | 
				
			||||||
int fdt_increase_size(void *fdt, int add_len);
 | 
					int fdt_increase_size(void *fdt, int add_len);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
int fdt_fixup_nor_flash_size(void *blob);
 | 
					int fdt_fixup_nor_flash_size(void *blob);
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue