diff options
| author | Tom Rini <trini@konsulko.com> | 2018-08-07 11:32:50 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-08-07 11:32:50 -0400 |
| commit | 188ebc7b594841b6e05ece4690a01517b4136cdd (patch) | |
| tree | 6144dfe164f47f4dfbe0294d46740fee6078cba6 /common | |
| parent | 63d54c9c598079d3f30efb9e71be8fe5345a451d (diff) | |
| parent | a492fdffa3c86f6b8420b6433a2ce07271597324 (diff) | |
Merge tag 'xilinx-for-v2018.09-rc2' of git://git.denx.de/u-boot-microblaze
Xilinx fixes for v2018.09-rc2
xilinx:
- Add support for zybo z7 and ultra96
- Tune zynq and zynqmp mini configurations
- Move SYS_MALLOC_LEN to Kconfig
fdt
- make static funcs
gpio:
- Fix soft gpio driver
- Fix Zynq gpio driver by using platdata
microblaze:
- Fix Kconfig entry
spi
- Move ISSI to Kconfig
Diffstat (limited to 'common')
| -rw-r--r-- | common/fdt_support.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/common/fdt_support.c b/common/fdt_support.c index 1bdd03fdda..34d2bd59c4 100644 --- a/common/fdt_support.c +++ b/common/fdt_support.c @@ -725,7 +725,7 @@ struct reg_cell { unsigned int r1; }; -int fdt_del_subnodes(const void *blob, int parent_offset) +static int fdt_del_subnodes(const void *blob, int parent_offset) { int off, ndepth; int ret; @@ -750,7 +750,7 @@ int fdt_del_subnodes(const void *blob, int parent_offset) return 0; } -int fdt_del_partitions(void *blob, int parent_offset) +static int fdt_del_partitions(void *blob, int parent_offset) { const void *prop; int ndepth = 0; |