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

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

diff --git a/include/configs/thunderx_88xx.h b/include/configs/thunderx_88xx.h
index fc1667823654303156d59f341328f6c8ee1d9cd4..f52fc8225c7b992cf0925f661b29f868fd45188c 100644 (file)
--- a/include/configs/thunderx_88xx.h
+++ b/include/configs/thunderx_88xx.h
@@ -13,13 +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
@@ -31,11 +24,9 @@
 /* SMP Spin Table Definitions */
 #define CPU_RELEASE_ADDR               (CONFIG_SYS_SDRAM_BASE + 0x7fff0)
 
-
 /* Generic Timer Definitions */
 #define COUNTER_FREQUENCY              (0x1800000)     /* 24MHz */
 
-
 #define CONFIG_SYS_MEMTEST_START       MEM_BASE
 #define CONFIG_SYS_MEMTEST_END         (MEM_BASE + PHYS_SDRAM_1_SIZE)
 
@@ -54,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)
@@ -89,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