[Pdbg] [PATCH 01/11] dts: Rename p9-kernel to bmc-kernel

[Amitay Isaacs]

Signed-off-by: Amitay Isaacs <amitay at ozlabs.org>
---
 Makefile.am                           | 6 +++---
 p9-kernel.dts.m4 => bmc-kernel.dts.m4 | 0
 libpdbg/dtb.c                         | 6 +++---
 tests/test_p9_fapi_translation.sh     | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)
 rename p9-kernel.dts.m4 => bmc-kernel.dts.m4 (100%)

diff --git a/Makefile.am b/Makefile.am
index 74ad99f..041ec01 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -36,7 +36,7 @@ TESTS = $(libpdbg_tests) optcmd_test $(PDBG_TESTS)
 
 tests/test_tree2.sh: fake2.dtb
 tests/test_prop.sh: fake.dtb
-tests/test_p9_fapi_translation.sh: p9.dtb p9-kernel.dtb
+tests/test_p9_fapi_translation.sh: p9.dtb bmc-kernel.dtb
 
 test: $(libpdbg_tests)
 
@@ -56,7 +56,7 @@ EXTRA_DIST = \
 	p8-pib.dts.m4 \
 	p9-fsi.dtsi.m4 \
 	p9-host.dts.m4 \
-	p9-kernel.dts.m4 \
+	bmc-kernel.dts.m4 \
 	p9-pib.dts.m4 \
 	p9r-fsi.dts.m4 \
 	p9w-fsi.dts.m4 \
@@ -79,7 +79,7 @@ endif
 
 DT = fake.dts fake2.dts p8-cronus.dts p9-cronus.dts \
      p8-fsi.dts p8-i2c.dts p8-kernel.dts \
-     p9w-fsi.dts p9r-fsi.dts p9z-fsi.dts p9-kernel.dts \
+     p9w-fsi.dts p9r-fsi.dts p9z-fsi.dts bmc-kernel.dts \
      p9-sbefifo.dts \
      p8-host.dts p9-host.dts p8.dts
 
diff --git a/p9-kernel.dts.m4 b/bmc-kernel.dts.m4
similarity index 100%
rename from p9-kernel.dts.m4
rename to bmc-kernel.dts.m4
diff --git a/libpdbg/dtb.c b/libpdbg/dtb.c
index a549c2f..f9573a6 100644
--- a/libpdbg/dtb.c
+++ b/libpdbg/dtb.c
@@ -38,7 +38,7 @@
 #include "p9w-fsi.dt.h"
 #include "p9r-fsi.dt.h"
 #include "p9z-fsi.dt.h"
-#include "p9-kernel.dt.h"
+#include "bmc-kernel.dt.h"
 #include "p8-host.dt.h"
 #include "p9-host.dt.h"
 #include "p8-cronus.dt.h"
@@ -195,7 +195,7 @@ static void bmc_target(struct pdbg_dtb *dtb)
 				dtb->system.fdt = &_binary_p8_dtb_o_start;
 		} else if (!strcmp(pdbg_backend_option, "p9")) {
 			if (!dtb->backend.fdt)
-				dtb->backend.fdt = &_binary_p9_kernel_dtb_o_start;
+				dtb->backend.fdt = &_binary_bmc_kernel_dtb_o_start;
 			if (!dtb->system.fdt)
 				dtb->system.fdt = &_binary_p9_dtb_o_start;
 		} else {
@@ -234,7 +234,7 @@ static void bmc_target(struct pdbg_dtb *dtb)
 	case CHIP_ID_P9P:
 		pdbg_log(PDBG_INFO, "Found a POWER9 OpenBMC based system\n");
 		if (!dtb->backend.fdt)
-			dtb->backend.fdt = &_binary_p9_kernel_dtb_o_start;
+			dtb->backend.fdt = &_binary_bmc_kernel_dtb_o_start;
 		if (!dtb->system.fdt)
 			dtb->system.fdt = &_binary_p9_dtb_o_start;
 		break;
diff --git a/tests/test_p9_fapi_translation.sh b/tests/test_p9_fapi_translation.sh
index a5a09b1..fbb194d 100755
--- a/tests/test_p9_fapi_translation.sh
+++ b/tests/test_p9_fapi_translation.sh
@@ -4,7 +4,7 @@
 
 test_group "p9 fapi translation tests"
 
-export PDBG_BACKEND_DTB=p9-kernel.dtb
+export PDBG_BACKEND_DTB=bmc-kernel.dtb
 export PDBG_DTB=p9.dtb
 
 test_result 0 <<EOF
-- 
2.25.4