summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Simek <monstr@monstr.eu>2007-05-05 18:54:42 +0200
committerMichal Simek <monstr@monstr.eu>2007-05-05 18:54:42 +0200
commitffc50f9bb194343c6303517a517708457a5eb6b8 (patch)
tree9393021f6fb0ff816aa70f691de56b4f7f265a35
parentf7e2e0eb0668136305f78bb9c21be79b48a34247 (diff)
downloadu-boot-imx-ffc50f9bb194343c6303517a517708457a5eb6b8.zip
u-boot-imx-ffc50f9bb194343c6303517a517708457a5eb6b8.tar.gz
u-boot-imx-ffc50f9bb194343c6303517a517708457a5eb6b8.tar.bz2
new: FSL and MSR support #2
-rw-r--r--README1
-rw-r--r--board/xilinx/ml401/xparameters.h3
-rw-r--r--common/Makefile2
-rw-r--r--include/cmd_confdefs.h2
-rw-r--r--include/configs/ml401.h3
5 files changed, 10 insertions, 1 deletions
diff --git a/README b/README
index 1542864..33039f1 100644
--- a/README
+++ b/README
@@ -703,6 +703,7 @@ The following options need to be configured:
CFG_CMD_VFD * VFD support (TRAB)
CFG_CMD_BSP * Board SPecific functions
CFG_CMD_CDP * Cisco Discover Protocol support
+ CFG_CMD_FSL * Microblaze FSL support
-----------------------------------------------
CFG_CMD_ALL all
diff --git a/board/xilinx/ml401/xparameters.h b/board/xilinx/ml401/xparameters.h
index 4fe36f8..f63ffed 100644
--- a/board/xilinx/ml401/xparameters.h
+++ b/board/xilinx/ml401/xparameters.h
@@ -29,6 +29,9 @@
/* System Clock Frequency */
#define XILINX_CLOCK_FREQ 100000000
+/* Microblaze is microblaze_0 */
+#define XILINX_FSL_NUMBER 2
+
/* Interrupt controller is intc_0 */
#define XILINX_INTC_BASEADDR 0x41200000
#define XILINX_INTC_NUM_INTR_INPUTS 4
diff --git a/common/Makefile b/common/Makefile
index 6f81c4a..c088821 100644
--- a/common/Makefile
+++ b/common/Makefile
@@ -50,7 +50,7 @@ COBJS = main.o ACEX1K.o altera.o bedbug.o circbuf.o cmd_autoscript.o \
memsize.o miiphybb.o miiphyutil.o \
s_record.o serial.o soft_i2c.o soft_spi.o spartan2.o spartan3.o \
usb.o usb_kbd.o usb_storage.o \
- virtex2.o xilinx.o crc16.o xyzModem.o cmd_mac.o
+ virtex2.o xilinx.o crc16.o xyzModem.o cmd_mac.o cmd_mfsl.o
SRCS := $(AOBJS:.o=.S) $(COBJS:.o=.c)
OBJS := $(addprefix $(obj),$(AOBJS) $(COBJS))
diff --git a/include/cmd_confdefs.h b/include/cmd_confdefs.h
index cf36583..b3ccdce 100644
--- a/include/cmd_confdefs.h
+++ b/include/cmd_confdefs.h
@@ -94,6 +94,7 @@
#define CFG_CMD_EXT2 0x1000000000000000ULL /* EXT2 Support */
#define CFG_CMD_SNTP 0x2000000000000000ULL /* SNTP support */
#define CFG_CMD_DISPLAY 0x4000000000000000ULL /* Display support */
+#define CFG_CMD_MFSL 0x8000000000000000ULL /* FSL support for Microblaze */
#define CFG_CMD_ALL 0xFFFFFFFFFFFFFFFFULL /* ALL commands */
@@ -125,6 +126,7 @@
CFG_CMD_IRQ | \
CFG_CMD_JFFS2 | \
CFG_CMD_KGDB | \
+ CFG_CMD_MFSL | \
CFG_CMD_MII | \
CFG_CMD_MMC | \
CFG_CMD_NAND | \
diff --git a/include/configs/ml401.h b/include/configs/ml401.h
index acaa1e4..f3ef962 100644
--- a/include/configs/ml401.h
+++ b/include/configs/ml401.h
@@ -161,6 +161,7 @@
CFG_CMD_ECHO |\
CFG_CMD_IMLS |\
CFG_CMD_FLASH |\
+ CFG_CMD_MFSL |\
CFG_CMD_PING \
)
#else /* !RAMENV */
@@ -185,6 +186,7 @@
CFG_CMD_EXT2 |\
CFG_CMD_JFFS2 |\
CFG_CMD_ECHO |\
+ CFG_CMD_MFSL |\
CFG_CMD_SAVES \
)
@@ -206,6 +208,7 @@
CFG_CMD_IMI |\
CFG_CMD_NET |\
CFG_CMD_CACHE |\
+ CFG_CMD_MFSL |\
CFG_CMD_PING \
)
#endif /* !FLASH */