summaryrefslogtreecommitdiff
path: root/include/configs/Rattler.h
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2011-10-17 05:38:58 +0000
committerWolfgang Denk <wd@denx.de>2011-10-17 22:25:31 +0200
commitd4590da43666443aaf0c7c59e5f245352989bd9d (patch)
treeef1e6ff2fc3fbf2e11119e46ad800585a605d2b1 /include/configs/Rattler.h
parent92faa8b109180fa28ec899479f676e62a3a391b7 (diff)
downloadu-boot-imx-d4590da43666443aaf0c7c59e5f245352989bd9d.zip
u-boot-imx-d4590da43666443aaf0c7c59e5f245352989bd9d.tar.gz
u-boot-imx-d4590da43666443aaf0c7c59e5f245352989bd9d.tar.bz2
powerpc: cpm2 boards: update fcc register logic
In the recent dropping of !NET_MULTI code (commit e2a53458a7ab37523304), I misread the logic in include/net.h. Some of it was used by NET_MULTI code as glue between the multi/non-multi worlds for cpm2 boards. Rather than restore the block of code, push the logic to the board config headers where it all belongs. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Diffstat (limited to 'include/configs/Rattler.h')
-rw-r--r--include/configs/Rattler.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/include/configs/Rattler.h b/include/configs/Rattler.h
index 4844fba..9ddf626 100644
--- a/include/configs/Rattler.h
+++ b/include/configs/Rattler.h
@@ -80,8 +80,8 @@
* - 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_CLK11 | CMXFCR_TF1CS_CLK10)
+#define CONFIG_SYS_CMXFCR_MASK1 (CMXFCR_FC1 | CMXFCR_RF1CS_MSK | CMXFCR_TF1CS_MSK)
+#define CONFIG_SYS_CMXFCR_VALUE1 (CMXFCR_RF1CS_CLK11 | CMXFCR_TF1CS_CLK10)
#define CONFIG_SYS_CPMFCR_RAMTYPE 0
#define CONFIG_SYS_FCC_PSMR (FCC_PSMR_FDE | FCC_PSMR_LPB)
@@ -92,8 +92,8 @@
* - 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_CLK15 | CMXFCR_TF2CS_CLK14)
+#define CONFIG_SYS_CMXFCR_MASK2 (CMXFCR_FC2 | CMXFCR_RF2CS_MSK | CMXFCR_TF2CS_MSK)
+#define CONFIG_SYS_CMXFCR_VALUE2 (CMXFCR_RF2CS_CLK15 | CMXFCR_TF2CS_CLK14)
#define CONFIG_SYS_CPMFCR_RAMTYPE 0
#define CONFIG_SYS_FCC_PSMR (FCC_PSMR_FDE | FCC_PSMR_LPB)