Skip to contentSkip to conversation

ep8248: add support for device tree and secondary Ethernet interface.

PATCH New Marcel Ziswiler 2 participants 6 messages Sep 3, 2009 – Sep 7, 2009

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ep8248: add support for device tree and secondary Ethernet interface.

ep8248: add support for device tree and secondary Ethernet interface.

---
 board/ep8248/ep8248.c    |   36 +++++++++++++++++++++++++++++-
 include/configs/ep8248.h |   53 ++++++++++++++++++++--------------------------
 2 files changed, 57 insertions(+), 32 deletions(-)
board/ep8248/ep8248.c +34 -2
index bc20ba7..a13f23f 100644
@@ -5,6 +5,10 @@
  * Support for Embedded Planet EP8248 boards.
  * Tested on EP8248E.
  *
+ * Copyright (C) 2009 Noser Engineering AG
+ * Marcel Ziswiler <[email protected]>
+ * Added support for device tree and secondary Ethernet interface
+ *
  * See file CREDITS for list of people who contributed to this
  * project.
  *
@@ -28,6 +32,12 @@
 #include <mpc8260.h>
 #include <ioports.h>
 
+#if defined(CONFIG_OF_LIBFDT)
+#include <libfdt.h>
+#include <libfdt_env.h>
+#include <fdt_support.h>
+#endif
+
 /*
  * I/O Port configuration table
  *
@@ -35,8 +45,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 +271,25 @@ int checkboard(void)
 
        return 0;
 }
+
+#if defined(CONFIG_OF_BOARD_SETUP) && defined(CONFIG_OF_LIBFDT)
+/*
+ * update "memory" property in the blob
+ */
+void ft_blob_update(void *blob, bd_t *bd)
+{
+       int ret;
+       ret = fdt_fixup_memory(blob, (u64)bd->bi_memstart, (u64)bd->bi_memsize);
+       if (ret < 0) {
+               printf("ft_blob_update(): cannot set /memory/reg "
+                      "property err:%s\n", fdt_strerror(ret));
+       }
+}
+
+void ft_board_setup(void *blob, bd_t *bd)
+{
+       ft_cpu_setup( blob, bd);
+       ft_blob_update(blob, bd);
+}
+#endif /* defined(CONFIG_OF_BOARD_SETUP) && defined(CONFIG_OF_LIBFDT) */
+
include/configs/ep8248.h +17 -17
index f7b3fde..b1dbe7d 100644
@@ -4,6 +4,10 @@
  *
  * U-Boot configuration for Embedded Planet EP8248 boards.
  *
+ * Copyright (C) 2009 Noser Engineering AG
+ * Marcel Ziswiler <[email protected]>
+ * 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_MS

K)
-#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_MS
K)
-#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.2.4

#1 lore raw

PATCH 1/1 ep8248: add support for device tree and secondary Ethernet interface.

Hi Marcel,

Quoted 1 line · Marcel Ziswiler

ep8248: add support for device tree and secondary Ethernet interface.

This commit message shouldn't be necessary since its identical to your commit subject.

<snip>

Quoted 4 lines
board/ep8248/ep8248.c +4 -0
+
+#if defined(CONFIG_OF_BOARD_SETUP) && defined(CONFIG_OF_LIBFDT)
+/*
+ * update "memory" property in the blob

board/ep8248/ep8248.c int checkboard(void) · line 287

Quoted 10 lines
board/ep8248/ep8248.c +10 -0
+ */
+void ft_blob_update(void *blob, bd_t *bd)
+{
+       int ret;
+       ret = fdt_fixup_memory(blob, (u64)bd->bi_memstart, (u64)bd->bi_memsize);
+       if (ret < 0) {
+               printf("ft_blob_update(): cannot set /memory/reg "
+                      "property err:%s\n", fdt_strerror(ret));
+       }
+}

Should this chunk of code should be added to your cpu's ft_cpu_setup() function instead of here? Then any mpc82xx board can leverage it instead of reinventing the wheel.

Best,
Peter

#2 lore raw

PATCH 1/1 ep8248: add support for device tree and secondary Ethernet interface.

Hi Peter

Quoted 3 lines · Peter Tyser <ptyser <at> xes-inc.com> writes:

Should this chunk of code should be added to your cpu's ft_cpu_setup() function instead of here? Then any mpc82xx board can leverage it instead of reinventing the wheel.

