Convert CONFIG_FSL_SERDES to Kconfig

This converts the following to Kconfig:
   CONFIG_FSL_SERDES

Signed-off-by: Tom Rini <trini@konsulko.com>

diff --git a/arch/powerpc/cpu/mpc83xx/Kconfig b/arch/powerpc/cpu/mpc83xx/Kconfig
index ec3405e9678fb7b12755503e5d08448c01430f07..563f52c5fdb3640842ff9add8daf5c7f335cf09c 100644 (file)
--- 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 bb963ee5e2f4826580b063103f13ea833e435327..d4848b2ec4d5d0d2cde00e0b92b3268dad3fe7c5 100644 (file)
--- 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 7054333d73733c1ead0074849ee910f3d07bb965..e6289fe104d2227240f40b06116db1fb1f6a870b 100644 (file)
--- 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 85c080cf27a5dfb6b4a87a681f97fa3dbc259fac..717320c34aeb4d2d7af1502a280bb19b26c4da34 100644 (file)
--- 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