Merge tag 'u-boot-imx-20200623' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx

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

diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h
index 46f18e711085f20605f4f8957fe7c3d180a15242..a9a0b1c9988e5a3b95862a442a8f7bc391e8c313 100644 (file)
--- a/include/configs/nokia_rx51.h
+++ b/include/configs/nokia_rx51.h
@@ -91,54 +91,8 @@
  * Board ONENAND Info.
  */
 
-#define PART1_NAME                     "bootloader"
-#define PART1_SIZE                     128
-#define PART1_MULL                     1024
-#define PART1_SUFF                     "k"
-#define PART1_OFFS                     0x00000000
-#define PART1_MASK                     0x00000003
-
-#define PART2_NAME                     "config"
-#define PART2_SIZE                     384
-#define PART2_MULL                     1024
-#define PART2_SUFF                     "k"
-#define PART2_OFFS                     0x00020000
-#define PART2_MASK                     0x00000000
-
-#define PART3_NAME                     "log"
-#define PART3_SIZE                     256
-#define PART3_MULL                     1024
-#define PART3_SUFF                     "k"
-#define PART3_OFFS                     0x00080000
-#define PART3_MASK                     0x00000000
-
-#define PART4_NAME                     "kernel"
-#define PART4_SIZE                     2
-#define PART4_MULL                     1024*1024
-#define PART4_SUFF                     "m"
-#define PART4_OFFS                     0x000c0000
-#define PART4_MASK                     0x00000000
-
-#define PART5_NAME                     "initfs"
-#define PART5_SIZE                     2
-#define PART5_MULL                     1024*1024
-#define PART5_SUFF                     "m"
-#define PART5_OFFS                     0x002c0000
-#define PART5_MASK                     0x00000000
-
-#define PART6_NAME                     "rootfs"
-#define PART6_SIZE                     257280
-#define PART6_MULL                     1024
-#define PART6_SUFF                     "k"
-#define PART6_OFFS                     0x004c0000
-#define PART6_MASK                     0x00000000
-
-#ifdef ONENAND_SUPPORT
-
 #define CONFIG_SYS_ONENAND_BASE                ONENAND_MAP
 
-#endif
-
 /* Watchdog support */
 #define CONFIG_HW_WATCHDOG
 
@@ -163,17 +117,11 @@ int rx51_kp_getc(struct stdio_dev *sdev);
 #endif
 
 /* Environment information */
-#ifdef CONFIG_MTDPARTS_DEFAULT
-#define MTDPARTS "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0"
-#else
-#define MTDPARTS
-#endif
 #define CONFIG_EXTRA_ENV_SETTINGS \
-       MTDPARTS \
        "usbtty=cdc_acm\0" \
-       "stdin=vga\0" \
-       "stdout=vga\0" \
-       "stderr=vga\0" \
+       "stdin=serial,vga\0" \
+       "stdout=serial,vga\0" \
+       "stderr=serial,vga\0" \
        "setcon=setenv stdin ${con};" \
                "setenv stdout ${con};" \
                "setenv stderr ${con}\0" \