Convert CONFIG_SYS_TIMER_COUNTS_DOWN to Kconfig

[J-u-boot.git] / include / configs / zynq-common.h

diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h
index f8c0800e5fc73efdcf17cfc769392eb1d9f403c8..2d6522af81b843d7efe2b597acc77105e74bb5b7 100644 (file)
--- a/include/configs/zynq-common.h
+++ b/include/configs/zynq-common.h
@@ -11,13 +11,11 @@
 
 /* Cache options */
 #ifndef CONFIG_SYS_L2CACHE_OFF
-# define CONFIG_SYS_L2_PL310
 # define CONFIG_SYS_PL310_BASE         0xf8f02000
 #endif
 
 #define ZYNQ_SCUTIMER_BASEADDR         0xF8F00600
 #define CONFIG_SYS_TIMERBASE           ZYNQ_SCUTIMER_BASEADDR
-#define CONFIG_SYS_TIMER_COUNTS_DOWN
 #define CONFIG_SYS_TIMER_COUNTER       (CONFIG_SYS_TIMERBASE + 0x4)
 
 /* GUIDs for capsule updatable firmware images */
@@ -38,16 +36,7 @@
 
 /* NOR */
 #ifdef CONFIG_MTD_NOR_FLASH
-# define CONFIG_SYS_MAX_FLASH_SECT     512
-# define CONFIG_SYS_FLASH_ERASE_TOUT   1000
-# define CONFIG_SYS_FLASH_WRITE_TOUT   5000
 # define CONFIG_FLASH_SHOW_PROGRESS    10
-# undef CONFIG_SYS_FLASH_EMPTY_INFO
-# define CONFIG_SYS_FLASH_QUIET_TEST
-#endif
-
-#ifdef CONFIG_NAND_ZYNQ
-#define CONFIG_SYS_MAX_NAND_DEVICE     1
 #endif
 
 #ifdef CONFIG_USB_EHCI_ZYNQ
@@ -199,35 +188,15 @@
 
 /* Miscellaneous configurable options */
 
-#define CONFIG_SYS_CBSIZE              2048 /* Console I/O Buffer Size */
-
 #define CONFIG_SYS_INIT_RAM_ADDR       0xFFFF0000
 #define CONFIG_SYS_INIT_RAM_SIZE       0x2000
-#define CONFIG_SYS_INIT_SP_ADDR                (CONFIG_SYS_INIT_RAM_ADDR + \
-                                       CONFIG_SYS_INIT_RAM_SIZE - \
-                                       GENERATED_GBL_DATA_SIZE)
 
 
 /* Extend size of kernel image for uncompression */
-#define CONFIG_SYS_BOOTM_LEN   (60 * 1024 * 1024)
-
-/* Boot FreeBSD/vxWorks from an ELF image */
-#define CONFIG_SYS_MMC_MAX_DEVICE      1
-
-/* MMC support */
-#ifdef CONFIG_MMC_SDHCI_ZYNQ
-#define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME     "u-boot.img"
-#endif
 
 /* Address in RAM where the parameters must be copied by SPL. */
-#define CONFIG_SYS_SPL_ARGS_ADDR       0x10000000
-
-#define CONFIG_SPL_FS_LOAD_ARGS_NAME           "system.dtb"
-#define CONFIG_SPL_FS_LOAD_KERNEL_NAME         "uImage"
 
 /* Not using MMC raw mode - just for compilation purpose */
-#define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR  0
-#define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS 0
 
 /* qspi mode is working fine */
 #ifdef CONFIG_ZYNQ_QSPI
@@ -240,21 +209,13 @@
 /* SP location before relocation, must use scratch RAM */
 
 /* 3 * 64kB blocks of OCM - one is on the top because of bootrom */
-#define CONFIG_SPL_MAX_SIZE    0x30000
 
 /* On the top of OCM space */
-#define CONFIG_SYS_SPL_MALLOC_START    CONFIG_SPL_STACK_R_ADDR
-#define CONFIG_SYS_SPL_MALLOC_SIZE     0x2000000
 
 /*
  * SPL stack position - and stack goes down
  * 0xfffffe00 is used for putting wfi loop.
  * Set it up as limit for now.
  */
-#define CONFIG_SPL_STACK       0xfffffe00
-
-/* BSS setup */
-#define CONFIG_SPL_BSS_START_ADDR      0x100000
-#define CONFIG_SPL_BSS_MAX_SIZE                0x100000
 
 #endif /* __CONFIG_ZYNQ_COMMON_H */