Merge branch 'master' of git://www.denx.de/git/u-boot-imx

[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 e43a7fd..a546db2 100644 (file)
--- a/include/configs/thunderx_88xx.h
+++ b/include/configs/thunderx_88xx.h
@@ -15,9 +15,6 @@
 
 #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
@@ -52,9 +49,6 @@
 
 #define CONFIG_BAUDRATE                        115200
 
-/* Command line configuration */
-#define CONFIG_MENU
-
 /* BOOTP options */
 #define CONFIG_BOOTP_BOOTFILESIZE
 #define CONFIG_BOOTP_BOOTPATH
@@ -84,7 +78,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