Fix build error introduced in beca5a5f5bf0d88125580e5e9c1730469cd50ab8

common/libcommon.a(fdt_support.o): In function `fdt_add_edid': /local/hudson/jobs/mirrors-u-boot.git/workspace/common/fdt_support.c:1205: undefined reference to `fdt_increase_size' make: *** [u-boot] Error 1

Signed-off-by: Matthew McClintock msm@freescale.com --- v2 - move fdt_increase_size out of CONFIG_FDT_FIXUP_PARTITIONS

common/fdt_support.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/common/fdt_support.c b/common/fdt_support.c index 9b65a8a..46e93a2 100644 --- a/common/fdt_support.c +++ b/common/fdt_support.c @@ -701,16 +701,6 @@ int fdt_del_subnodes(const void *blob, int parent_offset) return 0; }

-int fdt_increase_size(void *fdt, int add_len) -{ - int newlen; - - newlen = fdt_totalsize(fdt) + add_len; - - /* Open in place with a new len */ - return fdt_open_into(fdt, fdt, newlen); -} - int fdt_del_partitions(void *blob, int parent_offset) { const void *prop; @@ -886,6 +876,16 @@ void fdt_fixup_mtdparts(void *blob, void *node_info, int node_info_size) } #endif

+int fdt_increase_size(void *fdt, int add_len) +{ + int newlen; + + newlen = fdt_totalsize(fdt) + add_len; + + /* Open in place with a new len */ + return fdt_open_into(fdt, fdt, newlen); +} + void fdt_del_node_and_alias(void *blob, const char *alias) { int off = fdt_path_offset(blob, alias);

From: Matthew McClintock msm@freescale.com

Fix build error introduced in beca5a5f5bf0d88125580e5e9c1730469cd50ab8

common/libcommon.a(fdt_support.o): In function `fdt_add_edid': /local/hudson/jobs/mirrors-u-boot.git/workspace/common/fdt_support.c:1205: undefined reference to `fdt_increase_size' make: *** [u-boot] Error 1

Signed-off-by: Matthew McClintock msm@freescale.com Signed-off-by: Anatolij Gustschin agust@denx.de --- v3: - move fdt_increase_size() before conditionally compiled code which uses this function. This is needed to fix warnings while compiling for pdm360ng board.

common/fdt_support.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/common/fdt_support.c b/common/fdt_support.c index 9b65a8a..b8a3dc9 100644 --- a/common/fdt_support.c +++ b/common/fdt_support.c @@ -667,6 +667,16 @@ int fdt_fixup_nor_flash_size(void *blob) } #endif

+int fdt_increase_size(void *fdt, int add_len) +{ + int newlen; + + newlen = fdt_totalsize(fdt) + add_len; + + /* Open in place with a new len */ + return fdt_open_into(fdt, fdt, newlen); +} + #ifdef CONFIG_FDT_FIXUP_PARTITIONS #include <jffs2/load_kernel.h> #include <mtd_node.h> @@ -701,16 +711,6 @@ int fdt_del_subnodes(const void *blob, int parent_offset) return 0; }

-int fdt_increase_size(void *fdt, int add_len) -{ - int newlen; - - newlen = fdt_totalsize(fdt) + add_len; - - /* Open in place with a new len */ - return fdt_open_into(fdt, fdt, newlen); -} - int fdt_del_partitions(void *blob, int parent_offset) { const void *prop;