ARM: zynq: Move FLASH_BAR to Kconfig

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

diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h
index d3d5470..e8c3ef0 100644 (file)
--- a/include/configs/zynq-common.h
+++ b/include/configs/zynq-common.h
@@ -66,7 +66,6 @@
 #ifdef CONFIG_ZYNQ_QSPI
 # define CONFIG_SF_DEFAULT_SPEED       30000000
 # define CONFIG_SPI_FLASH_ISSI
-# define CONFIG_SPI_FLASH_BAR
 # define CONFIG_CMD_SF
 #endif
 
@@ -367,16 +366,16 @@
 /* The highest 64k OCM address */
 #define OCM_HIGH_ADDR  0xffff0000
 
-/* Just define any reasonable size */
-#define CONFIG_SPL_STACK_SIZE  0x1000
-
-/* SPL stack position - and stack goes down */
-#define CONFIG_SPL_STACK       (OCM_HIGH_ADDR + CONFIG_SPL_STACK_SIZE)
-
 /* On the top of OCM space */
-#define CONFIG_SYS_SPL_MALLOC_START    (CONFIG_SPL_STACK + \
-                                        GENERATED_GBL_DATA_SIZE)
-#define CONFIG_SYS_SPL_MALLOC_SIZE     0x1000
+#define CONFIG_SYS_SPL_MALLOC_START    OCM_HIGH_ADDR
+#define CONFIG_SYS_SPL_MALLOC_SIZE     0x2000
+
+/*
+ * 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