Convert CONFIG_SYS_BOOTCOUNT_SINGLEWORD to Kconfig

[people/ms/u-boot.git] / include / configs / highbank.h

diff --git a/include/configs/highbank.h b/include/configs/highbank.h
index 86823e235c6925d2cafe86102acba14b7b9e635b..9dc0c6c264af40a5ef5b9baac842d88098480fcf 100644 (file)
--- a/include/configs/highbank.h
+++ b/include/configs/highbank.h
@@ -10,13 +10,7 @@
 #include <config_distro_defaults.h>
 
 #define CONFIG_SYS_DCACHE_OFF
-#define CONFIG_SYS_THUMB_BUILD
 
-#define CONFIG_SYS_NO_FLASH
-#define CONFIG_SYS_GENERIC_BOARD
-
-#define CONFIG_OF_BOARD_SETUP
-#define CONFIG_FIT
 #define CONFIG_SYS_BOOTMAPSZ           (16 << 20)
 
 #define CONFIG_SYS_TIMER_RATE          (150000000/256)
@@ -28,21 +22,14 @@
  */
 #define CONFIG_SYS_MALLOC_LEN          (512 * 1024)
 
-#define CONFIG_PL011_SERIAL
 #define CONFIG_PL011_CLOCK             150000000
 #define CONFIG_PL01x_PORTS             { (void *)(0xFFF36000) }
 #define CONFIG_CONS_INDEX              0
 
-#define CONFIG_BAUDRATE                        115200
-
-#define CONFIG_BOOTCOUNT_LIMIT
-#define CONFIG_SYS_BOOTCOUNT_SINGLEWORD
 #define CONFIG_SYS_BOOTCOUNT_LE                /* Use little-endian accessors */
 #define CONFIG_SYS_BOOTCOUNT_ADDR      0xfff3cf0c
 
 #define CONFIG_MISC_INIT_R
-#define CONFIG_LIBATA
-#define CONFIG_SCSI_AHCI
 #define CONFIG_SCSI_AHCI_PLAT
 #define CONFIG_SYS_SCSI_MAX_SCSI_ID    5
 #define CONFIG_SYS_SCSI_MAX_LUN                1
@@ -54,7 +41,6 @@
 /*
  * Command line configuration.
  */
-#define CONFIG_CMD_SCSI
 
 #define CONFIG_BOOT_RETRY_TIME         -1
 #define CONFIG_RESET_TO_RETRY
@@ -63,34 +49,28 @@
  * Miscellaneous configurable options
  */
 #define CONFIG_SYS_CBSIZE              1024    /* Console I/O Buffer Size */
-#define CONFIG_SYS_MAXARGS             16      /* max number of cmd args */
 #define CONFIG_SYS_BARGSIZE            CONFIG_SYS_CBSIZE
-/* Print Buffer Size */
-#define CONFIG_SYS_PBSIZE              (CONFIG_SYS_CBSIZE + \
-                                        sizeof(CONFIG_SYS_PROMPT)+16)
 
 #define CONFIG_SYS_LOAD_ADDR           0x800000
 #define CONFIG_SYS_64BIT_LBA
 
-
 /*-----------------------------------------------------------------------
  * Physical Memory Map
+ * The DRAM is already setup, so do not touch the DT node later.
  */
-#define CONFIG_NR_DRAM_BANKS           1
+#define CONFIG_NR_DRAM_BANKS           0
 #define PHYS_SDRAM_1_SIZE              (4089 << 20)
 #define CONFIG_SYS_MEMTEST_START       0x100000
 #define CONFIG_SYS_MEMTEST_END         (PHYS_SDRAM_1_SIZE - 0x100000)
 
 /* Environment data setup
 */
-#define CONFIG_ENV_IS_IN_NVRAM
 #define CONFIG_SYS_NVRAM_BASE_ADDR     0xfff88000      /* NVRAM base address */
 #define CONFIG_SYS_NVRAM_SIZE          0x8000          /* NVRAM size */
 #define CONFIG_ENV_SIZE                        0x2000          /* Size of Environ */
 #define CONFIG_ENV_ADDR                        CONFIG_SYS_NVRAM_BASE_ADDR
 
 #define CONFIG_SYS_SDRAM_BASE          0x00000000
-#define CONFIG_SYS_TEXT_BASE           0x00008000
 #define CONFIG_SYS_INIT_SP_ADDR                0x01000000
 #define CONFIG_SKIP_LOWLEVEL_INIT