summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorwdenk <wdenk>2003-10-19 23:22:11 +0000
committerwdenk <wdenk>2003-10-19 23:22:11 +0000
commita3ad8e26a4ac96838b2963cb462770c70c9f6443 (patch)
treebe6c86113d1ce3da1d26b19b305d77d00370703f /include
parentd7281f41094bee59eca958de3c04995a2f79034a (diff)
downloadu-boot-imx-a3ad8e26a4ac96838b2963cb462770c70c9f6443.zip
u-boot-imx-a3ad8e26a4ac96838b2963cb462770c70c9f6443.tar.gz
u-boot-imx-a3ad8e26a4ac96838b2963cb462770c70c9f6443.tar.bz2
* Patch by Steven Scholz, 18 Oct 2003:
Fix AT91RM9200 ethernet driver * Patch by Nye Liu, 17 Oct 2003: Fix typo in include/mpc8xx.h * Patch by Richard Woodruff, 16 Oct 03: Fixes for cpu/arm925/interrupt.c - Initialize timestamp & lastdec vars. - fix timestamp overflows. - fix lastdec overflow. - smarter normalization to allow udelay() below 1ms to work. * Patch by Scott McNutt, 16 Oct add networking support for the Altera Nios Development Kit, Cyclone Edition (DK-1C20) * Patch by Jon Diekema, 14 Oct 2003: add hint about doc/README.silent to README file
Diffstat (limited to 'include')
-rw-r--r--include/configs/DK1C20.h9
-rw-r--r--include/mpc8xx.h2
2 files changed, 4 insertions, 7 deletions
diff --git a/include/configs/DK1C20.h b/include/configs/DK1C20.h
index ddb1a2f..938e83a 100644
--- a/include/configs/DK1C20.h
+++ b/include/configs/DK1C20.h
@@ -96,12 +96,10 @@
/*------------------------------------------------------------------------
* Ethernet -- needs work!
*----------------------------------------------------------------------*/
-#if 0
#define CONFIG_DRIVER_SMC91111 /* Using SMC91c111 */
-#define CONFIG_SMC91111_BASE 0x00910000 /* Base address */
-#undef CONFIG_SMC91111_EXT_PHY /* No external PHY */
-#define CONFIG_SMC_USE_32_BIT 1 /* 32-bit i/f */
-#endif
+#define CONFIG_SMC91111_BASE 0x00910300 /* Base address */
+#undef CONFIG_SMC91111_EXT_PHY /* Internal PHY */
+#define CONFIG_SMC_USE_32_BIT /* 32-bit data rd/wr */
#define CONFIG_ETHADDR 08:00:3e:26:0a:5b
#define CONFIG_NETMASK 255.255.255.0
@@ -131,7 +129,6 @@
CFG_CMD_JFFS2 | \
CFG_CMD_KGDB | \
CFG_CMD_NAND | \
- CFG_CMD_NET | \
CFG_CMD_MMC | \
CFG_CMD_MII | \
CFG_CMD_PCI | \
diff --git a/include/mpc8xx.h b/include/mpc8xx.h
index 3650643..4c0c73c 100644
--- a/include/mpc8xx.h
+++ b/include/mpc8xx.h
@@ -138,7 +138,7 @@
#define PLPRCR_MF_MSK 0xffff001e /* Multiplication factor + PDF bits */
#define PLPRCR_MFN_MSK 0xf8000000 /* Multiplication factor numerator bits */
#define PLPRCR_MFN_SHIFT 0x0000001b /* Multiplication factor numerator shift*/
-#define PLPRCR_MFD_MSK 0x03c00000 /* Multiplication factor denominator bits */
+#define PLPRCR_MFD_MSK 0x07c00000 /* Multiplication factor denominator bits */
#define PLPRCR_MFD_SHIFT 0x00000017 /* Multiplication factor denominator shift*/
#define PLPRCR_S_MSK 0x00300000 /* Multiplication factor integer bits */
#define PLPRCR_S_SHIFT 0x00000014 /* Multiplication factor integer shift */