From: Shreenidhi Shedi Date: Sat, 14 Jul 2018 20:35:39 +0000 (+0530) Subject: microblaze: Delete Xilinx watchdog related macros X-Git-Tag: v2018.09-rc1~141^2~23 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=88811bb5a11b1d29196694fdcfa26a4e6ebd87d4;p=oweals%2Fu-boot.git microblaze: Delete Xilinx watchdog related macros These macros are not required anymore. These will be taken from configuration file. Signed-off-by: Shreenidhi Shedi Signed-off-by: Michal Simek --- diff --git a/board/xilinx/microblaze-generic/xparameters.h b/board/xilinx/microblaze-generic/xparameters.h index 57998edba4..01116d827c 100644 --- a/board/xilinx/microblaze-generic/xparameters.h +++ b/board/xilinx/microblaze-generic/xparameters.h @@ -19,7 +19,3 @@ /* Flash Memory is FLASH_2Mx32 */ #define XILINX_FLASH_START 0x2c000000 #define XILINX_FLASH_SIZE 0x00800000 - -/* Watchdog IP is wxi_timebase_wdt_0 */ -#define XILINX_WATCHDOG_BASEADDR 0x50000000 -#define XILINX_WATCHDOG_IRQ 1 diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h index 7f16700d4f..6a049cf2af 100644 --- a/include/configs/microblaze-generic.h +++ b/include/configs/microblaze-generic.h @@ -43,16 +43,6 @@ # define CONFIG_SYS_GPIO_0_ADDR XILINX_GPIO_BASEADDR #endif -/* watchdog */ -#if defined(XILINX_WATCHDOG_BASEADDR) && defined(XILINX_WATCHDOG_IRQ) -# define CONFIG_WATCHDOG_BASEADDR XILINX_WATCHDOG_BASEADDR -# define CONFIG_WATCHDOG_IRQ XILINX_WATCHDOG_IRQ -# ifndef CONFIG_SPL_BUILD -# define CONFIG_HW_WATCHDOG -# define CONFIG_XILINX_TB_WATCHDOG -# endif -#endif - #define CONFIG_SYS_MALLOC_LEN 0xC0000 /* Stack location before relocation */