Merge git://git.denx.de/u-boot-socfpga

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

diff --git a/include/configs/xtfpga.h b/include/configs/xtfpga.h
index 8a920fa..33255a3 100644 (file)
--- a/include/configs/xtfpga.h
+++ b/include/configs/xtfpga.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * Copyright (C) 2007-2013 Tensilica, Inc.
  * Copyright (C) 2014 - 2016 Cadence Design Systems Inc.
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #ifndef __CONFIG_H
@@ -109,7 +108,6 @@
 /*==============================*/
 
 #define CONFIG_BOARD_POSTCLK_INIT
-#define CONFIG_MISC_INIT_R
 
 #define CONFIG_BOOTFILE                        "uImage"
        /* Console I/O Buffer Size  */
@@ -196,8 +194,6 @@
 /* Flash & Environment */
 /*=====================*/
 
-#define CONFIG_SYS_FLASH_CFI
-#define CONFIG_FLASH_CFI_DRIVER                        /* use generic CFI driver */
 #define CONFIG_SYS_FLASH_CFI_WIDTH     FLASH_CFI_16BIT
 #define CONFIG_SYS_MAX_FLASH_BANKS     1
 #ifdef CONFIG_XTFPGA_LX60
@@ -222,7 +218,6 @@
 #define CONFIG_SYS_MAX_FLASH_SECT      \
        (CONFIG_SYS_FLASH_SECT_SZ/CONFIG_SYS_FLASH_PARMSECT_SZ + \
         CONFIG_SYS_FLASH_SIZE/CONFIG_SYS_FLASH_SECT_SZ - 1)
-#define CONFIG_SYS_FLASH_PROTECTION            /* hw flash protection */
 
 /*
  * Put environment in top block (64kB)