Merge tag 'tpm-030822' of https://source.denx.de/u-boot/custodians/u-boot-tpm

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

diff --git a/include/configs/highbank.h b/include/configs/highbank.h
index 92bd658..bb6cc95 100644 (file)
--- a/include/configs/highbank.h
+++ b/include/configs/highbank.h
@@ -12,31 +12,11 @@
 #define CONFIG_SYS_TIMER_COUNTER       (0xFFF34000 + 0x4)
 #define CONFIG_SYS_TIMER_COUNTS_DOWN
 
-/*
- * Size of malloc() pool
- */
-#define CONFIG_SYS_MALLOC_LEN          (512 * 1024)
-
 #define CONFIG_PL011_CLOCK             150000000
 
-#define CONFIG_SYS_BOOTCOUNT_LE                /* Use little-endian accessors */
-
-#define CONFIG_SCSI_AHCI_PLAT
-#define CONFIG_SYS_SCSI_MAX_SCSI_ID    5
-#define CONFIG_SYS_SCSI_MAX_LUN                1
-#define CONFIG_SYS_SCSI_MAX_DEVICE     (CONFIG_SYS_SCSI_MAX_SCSI_ID * \
-                                       CONFIG_SYS_SCSI_MAX_LUN)
-
-#define CONFIG_BOOT_RETRY_TIME         -1
-#define CONFIG_RESET_TO_RETRY
-
 /*
  * Miscellaneous configurable options
  */
-#define CONFIG_SYS_CBSIZE              1024    /* Console I/O Buffer Size */
-#define CONFIG_SYS_BARGSIZE            CONFIG_SYS_CBSIZE
-
-#define CONFIG_SYS_64BIT_LBA
 
 /* Environment data setup
 */
@@ -44,7 +24,6 @@
 #define CONFIG_SYS_NVRAM_SIZE          0x8000          /* NVRAM size */
 
 #define CONFIG_SYS_SDRAM_BASE          0x00000000
-#define CONFIG_SYS_INIT_SP_ADDR                0x01000000
 
 #define CONFIG_EXTRA_ENV_SETTINGS                              \
        "fdt_high=0x20000000\0"                                 \