Merge tag 'xilinx-for-v2020.07-rc2' of https://gitlab.denx.de/u-boot/custodians/u...

[platform/kernel/u-boot.git] / include / configs / nokia_rx51.h

diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h
index 4bc0eca..fd755bb 100644 (file)
--- a/include/configs/nokia_rx51.h
+++ b/include/configs/nokia_rx51.h
@@ -50,7 +50,6 @@
 /*
  * Size of malloc() pool
  */
-#define CONFIG_ENV_SIZE                        (128 << 10)
 #define CONFIG_UBI_SIZE                        (512 << 10)
 #define CONFIG_SYS_MALLOC_LEN          (CONFIG_ENV_SIZE + CONFIG_UBI_SIZE + \
                                        (128 << 10))
@@ -72,7 +71,6 @@
  * select serial console configuration
  */
 #define CONFIG_SYS_NS16550_COM3                OMAP34XX_UART3
-#define CONFIG_SERIAL3                 3               /* UART3 on RX-51 */
 
 /* allow to overwrite serial and ethaddr */
 #define CONFIG_ENV_OVERWRITE
@@ -255,30 +253,6 @@ int rx51_kp_getc(struct stdio_dev *sdev);
        "bootmenu_delay=30\0" \
        ""
 
-#define CONFIG_PREBOOT \
-       "setenv mmcnum 1; setenv mmcpart 1;" \
-       "setenv mmcscriptfile bootmenu.scr;" \
-       "if run switchmmc; then " \
-               "setenv mmcdone true;" \
-               "setenv mmctype fat;" \
-               "if run scriptload; then true; else " \
-                       "setenv mmctype ext2;" \
-                       "if run scriptload; then true; else " \
-                               "setenv mmctype ext4;" \
-                               "if run scriptload; then true; else " \
-                                       "setenv mmcdone false;" \
-                               "fi;" \
-                       "fi;" \
-               "fi;" \
-               "if ${mmcdone}; then " \
-                       "run scriptboot;" \
-               "fi;" \
-       "fi;" \
-       "if run slide; then true; else " \
-               "setenv bootmenu_delay 0;" \
-               "setenv bootdelay 0;" \
-       "fi"
-
 #define CONFIG_POSTBOOTMENU \
        "echo;" \
        "echo Extra commands:;" \
@@ -296,8 +270,6 @@ int rx51_kp_getc(struct stdio_dev *sdev);
        "run attachboot;" \
        "echo"
 
-#define CONFIG_MENU_SHOW
-
 /*
  * Miscellaneous configurable options
  */