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

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

diff --git a/include/configs/zipitz2.h b/include/configs/zipitz2.h
index b5a326b..24fea68 100644 (file)
--- a/include/configs/zipitz2.h
+++ b/include/configs/zipitz2.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * Aeronix Zipit Z2 configuration file
  *
  * Copyright (C) 2009-2010 Marek Vasut <marek.vasut@gmail.com>
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #ifndef __CONFIG_H
@@ -43,7 +42,6 @@
  * STUART - the lower serial port on Colibri board
  */
 #define        CONFIG_STUART                   1
-#define CONFIG_CONS_INDEX              2
 
 /*
  * Bootloader Components Configuration
@@ -93,7 +91,6 @@ unsigned char zipitz2_spi_read(void);
 /*
  * DRAM Map
  */
-#define        CONFIG_NR_DRAM_BANKS            1               /* We have 1 bank of DRAM */
 #define        PHYS_SDRAM_1                    0xa0000000      /* SDRAM Bank #1 */
 #define        PHYS_SDRAM_1_SIZE               0x02000000      /* 32 MB */
 
@@ -116,8 +113,6 @@ unsigned char zipitz2_spi_read(void);
 #define PHYS_FLASH_SECT_SIZE           0x00010000      /* 64 KB sectors */
 #define CONFIG_SYS_FLASH_BASE          PHYS_FLASH_1
 
-#define CONFIG_SYS_FLASH_CFI
-#define CONFIG_FLASH_CFI_DRIVER                1
 #define CONFIG_SYS_FLASH_CFI_WIDTH      FLASH_CFI_16BIT
 
 #define CONFIG_SYS_MONITOR_BASE                PHYS_FLASH_1
@@ -126,13 +121,10 @@ unsigned char zipitz2_spi_read(void);
 #define CONFIG_SYS_MAX_FLASH_BANKS     1
 #define CONFIG_SYS_MAX_FLASH_SECT      256
 
-#define CONFIG_SYS_FLASH_USE_BUFFER_WRITE      1
-
 #define CONFIG_SYS_FLASH_ERASE_TOUT    240000
 #define CONFIG_SYS_FLASH_WRITE_TOUT    240000
 #define CONFIG_SYS_FLASH_LOCK_TOUT     240000
 #define CONFIG_SYS_FLASH_UNLOCK_TOUT   240000
-#define CONFIG_SYS_FLASH_PROTECTION
 
 /*
  * GPIO settings