[U-Boot] [PATCH 1/7] zynq: Do not explicitely enable icache
icache is already enabled by default.
Signed-off-by: Michal Simek michal.simek@xilinx.com ---
board/xilinx/zynq/board.c | 2 -- 1 file changed, 2 deletions(-)
diff --git a/board/xilinx/zynq/board.c b/board/xilinx/zynq/board.c index a5b9bde..08932a2 100644 --- a/board/xilinx/zynq/board.c +++ b/board/xilinx/zynq/board.c @@ -55,8 +55,6 @@ int board_init(void) } #endif
- icache_enable(); - #ifdef CONFIG_FPGA fpga_init(); fpga_add(fpga_xilinx, &fpga); -- 1.8.2.3
Enable dcache.
Signed-off-by: Michal Simek michal.simek@xilinx.com ---
arch/arm/cpu/armv7/zynq/cpu.c | 8 ++++++++ 1 file changed, 8 insertions(+)
diff --git a/arch/arm/cpu/armv7/zynq/cpu.c b/arch/arm/cpu/armv7/zynq/cpu.c index 9af340e..c771759 100644 --- a/arch/arm/cpu/armv7/zynq/cpu.c +++ b/arch/arm/cpu/armv7/zynq/cpu.c @@ -46,3 +46,11 @@ void reset_cpu(ulong addr) while (1) ; } + +#ifndef CONFIG_SYS_DCACHE_OFF +void enable_caches(void) +{ + /* Enable D-cache. I-cache is already enabled in start.S */ + dcache_enable(); +} +#endif -- 1.8.2.3
On Wed, Jan 22, 2014 at 2:53 PM, Michal Simek michal.simek@xilinx.com wrote:
Enable dcache.
Signed-off-by: Michal Simek michal.simek@xilinx.com
arch/arm/cpu/armv7/zynq/cpu.c | 8 ++++++++ 1 file changed, 8 insertions(+)
diff --git a/arch/arm/cpu/armv7/zynq/cpu.c b/arch/arm/cpu/armv7/zynq/cpu.c index 9af340e..c771759 100644 --- a/arch/arm/cpu/armv7/zynq/cpu.c +++ b/arch/arm/cpu/armv7/zynq/cpu.c @@ -46,3 +46,11 @@ void reset_cpu(ulong addr) while (1) ; }
+#ifndef CONFIG_SYS_DCACHE_OFF +void enable_caches(void) +{
/* Enable D-cache. I-cache is already enabled in start.S */dcache_enable();+}
+#endif
1.8.2.3
Acked-by: Jagannadha Sutradharudu Teki jaganna@xilinx.com
Zynq common configuration is placed in zynq-common.h not zynq_common.h.
Signed-off-by: Michal Simek michal.simek@xilinx.com ---
include/configs/zynq_zc70x.h | 2 +- include/configs/zynq_zed.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/include/configs/zynq_zc70x.h b/include/configs/zynq_zc70x.h index 673660e..de0e241 100644 --- a/include/configs/zynq_zc70x.h +++ b/include/configs/zynq_zc70x.h @@ -2,7 +2,7 @@ * (C) Copyright 2013 Xilinx, Inc. * * Configuration settings for the Xilinx Zynq ZC702 and ZC706 boards - * See zynq_common.h for Zynq common configs + * See zynq-common.h for Zynq common configs * * SPDX-License-Identifier: GPL-2.0+ */ diff --git a/include/configs/zynq_zed.h b/include/configs/zynq_zed.h index 412dede..274140c 100644 --- a/include/configs/zynq_zed.h +++ b/include/configs/zynq_zed.h @@ -2,7 +2,7 @@ * (C) Copyright 2013 Xilinx, Inc. * * Configuration for Zynq Evaluation and Development Board - ZedBoard - * See zynq_common.h for Zynq common configs + * See zynq-common.h for Zynq common configs * * SPDX-License-Identifier: GPL-2.0+ */ -- 1.8.2.3
On Wed, Jan 22, 2014 at 2:53 PM, Michal Simek michal.simek@xilinx.com wrote:
Zynq common configuration is placed in zynq-common.h not zynq_common.h.
Signed-off-by: Michal Simek michal.simek@xilinx.com
include/configs/zynq_zc70x.h | 2 +- include/configs/zynq_zed.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/include/configs/zynq_zc70x.h b/include/configs/zynq_zc70x.h index 673660e..de0e241 100644 --- a/include/configs/zynq_zc70x.h +++ b/include/configs/zynq_zc70x.h @@ -2,7 +2,7 @@
- (C) Copyright 2013 Xilinx, Inc.
- Configuration settings for the Xilinx Zynq ZC702 and ZC706 boards
- See zynq_common.h for Zynq common configs
*/
- See zynq-common.h for Zynq common configs
- SPDX-License-Identifier: GPL-2.0+
diff --git a/include/configs/zynq_zed.h b/include/configs/zynq_zed.h index 412dede..274140c 100644 --- a/include/configs/zynq_zed.h +++ b/include/configs/zynq_zed.h @@ -2,7 +2,7 @@
- (C) Copyright 2013 Xilinx, Inc.
- Configuration for Zynq Evaluation and Development Board - ZedBoard
- See zynq_common.h for Zynq common configs
*/
- See zynq-common.h for Zynq common configs
- SPDX-License-Identifier: GPL-2.0+
--
Acked-by: Jagannadha Sutradharudu Teki jaganna@xilinx.com
Extend max kernel image size. Gunzip is checking this value. If kernel is larger, message below is shown.
Uncompressing Kernel Image ... Error: inflate() returned -5 GUNZIP: uncompress, out-of-mem or overwrite error - must RESET board to recover
Signed-off-by: Michal Simek michal.simek@xilinx.com ---
include/configs/zynq-common.h | 3 +++ 1 file changed, 3 insertions(+)
diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h index e7a8e9f..08b53d0 100644 --- a/include/configs/zynq-common.h +++ b/include/configs/zynq-common.h @@ -221,6 +221,9 @@ #define CONFIG_FIT_SIGNATURE #define CONFIG_RSA
+/* Extend size of kernel image for uncompression */ +#define CONFIG_SYS_BOOTM_LEN (20 * 1024 * 1024) + /* Boot FreeBSD/vxWorks from an ELF image */ #if defined(CONFIG_ZYNQ_BOOT_FREEBSD) # define CONFIG_API -- 1.8.2.3
For saving content of memory via tftp to file.
Signed-off-by: Michal Simek michal.simek@xilinx.com ---
include/configs/zynq-common.h | 1 + 1 file changed, 1 insertion(+)
diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h index 08b53d0..6591372 100644 --- a/include/configs/zynq-common.h +++ b/include/configs/zynq-common.h @@ -237,5 +237,6 @@ #define CONFIG_CMD_PING #define CONFIG_CMD_DHCP #define CONFIG_CMD_MII +#define CONFIG_CMD_TFTPPUT
#endif /* __CONFIG_ZYNQ_COMMON_H */ -- 1.8.2.3
board_eth_init can be also called in cases where CMD_NET is not enabled.
Signed-off-by: Michal Simek michal.simek@xilinx.com ---
board/xilinx/zynq/board.c | 2 -- 1 file changed, 2 deletions(-)
diff --git a/board/xilinx/zynq/board.c b/board/xilinx/zynq/board.c index 08932a2..27aeaa4 100644 --- a/board/xilinx/zynq/board.c +++ b/board/xilinx/zynq/board.c @@ -83,7 +83,6 @@ int board_late_init(void) return 0; }
-#ifdef CONFIG_CMD_NET int board_eth_init(bd_t *bis) { u32 ret = 0; @@ -117,7 +116,6 @@ int board_eth_init(bd_t *bis) #endif return ret; } -#endif
#ifdef CONFIG_CMD_MMC int board_mmc_init(bd_t *bd) -- 1.8.2.3
These numbers will be reused by SPL.
Signed-off-by: Michal Simek michal.simek@xilinx.com ---
arch/arm/include/asm/arch-zynq/hardware.h | 6 ++++++ board/xilinx/zynq/board.c | 6 ------ 2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/arch/arm/include/asm/arch-zynq/hardware.h b/arch/arm/include/asm/arch-zynq/hardware.h index cd69677..1fe0448 100644 --- a/arch/arm/include/asm/arch-zynq/hardware.h +++ b/arch/arm/include/asm/arch-zynq/hardware.h @@ -21,6 +21,12 @@ #define ZYNQ_SPI_BASEADDR1 0xE0007000 #define ZYNQ_DDRC_BASEADDR 0xF8006000
+/* Bootmode setting values */ +#define ZYNQ_BM_MASK 0xF +#define ZYNQ_BM_NOR 0x2 +#define ZYNQ_BM_SD 0x5 +#define ZYNQ_BM_JTAG 0x0 + /* Reflect slcr offsets */ struct slcr_regs { u32 scl; /* 0x0 */ diff --git a/board/xilinx/zynq/board.c b/board/xilinx/zynq/board.c index 27aeaa4..82595fb 100644 --- a/board/xilinx/zynq/board.c +++ b/board/xilinx/zynq/board.c @@ -12,12 +12,6 @@
DECLARE_GLOBAL_DATA_PTR;
-/* Bootmode setting values */ -#define ZYNQ_BM_MASK 0x0F -#define ZYNQ_BM_NOR 0x02 -#define ZYNQ_BM_SD 0x05 -#define ZYNQ_BM_JTAG 0x0 - #ifdef CONFIG_FPGA Xilinx_desc fpga;
-- 1.8.2.3
On Wed, Jan 22, 2014 at 2:53 PM, Michal Simek michal.simek@xilinx.com wrote:
These numbers will be reused by SPL.
Signed-off-by: Michal Simek michal.simek@xilinx.com
arch/arm/include/asm/arch-zynq/hardware.h | 6 ++++++ board/xilinx/zynq/board.c | 6 ------ 2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/arch/arm/include/asm/arch-zynq/hardware.h b/arch/arm/include/asm/arch-zynq/hardware.h index cd69677..1fe0448 100644 --- a/arch/arm/include/asm/arch-zynq/hardware.h +++ b/arch/arm/include/asm/arch-zynq/hardware.h @@ -21,6 +21,12 @@ #define ZYNQ_SPI_BASEADDR1 0xE0007000 #define ZYNQ_DDRC_BASEADDR 0xF8006000
+/* Bootmode setting values */ +#define ZYNQ_BM_MASK 0xF +#define ZYNQ_BM_NOR 0x2 +#define ZYNQ_BM_SD 0x5 +#define ZYNQ_BM_JTAG 0x0
/* Reflect slcr offsets */ struct slcr_regs { u32 scl; /* 0x0 */ diff --git a/board/xilinx/zynq/board.c b/board/xilinx/zynq/board.c index 27aeaa4..82595fb 100644 --- a/board/xilinx/zynq/board.c +++ b/board/xilinx/zynq/board.c @@ -12,12 +12,6 @@
DECLARE_GLOBAL_DATA_PTR;
-/* Bootmode setting values */ -#define ZYNQ_BM_MASK 0x0F -#define ZYNQ_BM_NOR 0x02 -#define ZYNQ_BM_SD 0x05 -#define ZYNQ_BM_JTAG 0x0
#ifdef CONFIG_FPGA Xilinx_desc fpga;
-- 1.8.2.3
Acked-by: Jagannadha Sutradharudu Teki jaganna@xilinx.com
On Wed, Jan 22, 2014 at 2:53 PM, Michal Simek michal.simek@xilinx.com wrote:
icache is already enabled by default.
Signed-off-by: Michal Simek michal.simek@xilinx.com
board/xilinx/zynq/board.c | 2 -- 1 file changed, 2 deletions(-)
diff --git a/board/xilinx/zynq/board.c b/board/xilinx/zynq/board.c index a5b9bde..08932a2 100644 --- a/board/xilinx/zynq/board.c +++ b/board/xilinx/zynq/board.c @@ -55,8 +55,6 @@ int board_init(void) } #endif
icache_enable();#ifdef CONFIG_FPGA fpga_init(); fpga_add(fpga_xilinx, &fpga); -- 1.8.2.3
Acked-by: Jagannadha Sutradharudu Teki jaganna@xilinx.com
participants (2)
-
Jagan Teki -
Michal Simek