diff mbox

[U-Boot,v2,batch,1,09/10] powerpc/corenet_ds: Move SRIO enablement into specific boards

Message ID 1364232615-30719-9-git-send-email-yorksun@freescale.com
State Rejected, archived
Delegated to: Andy Fleming
Headers show

Commit Message

York Sun March 25, 2013, 5:30 p.m. UTC 
From: Kumar Gala <galak@kernel.crashing.org>

SRIO doesn't exist on the P5040DS board and we'll reuse the common
corenet_ds.h for it.  So move the SRIO defines into the board specific
headers.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
---
 include/configs/P3041DS.h |    3 +++
 include/configs/P4080DS.h |    3 +++
 include/configs/P5020DS.h |    3 +++
 3 files changed, 9 insertions(+)

Comments

Andy Fleming May 7, 2013, 10:28 p.m. UTC | #1 
On Mon, Mar 25, 2013 at 12:30 PM, York Sun <yorksun@freescale.com> wrote:

> From: Kumar Gala <galak@kernel.crashing.org>
>
> SRIO doesn't exist on the P5040DS board and we'll reuse the common
> corenet_ds.h for it.  So move the SRIO defines into the board specific
> headers.
>
> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
>


This patch is actually this patch:

commit 11860d888cdc2be5da7b8738a067b84cd76e71c0
Author: Timur Tabi <timur@freescale.com>
Date:   Fri Oct 5 09:48:53 2012 +0000

    powerpc/85xx: move SRIO configuration out of corenet_ds.h

Which is already upstream. My guess is that Kumar submitted it internally
to get internal u-boot in sync, or visa-versa, and it got merged internally.

This also means your subsequent patch from batch 3 (Remove duplicate
macro...) is unnecessary.

NAK. I will update patchworks.


Andy
diff mbox

Patch

diff --git a/include/configs/P3041DS.h b/include/configs/P3041DS.h
index ce8f9b0..a0a4a3c 100644
--- a/include/configs/P3041DS.h
+++ b/include/configs/P3041DS.h
@@ -35,6 +35,9 @@ 
 #define CONFIG_FSL_SATA_V2
 #define CONFIG_PCIE3
 #define CONFIG_PCIE4
+#define CONFIG_SYS_SRIO
+#define CONFIG_SRIO1			/* SRIO port 1 */
+#define CONFIG_SRIO2			/* SRIO port 2 */
 #define CONFIG_SYS_DPAA_RMAN
 
 #define CONFIG_SYS_SRIO
diff --git a/include/configs/P4080DS.h b/include/configs/P4080DS.h
index 53979dd..257258b 100644
--- a/include/configs/P4080DS.h
+++ b/include/configs/P4080DS.h
@@ -32,6 +32,9 @@ 
 
 #define CONFIG_MMC
 #define CONFIG_PCIE3
+#define CONFIG_SYS_SRIO
+#define CONFIG_SRIO1			/* SRIO port 1 */
+#define CONFIG_SRIO2			/* SRIO port 2 */
 
 #define CONFIG_SYS_SRIO
 #define CONFIG_SRIO1			/* SRIO port 1 */
diff --git a/include/configs/P5020DS.h b/include/configs/P5020DS.h
index 778230d..a32b610 100644
--- a/include/configs/P5020DS.h
+++ b/include/configs/P5020DS.h
@@ -35,6 +35,9 @@ 
 #define CONFIG_FSL_SATA_V2
 #define CONFIG_PCIE3
 #define CONFIG_PCIE4
+#define CONFIG_SYS_SRIO
+#define CONFIG_SRIO1			/* SRIO port 1 */
+#define CONFIG_SRIO2			/* SRIO port 2 */
 #define CONFIG_SYS_FSL_RAID_ENGINE
 #define CONFIG_SYS_DPAA_RMAN