mirror/u-boot-2016
1
0
Fork 0
mirror of https://git.codelinaro.org/clo/qsdk/oss/boot/u-boot-2016.git synced 2025-12-10 07:44:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'u-boot-microblaze/zynq' into 'u-boot-arm/master'

Browse source
This commit is contained in:
Albert ARIBAUD 2014-07-26 14:08:36 +02:00
commit f2c8d7f591
3 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
arch/arm/cpu/armv7/zynq/ddrc.c
View file

@ -34,7 +34,7 @@ void zynq_ddrc_init(void)
/* ECC is enabled when memory is in 16bit mode and it is enabled */ /* ECC is enabled when memory is in 16bit mode and it is enabled */
if ((ecctype == ZYNQ_DDRC_ECC_SCRUBREG_ECCMODE_SECDED) && if ((ecctype == ZYNQ_DDRC_ECC_SCRUBREG_ECCMODE_SECDED) &&
(width == ZYNQ_DDRC_CTRLREG_BUSWIDTH_16BIT)) { (width == ZYNQ_DDRC_CTRLREG_BUSWIDTH_16BIT)) {
puts("Memory: ECC enabled\n"); puts("ECC enabled ");
/* /*
* Clear the first 1MB because it is not initialized from * Clear the first 1MB because it is not initialized from
* first stage bootloader. To get ECC to work all memory has * first stage bootloader. To get ECC to work all memory has
@ -42,6 +42,6 @@ void zynq_ddrc_init(void)
*/ */
memset((void *)0, 0, 1 * 1024 * 1024); memset((void *)0, 0, 1 * 1024 * 1024);
} else { } else {
puts("Memory: ECC disabled\n"); puts("ECC disabled ");
} }
} }

3
board/xilinx/zynq/Makefile
View file

@ -10,3 +10,6 @@ obj-y := board.o
# Please copy ps7_init.c/h from hw project to this directory # Please copy ps7_init.c/h from hw project to this directory
obj-$(CONFIG_SPL_BUILD) += \ obj-$(CONFIG_SPL_BUILD) += \
$(if $(wildcard $(srctree)/$(src)/ps7_init.c), ps7_init.o) $(if $(wildcard $(srctree)/$(src)/ps7_init.c), ps7_init.o)
# Suppress "warning: function declaration isn't a prototype"
CFLAGS_REMOVE_ps7_init.o := -Wstrict-prototypes

2
include/configs/zynq-common.h
View file

@ -339,4 +339,6 @@
#define CONFIG_SYS_UBOOT_START CONFIG_SYS_TEXT_BASE #define CONFIG_SYS_UBOOT_START CONFIG_SYS_TEXT_BASE
#define CONFIG_SYS_GENERIC_BOARD
#endif /* __CONFIG_ZYNQ_COMMON_H */ #endif /* __CONFIG_ZYNQ_COMMON_H */