From: Kumar Gala <galak@kernel.crashing.org>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH 01/11] powerpc/85xx: Replace CONFIG_SYS_HAS_SERDES with a weak function
Date: Fri, 17 Dec 2010 17:33:26 -0600 [thread overview]
Message-ID: <1292628816-9436-1-git-send-email-galak@kernel.crashing.org> (raw)
Instead of a #define use a null weak function for fsl_serdes_init
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
---
arch/powerpc/cpu/mpc85xx/cpu_init.c | 8 ++++++--
include/configs/MPC8536DS.h | 1 -
include/configs/P1022DS.h | 1 -
include/configs/corenet_ds.h | 1 -
4 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/arch/powerpc/cpu/mpc85xx/cpu_init.c b/arch/powerpc/cpu/mpc85xx/cpu_init.c
index 4b8faa5..4a6cc65 100644
--- a/arch/powerpc/cpu/mpc85xx/cpu_init.c
+++ b/arch/powerpc/cpu/mpc85xx/cpu_init.c
@@ -232,6 +232,12 @@ void cpu_init_f (void)
invalidate_cpc();
}
+/* Implement a dummy function for those platforms w/o SERDES */
+static void __fsl_serdes__init(void)
+{
+ return ;
+}
+__attribute__((weak, alias("__fsl_serdes__init"))) void fsl_serdes_init(void);
/*
* Initialize L2 as cache.
@@ -375,10 +381,8 @@ int cpu_init_r(void)
qe_reset();
#endif
-#if defined(CONFIG_SYS_HAS_SERDES)
/* needs to be in ram since code uses global static vars */
fsl_serdes_init();
-#endif
#if defined(CONFIG_MP)
setup_mp();
diff --git a/include/configs/MPC8536DS.h b/include/configs/MPC8536DS.h
index 5c5be0c..7473834 100644
--- a/include/configs/MPC8536DS.h
+++ b/include/configs/MPC8536DS.h
@@ -78,7 +78,6 @@
#define CONFIG_FSL_PCI_INIT 1 /* Use common FSL init code */
#define CONFIG_FSL_PCIE_RESET 1 /* need PCIe reset errata */
#define CONFIG_SYS_PCI_64BIT 1 /* enable 64-bit PCI resources */
-#define CONFIG_SYS_HAS_SERDES /* has SERDES */
#define CONFIG_FSL_LAW 1 /* Use common FSL init code */
#define CONFIG_E1000 1 /* Defind e1000 pci Ethernet card*/
diff --git a/include/configs/P1022DS.h b/include/configs/P1022DS.h
index b411fc8..13f1125 100644
--- a/include/configs/P1022DS.h
+++ b/include/configs/P1022DS.h
@@ -34,7 +34,6 @@
#define CONFIG_FSL_PCI_INIT /* Use common FSL init code */
#define CONFIG_FSL_PCIE_RESET /* need PCIe reset errata */
#define CONFIG_SYS_PCI_64BIT /* enable 64-bit PCI resources */
-#define CONFIG_SYS_HAS_SERDES /* has SERDES */
#define CONFIG_PHYS_64BIT
#define CONFIG_ENABLE_36BIT_PHYS
diff --git a/include/configs/corenet_ds.h b/include/configs/corenet_ds.h
index 454a30a..e1cd1b0 100644
--- a/include/configs/corenet_ds.h
+++ b/include/configs/corenet_ds.h
@@ -50,7 +50,6 @@
#define CONFIG_PCIE3 /* PCIE controler 3 */
#define CONFIG_FSL_PCI_INIT /* Use common FSL init code */
#define CONFIG_SYS_PCI_64BIT /* enable 64-bit PCI resources */
-#define CONFIG_SYS_HAS_SERDES /* has SERDES */
#define CONFIG_SRIO1 /* SRIO port 1 */
#define CONFIG_SRIO2 /* SRIO port 2 */
--
1.7.2.3
next reply other threads:[~2010-12-17 23:33 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-12-17 23:33 Kumar Gala [this message]
2010-12-17 23:33 ` [U-Boot] [PATCH 02/11] powerpc/85xx: Create a SERDES section in Makefile Kumar Gala
2010-12-17 23:33 ` [U-Boot] [PATCH 03/11] powerpc/86xx: Add SERDES support on MPC8641 & MPC8610 Kumar Gala
2010-12-17 23:33 ` [U-Boot] [PATCH 04/11] powerpc/85xx: Add is_serdes_configured() support for P2020 SERDES Kumar Gala
2010-12-17 23:33 ` [U-Boot] [PATCH 05/11] powerpc/85xx: Add is_serdes_configured() support for MPC8572 SERDES Kumar Gala
2010-12-17 23:33 ` [U-Boot] [PATCH 06/11] powerpc/85xx: Add is_serdes_configured() support for MPC8548 SERDES Kumar Gala
2010-12-17 23:33 ` [U-Boot] [PATCH 07/11] powerpc/85xx: Add is_serdes_configured() support for MPC8568 SERDES Kumar Gala
2010-12-17 23:33 ` [U-Boot] [PATCH 08/11] powerpc/85xx: Add is_serdes_configured() support for MPC8569 SERDES Kumar Gala
2010-12-17 23:33 ` [U-Boot] [PATCH 09/11] powerpc/85xx: Add is_serdes_configured() support for MPC8544 SERDES Kumar Gala
2010-12-17 23:33 ` [U-Boot] [PATCH 10/11] powerpc/85xx: Add is_serdes_configured() support for P1021 SERDES Kumar Gala
2010-12-17 23:33 ` [U-Boot] [PATCH 11/11] powerpc/8xxx: Replace is_fsl_pci_cfg with is_serdes_configured Kumar Gala
2010-12-17 23:52 ` Kumar Gala
2011-01-06 16:05 ` Kumar Gala
2011-01-05 0:10 ` [U-Boot] [PATCH 10/11] powerpc/85xx: Add is_serdes_configured() support for P1021 SERDES Kumar Gala
2011-01-05 0:10 ` [U-Boot] [PATCH 09/11] powerpc/85xx: Add is_serdes_configured() support for MPC8544 SERDES Kumar Gala
2011-01-05 0:10 ` [U-Boot] [PATCH 08/11] powerpc/85xx: Add is_serdes_configured() support for MPC8569 SERDES Kumar Gala
2011-01-05 0:10 ` [U-Boot] [PATCH 07/11] powerpc/85xx: Add is_serdes_configured() support for MPC8568 SERDES Kumar Gala
2011-01-05 0:10 ` [U-Boot] [PATCH 06/11] powerpc/85xx: Add is_serdes_configured() support for MPC8548 SERDES Kumar Gala
2011-01-05 0:10 ` [U-Boot] [PATCH 05/11] powerpc/85xx: Add is_serdes_configured() support for MPC8572 SERDES Kumar Gala
2011-01-05 0:09 ` [U-Boot] [PATCH 04/11] powerpc/85xx: Add is_serdes_configured() support for P2020 SERDES Kumar Gala
2011-01-05 0:09 ` [U-Boot] [PATCH 03/11] powerpc/86xx: Add SERDES support on MPC8641 & MPC8610 Kumar Gala
2011-01-05 0:08 ` [U-Boot] [PATCH 02/11] powerpc/85xx: Create a SERDES section in Makefile Kumar Gala
2011-01-05 0:08 ` [U-Boot] [PATCH 01/11] powerpc/85xx: Replace CONFIG_SYS_HAS_SERDES with a weak function Kumar Gala
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1292628816-9436-1-git-send-email-galak@kernel.crashing.org \
--to=galak@kernel.crashing.org \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox