From 66a83931e586086d24acae1e3bfd0e1f545509db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Leczkowski?=
 <lukasz.leczkowski@phoenix-rtos.com>
Date: Thu, 1 Aug 2024 15:15:33 +0200
Subject: [PATCH] rename sparcv8leon3 to sparcv8leon

JIRA: RTOS-883
---
 ...on3-generic.sh => build-core-sparcv8leon-generic.sh |  0
 ...on3-gr712rc.sh => build-core-sparcv8leon-gr712rc.sh |  0
 ...v8leon3-gr716.sh => build-core-sparcv8leon-gr716.sh |  0
 makes/include-target.mk                                | 10 +++++-----
 target/{sparcv8leon3.mk => sparcv8leon.mk}             |  6 +++---
 toolchain/build-toolchain.sh                           |  2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)
 rename build-core-sparcv8leon3-generic.sh => build-core-sparcv8leon-generic.sh (100%)
 rename build-core-sparcv8leon3-gr712rc.sh => build-core-sparcv8leon-gr712rc.sh (100%)
 rename build-core-sparcv8leon3-gr716.sh => build-core-sparcv8leon-gr716.sh (100%)
 rename target/{sparcv8leon3.mk => sparcv8leon.mk} (94%)

diff --git a/build-core-sparcv8leon3-generic.sh b/build-core-sparcv8leon-generic.sh
similarity index 100%
rename from build-core-sparcv8leon3-generic.sh
rename to build-core-sparcv8leon-generic.sh
diff --git a/build-core-sparcv8leon3-gr712rc.sh b/build-core-sparcv8leon-gr712rc.sh
similarity index 100%
rename from build-core-sparcv8leon3-gr712rc.sh
rename to build-core-sparcv8leon-gr712rc.sh
diff --git a/build-core-sparcv8leon3-gr716.sh b/build-core-sparcv8leon-gr716.sh
similarity index 100%
rename from build-core-sparcv8leon3-gr716.sh
rename to build-core-sparcv8leon-gr716.sh
diff --git a/makes/include-target.mk b/makes/include-target.mk
index 91ea6000..d2f6bd68 100644
--- a/makes/include-target.mk
+++ b/makes/include-target.mk
@@ -70,15 +70,15 @@ ifeq ($(TARGET_FAMILY), host)
   TARGET_SUFF ?= host
 endif
 
-# SPARCV8 LEON 3
+# SPARCV8 LEON
 TARGETS_SPARC := \
-  sparcv8leon3-gr716 \
-  sparcv8leon3-gr712rc \
-  sparcv8leon3-generic
+  sparcv8leon-gr716 \
+  sparcv8leon-gr712rc \
+  sparcv8leon-generic
 
 TARGETS += $(TARGETS_SPARC)
 ifneq (,$(filter $(TARGETS_SPARC),$(TARGET_FAMILY)-$(TARGET_SUBFAMILY)))
-  TARGET_SUFF ?= sparcv8leon3
+  TARGET_SUFF ?= sparcv8leon
 endif
 
 SPACE :=
diff --git a/target/sparcv8leon3.mk b/target/sparcv8leon.mk
similarity index 94%
rename from target/sparcv8leon3.mk
rename to target/sparcv8leon.mk
index 5fde6f56..0d5568a9 100644
--- a/target/sparcv8leon3.mk
+++ b/target/sparcv8leon.mk
@@ -1,7 +1,7 @@
 #
 # Makefile for Phoenix-RTOS 3
 #
-# SPARCv8 LEON3 options
+# SPARCv8 LEON options
 #
 # Copyright 2022-2024 Phoenix Systems
 #
@@ -22,7 +22,7 @@ ifeq ($(TARGET_SUBFAMILY), gr716)
   VADDR_KERNEL_INIT := $(KERNEL_PHADDR)
 
   CFLAGS += -msoft-float
-  CPPFLAGS += -DLEON3_USE_PWR
+  CPPFLAGS += -DLEON_USE_PWR
 
   ifeq ($(KERNEL), 1)
     LDFLAGS += -Wl,-z,max-page-size=0x200 -Tbss=40001800 -Tdata=40001800 -Wl,--section-start=.rodata=40000000
@@ -42,7 +42,7 @@ else ifeq ($(TARGET_SUBFAMILY), gr712rc)
   STRIP := $(CROSS)strip
   VADDR_KERNEL_INIT := 0xc0000000
   CFLAGS += -mfix-gr712rc
-  CPPFLAGS += -DLEON3_TN_0018_FIX
+  CPPFLAGS += -DLEON_TN_0018_FIX
   LDFLAGS += -Wl,-z,max-page-size=0x1000
 
   HAVE_MMU := y
diff --git a/toolchain/build-toolchain.sh b/toolchain/build-toolchain.sh
index c525efbb..ef2eb785 100755
--- a/toolchain/build-toolchain.sh
+++ b/toolchain/build-toolchain.sh
@@ -15,7 +15,7 @@ declare -A TOOLCHAN_TO_PHOENIX_TARGETS=(
     [arm-phoenix]="armv7a9-zynq7000 armv7a7-imx6ull armv7m7-imxrt106x armv7m4-stm32l4x6"
     [i386-pc-phoenix]="ia32-generic"
     [riscv64-phoenix]="riscv64-generic"
-    [sparc-phoenix]="sparcv8leon3-gr716 sparcv8leon3-gr712rc"
+    [sparc-phoenix]="sparcv8leon-gr716 sparcv8leon-gr712rc sparcv8leon-generic"
 )
 
 TARGET="$1"