Merge git://git.denx.de/u-boot-rockchip

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

diff --git a/include/configs/thunderx_88xx.h b/include/configs/thunderx_88xx.h
index e43a7fdf3cfd3fad1600d08c23850bbd95323205..34940efb412c73aea09207dfbb9a3d7d7686fc99 100644 (file)
--- a/include/configs/thunderx_88xx.h
+++ b/include/configs/thunderx_88xx.h
@@ -13,11 +13,6 @@
 
 #define CONFIG_SYS_64BIT
 
-#define CONFIG_SYS_NO_FLASH
-
-#define CONFIG_IDENT_STRING    \
-       " for Cavium Thunder CN88XX ARM v8 Multi-Core"
-
 #define MEM_BASE                       0x00500000
 
 #define CONFIG_SYS_LOWMEM_BASE         MEM_BASE
@@ -40,7 +35,6 @@
 
 /* PL011 Serial Configuration */
 
-#define CONFIG_PL01X_SERIAL
 #define CONFIG_PL011_CLOCK             24000000
 #define CONFIG_CONS_INDEX              1
 
@@ -50,11 +44,6 @@
 #define CONFIG_SYS_SERIAL0             0x87e024000000
 #define CONFIG_SYS_SERIAL1             0x87e025000000
 
-#define CONFIG_BAUDRATE                        115200
-
-/* Command line configuration */
-#define CONFIG_MENU
-
 /* BOOTP options */
 #define CONFIG_BOOTP_BOOTFILESIZE
 #define CONFIG_BOOTP_BOOTPATH
@@ -79,22 +68,11 @@
                                        "fdt_addr=0x94C00000\0"         \
                                        "fdt_high=0x9fffffff\0"
 
-#define CONFIG_BOOTARGS                        \
-                                       "console=ttyAMA0,115200n8 " \
-                                       "earlycon=pl011,0x87e024000000 " \
-                                       "debug maxcpus=48 rootwait rw "\
-                                       "root=/dev/sda2 coherent_pool=16M"
-#define CONFIG_BOOTDELAY               5
-
 /* Do not preserve environment */
-#define CONFIG_ENV_IS_NOWHERE          1
 #define CONFIG_ENV_SIZE                        0x1000
 
 /* Monitor Command Prompt */
 #define CONFIG_SYS_CBSIZE              512     /* Console I/O Buffer Size */
-#define CONFIG_SYS_PBSIZE              (CONFIG_SYS_CBSIZE + \
-                                        sizeof(CONFIG_SYS_PROMPT) + 16)
-#define CONFIG_SYS_BARGSIZE            CONFIG_SYS_CBSIZE
 #define CONFIG_SYS_LONGHELP
 #define CONFIG_CMDLINE_EDITING         1
 #define CONFIG_SYS_MAXARGS             64              /* max command args */