From 0cfd0a976f0393afb0a3581fce776bf7d83324fb Mon Sep 17 00:00:00 2001 From: Michal Simek Date: Wed, 27 Jul 2016 14:56:49 +0200 Subject: ARM64: zynqmp: Define config USB_STORAGE through defconfig Define config USB_STORAGE through defconfig for all Xilinx ZynqMP boards. Signed-off-by: Michal Simek --- include/configs/xilinx_zynqmp.h | 1 - 1 file changed, 1 deletion(-) (limited to 'include') diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h index e776e324120..65f768da73f 100644 --- a/include/configs/xilinx_zynqmp.h +++ b/include/configs/xilinx_zynqmp.h @@ -117,7 +117,6 @@ #if defined(CONFIG_ZYNQMP_USB) #define CONFIG_USB_MAX_CONTROLLER_COUNT 1 #define CONFIG_SYS_USB_XHCI_MAX_ROOT_PORTS 2 -#define CONFIG_USB_STORAGE #define CONFIG_USB_XHCI_ZYNQMP #define CONFIG_SYS_DFU_DATA_BUF_SIZE 0x1800000 -- cgit v1.2.3 From 8fbf678ba028e2e1d346190e3101d1a475f11b63 Mon Sep 17 00:00:00 2001 From: Soren Brinkmann Date: Wed, 27 Jul 2016 14:12:03 -0700 Subject: ARM64: zynqmp: Fix stack pointer initialization This partly reverts commit: "ARM64: zynqmp: Add SPL support support" (sha1: e6a9ed04e78cf87ec97e306fa4e7a1669ef98df6) Stack can rewrite ATF code. Signed-off-by: Soren Brinkmann Signed-off-by: Michal Simek --- include/configs/xilinx_zynqmp.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'include') diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h index 65f768da73f..297cc4d5f3d 100644 --- a/include/configs/xilinx_zynqmp.h +++ b/include/configs/xilinx_zynqmp.h @@ -41,7 +41,7 @@ # define CONFIG_IDENT_STRING " Xilinx ZynqMP" #endif -#define CONFIG_SYS_INIT_SP_ADDR 0xfffffffc +#define CONFIG_SYS_INIT_SP_ADDR CONFIG_SYS_TEXT_BASE /* Generic Timer Definitions - setup in EL3. Setup by ATF for other cases */ #if !defined(COUNTER_FREQUENCY) @@ -256,6 +256,7 @@ #endif #define CONFIG_SPL_TEXT_BASE 0xfffc0000 +#define CONFIG_SPL_STACK 0xfffffffc #define CONFIG_SPL_MAX_SIZE 0x20000 /* Just random location in OCM */ -- cgit v1.2.3