From 7bbf825492ef8399146a5885f5e4e90d296baf55 Mon Sep 17 00:00:00 2001 From: Nathan Rossi Date: Wed, 9 Dec 2015 00:44:42 +1000 Subject: arm: zynq: Update ZYBO config options Update the ZYBO device tree and enable config options that relate to the added devices in the device tree. Signed-off-by: Nathan Rossi Cc: Albert Aribaud Cc: Michal Simek Cc: Simon Glass Signed-off-by: Michal Simek --- include/configs/zynq_zybo.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include') diff --git a/include/configs/zynq_zybo.h b/include/configs/zynq_zybo.h index 5d1a9d5572..c53ba79d48 100644 --- a/include/configs/zynq_zybo.h +++ b/include/configs/zynq_zybo.h @@ -15,6 +15,7 @@ #define CONFIG_SYS_NO_FLASH +#define CONFIG_ZYNQ_USB #define CONFIG_ZYNQ_SDHCI0 #define CONFIG_ZYNQ_BOOT_FREEBSD -- cgit v1.2.1 From 7bccc75a2b3f728981920abde4454ba4ea4e481a Mon Sep 17 00:00:00 2001 From: Michal Simek Date: Fri, 11 Dec 2015 09:14:31 +0100 Subject: net: gem: Add driver dependencies to PHYLIB Clear driver dependecies via Kconfig. Remove PHYLIB dependency from the driver. 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 50ac5f531c..03f74508ef 100644 --- a/include/configs/xilinx_zynqmp.h +++ b/include/configs/xilinx_zynqmp.h @@ -188,7 +188,6 @@ # define CONFIG_NET_MULTI # define CONFIG_MII # define CONFIG_SYS_FAULT_ECHO_LINK_DOWN -# define CONFIG_PHYLIB # define CONFIG_PHY_MARVELL # define CONFIG_PHY_TI #endif -- cgit v1.2.1 From 4fcd0b33c7a0db2e86cccdc1831db235a6bc1b2d Mon Sep 17 00:00:00 2001 From: Michal Simek Date: Tue, 8 Dec 2015 14:34:13 +0100 Subject: microblaze: Make room for malloc before ELF Create space below u-boot binary for early malloc. It means memory layout is stack grows down, space for early malloc, u-boot code. Signed-off-by: Michal Simek --- include/configs/microblaze-generic.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'include') diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h index 06f6ed1fc0..a48c8d6094 100644 --- a/include/configs/microblaze-generic.h +++ b/include/configs/microblaze-generic.h @@ -121,7 +121,8 @@ #endif /* Stack location before relocation */ -#define CONFIG_SYS_INIT_SP_OFFSET CONFIG_SYS_TEXT_BASE +#define CONFIG_SYS_INIT_SP_OFFSET (CONFIG_SYS_TEXT_BASE - \ + CONFIG_SYS_MALLOC_F_LEN) /* * CFI flash memory layout - Example -- cgit v1.2.1 From 4de9bbdcc893e3700f8390580258acfe9f450aad Mon Sep 17 00:00:00 2001 From: Michal Simek Date: Tue, 8 Dec 2015 14:45:54 +0100 Subject: microblaze: Use malloc setting via Kconfig Clean board specific file. Signed-off-by: Michal Simek Reviewed-by: Simon Glass --- include/configs/microblaze-generic.h | 6 ------ 1 file changed, 6 deletions(-) (limited to 'include') diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h index a48c8d6094..e0bc41c874 100644 --- a/include/configs/microblaze-generic.h +++ b/include/configs/microblaze-generic.h @@ -113,12 +113,6 @@ #endif #define CONFIG_SYS_MALLOC_LEN 0xC0000 -#ifndef CONFIG_SPL_BUILD -# define CONFIG_SYS_MALLOC_F_LEN 1024 -#else -# define CONFIG_SYS_MALLOC_SIMPLE -# define CONFIG_SYS_MALLOC_F_LEN 0x150 -#endif /* Stack location before relocation */ #define CONFIG_SYS_INIT_SP_OFFSET (CONFIG_SYS_TEXT_BASE - \ -- cgit v1.2.1 From 4632b1ea2080cab08c6e2062de1a05059fd41e5f Mon Sep 17 00:00:00 2001 From: Michal Simek Date: Wed, 2 Dec 2015 17:22:07 +0100 Subject: microblaze: Remove support for LL_TEMAC LL_TEMAC is available at big endian MB and it is not properly tested that's why the patch removes it. Signed-off-by: Michal Simek --- include/configs/microblaze-generic.h | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'include') diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h index e0bc41c874..8db6b551ce 100644 --- a/include/configs/microblaze-generic.h +++ b/include/configs/microblaze-generic.h @@ -68,10 +68,6 @@ # define CONFIG_XILINX_EMACLITE 1 # define CONFIG_SYS_ENET #endif -#if defined(XILINX_LLTEMAC_BASEADDR) -# define CONFIG_XILINX_LL_TEMAC 1 -# define CONFIG_SYS_ENET -#endif #if defined(XILINX_AXIEMAC_BASEADDR) # define CONFIG_XILINX_AXIEMAC 1 # define CONFIG_SYS_ENET @@ -355,7 +351,7 @@ #define CONFIG_FIT 1 #define CONFIG_OF_LIBFDT 1 -#if defined(CONFIG_XILINX_LL_TEMAC) || defined(CONFIG_XILINX_AXIEMAC) +#if defined(CONFIG_XILINX_AXIEMAC) # define CONFIG_MII 1 # define CONFIG_CMD_MII 1 # define CONFIG_PHY_GIGE 1 -- cgit v1.2.1 From b5e9b9a9a1bb231e35e206f8f3e2becee1dd06ab Mon Sep 17 00:00:00 2001 From: Michal Simek Date: Wed, 9 Dec 2015 11:53:25 +0100 Subject: microblaze: Do not handle watchdog and gpio in SPL watchdog and gpio are not validated for SPL that's why do not use them. Signed-off-by: Michal Simek --- include/configs/microblaze-generic.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h index 8db6b551ce..f93861d770 100644 --- a/include/configs/microblaze-generic.h +++ b/include/configs/microblaze-generic.h @@ -97,8 +97,10 @@ #if defined(XILINX_WATCHDOG_BASEADDR) && defined(XILINX_WATCHDOG_IRQ) # define CONFIG_WATCHDOG_BASEADDR XILINX_WATCHDOG_BASEADDR # define CONFIG_WATCHDOG_IRQ XILINX_WATCHDOG_IRQ -# define CONFIG_HW_WATCHDOG -# define CONFIG_XILINX_TB_WATCHDOG +# ifndef CONFIG_SPL_BUILD +# define CONFIG_HW_WATCHDOG +# define CONFIG_XILINX_TB_WATCHDOG +# endif #endif #if !defined(CONFIG_OF_CONTROL) || \ -- cgit v1.2.1