diff mbox

[U-Boot,1/3] omap3: mvblx: change console to ttyO0 and make silent by default.

Message ID 1360317217-8426-2-git-send-email-michael.jones@matrix-vision.de
State Accepted
Delegated to: Tom Rini
Headers show

Commit Message

Michael Jones Feb. 8, 2013, 9:53 a.m. UTC 
From: Howard Gray <howard.gray@matrix-vision.de>

Also, change bootdelay to 0 but allow pressing 'S' to stop at U-Boot prompt.

Signed-off-by: Michael Jones <michael.jones@matrix-vision.de>
---
 include/configs/omap3_mvblx.h |   18 +++++++++++++-----
 1 files changed, 13 insertions(+), 5 deletions(-)

Comments

Stefan Roese Feb. 8, 2013, 10:26 a.m. UTC | #1 
On 02/08/2013 10:53 AM, Michael Jones wrote:
> From: Howard Gray <howard.gray@matrix-vision.de>
> 
> Also, change bootdelay to 0 but allow pressing 'S' to stop at U-Boot prompt.
> 
> Signed-off-by: Michael Jones <michael.jones@matrix-vision.de>

Michael, you should to add a s-o-b from the original author here too.
Best placed before yours. So this should be:

From: Howard Gray <howard.gray@matrix-vision.de>

Also, change bootdelay to 0 but allow pressing 'S' to stop at U-Boot prompt.

Signed-off-by: Howard Gray <howard.gray@matrix-vision.de>
Signed-off-by: Michael Jones <michael.jones@matrix-vision.de>

Thanks,
Stefan
Tom Rini Feb. 19, 2013, 4:18 p.m. UTC | #2 
On Thu, Feb 07, 2013 at 11:53:35PM -0000, Michael Jones wrote:

> From: Howard Gray <howard.gray@matrix-vision.de>
> 
> Also, change bootdelay to 0 but allow pressing 'S' to stop at U-Boot prompt.
> 
> Signed-off-by: Michael Jones <michael.jones@matrix-vision.de>
> Signed-off-by: Howard Gray <howard.gray@matrix-vision.de>
> Signed-off-by: Michael Jones <michael.jones@matrix-vision.de>

This along with the rest of the series have been applied to
u-boot-ti/msater, thanks!
diff mbox

Patch

diff --git a/include/configs/omap3_mvblx.h b/include/configs/omap3_mvblx.h
index 07de565..99f0d4b 100644
--- a/include/configs/omap3_mvblx.h
+++ b/include/configs/omap3_mvblx.h
@@ -90,9 +90,9 @@ 
 /*
  * select serial console configuration
  */
-#define CONFIG_CONS_INDEX		3
-#define CONFIG_SYS_NS16550_COM3		OMAP34XX_UART3
-#define CONFIG_SERIAL3			3	/* UART3 */
+#define CONFIG_CONS_INDEX		1
+#define CONFIG_SYS_NS16550_COM1		OMAP34XX_UART1
+#define CONFIG_SERIAL1			1	/* UART1 */
 
 #define CONFIG_BAUDRATE			115200
 #define CONFIG_SYS_BAUDRATE_TABLE	{4800, 9600, 19200, 38400, 57600,\
@@ -102,6 +102,10 @@ 
 #define CONFIG_OMAP_HSMMC		1
 #define CONFIG_DOS_PARTITION		1
 
+/* silent console by default */
+#define CONFIG_SYS_DEVICE_NULLDEV	1
+#define CONFIG_SILENT_CONSOLE		1
+
 /* USB */
 #define CONFIG_MUSB_UDC			1
 #define CONFIG_USB_OMAP3		1
@@ -152,12 +156,16 @@ 
 
 /* Environment information */
 #undef CONFIG_ENV_OVERWRITE	/* disallow overwriting serial# and ethaddr */
-#define CONFIG_BOOTDELAY		3
+#define CONFIG_BOOTDELAY		0
+#define CONFIG_ZERO_BOOTDELAY_CHECK
+#define CONFIG_AUTOBOOT_KEYED
+#define CONFIG_AUTOBOOT_STOP_STR "S"
 
 #define CONFIG_EXTRA_ENV_SETTINGS \
+	"silent=true\0" \
 	"loadaddr=0x82000000\0" \
 	"usbtty=cdc_acm\0" \
-	"console=ttyO2,115200n8\0" \
+	"console=ttyO0,115200n8\0" \
 	"mpurate=600\0" \
 	"vram=12M\0" \
 	"dvimode=1024x768-24@60\0" \