Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-14 00:47:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

cmd/fdt: add possibilty to have 'extrasize' on fdt resize

Browse source 
Sometimes devicetree nodes and or properties are added out of the u-boot
console, maybe through some script or manual interaction.

The devicetree as loaded or embedded is quite small, so the devicetree
has to be resized to take up those new nodes/properties.

In original the devicetree was only extended by effective
4 * add_mem_rsv.

With this commit we can add an argument to the "fdt resize" command,
which takes the extrasize to be added.

Signed-off-by: Hannes Schmelzer <hannes.schmelzer@br-automation.com>

Signed-off-by: Hannes Schmelzer <oe5hpm@oevsv.at>
Acked-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Hannes Schmelzer 2016-09-20 18:10:43 +02:00 committed by Simon Glass
parent c69f6d04ec
commit ef47683646
5 changed files with 20 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
board/compulab/cm_fx6/cm_fx6.c
View file

@ -602,7 +602,7 @@ int ft_board_setup(void *blob, bd_t *bd)
char baseboard_name[16]; char baseboard_name[16];
int err; int err;
fdt_shrink_to_minimum(blob); /* Make room for new properties */ fdt_shrink_to_minimum(blob, 0); /* Make room for new properties */
/* MAC addr */ /* MAC addr */
if (eth_getenv_enetaddr("ethaddr", enetaddr)) { if (eth_getenv_enetaddr("ethaddr", enetaddr)) {

9
cmd/fdt.c
View file

@ -662,7 +662,12 @@ static int do_fdt(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
#endif #endif
/* resize the fdt */ /* resize the fdt */
else if (strncmp(argv[1], "re", 2) == 0) { else if (strncmp(argv[1], "re", 2) == 0) {
fdt_shrink_to_minimum(working_fdt); uint extrasize;
if (argc > 2)
extrasize = simple_strtoul(argv[2], NULL, 16);
else
extrasize = 0;
fdt_shrink_to_minimum(working_fdt, extrasize);
} }
else { else {
/* Unrecognized command */ /* Unrecognized command */
@ -1056,7 +1061,7 @@ static char fdt_help_text[] =
"fdt systemsetup - Do system-specific set up\n" "fdt systemsetup - Do system-specific set up\n"
#endif #endif
"fdt move <fdt> <newaddr> <length> - Copy the fdt to <addr> and make it active\n" "fdt move <fdt> <newaddr> <length> - Copy the fdt to <addr> and make it active\n"
"fdt resize - Resize fdt to size + padding to 4k addr\n" "fdt resize [<extrasize>] - Resize fdt to size + padding to 4k addr + some optional <extrasize> if needed\n"
"fdt print <path> [<prop>] - Recursive print starting at <path>\n" "fdt print <path> [<prop>] - Recursive print starting at <path>\n"
"fdt list <path> [<prop>] - Print one level starting at <path>\n" "fdt list <path> [<prop>] - Print one level starting at <path>\n"
"fdt get value <var> <path> <prop> - Get <property> and store in <var>\n" "fdt get value <var> <path> <prop> - Get <property> and store in <var>\n"

3
common/fdt_support.c
View file

@ -523,7 +523,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_shrink_to_minimum(void *blob) int fdt_shrink_to_minimum(void *blob, uint extrasize)
{ {
int i; int i;
uint64_t addr, size; uint64_t addr, size;
@ -551,6 +551,7 @@ int fdt_shrink_to_minimum(void *blob)
actualsize = fdt_off_dt_strings(blob) + actualsize = fdt_off_dt_strings(blob) +
fdt_size_dt_strings(blob) + 5 * sizeof(struct fdt_reserve_entry); fdt_size_dt_strings(blob) + 5 * sizeof(struct fdt_reserve_entry);
actualsize += extrasize;
/* Make it so the fdt ends on a page boundary */ /* Make it so the fdt ends on a page boundary */
actualsize = ALIGN(actualsize + ((uintptr_t)blob & 0xfff), 0x1000); actualsize = ALIGN(actualsize + ((uintptr_t)blob & 0xfff), 0x1000);
actualsize = actualsize - ((uintptr_t)blob & 0xfff); actualsize = actualsize - ((uintptr_t)blob & 0xfff);

2
common/image-fdt.c
View file

@ -503,7 +503,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_shrink_to_minimum(blob); ret = fdt_shrink_to_minimum(blob, 0);
if (ret < 0) if (ret < 0)
goto err; goto err;
of_size = ret; of_size = ret;

10
include/fdt_support.h
View file

@ -167,7 +167,15 @@ void ft_pci_setup(void *blob, bd_t *bd);
int ft_system_setup(void *blob, bd_t *bd); int ft_system_setup(void *blob, bd_t *bd);
void set_working_fdt_addr(ulong addr); void set_working_fdt_addr(ulong addr);
int fdt_shrink_to_minimum(void *blob);
/**
* shrink down the given blob to minimum size + some extrasize if required
*
* @param blob FDT blob to update
* @param extrasize additional bytes needed
* @return 0 if ok, or -FDT_ERR_... on error
*/
int fdt_shrink_to_minimum(void *blob, uint extrasize);
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);