From 5fdf57516a05e1b9c1240f35d79b6c2ee980d567 Mon Sep 17 00:00:00 2001
From: Samuel Dolt <samuel.dolt@netmodule.com>
Date: Wed, 31 May 2023 10:45:10 +0200
Subject: [PATCH] rename genimi to hw34

---
 arch/arm/dts/Makefile                                       | 6 +++---
 arch/arm/dts/k3-am642-gemini-binman.dtsi                    | 4 ++--
 .../{k3-am642-gemini-v1.dts => k3-am642-netmodule-hw34.dts} | 2 +-
 ...m642-r5-gemini-v1.dts => k3-am642-r5-netmodule-hw34.dts} | 0
 ...ini_a53_defconfig => am64x_netmodule_hw34_a53_defconfig} | 2 +-
 ...emini_r5_defconfig => am64x_netmodule_hw34_r5_defconfig} | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)
 rename arch/arm/dts/{k3-am642-gemini-v1.dts => k3-am642-netmodule-hw34.dts} (99%)
 rename arch/arm/dts/{k3-am642-r5-gemini-v1.dts => k3-am642-r5-netmodule-hw34.dts} (100%)
 rename configs/{am64x_gemini_a53_defconfig => am64x_netmodule_hw34_a53_defconfig} (98%)
 rename configs/{am64x_gemini_r5_defconfig => am64x_netmodule_hw34_r5_defconfig} (98%)

diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
index 6c89cd167f..2a0fccb482 100644
--- a/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@ -1281,9 +1281,9 @@ dtb-$(CONFIG_SOC_K3_AM642) += k3-am642-evm.dtb \
 			      k3-am642-r5-evm.dtb \
 			      k3-am642-sk.dtb \
 			      k3-am642-r5-sk.dtb \
-			      k3-am642-gemini-v1.dtb \
-			      k3-am642-r5-gemini-v1.dtb \
-			      k3-am642-evm-nand.dtbo
+			      k3-am642-evm-nand.dtbo \
+			      k3-am642-netmodule-hw34.dtb \
+			      k3-am642-r5-netmodule-hw34.dtb
 
 dtb-$(CONFIG_SOC_K3_AM625) += k3-am625-sk.dtb \
 			      k3-am625-r5-sk.dtb \
diff --git a/arch/arm/dts/k3-am642-gemini-binman.dtsi b/arch/arm/dts/k3-am642-gemini-binman.dtsi
index 09b04512dc..9873461bac 100644
--- a/arch/arm/dts/k3-am642-gemini-binman.dtsi
+++ b/arch/arm/dts/k3-am642-gemini-binman.dtsi
@@ -89,10 +89,10 @@
 #define UBOOT_IMG "u-boot.img"
 
 #define SPL_NODTB "spl/u-boot-spl-nodtb.bin"
-#define SPL_AM642_GEMINI_DTB "spl/dts/k3-am642-gemini-v1.dtb"
+#define SPL_AM642_GEMINI_DTB "spl/dts/k3-am642-netmodule-hw34.dtb"
 
 #define UBOOT_NODTB "u-boot-nodtb.bin"
-#define AM642_GEMINI_DTB "arch/arm/dts/k3-am642-gemini-v1.dtb"
+#define AM642_GEMINI_DTB "arch/arm/dts/k3-am642-netmodule-hw34.dtb"
 
 &binman {
 	ti-spl {
diff --git a/arch/arm/dts/k3-am642-gemini-v1.dts b/arch/arm/dts/k3-am642-netmodule-hw34.dts
similarity index 99%
rename from arch/arm/dts/k3-am642-gemini-v1.dts
rename to arch/arm/dts/k3-am642-netmodule-hw34.dts
index 442d5b1ace..938d72deca 100644
--- a/arch/arm/dts/k3-am642-gemini-v1.dts
+++ b/arch/arm/dts/k3-am642-netmodule-hw34.dts
@@ -12,7 +12,7 @@
 #include "k3-am642.dtsi"
 
 / {
-	compatible =  "ti,am642-gemini", "ti,am642";
+	compatible =  "netmodule,hw34", "ti,am642";
 	model = "NetModule AM642 based Gemini";
 
 	aliases {
diff --git a/arch/arm/dts/k3-am642-r5-gemini-v1.dts b/arch/arm/dts/k3-am642-r5-netmodule-hw34.dts
similarity index 100%
rename from arch/arm/dts/k3-am642-r5-gemini-v1.dts
rename to arch/arm/dts/k3-am642-r5-netmodule-hw34.dts
diff --git a/configs/am64x_gemini_a53_defconfig b/configs/am64x_netmodule_hw34_a53_defconfig
similarity index 98%
rename from configs/am64x_gemini_a53_defconfig
rename to configs/am64x_netmodule_hw34_a53_defconfig
index 73fb3f0720..93aabd0f24 100644
--- a/configs/am64x_gemini_a53_defconfig
+++ b/configs/am64x_netmodule_hw34_a53_defconfig
@@ -14,7 +14,7 @@ CONFIG_ENV_SIZE=0x20000
 CONFIG_ENV_OFFSET=0x3e0000
 CONFIG_DM_GPIO=y
 CONFIG_SPL_DM_SPI=y
-CONFIG_DEFAULT_DEVICE_TREE="k3-am642-gemini-v1"
+CONFIG_DEFAULT_DEVICE_TREE="k3-am642-netmodule-hw34"
 CONFIG_SPL_TEXT_BASE=0x80080000
 CONFIG_SPL_MMC=y
 CONFIG_SPL_SERIAL=y
diff --git a/configs/am64x_gemini_r5_defconfig b/configs/am64x_netmodule_hw34_r5_defconfig
similarity index 98%
rename from configs/am64x_gemini_r5_defconfig
rename to configs/am64x_netmodule_hw34_r5_defconfig
index 44c0364eef..c7e66a18e8 100644
--- a/configs/am64x_gemini_r5_defconfig
+++ b/configs/am64x_netmodule_hw34_r5_defconfig
@@ -11,7 +11,7 @@ CONFIG_TARGET_AM642_R5_GEMINI=y
 CONFIG_DM_GPIO=y
 CONFIG_SPL_DM_SPI=y
 CONFIG_SYS_SPI_U_BOOT_OFFS=0x100000
-CONFIG_DEFAULT_DEVICE_TREE="k3-am642-r5-gemini-v1"
+CONFIG_DEFAULT_DEVICE_TREE="k3-am642-r5-netmodule-hw34"
 CONFIG_SPL_TEXT_BASE=0x70000000
 CONFIG_SPL_MMC=y
 CONFIG_SPL_SERIAL=y