diff options
| author | Tom Rini <trini@konsulko.com> | 2015-12-18 07:28:24 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-12-18 07:28:24 -0500 |
| commit | 4832e17787acb29734d895751bc7a594908aecc6 (patch) | |
| tree | 74d28b656a3b31fd4053279535c13f1a808fb035 /include | |
| parent | 123b70177931a5aed92beca76bb622b2f4005be8 (diff) | |
| parent | b5e9b9a9a1bb231e35e206f8f3e2becee1dd06ab (diff) | |
| download | u-boot-imx-4832e17787acb29734d895751bc7a594908aecc6.zip u-boot-imx-4832e17787acb29734d895751bc7a594908aecc6.tar.gz u-boot-imx-4832e17787acb29734d895751bc7a594908aecc6.tar.bz2 | |
Merge branch 'master' of git://www.denx.de/git/u-boot-microblaze
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/microblaze-generic.h | 21 | ||||
| -rw-r--r-- | include/configs/xilinx_zynqmp.h | 1 | ||||
| -rw-r--r-- | include/configs/zynq_zybo.h | 1 |
3 files changed, 8 insertions, 15 deletions
diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h index 06f6ed1..f93861d 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 @@ -101,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) || \ @@ -113,15 +111,10 @@ #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 +#define CONFIG_SYS_INIT_SP_OFFSET (CONFIG_SYS_TEXT_BASE - \ + CONFIG_SYS_MALLOC_F_LEN) /* * CFI flash memory layout - Example @@ -360,7 +353,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 diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h index 50ac5f5..03f7450 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 diff --git a/include/configs/zynq_zybo.h b/include/configs/zynq_zybo.h index 5d1a9d5..c53ba79 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 |