Merge branch '2019-03-25-master-imports'

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

diff --git a/include/configs/topic_miami.h b/include/configs/topic_miami.h
index ee46d3a..f14c4ee 100644 (file)
--- a/include/configs/topic_miami.h
+++ b/include/configs/topic_miami.h
@@ -1,20 +1,16 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * (C) Copyright 2014 Topic Embedded Products
  *
  * Configuration for Zynq Evaluation and Development Board - Miami
  * See zynq-common.h for Zynq common configs
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #ifndef __CONFIG_TOPIC_MIAMI_H
 #define __CONFIG_TOPIC_MIAMI_H
 
-#define CONFIG_ZYNQ_I2C0
-#define CONFIG_ZYNQ_I2C1
 
 /* Speed up boot time by ignoring the environment which we never used */
-#define CONFIG_ENV_IS_NOWHERE
 
 #include "zynq-common.h"
 
@@ -46,7 +42,6 @@
 /* FPGA commands that we don't use */
 
 /* Extras */
-#define CONFIG_CMD_MEMTEST
 #undef CONFIG_SYS_MEMTEST_START
 #define CONFIG_SYS_MEMTEST_START       0
 #undef CONFIG_SYS_MEMTEST_END
@@ -58,7 +53,6 @@
 #define CONFIG_SF_DEFAULT_MODE SPI_MODE_0
 #define CONFIG_ENV_SPI_MAX_HZ CONFIG_SF_DEFAULT_SPEED
 #undef CONFIG_SPI_FLASH_WINBOND
-#undef CONFIG_SPI_FLASH_ISSI
 
 /* Setup proper boot sequences for Miami boards */
 
@@ -134,8 +128,4 @@
        "fi; fi; run $modeboot"
 #undef CONFIG_DISPLAY_BOARDINFO
 
-/* Further tweaks to reduce image size */
-#undef CONFIG_CMD_BOOTZ
-#undef CONFIG_CMD_NET
-
 #endif /* __CONFIG_TOPIC_MIAMI_H */