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

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

diff --git a/include/configs/thunderx_88xx.h b/include/configs/thunderx_88xx.h
index 7c35d8c..f52fc82 100644 (file)
--- a/include/configs/thunderx_88xx.h
+++ b/include/configs/thunderx_88xx.h
@@ -13,12 +13,6 @@
 
 #define CONFIG_SYS_64BIT
 
-#define CONFIG_SYS_NO_FLASH
-
-#define CONFIG_IDENT_STRING    \
-       " for Cavium Thunder CN88XX ARM v8 Multi-Core"
-#define CONFIG_BOOTP_VCI_STRING                "Diagnostics"
-
 #define MEM_BASE                       0x00500000
 
 #define CONFIG_SYS_LOWMEM_BASE         MEM_BASE
@@ -51,18 +45,12 @@
 #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
 #define CONFIG_BOOTP_GATEWAY
 #define CONFIG_BOOTP_HOSTNAME
 #define CONFIG_BOOTP_PXE
-#define CONFIG_BOOTP_PXE_CLIENTARCH    0x100
 
 /* Miscellaneous configurable options */
 #define CONFIG_SYS_LOAD_ADDR           (MEM_BASE)
@@ -86,7 +74,6 @@
                                        "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