[PATCH 06/38] Convert CONFIG_FSL_SERDES to Kconfig

Tom Rini
2022-11-19T23:47:04Z

This converts the following to Kconfig:
CONFIG_FSL_SERDES

Signed-off-by: Tom Rini <trini@konsulko.com>
---
arch/powerpc/cpu/mpc83xx/Kconfig | 4 ++++
arch/powerpc/cpu/mpc83xx/serdes.c | 4 ----
configs/MPC837XERDB_defconfig | 1 +
include/configs/MPC837XERDB.h | 1 -
4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/arch/powerpc/cpu/mpc83xx/Kconfig b/arch/powerpc/cpu/mpc83xx/Kconfig
index ec3405e9678f..563f52c5fdb3 100644
--- a/arch/powerpc/cpu/mpc83xx/Kconfig
+++ b/arch/powerpc/cpu/mpc83xx/Kconfig
@@ -196,6 +196,10 @@ config 83XX_PCICLK
config FSL_ELBC
bool

+config FSL_SERDES
+ bool "SerDes initialization"
+ depends on !MPC83XX_SERDES
+
source "board/freescale/mpc837xerdb/Kconfig"
source "board/gdsys/mpc8308/Kconfig"

diff --git a/arch/powerpc/cpu/mpc83xx/serdes.c b/arch/powerpc/cpu/mpc83xx/serdes.c
index bb963ee5e2f4..d4848b2ec4d5 100644
--- a/arch/powerpc/cpu/mpc83xx/serdes.c
+++ b/arch/powerpc/cpu/mpc83xx/serdes.c
@@ -8,8 +8,6 @@
* Author: Li Yang <leoli@freescale.com>
*/

-#ifndef CONFIG_MPC83XX_SERDES
-
#include <config.h>
#include <common.h>
#include <asm/io.h>
@@ -151,5 +149,3 @@ void fsl_setup_serdes(u32 offset, char proto, u32 rfcks, char vdd)
tmp |= FSL_SRDSRSTCTL_RST;
out_be32(regs + FSL_SRDSRSTCTL_OFFS, tmp);
}
-
-#endif /* !CONFIG_MPC83XX_SERDES */
diff --git a/configs/MPC837XERDB_defconfig b/configs/MPC837XERDB_defconfig
index 675b2de151c7..d97fa5aec521 100644
--- a/configs/MPC837XERDB_defconfig
+++ b/configs/MPC837XERDB_defconfig
@@ -147,6 +147,7 @@ CONFIG_ACR_RPTCNT_4=y
CONFIG_SPCR_TSECEP_3=y
CONFIG_LCRR_DBYP_PLL_BYPASSED=y
CONFIG_LCRR_CLKDIV_8=y
+CONFIG_FSL_SERDES=y
CONFIG_SYS_MONITOR_LEN=524288
CONFIG_OF_BOARD_SETUP=y
CONFIG_OF_STDOUT_VIA_ALIAS=y
diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h
index 85c080cf27a5..717320c34aeb 100644
--- a/include/configs/MPC837XERDB.h
+++ b/include/configs/MPC837XERDB.h
@@ -160,7 +160,6 @@
#define CFG_SYS_NS16550_COM2 (CONFIG_SYS_IMMR+0x4600)

/* SERDES */
-#define CONFIG_FSL_SERDES
#define CONFIG_FSL_SERDES1 0xe3000
#define CONFIG_FSL_SERDES2 0xe3100

--
2.25.1