* [U-Boot] [PATCH][v3] ep8248: add support for device tree and secondary Ethernet interface.
@ 2009-09-08 15:33 Marcel Ziswiler
2009-09-08 18:46 ` Wolfgang Denk
2009-09-09 19:22 ` [U-Boot] [PATCH][v4] " Marcel Ziswiler
0 siblings, 2 replies; 5+ messages in thread
From: Marcel Ziswiler @ 2009-09-08 15:33 UTC (permalink / raw)
To: u-boot
Signed-off-by: Marcel Ziswiler <marcel.ziswiler@noser.com>
---
board/ep8248/ep8248.c | 16 ++++++++++++-
include/configs/ep8248.h | 53 ++++++++++++++++++++--------------------------
2 files changed, 37 insertions(+), 32 deletions(-)
diff --git a/board/ep8248/ep8248.c b/board/ep8248/ep8248.c
index bc20ba7..eb11418 100644
--- a/board/ep8248/ep8248.c
+++ b/board/ep8248/ep8248.c
@@ -5,6 +5,10 @@
* Support for Embedded Planet EP8248 boards.
* Tested on EP8248E.
*
+ * Copyright (C) 2009 Noser Engineering AG
+ * Marcel Ziswiler <marcel.ziswiler@noser.com>
+ * Added support for device tree and secondary Ethernet interface
+ *
* See file CREDITS for list of people who contributed to this
* project.
*
@@ -35,8 +39,8 @@
* according to the five values podr/pdir/ppar/psor/pdat for that entry
*/
-#define CONFIG_SYS_FCC1 (CONFIG_ETHER_INDEX == 1)
-#define CONFIG_SYS_FCC2 (CONFIG_ETHER_INDEX == 2)
+#define CONFIG_SYS_FCC1 (CONFIG_ETHER_ON_FCC1 == 1)
+#define CONFIG_SYS_FCC2 (CONFIG_ETHER_ON_FCC2 == 1)
const iop_conf_t iop_conf_tab[4][32] = {
@@ -261,3 +265,11 @@ int checkboard(void)
return 0;
}
+
+#if defined(CONFIG_OF_BOARD_SETUP) && defined(CONFIG_OF_LIBFDT)
+void ft_board_setup(void *blob, bd_t *bd)
+{
+ ft_cpu_setup( blob, bd);
+}
+#endif /* defined(CONFIG_OF_BOARD_SETUP) && defined(CONFIG_OF_LIBFDT) */
+
diff --git a/include/configs/ep8248.h b/include/configs/ep8248.h
index f7b3fde..b1dbe7d 100644
--- a/include/configs/ep8248.h
+++ b/include/configs/ep8248.h
@@ -4,6 +4,10 @@
*
* U-Boot configuration for Embedded Planet EP8248 boards.
*
+ * Copyright (C) 2009 Noser Engineering AG
+ * Marcel Ziswiler <marcel.ziswiler@noser.com>
+ * Added support for device tree and secondary Ethernet interface
+ *
* See file CREDITS for list of people who contributed to this
* project.
*
@@ -50,50 +54,41 @@
#define CONFIG_SYS_BCSR 0xFA000000
-/*
- * Select ethernet configuration
- *
- * If either CONFIG_ETHER_ON_SCC or CONFIG_ETHER_ON_FCC is selected,
- * then CONFIG_ETHER_INDEX must be set to the channel number (1-4 for
- * SCC, 1-3 for FCC)
- *
- * If CONFIG_ETHER_NONE is defined, then either the ethernet routines
- * must be defined elsewhere (as for the console), or CONFIG_CMD_NET
- * must be unset.
- */
+/* Pass open firmware flat device tree */
+#define CONFIG_OF_LIBFDT 1
+#define CONFIG_OF_BOARD_SETUP 1
+
+#define OF_TBCLK (bd->bi_busfreq / 4)
+#define OF_STDOUT_PATH "/soc/cpm/serial at 11a80"
+
+/* Select ethernet configuration */
#undef CONFIG_ETHER_ON_SCC /* Ethernet is not on SCC */
#define CONFIG_ETHER_ON_FCC /* Ethernet is on FCC */
#undef CONFIG_ETHER_NONE /* No external Ethernet */
-#ifdef CONFIG_ETHER_ON_FCC
-
-#define CONFIG_ETHER_INDEX 1 /* FCC1 is used for Ethernet */
-
-#if (CONFIG_ETHER_INDEX == 1)
+#define CONFIG_NET_MULTI
+#define CONFIG_SYS_CPMFCR_RAMTYPE 0
+#define CONFIG_SYS_FCC_PSMR (FCC_PSMR_FDE | FCC_PSMR_LPB)
+#define CONFIG_HAS_ETH0
+#define CONFIG_ETHER_ON_FCC1 1
/* - Rx clock is CLK10
* - Tx clock is CLK11
* - BDs/buffers on 60x bus
* - Full duplex
*/
-#define CONFIG_SYS_CMXFCR_MASK (CMXFCR_FC1 | CMXFCR_RF1CS_MSK | CMXFCR_TF1CS_MSK)
-#define CONFIG_SYS_CMXFCR_VALUE (CMXFCR_RF1CS_CLK10 | CMXFCR_TF1CS_CLK11)
-#define CONFIG_SYS_CPMFCR_RAMTYPE 0
-#define CONFIG_SYS_FCC_PSMR (FCC_PSMR_FDE | FCC_PSMR_LPB)
-
-#elif (CONFIG_ETHER_INDEX == 2)
+#define CONFIG_SYS_CMXFCR_MASK1 (CMXFCR_FC1 | CMXFCR_RF1CS_MSK | CMXFCR_TF1CS_MSK)
+#define CONFIG_SYS_CMXFCR_VALUE1 (CMXFCR_RF1CS_CLK10 | CMXFCR_TF1CS_CLK11)
+#define CONFIG_HAS_ETH1
+#define CONFIG_ETHER_ON_FCC2 1
/* - Rx clock is CLK13
* - Tx clock is CLK14
* - BDs/buffers on 60x bus
* - Full duplex
*/
-#define CONFIG_SYS_CMXFCR_MASK (CMXFCR_FC2 | CMXFCR_RF2CS_MSK | CMXFCR_TF2CS_MSK)
-#define CONFIG_SYS_CMXFCR_VALUE (CMXFCR_RF2CS_CLK13 | CMXFCR_TF2CS_CLK14)
-#define CONFIG_SYS_CPMFCR_RAMTYPE 0
-#define CONFIG_SYS_FCC_PSMR (FCC_PSMR_FDE | FCC_PSMR_LPB)
-
-#endif /* CONFIG_ETHER_INDEX */
+#define CONFIG_SYS_CMXFCR_MASK2 (CMXFCR_FC2 | CMXFCR_RF2CS_MSK | CMXFCR_TF2CS_MSK)
+#define CONFIG_SYS_CMXFCR_VALUE2 (CMXFCR_RF2CS_CLK13 | CMXFCR_TF2CS_CLK14)
#define CONFIG_MII /* MII PHY management */
#define CONFIG_BITBANGMII /* Bit-banged MDIO interface */
@@ -113,8 +108,6 @@
#define MIIDELAY udelay(1)
-#endif /* CONFIG_ETHER_ON_FCC */
-
#ifndef CONFIG_8260_CLKIN
#define CONFIG_8260_CLKIN 66000000 /* in Hz */
#endif
--
1.6.0.4
^ permalink raw reply related [flat|nested] 5+ messages in thread* [U-Boot] [PATCH][v3] ep8248: add support for device tree and secondary Ethernet interface.
2009-09-08 15:33 [U-Boot] [PATCH][v3] ep8248: add support for device tree and secondary Ethernet interface Marcel Ziswiler
@ 2009-09-08 18:46 ` Wolfgang Denk
2009-09-08 21:05 ` Marcel Ziswiler
2009-09-09 19:22 ` [U-Boot] [PATCH][v4] " Marcel Ziswiler
1 sibling, 1 reply; 5+ messages in thread
From: Wolfgang Denk @ 2009-09-08 18:46 UTC (permalink / raw)
To: u-boot
Dear Marcel Ziswiler,
In message <1252424017.5386.19.camel@com-21> you wrote:
> Signed-off-by: Marcel Ziswiler <marcel.ziswiler@noser.com>
> ---
> board/ep8248/ep8248.c | 16 ++++++++++++-
> include/configs/ep8248.h | 53 ++++++++++++++++++++--------------------------
> 2 files changed, 37 insertions(+), 32 deletions(-)
Please put the board maintainer on Cc:
> diff --git a/board/ep8248/ep8248.c b/board/ep8248/ep8248.c
> index bc20ba7..eb11418 100644
> --- a/board/ep8248/ep8248.c
> +++ b/board/ep8248/ep8248.c
> @@ -5,6 +5,10 @@
> * Support for Embedded Planet EP8248 boards.
> * Tested on EP8248E.
> *
> + * Copyright (C) 2009 Noser Engineering AG
> + * Marcel Ziswiler <marcel.ziswiler@noser.com>
> + * Added support for device tree and secondary Ethernet interface
We don't add copyright entries for so few lines of code. And we don;t
add a change log either. We have git to track the history of changes
for us.
> diff --git a/include/configs/ep8248.h b/include/configs/ep8248.h
> index f7b3fde..b1dbe7d 100644
> --- a/include/configs/ep8248.h
> +++ b/include/configs/ep8248.h
> @@ -4,6 +4,10 @@
> *
> * U-Boot configuration for Embedded Planet EP8248 boards.
> *
> + * Copyright (C) 2009 Noser Engineering AG
> + * Marcel Ziswiler <marcel.ziswiler@noser.com>
> + * Added support for device tree and secondary Ethernet interface
> + *
Ditto.
Best regards,
Wolfgang Denk
--
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
A woman should have compassion.
-- Kirk, "Catspaw", stardate 3018.2
^ permalink raw reply [flat|nested] 5+ messages in thread
* [U-Boot] [PATCH][v3] ep8248: add support for device tree and secondary Ethernet interface.
2009-09-08 18:46 ` Wolfgang Denk
@ 2009-09-08 21:05 ` Marcel Ziswiler
0 siblings, 0 replies; 5+ messages in thread
From: Marcel Ziswiler @ 2009-09-08 21:05 UTC (permalink / raw)
To: u-boot
Dear Wolfgang Denk
On Tue, 2009-09-08 at 20:46 +0200, Wolfgang Denk wrote:
> Please put the board maintainer on Cc:
OK, did so now.
> We don't add copyright entries for so few lines of code. And we don;t
> add a change log either. We have git to track the history of changes
> for us.
OK, sorry. Will change that.
Cheers
Marcel Ziswiler
^ permalink raw reply [flat|nested] 5+ messages in thread
* [U-Boot] [PATCH][v4] ep8248: add support for device tree and secondary Ethernet interface.
2009-09-08 15:33 [U-Boot] [PATCH][v3] ep8248: add support for device tree and secondary Ethernet interface Marcel Ziswiler
2009-09-08 18:46 ` Wolfgang Denk
@ 2009-09-09 19:22 ` Marcel Ziswiler
2009-09-10 21:09 ` Wolfgang Denk
1 sibling, 1 reply; 5+ messages in thread
From: Marcel Ziswiler @ 2009-09-09 19:22 UTC (permalink / raw)
To: u-boot
Signed-off-by: Marcel Ziswiler <marcel.ziswiler@noser.com>
---
Changes since v1:
- Removed redundant commit message as pointed out by Peter Tyser
- Separate patch to move FDT memory node fixup into common CPU code as pointed out by Peter Tyser
Changes since v2:
- Fix patch line wrapping
Changes since v3:
- Removed copyright and change log entries as pointed out by Wolfgang Denk
board/ep8248/ep8248.c | 12 +++++++++-
include/configs/ep8248.h | 49 +++++++++++++++++----------------------------
2 files changed, 29 insertions(+), 32 deletions(-)
diff --git a/board/ep8248/ep8248.c b/board/ep8248/ep8248.c
index bc20ba7..57d39aa 100644
--- a/board/ep8248/ep8248.c
+++ b/board/ep8248/ep8248.c
@@ -35,8 +35,8 @@
* according to the five values podr/pdir/ppar/psor/pdat for that entry
*/
-#define CONFIG_SYS_FCC1 (CONFIG_ETHER_INDEX == 1)
-#define CONFIG_SYS_FCC2 (CONFIG_ETHER_INDEX == 2)
+#define CONFIG_SYS_FCC1 (CONFIG_ETHER_ON_FCC1 == 1)
+#define CONFIG_SYS_FCC2 (CONFIG_ETHER_ON_FCC2 == 1)
const iop_conf_t iop_conf_tab[4][32] = {
@@ -261,3 +261,11 @@ int checkboard(void)
return 0;
}
+
+#if defined(CONFIG_OF_BOARD_SETUP) && defined(CONFIG_OF_LIBFDT)
+void ft_board_setup(void *blob, bd_t *bd)
+{
+ ft_cpu_setup( blob, bd);
+}
+#endif /* defined(CONFIG_OF_BOARD_SETUP) && defined(CONFIG_OF_LIBFDT) */
+
diff --git a/include/configs/ep8248.h b/include/configs/ep8248.h
index f7b3fde..cb4185a 100644
--- a/include/configs/ep8248.h
+++ b/include/configs/ep8248.h
@@ -50,50 +50,41 @@
#define CONFIG_SYS_BCSR 0xFA000000
-/*
- * Select ethernet configuration
- *
- * If either CONFIG_ETHER_ON_SCC or CONFIG_ETHER_ON_FCC is selected,
- * then CONFIG_ETHER_INDEX must be set to the channel number (1-4 for
- * SCC, 1-3 for FCC)
- *
- * If CONFIG_ETHER_NONE is defined, then either the ethernet routines
- * must be defined elsewhere (as for the console), or CONFIG_CMD_NET
- * must be unset.
- */
+/* Pass open firmware flat device tree */
+#define CONFIG_OF_LIBFDT 1
+#define CONFIG_OF_BOARD_SETUP 1
+
+#define OF_TBCLK (bd->bi_busfreq / 4)
+#define OF_STDOUT_PATH "/soc/cpm/serial <at> 11a80"
+
+/* Select ethernet configuration */
#undef CONFIG_ETHER_ON_SCC /* Ethernet is not on SCC */
#define CONFIG_ETHER_ON_FCC /* Ethernet is on FCC */
#undef CONFIG_ETHER_NONE /* No external Ethernet */
-#ifdef CONFIG_ETHER_ON_FCC
-
-#define CONFIG_ETHER_INDEX 1 /* FCC1 is used for Ethernet */
-
-#if (CONFIG_ETHER_INDEX == 1)
+#define CONFIG_NET_MULTI
+#define CONFIG_SYS_CPMFCR_RAMTYPE 0
+#define CONFIG_SYS_FCC_PSMR (FCC_PSMR_FDE | FCC_PSMR_LPB)
+#define CONFIG_HAS_ETH0
+#define CONFIG_ETHER_ON_FCC1 1
/* - Rx clock is CLK10
* - Tx clock is CLK11
* - BDs/buffers on 60x bus
* - Full duplex
*/
-#define CONFIG_SYS_CMXFCR_MASK (CMXFCR_FC1 | CMXFCR_RF1CS_MSK | CMXFCR_TF1CS_MSK)
-#define CONFIG_SYS_CMXFCR_VALUE (CMXFCR_RF1CS_CLK10 | CMXFCR_TF1CS_CLK11)
-#define CONFIG_SYS_CPMFCR_RAMTYPE 0
-#define CONFIG_SYS_FCC_PSMR (FCC_PSMR_FDE | FCC_PSMR_LPB)
-
-#elif (CONFIG_ETHER_INDEX == 2)
+#define CONFIG_SYS_CMXFCR_MASK1 (CMXFCR_FC1 | CMXFCR_RF1CS_MSK | CMXFCR_TF1CS_MSK)
+#define CONFIG_SYS_CMXFCR_VALUE1 (CMXFCR_RF1CS_CLK10 | CMXFCR_TF1CS_CLK11)
+#define CONFIG_HAS_ETH1
+#define CONFIG_ETHER_ON_FCC2 1
/* - Rx clock is CLK13
* - Tx clock is CLK14
* - BDs/buffers on 60x bus
* - Full duplex
*/
-#define CONFIG_SYS_CMXFCR_MASK (CMXFCR_FC2 | CMXFCR_RF2CS_MSK | CMXFCR_TF2CS_MSK)
-#define CONFIG_SYS_CMXFCR_VALUE (CMXFCR_RF2CS_CLK13 | CMXFCR_TF2CS_CLK14)
-#define CONFIG_SYS_CPMFCR_RAMTYPE 0
-#define CONFIG_SYS_FCC_PSMR (FCC_PSMR_FDE | FCC_PSMR_LPB)
-
-#endif /* CONFIG_ETHER_INDEX */
+#define CONFIG_SYS_CMXFCR_MASK2 (CMXFCR_FC2 | CMXFCR_RF2CS_MSK | CMXFCR_TF2CS_MSK)
+#define CONFIG_SYS_CMXFCR_VALUE2 (CMXFCR_RF2CS_CLK13 | CMXFCR_TF2CS_CLK14)
#define CONFIG_MII /* MII PHY management */
#define CONFIG_BITBANGMII /* Bit-banged MDIO interface */
@@ -113,8 +104,6 @@
#define MIIDELAY udelay(1)
-#endif /* CONFIG_ETHER_ON_FCC */
-
#ifndef CONFIG_8260_CLKIN
#define CONFIG_8260_CLKIN 66000000 /* in Hz */
#endif
--
1.6.4.2
^ permalink raw reply related [flat|nested] 5+ messages in thread* [U-Boot] [PATCH][v4] ep8248: add support for device tree and secondary Ethernet interface.
2009-09-09 19:22 ` [U-Boot] [PATCH][v4] " Marcel Ziswiler
@ 2009-09-10 21:09 ` Wolfgang Denk
0 siblings, 0 replies; 5+ messages in thread
From: Wolfgang Denk @ 2009-09-10 21:09 UTC (permalink / raw)
To: u-boot
Dear Marcel Ziswiler,
In message <1252524128.3643.12.camel@com-21> you wrote:
> Signed-off-by: Marcel Ziswiler <marcel.ziswiler@noser.com>
> ---
> Changes since v1:
> - Removed redundant commit message as pointed out by Peter Tyser
> - Separate patch to move FDT memory node fixup into common CPU code as pointed out by Peter Tyser
> Changes since v2:
> - Fix patch line wrapping
> Changes since v3:
> - Removed copyright and change log entries as pointed out by Wolfgang Denk
>
> board/ep8248/ep8248.c | 12 +++++++++-
> include/configs/ep8248.h | 49 +++++++++++++++++----------------------------
> 2 files changed, 29 insertions(+), 32 deletions(-)
Applied, thanks.
Best regards,
Wolfgang Denk
--
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
"An open mind has but one disadvantage: it collects dirt."
- a saying at RPI
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2009-09-10 21:09 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-09-08 15:33 [U-Boot] [PATCH][v3] ep8248: add support for device tree and secondary Ethernet interface Marcel Ziswiler
2009-09-08 18:46 ` Wolfgang Denk
2009-09-08 21:05 ` Marcel Ziswiler
2009-09-09 19:22 ` [U-Boot] [PATCH][v4] " Marcel Ziswiler
2009-09-10 21:09 ` Wolfgang Denk
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox