From: Brian Hill <brian.hill@xilinx.com>
Date: Mon, 23 May 2011 16:08:29 +0000 (-0600)
Subject: Xilinx: ARM: Default baud rate set to 115200.
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d9e26e2bb68e9833cf87d016eb4017a9ff6c863b;p=thirdparty%2Fu-boot.git

Xilinx: ARM: Default baud rate set to 115200.
---

diff --git a/board/xilinx/dfe/board.c b/board/xilinx/dfe/board.c
index 52171932077..e0c68511ad3 100644
--- a/board/xilinx/dfe/board.c
+++ b/board/xilinx/dfe/board.c
@@ -14,10 +14,10 @@
 
 #define BOOT_MODE_REG     (XPSS_SYS_CTRL_BASEADDR + 0x25C)
 #define BOOT_MODES_MASK    0x0000000F
-#define QSPI_MODE         (0x00000000)            /**< QSPI */
+#define SD_MODE           (0x00000000)            /**< Secure Digital card */
 #define NAND_FLASH_MODE   (0x00000001)            /**< NAND */
 #define NOR_FLASH_MODE    (0x00000002)            /**< NOR  */
-#define SD_MODE           (0x00000008)            /**< Secure Digital card */
+#define QSPI_MODE         (0x00000008)            /**< QSPI */
 
 
 DECLARE_GLOBAL_DATA_PTR;
@@ -138,13 +138,19 @@ int dram_init(void)
  */
 void reset_cpu(ulong addr)
 {
-	puts("Warning: this reset doesn't work.");
-	/* hah. */
-	goto *((void*)0x0);
+	u32 *slcr_p;
+
+	slcr_p = (u32*)XPSS_SYS_CTRL_BASEADDR;
+
+	/* unlock SLCR */
+	*(slcr_p + 2) = 0xDF0D;
+	/* Tickle soft reset bit */
+	*(slcr_p + 128) = 1;
+
+	while(1) {;}
 }
 
 void do_reset(void)
 {
 	reset_cpu(0);
-	goto *((void*)0x0); /* call optimized out? */
 }
diff --git a/include/configs/xpele.h b/include/configs/xpele.h
index 36855caad69..f19e21e471e 100644
--- a/include/configs/xpele.h
+++ b/include/configs/xpele.h
@@ -47,24 +47,17 @@
 
 #undef CONFIG_PELE_XIL_LQSPI
 
-/* default boot is NOR, then QSPI when u-boot is built for it, NAND must be selected
-   by the user
-*/
+/* default boot is according to the bootmode switch settings */
+#define CONFIG_BOOTCOMMAND "run modeboot"
 
-#ifndef CONFIG_PELE_XIL_LQSPI
-#define CONFIG_BOOTCOMMAND "run norboot"
-#else
-#define CONFIG_BOOTCOMMAND "run qspiboot"
-#endif
-
-#define CONFIG_BAUDRATE		9600
+#define CONFIG_BAUDRATE		115200
 #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 38400, 115200 }
 #define CONFIG_BOOTDELAY	2 /* -1 to Disable autoboot */
 
 #define	CONFIG_PSS_SERIAL
 #define	CONFIG_RTC_XPSSRTC
 
-#include <config_cmd_default.h>	/* FIXME: check this! */
+#include <config_cmd_default.h>	
 #define CONFIG_CMD_DATE		/* RTC? */
 #define CONFIG_CMD_PING		/* Might be useful for debugging */
 #define CONFIG_CMD_SAVEENV	/* Command to save ENV to Flash */