diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index 5a320fd870..5a97490e5d 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -1274,8 +1274,8 @@ 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-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 38627882ea..a06dc706b3 100644 --- a/arch/arm/dts/k3-am642-gemini-binman.dtsi +++ b/arch/arm/dts/k3-am642-gemini-binman.dtsi @@ -13,10 +13,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 d134e3a712..1608c3bf9d 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 900f29d7c1..acf5a340dc 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