Sure, I just copied it from one of the other 13 boards that do it like that (;-p). I will move it to my cpu's ft_cpu_setup() routine, fix the other boards using that cpu and post v2 of my patch.

Stay tuned.

Marcel

#3 lore raw

PATCH v2 1/1 ep8248: add support for device tree and secondary Ethernet interface.

---
 board/ep8248/ep8248.c    |   22 +++++++++++++++++-
 include/configs/ep8248.h |   53 ++++++++++++++++++++--------------------------
 2 files changed, 43 insertions(+), 32 deletions(-)
board/ep8248/ep8248.c +20 -2
index bc20ba7..6a190fe 100644
@@ -5,6 +5,10 @@
  * Support for Embedded Planet EP8248 boards.
  * Tested on EP8248E.
  *
+ * Copyright (C) 2009 Noser Engineering AG
+ * Marcel Ziswiler <[email protected]>
+ * Added support for device tree and secondary Ethernet interface
+ *
  * See file CREDITS for list of people who contributed to this
  * project.
  *
@@ -28,6 +32,12 @@
 #include <mpc8260.h>
 #include <ioports.h>
 
+#if defined(CONFIG_OF_LIBFDT)
+#include <libfdt.h>
+#include <libfdt_env.h>
+#include <fdt_support.h>
+#endif
+
 /*
  * I/O Port configuration table
  *
@@ -35,8 +45,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 +271,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) */
+
include/configs/ep8248.h +17 -17
index f7b3fde..b1dbe7d 100644
@@ -4,6 +4,10 @@
  *
  * U-Boot configuration for Embedded Planet EP8248 boards.
  *
+ * Copyright (C) 2009 Noser Engineering AG
+ * Marcel Ziswiler <[email protected]>
+ * 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_MS

K)
-#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_MS
K)
-#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.4.4.4

#4 lore raw

PATCH v2 1/1 ep8248: add support for device tree and secondary Ethernet interface.

Hi Marcel,
This patch also appears to be line wrapped.

Best,
Peter

Quoted 167 lines · Marcel ziswiler
---
 board/ep8248/ep8248.c    |   22 +++++++++++++++++-
 include/configs/ep8248.h |   53 ++++++++++++++++++++--------------------------
 2 files changed, 43 insertions(+), 32 deletions(-)
board/ep8248/ep8248.c +20 -2
index bc20ba7..6a190fe 100644
@@ -5,6 +5,10 @@
  * Support for Embedded Planet EP8248 boards.
  * Tested on EP8248E.
  *
+ * Copyright (C) 2009 Noser Engineering AG
+ * Marcel Ziswiler <[email protected]>
+ * Added support for device tree and secondary Ethernet interface
+ *
  * See file CREDITS for list of people who contributed to this
  * project.
  *
@@ -28,6 +32,12 @@
 #include <mpc8260.h>
 #include <ioports.h>
 
+#if defined(CONFIG_OF_LIBFDT)
+#include <libfdt.h>
+#include <libfdt_env.h>
+#include <fdt_support.h>
+#endif
+
 /*
  * I/O Port configuration table
  *
@@ -35,8 +45,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 +271,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) */
+
include/configs/ep8248.h +21 -24
index f7b3fde..b1dbe7d 100644
@@ -4,6 +4,10 @@
  *
  * U-Boot configuration for Embedded Planet EP8248 boards.
  *
+ * Copyright (C) 2009 Noser Engineering AG
+ * Marcel Ziswiler <[email protected]>
+ * 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_MS
 K)
-#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_MS
 K)
-#define CONFIG_SYS_CMXFCR_VALUE        (CMXFCR_RF2CS_CLK13 | CMXFCR_TF2CS_CLK14

)

include/configs/ep8248.h +1 -4
-#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 */

include/configs/ep8248.h +0 -3
@@ -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.4.4.4

_______________________________________________
U-Boot mailing list
U-Boot at lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

#5 lore raw

PATCH v2 1/1 ep8248: add support for device tree and secondary Ethernet interface.

Hi Peter

Quoted 3 lines · Peter Tyser <ptyser <at> xes-inc.com> writes:

Hi Marcel,
This patch also appears to be line wrapped.

Sorry, obviously gmane can't be used for patch submission. Unfortunately I am not in a very Linux friendly environment right now, meaning M$ proxies and such. Trying to find a cleaner submission path will take me some time. Stay tuned.

Cheers

Marcel