arm: zynq: Move CONFIG_SF_DUAL_FLASH to defconfig

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

diff --git a/include/configs/topic_miami.h b/include/configs/topic_miami.h
index 3b0fa29890ff98d2280d839c8ecc1abc7dd70f5a..ee46d3ac7ecfd98ef1a51f66789810cbbbad559d 100644 (file)
--- a/include/configs/topic_miami.h
+++ b/include/configs/topic_miami.h
@@ -10,8 +10,6 @@
 #ifndef __CONFIG_TOPIC_MIAMI_H
 #define __CONFIG_TOPIC_MIAMI_H
 
-#define CONFIG_ZYNQ_PS_CLK_FREQ                33333333UL
-
 #define CONFIG_ZYNQ_I2C0
 #define CONFIG_ZYNQ_I2C1
 
@@ -46,10 +44,6 @@
 #undef CONFIG_SPL_FPGA_SUPPORT
 
 /* FPGA commands that we don't use */
-#undef CONFIG_CMD_FPGA_LOADMK
-#undef CONFIG_CMD_FPGA_LOADP
-#undef CONFIG_CMD_FPGA_LOADBP
-#undef CONFIG_CMD_FPGA_LOADFS
 
 /* Extras */
 #define CONFIG_CMD_MEMTEST
@@ -62,7 +56,6 @@
 #undef CONFIG_SF_DEFAULT_SPEED
 #define CONFIG_SF_DEFAULT_SPEED        108000000
 #define CONFIG_SF_DEFAULT_MODE SPI_MODE_0
-#undef CONFIG_SF_DUAL_FLASH
 #define CONFIG_ENV_SPI_MAX_HZ CONFIG_SF_DEFAULT_SPEED
 #undef CONFIG_SPI_FLASH_WINBOND
 #undef CONFIG_SPI_FLASH_ISSI
@@ -110,7 +103,7 @@
        "bootscript=autorun.scr\0" \
        "loadbit_addr=0x100000\0"       \
        "loadbootenv_addr=0x2000000\0" \
-       "kernel_size=0x400000\0"        \
+       "kernel_size=0x440000\0"        \
        "devicetree_size=0x10000\0"     \
        "boot_size=0xF00000\0"  \
        "fdt_high=0x20000000\0" \
@@ -144,6 +137,5 @@
 /* Further tweaks to reduce image size */
 #undef CONFIG_CMD_BOOTZ
 #undef CONFIG_CMD_NET
-#undef CONFIG_CMD_AES
 
 #endif /* __CONFIG_TOPIC_MIAMI_H */