This patch added Kconfig support for CONFIG_XILINX_GPIO and enabled it in respective defconfig.

Signed-off-by: Vipul Kumar vipulk@xilinx.com Signed-off-by: Siva Durga Prasad Paladugu sivadur@xilinx.com --- configs/microblaze-generic_defconfig | 1 + drivers/gpio/Kconfig | 5 +++++ include/configs/microblaze-generic.h | 1 - 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/configs/microblaze-generic_defconfig b/configs/microblaze-generic_defconfig index ca68a81..e707b9f 100644 --- a/configs/microblaze-generic_defconfig +++ b/configs/microblaze-generic_defconfig @@ -42,6 +42,7 @@ CONFIG_SPL_OF_CONTROL=y CONFIG_OF_EMBED=y CONFIG_NETCONSOLE=y CONFIG_SPL_DM=y +CONFIG_XILINX_GPIO=y CONFIG_MTD_NOR_FLASH=y CONFIG_PHY_ATHEROS=y CONFIG_PHY_BROADCOM=y diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig index 34d4409..f35c2e7 100644 --- a/drivers/gpio/Kconfig +++ b/drivers/gpio/Kconfig @@ -183,6 +183,11 @@ config SANDBOX_GPIO_COUNT of 'anonymous' GPIOs that do not belong to any device or bank. Select a suitable value depending on your needs.

+config XILINX_GPIO + bool "Enable Xilinx GPIO driver" + help + This config enable the Xilinx GPIO driver for Microblaze. + config CMD_TCA642X bool "tca642x - Command to access tca642x state" help diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h index a065dd3..de33583 100644 --- a/include/configs/microblaze-generic.h +++ b/include/configs/microblaze-generic.h @@ -41,7 +41,6 @@

/* gpio */ #ifdef XILINX_GPIO_BASEADDR -# define CONFIG_XILINX_GPIO # define CONFIG_SYS_GPIO_0_ADDR XILINX_GPIO_BASEADDR #endif

-- 2.7.4

This email and any attachments are intended for the sole use of the named recipient(s) and contain(s) confidential information that may be proprietary, privileged or copyrighted under applicable law. If you are not the intended recipient, do not read, copy, or forward this email message or any attachments. Delete this email message and any attachments immediately.

This patch added Kconfig support for CONFIG_XILINX_TB_WATCHDOG and enabled it in respective defconfig.

Signed-off-by: Vipul Kumar vipulk@xilinx.com Signed-off-by: Siva Durga Prasad Paladugu sivadur@xilinx.com --- configs/microblaze-generic_defconfig | 1 + drivers/watchdog/Kconfig | 6 ++++++ include/configs/microblaze-generic.h | 1 - 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/configs/microblaze-generic_defconfig b/configs/microblaze-generic_defconfig index e707b9f..47d4204 100644 --- a/configs/microblaze-generic_defconfig +++ b/configs/microblaze-generic_defconfig @@ -59,3 +59,4 @@ CONFIG_XILINX_AXIEMAC=y CONFIG_XILINX_EMACLITE=y CONFIG_SYS_NS16550=y CONFIG_XILINX_UARTLITE=y +CONFIG_XILINX_TB_WATCHDOG=y diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig index fc46b67..bd209fa 100644 --- a/drivers/watchdog/Kconfig +++ b/drivers/watchdog/Kconfig @@ -78,4 +78,10 @@ config WDT_ORION Select this to enable Orion watchdog timer, which can be found on some Marvell Armada chips.

+config XILINX_TB_WATCHDOG + bool "Xilinx watchdog timer support" + depends on MICROBLAZE && !SPL_BUILD + help + Available for Xilinx Axi platforms to service timebase watchdog timer. + endmenu diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h index de33583..a4d911d 100644 --- a/include/configs/microblaze-generic.h +++ b/include/configs/microblaze-generic.h @@ -50,7 +50,6 @@ # define CONFIG_WATCHDOG_IRQ XILINX_WATCHDOG_IRQ # ifndef CONFIG_SPL_BUILD # define CONFIG_HW_WATCHDOG -# define CONFIG_XILINX_TB_WATCHDOG # endif #endif

-- 2.7.4

This email and any attachments are intended for the sole use of the named recipient(s) and contain(s) confidential information that may be proprietary, privileged or copyrighted under applicable law. If you are not the intended recipient, do not read, copy, or forward this email message or any attachments. Delete this email message and any attachments immediately.