From a98e58d537c5b3b4a2464f57749665b4b02012f6 Mon Sep 17 00:00:00 2001
From: gtxaspec <gtxent@gmail.com>
Date: Sun, 7 Jan 2024 23:25:47 -0800
Subject: [PATCH] fix sfprobe; rm extra gpio settings, gpio env names

---
 include/configs/isvp_common.h | 14 +++++++-------
 include/configs/isvp_t10.h    |  5 ++---
 include/configs/isvp_t20.h    |  4 ++--
 include/configs/isvp_t21.h    |  2 --
 include/configs/isvp_t30.h    |  4 +---
 include/configs/isvp_t31.h    |  4 ++--
 6 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/include/configs/isvp_common.h b/include/configs/isvp_common.h
index 98f08380..b9a644dd 100644
--- a/include/configs/isvp_common.h
+++ b/include/configs/isvp_common.h
@@ -123,18 +123,18 @@
 "bootm ${baseaddr};"
 #elif defined(CONFIG_SFC_NOR)
 #define CONFIG_BOOTCOMMAND \
-"setenv setargs setenv bootargs ${bootargs};run setargs;" \
-"sf probe;sf read ${baseaddr} 0x50000 \\${kern_len};" \
+"sf probe;setenv setargs setenv bootargs ${bootargs};run setargs;" \
+"sf read ${baseaddr} 0x50000 \\${kern_len};" \
 "bootm ${baseaddr};"
 #elif defined(CONFIG_SFC_NAND)
 #define CONFIG_BOOTCOMMAND \
-"setenv setargs setenv bootargs ${bootargs};run setargs;" \
-"sf probe;sfcnand read 0x50000 0x200000 ${baseaddr};" \
+"sf probe;setenv setargs setenv bootargs ${bootargs};run setargs;" \
+"sfcnand read 0x50000 0x200000 ${baseaddr};" \
 "bootm ${baseaddr};"
 #else
 #define CONFIG_BOOTCOMMAND \
-"setenv setargs setenv bootargs ${bootargs};run setargs;" \
-"sf probe;sf read ${baseaddr} 0x50000 0x250000;" \
+"sf probe;setenv setargs setenv bootargs ${bootargs};run setargs;" \
+"sf read ${baseaddr} 0x50000 0x250000;" \
 "bootm ${baseaddr};"
 #endif
 
@@ -156,6 +156,6 @@ CONFIG_GPIO_IRCUT_SETTINGS
 /* IRCUT Default GPIOs */
 
 #define CONFIG_GPIO_IRCUT_SETTINGS \
-"gpio_dev_ircut=25o 26o 52o 53o 49o 50o\0"
+"gpio_default_ircut=25o 26o 52o 53o 49o 50o\0"
 
 #endif /*__CONFIG_ISVP_COMMON__*/
diff --git a/include/configs/isvp_t10.h b/include/configs/isvp_t10.h
index 03939573..69f4f05c 100644
--- a/include/configs/isvp_t10.h
+++ b/include/configs/isvp_t10.h
@@ -437,7 +437,6 @@
 #include "isvp_common.h"
 
 #define CONFIG_GPIO_SETTINGS \
-    "gpio_dev=47O\0" \
-    "gpio_dev_net=43O 48o 43o\0"
-	
+""
+
 #endif /*__CONFIG_ISVP_T10_H__*/
diff --git a/include/configs/isvp_t20.h b/include/configs/isvp_t20.h
index da6f47f5..4a2ed292 100644
--- a/include/configs/isvp_t20.h
+++ b/include/configs/isvp_t20.h
@@ -445,8 +445,8 @@
 */
 
 #define CONFIG_GPIO_SETTINGS \
-"gpio_dev=47O\0" \
-"gpio_dev_net=43O 48o 43o\0"
+"gpio_default=47O\0" \
+"gpio_default_net=43O 48o 43o\0"
 
 #include "isvp_common.h"
 
diff --git a/include/configs/isvp_t21.h b/include/configs/isvp_t21.h
index b4f00fdd..963fa9a8 100644
--- a/include/configs/isvp_t21.h
+++ b/include/configs/isvp_t21.h
@@ -536,6 +536,4 @@
 
 #include "isvp_common.h"
 
-#define CONFIG_GPIO_SETTINGS
-
 #endif /*__CONFIG_ISVP_T20_H__*/
diff --git a/include/configs/isvp_t30.h b/include/configs/isvp_t30.h
index d330a87d..b4640e6f 100644
--- a/include/configs/isvp_t30.h
+++ b/include/configs/isvp_t30.h
@@ -498,10 +498,8 @@
 	Platform Default GPIOs:
 */
 #define CONFIG_GPIO_SETTINGS \
-	""
+""
 
 #include "isvp_common.h"
 
-#define CONFIG_GPIO_SETTINGS
-
 #endif /*__CONFIG_ISVP_T30_H__*/
diff --git a/include/configs/isvp_t31.h b/include/configs/isvp_t31.h
index 686b86e8..d2081804 100644
--- a/include/configs/isvp_t31.h
+++ b/include/configs/isvp_t31.h
@@ -735,8 +735,8 @@
 */
 
 #define CONFIG_GPIO_SETTINGS \
-"gpio_dev=62O\0" \
-"gpio_dev_net=61o 48o\0"
+"gpio_default=62O\0" \
+"gpio_default_net=61o 48o\0"
 
 #include "isvp_common.h"