Prepare v2023.10

[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 5eeb5a1..3dfcb13 100644 (file)
--- a/include/configs/mv-common.h
+++ b/include/configs/mv-common.h
@@ -16,56 +16,41 @@
 #ifndef _MV_COMMON_H
 #define _MV_COMMON_H
 
+#include <linux/stringify.h>
+
 /*
  * High Level Configuration Options (easy to change)
  */
-#define CONFIG_MARVELL         1
 
 /*
- * Custom CONFIG_SYS_TEXT_BASE can be done in <board>.h
+ * Custom CONFIG_TEXT_BASE can be done in <board>.h
  */
 
 /* additions for new ARM relocation support */
-#define CONFIG_SYS_SDRAM_BASE  0x00000000
+#define CFG_SYS_SDRAM_BASE     0x00000000
 
 /*
  * NS16550 Configuration
  */
-#define CONFIG_SYS_NS16550_SERIAL
-#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
+#define CFG_SYS_NS16550_CLK            CFG_SYS_TCLK
+#if !CONFIG_IS_ENABLED(DM_SERIAL)
+#define CFG_SYS_NS16550_COM1           MV_UART_CONSOLE_BASE
 #endif
 
-/* auto boot */
-#define CONFIG_PREBOOT
-
-/*
- * For booting Linux, the board info and command line data
- * have to be in the first 8 MB of memory, since this is
- * the maximum mapped by the Linux kernel during initialization.
- */
-#define CONFIG_CMDLINE_TAG     1       /* enable passing of ATAGs  */
-#define CONFIG_INITRD_TAG      1       /* enable INITRD tag */
-#define CONFIG_SETUP_MEMORY_TAGS 1     /* enable memory tag */
-
-#define        CONFIG_SYS_CBSIZE       1024    /* Console I/O Buff Size */
+#if defined(CONFIG_ARMADA_38X) && !defined(CFG_SYS_BAUDRATE_TABLE)
+#define CFG_SYS_BAUDRATE_TABLE { 300, 600, 1200, 1800, 2400, 4800, \
+                                         9600, 19200, 38400, 57600, 115200, \
+                                         230400, 460800, 500000, 576000, \
+                                         921600, 1000000, 1152000, 1500000, \
+                                         2000000, 2500000, 3125000, 4000000, \
+                                         5200000 }
+#endif
 
-/*
- * Size of malloc() pool
- */
-#define CONFIG_SYS_MALLOC_LEN  (1024 * 1024 * 4) /* 4MiB for malloc() */
+/* auto boot */
 
 /*
  * Other required minimal configurations
  */
-#define CONFIG_ARCH_CPU_INIT   /* call arch_cpu_init() */
-#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     32      /* max number of command args */
 
 /* ====> Include platform Common Definitions */
 #include <asm/arch/config.h>
@@ -74,8 +59,5 @@
 /*
  * Common NAND configuration
  */
-#ifdef CONFIG_CMD_NAND
-#define CONFIG_SYS_MAX_NAND_DEVICE     1
-#endif
 
 #endif /* _MV_COMMON_H */