diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-07-26 14:08:36 +0200 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-07-26 14:08:36 +0200 |
| commit | f2c8d7f591e28d3437155c7a6eae8c8d9e3fe552 (patch) | |
| tree | 00286cd23858a70dd0c526e5a47e50f2c125c3b3 | |
| parent | 772e173802627a1917a3f5878ad4b9b920089a33 (diff) | |
| parent | 327474915a413be98950deeeba27c3d17e5134bc (diff) | |
| download | u-boot-imx-f2c8d7f591e28d3437155c7a6eae8c8d9e3fe552.zip u-boot-imx-f2c8d7f591e28d3437155c7a6eae8c8d9e3fe552.tar.gz u-boot-imx-f2c8d7f591e28d3437155c7a6eae8c8d9e3fe552.tar.bz2 | |
Merge branch 'u-boot-microblaze/zynq' into 'u-boot-arm/master'
| -rw-r--r-- | arch/arm/cpu/armv7/zynq/ddrc.c | 4 | ||||
| -rw-r--r-- | board/xilinx/zynq/Makefile | 3 | ||||
| -rw-r--r-- | include/configs/zynq-common.h | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/arch/arm/cpu/armv7/zynq/ddrc.c b/arch/arm/cpu/armv7/zynq/ddrc.c index e0ed3bf..1ea086d 100644 --- a/arch/arm/cpu/armv7/zynq/ddrc.c +++ b/arch/arm/cpu/armv7/zynq/ddrc.c @@ -34,7 +34,7 @@ void zynq_ddrc_init(void) /* ECC is enabled when memory is in 16bit mode and it is enabled */ if ((ecctype == ZYNQ_DDRC_ECC_SCRUBREG_ECCMODE_SECDED) && (width == ZYNQ_DDRC_CTRLREG_BUSWIDTH_16BIT)) { - puts("Memory: ECC enabled\n"); + puts("ECC enabled "); /* * Clear the first 1MB because it is not initialized from * 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); } else { - puts("Memory: ECC disabled\n"); + puts("ECC disabled "); } } diff --git a/board/xilinx/zynq/Makefile b/board/xilinx/zynq/Makefile index fd93f63..71c0c35 100644 --- a/board/xilinx/zynq/Makefile +++ b/board/xilinx/zynq/Makefile @@ -10,3 +10,6 @@ obj-y := board.o # Please copy ps7_init.c/h from hw project to this directory obj-$(CONFIG_SPL_BUILD) += \ $(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 diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h index fa252c0..690cacb 100644 --- a/include/configs/zynq-common.h +++ b/include/configs/zynq-common.h @@ -339,4 +339,6 @@ #define CONFIG_SYS_UBOOT_START CONFIG_SYS_TEXT_BASE +#define CONFIG_SYS_GENERIC_BOARD + #endif /* __CONFIG_ZYNQ_COMMON_H */ |