new: FSL and MSR support #2

diff --git a/README b/README
index 15428643edef7ea77710113f8908002b50328577..33039f1d9cab682cb42faf93c831cc932eeae447 100644 (file)
--- 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 4fe36f8a9d29555a1f3d99b3dac6be2911bcdcca..f63ffed3dcc33c332c801d931393408ecdb7cdb7 100644 (file)
--- 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 6f81c4abcf372de20530741c9e69a2002e76e0fb..c088821a57d95b821d47dbeeddec773f14391059 100644 (file)
--- 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 cf36583108c7bd1513eb1f1863fc1eb4053a66b9..b3ccdcea2b0d3e42157e7bca1d84517c02b4a545 100644 (file)
--- 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 acaa1e4f2b945addd08c55bf741f4a51e53a6f27..f3ef962a78571124caa2b5e931158ee998d1a684 100644 (file)
--- 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 */