Skip to contentSkip to conversation

microblaze: Moved U-boot headers to Kconfig

PATCH Superseded Vipul Kumar 2 participants 5 messages Feb 28, 2018 – Mar 1, 2018

Subsystems (2)

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

v2 cover microblaze: Moved U-boot headers to Kconfig

This seris of patch moved microblaze u-boot headers to the kconfig and enabled it in respective defconfig.
These are the configs:
-CONFIG_XILINX_GPIO
-CONFIG_XILINX_TB_WATCHDOG

- Changes in v2:
- Removed "Enable" from description
- Added select HW_WATCHDOG
- Branch: u-boot-microblaze/kconfig

Vipul Kumar (2):
microblaze: Added Kconfig support for CONFIG_XILINX_GPIO
microblaze: wdt: Added Kconfig support for CONFIG_XILINX_TB_WATCHDOG

 configs/microblaze-generic_defconfig | 2 ++
 drivers/gpio/Kconfig                 | 5 +++++
 drivers/watchdog/Kconfig             | 7 +++++++
 include/configs/microblaze-generic.h | 2 --
 4 files changed, 14 insertions(+), 2 deletions(-)

--
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.

#1 lore raw

PATCH v2 1/2 microblaze: Added Kconfig support for CONFIG_XILINX_GPIO

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

---
- Changes in v2:
- Removed "Enable" from description
- Branch: u-boot-microblaze/kconfig

---
 configs/microblaze-generic_defconfig | 1 +
 drivers/gpio/Kconfig                 | 5 +++++
 include/configs/microblaze-generic.h | 1 -
 3 files changed, 6 insertions(+), 1 deletion(-)
configs/microblaze-generic_defconfig +1 -0
index ac49404..699dc44 100644
@@ -46,6 +46,7 @@ CONFIG_BOOTP_BOOTPATH=y
 CONFIG_BOOTP_GATEWAY=y
 CONFIG_BOOTP_HOSTNAME=y
 CONFIG_SPL_DM=y
+CONFIG_XILINX_GPIO=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_PHY_ATHEROS=y
 CONFIG_PHY_BROADCOM=y
drivers/gpio/Kconfig +5 -0
index 34d4409..cc75aec 100644
@@ -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 "Xilinx GPIO driver"
+       help
+         This config enable the Xilinx GPIO driver for Microblaze.
+
 config CMD_TCA642X
        bool "tca642x - Command to access tca642x state"
        help
include/configs/microblaze-generic.h +0 -1
index fe9aaae..73c3c2a 100644
@@ -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.

#2 lore raw

PATCH v2 1/2 microblaze: Added Kconfig support for CONFIG_XILINX_GPIO

Quoted 49 lines · Vipul Kumar

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

---
- Changes in v2:
- Removed "Enable" from description
- Branch: u-boot-microblaze/kconfig

---
 configs/microblaze-generic_defconfig | 1 +
 drivers/gpio/Kconfig                 | 5 +++++
 include/configs/microblaze-generic.h | 1 -
 3 files changed, 6 insertions(+), 1 deletion(-)
configs/microblaze-generic_defconfig +1 -0
index ac49404..699dc44 100644
@@ -46,6 +46,7 @@ CONFIG_BOOTP_BOOTPATH=y
 CONFIG_BOOTP_GATEWAY=y
 CONFIG_BOOTP_HOSTNAME=y
 CONFIG_SPL_DM=y
+CONFIG_XILINX_GPIO=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_PHY_ATHEROS=y
 CONFIG_PHY_BROADCOM=y
drivers/gpio/Kconfig +5 -0
index 34d4409..cc75aec 100644
@@ -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 "Xilinx GPIO driver"
+	help
+	  This config enable the Xilinx GPIO driver for Microblaze.
+
 config CMD_TCA642X
 	bool "tca642x - Command to access tca642x state"
 	help
include/configs/microblaze-generic.h +0 -0
index fe9aaae..73c3c2a 100644

include/configs/microblaze-generic.h line 46

Quoted 7 lines
include/configs/microblaze-generic.h +0 -1
@@ -41,7 +41,6 @@
 
 /* gpio */
 #ifdef XILINX_GPIO_BASEADDR
-# define CONFIG_XILINX_GPIO
 # define CONFIG_SYS_GPIO_0_ADDR		XILINX_GPIO_BASEADDR
 #endif
 

