From 9e2e95d324fdf19193e0a4ba1c17a87bb7fa6976 Mon Sep 17 00:00:00 2001 From: Ola Jeppsson Date: Mon, 20 Apr 2015 15:42:03 +0200 Subject: [PATCH] zynq: Minor modifications for Adapteva Parallella board Minor modifications so that the Adapteva Parallella board can piggy-back on most of the zynq board code. Signed-off-by: Ola Jeppsson --- board/xilinx/zynq/board.c | 4 ++-- include/configs/zynq-common.h | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/board/xilinx/zynq/board.c b/board/xilinx/zynq/board.c index 95e3ab19a6c..5200b7f89c8 100644 --- a/board/xilinx/zynq/board.c +++ b/board/xilinx/zynq/board.c @@ -77,7 +77,7 @@ int board_init(void) return 0; } -int board_late_init(void) +__weak int board_late_init(void) { switch ((zynq_slcr_get_boot_mode()) & ZYNQ_BM_MASK) { case ZYNQ_BM_QSPI: @@ -104,7 +104,7 @@ int board_late_init(void) } #ifdef CONFIG_DISPLAY_BOARDINFO -int checkboard(void) +__weak int checkboard(void) { puts("Board:\tXilinx Zynq\n"); return 0; diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h index e5f2fc54f36..271829156d6 100644 --- a/include/configs/zynq-common.h +++ b/include/configs/zynq-common.h @@ -251,6 +251,7 @@ #endif /* Default environment */ +#ifndef CONFIG_EXTRA_ENV_SETTINGS #define CONFIG_PREBOOT #define CONFIG_EXTRA_ENV_SETTINGS \ "ethaddr=00:0a:35:00:01:22\0" \ @@ -355,6 +356,7 @@ "zynqrsa 0x100000 && " \ "bootm ${kernel_load_address} ${ramdisk_load_address} ${devicetree_load_address}\0" \ DFU_ALT_INFO +#endif /* ifndef CONFIG_EXTRA_ENV_SETTINGS */ /* Default environment */ #define CONFIG_IPADDR 10.10.70.102 @@ -366,7 +368,9 @@ #else #define CONFIG_BOOTCOMMAND "run $modeboot" #endif +#ifndef CONFIG_BOOTDELAY #define CONFIG_BOOTDELAY 3 /* -1 to Disable autoboot */ +#endif #define CONFIG_SYS_LOAD_ADDR 0 /* default? */ /* Miscellaneous configurable options */ @@ -494,7 +498,7 @@ #endif /* MMC support */ -#ifdef CONFIG_ZYNQ_SDHCI0 +#ifdef CONFIG_ZYNQ_SDHCI #define CONFIG_SPL_MMC_SUPPORT #define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR 0x300 /* address 0x60000 */ #define CONFIG_SYS_U_BOOT_MAX_SIZE_SECTORS 0x200 /* 256 KB */