Convert CONFIG_CMD_JFFS2 to Kconfig

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

diff --git a/include/configs/mv-common.h b/include/configs/mv-common.h
index 7086d1d..13bd6cf 100644 (file)
--- a/include/configs/mv-common.h
+++ b/include/configs/mv-common.h
@@ -3,23 +3,7 @@
  * Marvell Semiconductor <www.marvell.com>
  * Written-by: Prafulla Wadaskar <prafulla@marvell.com>
  *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301 USA
+ * SPDX-License-Identifier:    GPL-2.0+
  */
 
 /*
@@ -51,16 +35,16 @@
 /*
  * CLKs configurations
  */
-#define CONFIG_SYS_HZ          1000
 
 /*
  * NS16550 Configuration
  */
-#define CONFIG_SYS_NS16550
 #define CONFIG_SYS_NS16550_SERIAL
-#define CONFIG_SYS_NS16550_REG_SIZE    (-4)
 #define CONFIG_SYS_NS16550_CLK         CONFIG_SYS_TCLK
+#if !defined(CONFIG_DM_SERIAL)
+#define CONFIG_SYS_NS16550_REG_SIZE    (-4)
 #define CONFIG_SYS_NS16550_COM1                MV_UART_CONSOLE_BASE
+#endif
 
 /*
  * Serial Port configuration
@@ -69,11 +53,10 @@
  */
 
 #define CONFIG_CONS_INDEX      1       /*Console on UART0 */
-#define CONFIG_BAUDRATE                        115200
 #define CONFIG_SYS_BAUDRATE_TABLE      { 9600, 19200, 38400, 57600, \
                                          115200,230400, 460800, 921600 }
 /* auto boot */
-#define CONFIG_BOOTDELAY       3       /* default enable autoboot */
+#define CONFIG_PREBOOT
 
 /*
  * For booting Linux, the board info and command line data
@@ -84,7 +67,6 @@
 #define CONFIG_INITRD_TAG      1       /* enable INITRD tag */
 #define CONFIG_SETUP_MEMORY_TAGS 1     /* enable memory tag */
 
-#define        CONFIG_SYS_PROMPT       "Marvell>> "    /* Command Prompt */
 #define        CONFIG_SYS_CBSIZE       1024    /* Console I/O Buff Size */
 #define        CONFIG_SYS_PBSIZE       (CONFIG_SYS_CBSIZE \
                +sizeof(CONFIG_SYS_PROMPT) + 16)        /* Print Buff */
@@ -92,7 +74,7 @@
 /*
  * Size of malloc() pool
  */
-#define CONFIG_SYS_MALLOC_LEN  (1024 * 1024) /* 1MiB for malloc() */
+#define CONFIG_SYS_MALLOC_LEN  (1024 * 1024 * 4) /* 4MiB for malloc() */
 
 /*
  * Other required minimal configurations
@@ -100,16 +82,12 @@
 #define CONFIG_SYS_LONGHELP
 #define CONFIG_AUTO_COMPLETE
 #define CONFIG_CMDLINE_EDITING
-#define CONFIG_CONSOLE_INFO_QUIET      /* some code reduction */
 #define CONFIG_ARCH_CPU_INIT   /* call arch_cpu_init() */
-#define CONFIG_ARCH_MISC_INIT  /* call arch_misc_init() */
-#define CONFIG_BOARD_EARLY_INIT_F /* call board_init_f for early inits */
-#define CONFIG_DISPLAY_CPUINFO /* Display cpu info */
 #define CONFIG_SYS_LOAD_ADDR   0x00800000      /* default load adr- 8M */
 #define CONFIG_SYS_MEMTEST_START 0x00800000    /* 8M */
 #define CONFIG_SYS_MEMTEST_END 0x00ffffff      /*(_16M -1) */
 #define CONFIG_SYS_RESET_ADDRESS 0xffff0000    /* Rst Vector Adr */
-#define CONFIG_SYS_MAXARGS     16      /* max number of command args */
+#define CONFIG_SYS_MAXARGS     32      /* max number of command args */
 
 /* ====> Include platform Common Definitions */
 #include <asm/arch/config.h>
@@ -137,18 +115,12 @@
  * Common SPI Flash configuration
  */
 #ifdef CONFIG_CMD_SF
-#define CONFIG_SPI_FLASH               1
-#define CONFIG_SPI_FLASH_MACRONIX      1
 #endif
 
 /*
  * Common USB/EHCI configuration
  */
-#ifdef CONFIG_CMD_USB
-#define CONFIG_USB_EHCI                /* Enable EHCI USB support */
-#define CONFIG_USB_STORAGE
-#define CONFIG_DOS_PARTITION
-#define CONFIG_ISO_PARTITION
+#if defined(CONFIG_CMD_USB) && !defined(CONFIG_DM)
 #define CONFIG_SUPPORT_VFAT
 #endif /* CONFIG_CMD_USB */
 
@@ -156,10 +128,6 @@
  * File system
  */
 #ifdef CONFIG_SYS_MVFS
-#define CONFIG_CMD_EXT2
-#define CONFIG_CMD_JFFS2
-#define CONFIG_CMD_FAT
-#define CONFIG_CMD_UBI
 #define CONFIG_CMD_UBIFS
 #define CONFIG_RBTREE
 #define CONFIG_MTD_DEVICE               /* needed for mtdparts commands */