Merge tag 'versal-qspi-for-v2022.10' of https://gitlab.denx.de/u-boot/custodians...

[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 88c6490..6a045ec 100644 (file)
--- a/include/configs/zynq-common.h
+++ b/include/configs/zynq-common.h
@@ -9,8 +9,6 @@
 #ifndef __CONFIG_ZYNQ_COMMON_H
 #define __CONFIG_ZYNQ_COMMON_H
 
-#define CONFIG_REMAKE_ELF
-
 /* Cache options */
 #ifndef CONFIG_SYS_L2CACHE_OFF
 # define CONFIG_SYS_L2_PL310
@@ -22,20 +20,24 @@
 #define CONFIG_SYS_TIMER_COUNTS_DOWN
 #define CONFIG_SYS_TIMER_COUNTER       (CONFIG_SYS_TIMERBASE + 0x4)
 
+/* GUIDs for capsule updatable firmware images */
+#define XILINX_BOOT_IMAGE_GUID \
+       EFI_GUID(0x1ba29a15, 0x9969, 0x40aa, 0xb4, 0x24, \
+                0xe8, 0x61, 0x21, 0x61, 0x86, 0x64)
+
+#define XILINX_UBOOT_IMAGE_GUID \
+       EFI_GUID(0x1a5178f0, 0x87d3, 0x4f36, 0xac, 0x63, \
+                0x3b, 0x31, 0xa2, 0x3b, 0xe3, 0x05)
+
 /* Serial drivers */
 /* The following table includes the supported baudrates */
 #define CONFIG_SYS_BAUDRATE_TABLE  \
        {300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 57600, 115200, 230400}
 
 /* Ethernet driver */
-#if defined(CONFIG_ZYNQ_GEM)
-# define CONFIG_SYS_FAULT_ECHO_LINK_DOWN
-# define CONFIG_BOOTP_MAY_FAIL
-#endif
 
 /* NOR */
 #ifdef CONFIG_MTD_NOR_FLASH
-# define CONFIG_SYS_MAX_FLASH_BANKS    1
 # define CONFIG_SYS_MAX_FLASH_SECT     512
 # define CONFIG_SYS_FLASH_ERASE_TOUT   1000
 # define CONFIG_SYS_FLASH_WRITE_TOUT   5000
@@ -197,15 +199,8 @@
 
 /* Miscellaneous configurable options */
 
-#define CONFIG_CLOCKS
-#define CONFIG_SYS_MAXARGS             32 /* max number of command args */
-#define CONFIG_SYS_CBSIZE              2048 /* Console I/O Buffer Size */
-
 #define CONFIG_SYS_INIT_RAM_ADDR       0xFFFF0000
 #define CONFIG_SYS_INIT_RAM_SIZE       0x2000
-#define CONFIG_SYS_INIT_SP_ADDR                (CONFIG_SYS_INIT_RAM_ADDR + \
-                                       CONFIG_SYS_INIT_RAM_SIZE - \
-                                       GENERATED_GBL_DATA_SIZE)
 
 
 /* Extend size of kernel image for uncompression */
@@ -214,21 +209,9 @@
 /* Boot FreeBSD/vxWorks from an ELF image */
 #define CONFIG_SYS_MMC_MAX_DEVICE      1
 
-/* MMC support */
-#ifdef CONFIG_MMC_SDHCI_ZYNQ
-#define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME     "u-boot.img"
-#endif
-
 /* Address in RAM where the parameters must be copied by SPL. */
-#define CONFIG_SYS_SPL_ARGS_ADDR       0x10000000
-
-#define CONFIG_SPL_FS_LOAD_ARGS_NAME           "system.dtb"
-#define CONFIG_SPL_FS_LOAD_KERNEL_NAME         "uImage"
 
 /* Not using MMC raw mode - just for compilation purpose */
-#define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR  0
-#define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS 0
-#define CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR        0
 
 /* qspi mode is working fine */
 #ifdef CONFIG_ZYNQ_QSPI
@@ -241,21 +224,13 @@
 /* SP location before relocation, must use scratch RAM */
 
 /* 3 * 64kB blocks of OCM - one is on the top because of bootrom */
-#define CONFIG_SPL_MAX_SIZE    0x30000
 
 /* On the top of OCM space */
-#define CONFIG_SYS_SPL_MALLOC_START    CONFIG_SPL_STACK_R_ADDR
-#define CONFIG_SYS_SPL_MALLOC_SIZE     0x2000000
 
 /*
  * 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
-#define CONFIG_SPL_BSS_MAX_SIZE                0x100000
 
 #endif /* __CONFIG_ZYNQ_COMMON_H */