Applied this one.

M

#3 lore raw

PATCH v2 2/2 microblaze: wdt: Added Kconfig support for CONFIG_XILINX_TB_WATCHDOG

In reply to Vipul Kumar

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

---
- Changes in v2:
- Added select HW_WATCHDOG
- Branch: u-boot-microblaze/kconfig

---
 configs/microblaze-generic_defconfig | 1 +
 drivers/watchdog/Kconfig             | 7 +++++++
 include/configs/microblaze-generic.h | 1 -
 3 files changed, 8 insertions(+), 1 deletion(-)
configs/microblaze-generic_defconfig +1 -0
index 699dc44..fba3820 100644
@@ -63,3 +63,4 @@ CONFIG_XILINX_AXIEMAC=y
 CONFIG_XILINX_EMACLITE=y
 CONFIG_SYS_NS16550=y
 CONFIG_XILINX_UARTLITE=y
+CONFIG_XILINX_TB_WATCHDOG=y
drivers/watchdog/Kconfig +7 -0
index fc46b67..a1e9432 100644
@@ -78,4 +78,11 @@ 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
+       select HW_WATCHDOG
+       help
+         Available for Xilinx Axi platforms to service timebase watchdog timer.
+
 endmenu
include/configs/microblaze-generic.h +0 -1
index 73c3c2a..391b26a 100644
@@ -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.

#4 lore raw

PATCH v2 2/2 microblaze: wdt: Added Kconfig support for CONFIG_XILINX_TB_WATCHDOG

Quoted 29 lines · Vipul Kumar

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

---
- Changes in v2:
- Added select HW_WATCHDOG
- Branch: u-boot-microblaze/kconfig

---
 configs/microblaze-generic_defconfig | 1 +
 drivers/watchdog/Kconfig             | 7 +++++++
 include/configs/microblaze-generic.h | 1 -
 3 files changed, 8 insertions(+), 1 deletion(-)
configs/microblaze-generic_defconfig +1 -0
index 699dc44..fba3820 100644
@@ -63,3 +63,4 @@ CONFIG_XILINX_AXIEMAC=y
 CONFIG_XILINX_EMACLITE=y
 CONFIG_SYS_NS16550=y
 CONFIG_XILINX_UARTLITE=y
+CONFIG_XILINX_TB_WATCHDOG=y
drivers/watchdog/Kconfig +0 -0
index fc46b67..a1e9432 100644

drivers/watchdog/Kconfig config WDT_ORION · line 83

Quoted 6 lines
drivers/watchdog/Kconfig +3 -0
@@ -78,4 +78,11 @@ 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

Based on my chat with Tom this is not working and
that needs to be done at the code/Makefile level.

Quoted 11 lines
drivers/watchdog/Kconfig +4 -0
+	select HW_WATCHDOG
+	help
+	  Available for Xilinx Axi platforms to service timebase watchdog timer.
+
 endmenu
include/configs/microblaze-generic.h +0 -0
index 73c3c2a..391b26a 100644

include/configs/microblaze-generic.h line 55

Quoted 7 lines
include/configs/microblaze-generic.h +0 -1
@@ -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
 

When this is applied there is compilation warning.
I think that will be just easier to convert this driver to DM and ged rid of all these configs.

Or don't select hw_watchdog via Kconfig even that dependency is there.

M

(quoted diff) +0 -0

b/configs/microblaze-generic_defconfig
index 699dc447f0ff..fba382037a76 100644

configs/microblaze-generic_defconfig +1 -0
@@ -63,3 +63,4 @@ CONFIG_XILINX_AXIEMAC=y
 CONFIG_XILINX_EMACLITE=y
 CONFIG_SYS_NS16550=y
 CONFIG_XILINX_UARTLITE=y
+CONFIG_XILINX_TB_WATCHDOG=y
drivers/watchdog/Kconfig +0 -0
index fc46b6774d57..3a55ae08abd8 100644
@@ -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
+       help

+ Available for Xilinx Axi platforms to service timebase
watchdog timer.
+
endmenu

(quoted diff) +0 -0

b/include/configs/microblaze-generic.h
index 73c3c2ae485c..391b26ae82c5 100644

include/configs/microblaze-generic.h +0 -1
@@ -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