From b7e9b568c2905d81f7292e62af06d94679d96ed8 Mon Sep 17 00:00:00 2001
From: Kairui Song <kasong@tencent.com>
Date: Mon, 6 Jun 2022 14:14:45 +0800
Subject: [PATCH] libfdt: include fdt_addresses.c

Upstream: c273a2bd8aa81b72e48736c3aa51f7ffeae39925
Link: https://github.com/AmpereComputing/ampere-lts-kernel/commit/887436bdb7b2c1994a9a45da519720c69d2f43d7

commit c273a2bd8aa81b72e48736c3aa51f7ffeae39925
Author: AKASHI Takahiro <takahiro.akashi@linaro.org>
Date:   Mon Dec 9 12:03:44 2019 +0900

    libfdt: include fdt_addresses.c

    In the implementation of kexec_file_loaded-based kdump for arm64,
    fdt_appendprop_addrrange() will be needed.

    So include fdt_addresses.c in making libfdt.

    Signed-off-by: AKASHI Takahiro <takahiro.akashi@linaro.org>
    Cc: Rob Herring <robh+dt@kernel.org>
    Cc: Frank Rowand <frowand.list@gmail.com>
    Signed-off-by: Will Deacon <will@kernel.org>

Signed-off-by: Kairui Song <kasong@tencent.com>
Reviewed-by: Bin Lai <robinlai@tencent.com>
---
 lib/Makefile        | 2 +-
 lib/fdt_addresses.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)
 create mode 100644 lib/fdt_addresses.c

diff --git a/lib/Makefile b/lib/Makefile
index 3b8977aed1b4..6bf453fb731d 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -220,7 +220,7 @@ KASAN_SANITIZE_stackdepot.o := n
 KCOV_INSTRUMENT_stackdepot.o := n
 
 libfdt_files = fdt.o fdt_ro.o fdt_wip.o fdt_rw.o fdt_sw.o fdt_strerror.o \
-	       fdt_empty_tree.o
+	       fdt_empty_tree.o fdt_addresses.o
 $(foreach file, $(libfdt_files), \
 	$(eval CFLAGS_$(file) = -I $(srctree)/scripts/dtc/libfdt))
 lib-$(CONFIG_LIBFDT) += $(libfdt_files)
diff --git a/lib/fdt_addresses.c b/lib/fdt_addresses.c
new file mode 100644
index 000000000000..23610bcf390b
--- /dev/null
+++ b/lib/fdt_addresses.c
@@ -0,0 +1,2 @@
+#include <linux/libfdt_env.h>
+#include "../scripts/dtc/libfdt/fdt_addresses.c"