GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-18 21:21:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

microblaze: Do not handle watchdog and gpio in SPL

Browse source 
watchdog and gpio are not validated for SPL that's why do not use them.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
This commit is contained in:
Michal Simek 2015-12-09 11:53:25 +01:00
parent 4280f50238
commit b5e9b9a9a1
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
board/xilinx/microblaze-generic/microblaze-generic.c
View file

@ -69,6 +69,7 @@ int dram_init(void)
int do_reset(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) int do_reset(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
{ {
#ifndef CONFIG_SPL_BUILD
#ifdef CONFIG_XILINX_GPIO #ifdef CONFIG_XILINX_GPIO
if (reset_pin != -1) if (reset_pin != -1)
gpio_direction_output(reset_pin, 1); gpio_direction_output(reset_pin, 1);
@ -77,7 +78,7 @@ int do_reset(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
#ifdef CONFIG_XILINX_TB_WATCHDOG #ifdef CONFIG_XILINX_TB_WATCHDOG
hw_watchdog_disable(); hw_watchdog_disable();
#endif #endif
#endif
puts ("Reseting board\n"); puts ("Reseting board\n");
__asm__ __volatile__ (" mts rmsr, r0;" \ __asm__ __volatile__ (" mts rmsr, r0;" \
"bra r0"); "bra r0");

6
include/configs/microblaze-generic.h
View file

@ -97,8 +97,10 @@
#if defined(XILINX_WATCHDOG_BASEADDR) && defined(XILINX_WATCHDOG_IRQ) #if defined(XILINX_WATCHDOG_BASEADDR) && defined(XILINX_WATCHDOG_IRQ)
# define CONFIG_WATCHDOG_BASEADDR XILINX_WATCHDOG_BASEADDR # define CONFIG_WATCHDOG_BASEADDR XILINX_WATCHDOG_BASEADDR
# define CONFIG_WATCHDOG_IRQ XILINX_WATCHDOG_IRQ # define CONFIG_WATCHDOG_IRQ XILINX_WATCHDOG_IRQ
# define CONFIG_HW_WATCHDOG # ifndef CONFIG_SPL_BUILD
# define CONFIG_XILINX_TB_WATCHDOG # define CONFIG_HW_WATCHDOG
# define CONFIG_XILINX_TB_WATCHDOG
# endif
#endif #endif
#if !defined(CONFIG_OF_CONTROL) || \ #if !defined(CONFIG_OF_CONTROL) || \