omap3_logic: Change console from ttyO0 to ttyS0

[u-boot] / include / configs / omap3_logic.h

diff --git a/include/configs/omap3_logic.h b/include/configs/omap3_logic.h
index 70745a882cbd4ead6665d3bea62fffa2732d38bb..7b8f402e14d982660b92dbd46e469bea0ccc59b1 100644 (file)
--- a/include/configs/omap3_logic.h
+++ b/include/configs/omap3_logic.h
@@ -1,11 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * (C) Copyright 2011 Logic Product Development <www.logicpd.com>
  *     Peter Barada <peter.barada@logicpd.com>
  *
  * Configuration settings for the Logic OMAP35x/DM37x SOM LV/Torpedo
  * reference boards.
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #ifndef __CONFIG_H
@@ -18,16 +17,7 @@
 #include <configs/ti_omap3_common.h>
 
 #ifdef CONFIG_SPL_BUILD
-/*
- * Disable MMC DM for SPL build and can be re-enabled after adding
- * DM support in SPL
- */
-#undef CONFIG_DM_MMC
-#undef OMAP_HSMMC_USE_GPIO
-
 /* select serial console configuration for SPL */
-#undef CONFIG_CONS_INDEX
-#define CONFIG_CONS_INDEX              1
 #define CONFIG_SYS_NS16550_COM1                OMAP34XX_UART1
 #endif
 
@@ -38,7 +28,6 @@
  * order to allow for BCH8 to fit in.
  */
 #undef CONFIG_SPL_TEXT_BASE
-#define CONFIG_SPL_FRAMEWORK
 #define CONFIG_SPL_TEXT_BASE           0x40200000
 
 #define CONFIG_MISC_INIT_R             /* misc_init_r dumps the die id */
@@ -103,7 +92,7 @@
                        "fi; " \
                "else run defaultboot; fi\0" \
        "defaultboot=run mmcramboot\0" \
-       "consoledevice=ttyO0\0" \
+       "consoledevice=ttyS0\0" \
        "setconsole=setenv console ${consoledevice},${baudrate}n8\0" \
        "dump_bootargs=echo 'Bootargs: '; echo $bootargs\0" \
        "rotation=0\0" \
@@ -163,10 +152,10 @@
                "run loadramdisk\0" \
        "mmcramboot=setenv bootfile uImage; " \
                "run mmcrambootcommon; " \
-               "bootm ${loadaddr} ${rdaddr} ${fdtimage}\0" \
+               "bootm ${loadaddr} ${rdaddr} ${fdtaddr}\0" \
        "mmcrambootz=setenv bootfile zImage; " \
                "run mmcrambootcommon; " \
-               "bootz ${loadaddr} ${rdaddr} ${fdtimage}\0" \
+               "bootz ${loadaddr} ${rdaddr} ${fdtaddr}\0" \
        "tftpboot=echo 'Booting kernel/ramdisk rootfs from tftp...'; " \
                "run ramargs; " \
                "run common_bootargs; " \