Convert Watchdog related defines to Kconfig
Subsystems (3)
v2 cover Convert Watchdog related defines to Kconfig
This patch series converts watchdog related configs:CONFIG_HW_WATCHDOG, CONFIG_IMX_WATCHDOG and CONFIG_WATCHDOG_TIMEOUT_MSECS to Kconfig.
This is the first step to move iMX Watchdog driver to DM.
Comments and tests are welcome.
"Green" travis CI build:
https://travis-ci.org/lmajewski/u-boot-dfu/builds/338077474
This patch has been applied on top of u-boot/master:
SHA1: a43aebee89acf57b4e22018f401cffc9fef4fd85
Changes in v2:
- None
- Correct "mili" to "milli" seconds
- None
- None
Lukasz Majewski (4):
Convert CONFIG_IMX_WATCHDOG to Kconfig and remove HW_WATCHDOG Convert CONFIG_WATCHDOG_TIMEOUT_MSECS to Kconfig
Convert socfpga: select CONFIG_HW_WATCHDOG support for ARCH_SOCFPGA Convert CONFIG_HW_WATCHDOG to Kconfig
arch/arm/Kconfig | 1 + configs/aristainetos2_defconfig | 1 + configs/aristainetos2b_defconfig | 1 + configs/aristainetos_defconfig | 1 + configs/axm_defconfig | 1 + configs/calimain_defconfig | 1 + configs/dh_imx6_defconfig | 2 ++ configs/microblaze-generic_defconfig | 1 + configs/mx53ppd_defconfig | 2 ++ configs/nokia_rx51_defconfig | 1 + configs/picosam9g45_defconfig | 1 + configs/smartweb_defconfig | 1 + configs/taurus_defconfig | 1 + configs/tqma6s_wru4_mmc_defconfig | 2 ++ configs/ts4800_defconfig | 1 + configs/warp_defconfig | 2 ++ drivers/watchdog/Kconfig | 14 ++++++++++++++ include/configs/M5475EVB.h | 1 - include/configs/M5485EVB.h | 1 - include/configs/aristainetos-common.h | 3 --- include/configs/calimain.h | 1 - include/configs/controlcenterd.h | 1 - include/configs/dh_imx6.h | 5 ----- include/configs/eb_cpu5282.h | 2 -- include/configs/microblaze-generic.h | 1 - include/configs/mx53ppd.h | 4 ---- include/configs/nokia_rx51.h | 1 - include/configs/picosam9g45.h | 1 - include/configs/smartweb.h | 3 --- include/configs/socfpga_arria10_socdk.h | 2 -- include/configs/socfpga_arria5_socdk.h | 2 -- include/configs/socfpga_common.h | 1 - include/configs/socfpga_cyclone5_socdk.h | 2 -- include/configs/socfpga_de0_nano_soc.h | 2 -- include/configs/socfpga_de10_nano.h | 2 -- include/configs/socfpga_de1_soc.h | 2 -- include/configs/socfpga_is1.h | 2 -- include/configs/socfpga_mcvevk.h | 2 -- include/configs/socfpga_sockit.h | 2 -- include/configs/socfpga_socrates.h | 2 -- include/configs/socfpga_sr1500.h | 2 -- include/configs/socfpga_vining_fpga.h | 2 -- include/configs/taurus.h | 1 - include/configs/tqma6_wru4.h | 5 ----- include/configs/ts4800.h | 2 -- include/configs/warp.h | 5 ----- 46 files changed, 34 insertions(+), 62 deletions(-)
Signature · 1 line
2.11.0
PATCH v2 1/4 Convert CONFIG_IMX_WATCHDOG to Kconfig and remove HW_WATCHDOG
This converts the following to Kconfig:
CONFIG_IMX_WATCHDOG
It also removes the CONFIG_HW_WATCHDOG, which is selected by IMX_WATCHDOG.
---
Changes in v2:
- None
configs/aristainetos2_defconfig | 1 + configs/aristainetos2b_defconfig | 1 + configs/aristainetos_defconfig | 1 + configs/dh_imx6_defconfig | 1 + configs/mx53ppd_defconfig | 1 + configs/tqma6s_wru4_mmc_defconfig | 1 + configs/warp_defconfig | 1 + drivers/watchdog/Kconfig | 6 ++++++ include/configs/aristainetos-common.h | 3 --- include/configs/dh_imx6.h | 2 -- include/configs/mx53ppd.h | 2 -- include/configs/tqma6_wru4.h | 2 -- include/configs/warp.h | 2 -- 13 files changed, 13 insertions(+), 11 deletions(-)
configs/aristainetos2_defconfig +1 -0
@@ -44,4 +44,5 @@ CONFIG_USB=y CONFIG_USB_STORAGE=y CONFIG_VIDEO=y # CONFIG_VIDEO_SW_CURSOR is not set +CONFIG_IMX_WATCHDOG=y CONFIG_OF_LIBFDT=y
configs/aristainetos2b_defconfig +1 -0
@@ -44,4 +44,5 @@ CONFIG_USB=y CONFIG_USB_STORAGE=y CONFIG_VIDEO=y # CONFIG_VIDEO_SW_CURSOR is not set +CONFIG_IMX_WATCHDOG=y CONFIG_OF_LIBFDT=y
configs/aristainetos_defconfig +1 -0
@@ -42,4 +42,5 @@ CONFIG_USB=y CONFIG_USB_STORAGE=y CONFIG_VIDEO=y # CONFIG_VIDEO_SW_CURSOR is not set +CONFIG_IMX_WATCHDOG=y CONFIG_OF_LIBFDT=y
configs/dh_imx6_defconfig +1 -0
@@ -56,4 +56,5 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0525 CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 CONFIG_CI_UDC=y CONFIG_USB_GADGET_DOWNLOAD=y +CONFIG_IMX_WATCHDOG=y CONFIG_OF_LIBFDT=y
configs/mx53ppd_defconfig +1 -0
@@ -29,4 +29,5 @@ CONFIG_USB=y CONFIG_USB_STORAGE=y CONFIG_VIDEO=y # CONFIG_VIDEO_SW_CURSOR is not set +CONFIG_IMX_WATCHDOG=y CONFIG_OF_LIBFDT=y
configs/tqma6s_wru4_mmc_defconfig +1 -0
@@ -57,4 +57,5 @@ CONFIG_USB=y CONFIG_USB_STORAGE=y CONFIG_USB_HOST_ETHER=y CONFIG_USB_ETHER_SMSC95XX=y +CONFIG_IMX_WATCHDOG=y CONFIG_OF_LIBFDT=y
configs/warp_defconfig +1 -0
@@ -34,4 +34,5 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0525 CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 CONFIG_CI_UDC=y CONFIG_USB_GADGET_DOWNLOAD=y +CONFIG_IMX_WATCHDOG=y CONFIG_OF_LIBFDT=y
drivers/watchdog/Kconfig +6 -0
@@ -12,6 +12,12 @@ config BCM2835_WDT This provides basic infrastructure to support BCM2835/2836 watchdog hardware, with a max timeout of ~15secs. +config IMX_WATCHDOG + bool "IMX watchdog driver" + select HW_WATCHDOG + help + Say Y here to enable the IMX watchdog driver. + config OMAP_WATCHDOG bool "TI OMAP watchdog driver" depends on ARCH_OMAP2PLUS
include/configs/aristainetos-common.h +0 -3
@@ -198,9 +198,6 @@#define CONFIG_MTD_PARTITIONS #define CONFIG_MTD_DEVICE -#define CONFIG_HW_WATCHDOG -#define CONFIG_IMX_WATCHDOG -/* Framebuffer */ #define CONFIG_VIDEO_IPUV3 /* check this console not needed, after test remove it */
include/configs/dh_imx6.h +0 -2
@@ -123,8 +123,6 @@#endif /* Watchdog */ -#define CONFIG_HW_WATCHDOG -#define CONFIG_IMX_WATCHDOG #define CONFIG_WATCHDOG_TIMEOUT_MSECS 60000/* allow to overwrite serial and ethaddr */
include/configs/mx53ppd.h +0 -2
@@ -23,8 +23,6 @@/* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN (10 * 1024 * 1024) -#define CONFIG_HW_WATCHDOG -#define CONFIG_IMX_WATCHDOG #define CONFIG_WATCHDOG_TIMEOUT_MSECS 8000#define CONFIG_MISC_INIT_R
include/configs/tqma6_wru4.h +0 -2
@@ -20,8 +20,6 @@#define CONFIG_MISC_INIT_R /* Watchdog */ -#define CONFIG_HW_WATCHDOG -#define CONFIG_IMX_WATCHDOG #define CONFIG_WATCHDOG_TIMEOUT_MSECS 60000/* Config on-board RTC */
include/configs/warp.h +0 -2
@@ -27,8 +27,6 @@#define CONFIG_SUPPORT_EMMC_BOOT /* Watchdog */ -#define CONFIG_HW_WATCHDOG -#define CONFIG_IMX_WATCHDOG #define CONFIG_WATCHDOG_TIMEOUT_MSECS 30000/* 30s */ #define CONFIG_SYS_MEMTEST_START 0x80000000
Signature · 1 line
2.11.0
PATCH v2 1/4 Convert CONFIG_IMX_WATCHDOG to Kconfig and remove HW_WATCHDOG
Hello Lukasz,
Am 09.02.2018 um 23:14 schrieb Lukasz Majewski:
Quoted 11 lines
This converts the following to
Kconfig:
CONFIG_IMX_WATCHDOGIt also removes the
CONFIG_HW_WATCHDOG, which is selected byIMX_WATCHDOG.Signed-off-by Lukasz Majewski <[email protected]>---
Changes in v2:
- None
Quoted 14 lines
configs/aristainetos2_defconfig | 1 + configs/aristainetos2b_defconfig | 1 + configs/aristainetos_defconfig | 1 + configs/dh_imx6_defconfig | 1 + configs/mx53ppd_defconfig | 1 + configs/tqma6s_wru4_mmc_defconfig | 1 + configs/warp_defconfig | 1 + drivers/watchdog/Kconfig | 6 ++++++ include/configs/aristainetos-common.h | 3 --- include/configs/dh_imx6.h | 2 -- include/configs/mx53ppd.h | 2 -- include/configs/tqma6_wru4.h | 2 -- include/configs/warp.h | 2 -- 13 files changed, 13 insertions(+), 11 deletions(-)
Thanks!
bye,
Heiko
Signature · 3 lines
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-52 Fax: +49-8142-66989-80 Email: hs at denx.de
PATCH v2 2/4 Convert CONFIG_WATCHDOG_TIMEOUT_MSECS to Kconfig
In reply to Lukasz MajewskiThis converts the following to Kconfig:
CONFIG_WATCHDOG_TIMEOUT_MSECS
The CONFIG_WATCHDOG_TIMEOUT_MSECS default value has been set to 10s.
---
Changes in v2:
- Correct "mili" to "milli" seconds
configs/dh_imx6_defconfig | 1 + configs/mx53ppd_defconfig | 1 + configs/tqma6s_wru4_mmc_defconfig | 1 + configs/warp_defconfig | 1 + drivers/watchdog/Kconfig | 8 ++++++++ include/configs/dh_imx6.h | 3 --- include/configs/mx53ppd.h | 2 -- include/configs/socfpga_common.h | 1 - include/configs/tqma6_wru4.h | 3 --- include/configs/warp.h | 3 --- 10 files changed, 12 insertions(+), 12 deletions(-)
configs/dh_imx6_defconfig +1 -0
@@ -58,3 +58,4 @@ CONFIG_CI_UDC=y CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_IMX_WATCHDOG=y CONFIG_OF_LIBFDT=y +CONFIG_WATCHDOG_TIMEOUT_MSECS=60000
configs/mx53ppd_defconfig +1 -0
@@ -31,3 +31,4 @@ CONFIG_VIDEO=y # CONFIG_VIDEO_SW_CURSOR is not set CONFIG_IMX_WATCHDOG=y CONFIG_OF_LIBFDT=y +CONFIG_WATCHDOG_TIMEOUT_MSECS=8000
configs/tqma6s_wru4_mmc_defconfig +1 -0
@@ -59,3 +59,4 @@ CONFIG_USB_HOST_ETHER=y CONFIG_USB_ETHER_SMSC95XX=y CONFIG_IMX_WATCHDOG=y CONFIG_OF_LIBFDT=y +CONFIG_WATCHDOG_TIMEOUT_MSECS=60000
configs/warp_defconfig +1 -0
@@ -36,3 +36,4 @@ CONFIG_CI_UDC=y CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_IMX_WATCHDOG=y CONFIG_OF_LIBFDT=y +CONFIG_WATCHDOG_TIMEOUT_MSECS=30000
drivers/watchdog/Kconfig +8 -0
@@ -40,6 +40,14 @@ config ULP_WATCHDOG help Say Y here to enable i.MX7ULP watchdog driver. +config WATCHDOG_TIMEOUT_MSECS + int "Specify watchdog timeout in milli seconds" + default 30000 if ARCH_SOCFPGA + default 10000 + depends on HW_WATCHDOG + help + Set watchdog trigger timeout (in [ms]). + config WDT bool "Enable driver model for watchdog timer drivers" depends on DM
include/configs/dh_imx6.h +0 -3
@@ -122,9 +122,6 @@#endif #endif -/* Watchdog */ -#define CONFIG_WATCHDOG_TIMEOUT_MSECS 60000 -/* allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE
include/configs/mx53ppd.h +0 -2
@@ -23,8 +23,6 @@/* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN (10 * 1024 * 1024) -#define CONFIG_WATCHDOG_TIMEOUT_MSECS 8000 -#define CONFIG_MISC_INIT_R #define CONFIG_BOARD_LATE_INIT #define CONFIG_REVISION_TAG
include/configs/socfpga_common.h +0 -1
@@ -120,7 +120,6 @@#define CONFIG_DESIGNWARE_WATCHDOG #define CONFIG_DW_WDT_BASE SOCFPGA_L4WD0_ADDRESS#define CONFIG_DW_WDT_CLOCK_KHZ 25000 -#define CONFIG_WATCHDOG_TIMEOUT_MSECS 30000#endif /*
include/configs/tqma6_wru4.h +0 -3
@@ -19,9 +19,6 @@#define CONFIG_MISC_INIT_R -/* Watchdog */ -#define CONFIG_WATCHDOG_TIMEOUT_MSECS 60000 -/* Config on-board RTC */ #define CONFIG_RTC_DS1337 #define CONFIG_SYS_RTC_BUS_NUM 2
include/configs/warp.h +0 -3
@@ -26,9 +26,6 @@#define CONFIG_SYS_FSL_ESDHC_HAS_DDR_MODE #define CONFIG_SUPPORT_EMMC_BOOT -/* Watchdog */ -#define CONFIG_WATCHDOG_TIMEOUT_MSECS 30000/* 30s */ -#define CONFIG_SYS_MEMTEST_START 0x80000000#define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + SZ_256M)
Signature · 1 line
2.11.0
PATCH v2 2/4 Convert CONFIG_WATCHDOG_TIMEOUT_MSECS to Kconfig
Hello Lukasz,
Am 09.02.2018 um 23:14 schrieb Lukasz Majewski:
Quoted 11 lines
This converts the following to
Kconfig:
CONFIG_WATCHDOG_TIMEOUT_MSECSThe
CONFIG_WATCHDOG_TIMEOUT_MSECSdefault value has been set to 10s.Signed-off-by Lukasz Majewski <[email protected]>---
Changes in v2:
- Correct "mili" to "milli" seconds
Quoted 11 lines
configs/dh_imx6_defconfig | 1 + configs/mx53ppd_defconfig | 1 + configs/tqma6s_wru4_mmc_defconfig | 1 + configs/warp_defconfig | 1 + drivers/watchdog/Kconfig | 8 ++++++++ include/configs/dh_imx6.h | 3 --- include/configs/mx53ppd.h | 2 -- include/configs/socfpga_common.h | 1 - include/configs/tqma6_wru4.h | 3 --- include/configs/warp.h | 3 --- 10 files changed, 12 insertions(+), 12 deletions(-)
Thanks!
bye,
Heiko
Signature · 3 lines
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-52 Fax: +49-8142-66989-80 Email: hs at denx.de
PATCH v2 3/4 Convert socfpga: select CONFIG_HW_WATCHDOG support for ARCH_SOCFPGA
In reply to Lukasz MajewskiAll Socfpga boards from ./include/configs/socfpga_* define CONFIG_HW_WATCHDOG.
To ease CONFIG_HW_WATCHDOG conversion to Kconfig select it in config ARCH_SOCFPGA (arch/arm/Kconfig) section.
---
Changes in v2:
- None
arch/arm/Kconfig | 1 + include/configs/socfpga_arria10_socdk.h | 2 -- include/configs/socfpga_arria5_socdk.h | 2 -- include/configs/socfpga_cyclone5_socdk.h | 2 -- include/configs/socfpga_de0_nano_soc.h | 2 -- include/configs/socfpga_de10_nano.h | 2 -- include/configs/socfpga_de1_soc.h | 2 -- include/configs/socfpga_is1.h | 2 -- include/configs/socfpga_mcvevk.h | 2 -- include/configs/socfpga_sockit.h | 2 -- include/configs/socfpga_socrates.h | 2 -- include/configs/socfpga_sr1500.h | 2 -- include/configs/socfpga_vining_fpga.h | 2 -- 13 files changed, 1 insertion(+), 24 deletions(-)
arch/arm/Kconfig +1 -0
@@ -702,6 +702,7 @@ config ARCH_SOCFPGA select DM_SPI_FLASH select DM_SPI select ENABLE_ARM_SOC_BOOT0_HOOK + select HW_WATCHDOG select ARCH_EARLY_INIT_R select ARCH_MISC_INIT select SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION
include/configs/socfpga_arria10_socdk.h +0 -2
@@ -9,8 +9,6 @@#include <asm/arch/base_addr_a10.h> -#define CONFIG_HW_WATCHDOG -/* Booting Linux */ #define CONFIG_LOADADDR 0x01000000#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
include/configs/socfpga_arria5_socdk.h +0 -2
@@ -8,8 +8,6 @@#include <asm/arch/base_addr_ac5.h> -#define CONFIG_HW_WATCHDOG -/* Memory configurations */ #define PHYS_SDRAM_1_SIZE 0x40000000/* 1GiB on SoCDK */
include/configs/socfpga_cyclone5_socdk.h +0 -2
@@ -8,8 +8,6 @@#include <asm/arch/base_addr_ac5.h> -#define CONFIG_HW_WATCHDOG -/* Memory configurations */ #define PHYS_SDRAM_1_SIZE 0x40000000/* 1GiB on SoCDK */
include/configs/socfpga_de0_nano_soc.h +0 -2
@@ -8,8 +8,6 @@#include <asm/arch/base_addr_ac5.h> -#define CONFIG_HW_WATCHDOG -/* Memory configurations */ #define PHYS_SDRAM_1_SIZE 0x40000000/* 1GiB */
include/configs/socfpga_de10_nano.h +0 -2
@@ -8,8 +8,6 @@#include <asm/arch/base_addr_ac5.h> -#define CONFIG_HW_WATCHDOG -/* Memory configurations */ #define PHYS_SDRAM_1_SIZE 0x40000000/* 1GiB */
include/configs/socfpga_de1_soc.h +0 -2
@@ -8,8 +8,6 @@#include <asm/arch/base_addr_ac5.h> -#define CONFIG_HW_WATCHDOG -/* Memory configurations */ #define PHYS_SDRAM_1_SIZE 0x40000000/* 1GiB */
include/configs/socfpga_is1.h +0 -2
@@ -9,8 +9,6 @@#include <asm/arch/base_addr_ac5.h> -#define CONFIG_HW_WATCHDOG -/* Memory configurations */ #define PHYS_SDRAM_1_SIZE 0x10000000
include/configs/socfpga_mcvevk.h +0 -2
@@ -8,8 +8,6 @@#include <asm/arch/base_addr_ac5.h> -#define CONFIG_HW_WATCHDOG -/* Memory configurations */ #define PHYS_SDRAM_1_SIZE 0x40000000/* 1GiB on MCV */
include/configs/socfpga_sockit.h +0 -2
@@ -8,8 +8,6 @@#include <asm/arch/base_addr_ac5.h> -#define CONFIG_HW_WATCHDOG -/* Memory configurations */ #define PHYS_SDRAM_1_SIZE 0x40000000/* 1GiB on SoCDK */
include/configs/socfpga_socrates.h +0 -2
@@ -8,8 +8,6 @@#include <asm/arch/base_addr_ac5.h> -#define CONFIG_HW_WATCHDOG -/* Memory configurations */ #define PHYS_SDRAM_1_SIZE 0x40000000/* 1GiB on SoCrates */
include/configs/socfpga_sr1500.h +0 -2
@@ -8,8 +8,6 @@#include <asm/arch/base_addr_ac5.h> -#define CONFIG_HW_WATCHDOG -/* Memory configurations */ #define PHYS_SDRAM_1_SIZE 0x40000000/* 1GiB on SR1500 */
include/configs/socfpga_vining_fpga.h +0 -2
@@ -8,8 +8,6 @@#include <asm/arch/base_addr_ac5.h> -#define CONFIG_HW_WATCHDOG -/* Memory configurations */ #define PHYS_SDRAM_1_SIZE 0x40000000/* 1GiB on VINING_FPGA */
Signature · 1 line
2.11.0
PATCH v2 3/4 Convert socfpga: select CONFIG_HW_WATCHDOG support for ARCH_SOCFPGA
Quoted 4 lines · Lukasz Majewski
All Socfpga boards from
./include/configs/socfpga_*defineCONFIG_HW_WATCHDOG.
To easeCONFIG_HW_WATCHDOGconversion toKconfigselect it in configARCH_SOCFPGA(arch/arm/Kconfig) section.
I do have board configs where the internal watchdog is not used and should be disabled (because there's an external one). Also, given that this is an FPGA, I suppose having non-upstreamed boards is not uncommon.
I'm not too familiar with these settings though: can I leave the watchdog disabled when CONFIG_HW_WATCHDOG is off? Before, I just haven't enabled this in my own board config...
Simon
Quoted 190 lines
Signed-off-by Lukasz Majewski <[email protected]>---
Changes in v2:
- Nonearch/arm/Kconfig | 1 + include/configs/socfpga_arria10_socdk.h | 2 -- include/configs/socfpga_arria5_socdk.h | 2 -- include/configs/socfpga_cyclone5_socdk.h | 2 -- include/configs/socfpga_de0_nano_soc.h | 2 -- include/configs/socfpga_de10_nano.h | 2 -- include/configs/socfpga_de1_soc.h | 2 -- include/configs/socfpga_is1.h | 2 -- include/configs/socfpga_mcvevk.h | 2 -- include/configs/socfpga_sockit.h | 2 -- include/configs/socfpga_socrates.h | 2 -- include/configs/socfpga_sr1500.h | 2 -- include/configs/socfpga_vining_fpga.h | 2 -- 13 files changed, 1 insertion(+), 24 deletions(-)arch/arm/Kconfig +1
-0@@ -702,6 +702,7 @@ config ARCH_SOCFPGA select DM_SPI_FLASH select DM_SPI select ENABLE_ARM_SOC_BOOT0_HOOK + select HW_WATCHDOG select ARCH_EARLY_INIT_R select ARCH_MISC_INIT select SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITIONinclude/configs/socfpga_arria10_socdk.h +0
-2@@ -9,8 +9,6 @@#include <asm/arch/base_addr_a10.h> -#define CONFIG_HW_WATCHDOG -/* Booting Linux */ #define CONFIG_LOADADDR 0x01000000#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDRinclude/configs/socfpga_arria5_socdk.h +0
-2@@ -8,8 +8,6 @@#include <asm/arch/base_addr_ac5.h> -#define CONFIG_HW_WATCHDOG -/* Memory configurations */ #define PHYS_SDRAM_1_SIZE 0x40000000/* 1GiB on SoCDK */ include/configs/socfpga_cyclone5_socdk.h +0
-2@@ -8,8 +8,6 @@#include <asm/arch/base_addr_ac5.h> -#define CONFIG_HW_WATCHDOG -/* Memory configurations */ #define PHYS_SDRAM_1_SIZE 0x40000000/* 1GiB on SoCDK */ include/configs/socfpga_de0_nano_soc.h +0
-2@@ -8,8 +8,6 @@#include <asm/arch/base_addr_ac5.h> -#define CONFIG_HW_WATCHDOG -/* Memory configurations */ #define PHYS_SDRAM_1_SIZE 0x40000000/* 1GiB */ include/configs/socfpga_de10_nano.h +0
-2@@ -8,8 +8,6 @@#include <asm/arch/base_addr_ac5.h> -#define CONFIG_HW_WATCHDOG -/* Memory configurations */ #define PHYS_SDRAM_1_SIZE 0x40000000/* 1GiB */ include/configs/socfpga_de1_soc.h +0
-2@@ -8,8 +8,6 @@#include <asm/arch/base_addr_ac5.h> -#define CONFIG_HW_WATCHDOG -/* Memory configurations */ #define PHYS_SDRAM_1_SIZE 0x40000000/* 1GiB */ include/configs/socfpga_is1.h +0
-2@@ -9,8 +9,6 @@#include <asm/arch/base_addr_ac5.h> -#define CONFIG_HW_WATCHDOG -/* Memory configurations */ #define PHYS_SDRAM_1_SIZE 0x10000000include/configs/socfpga_mcvevk.h +0
-2@@ -8,8 +8,6 @@#include <asm/arch/base_addr_ac5.h> -#define CONFIG_HW_WATCHDOG -/* Memory configurations */ #define PHYS_SDRAM_1_SIZE 0x40000000/* 1GiB on MCV */ include/configs/socfpga_sockit.h +0
-2@@ -8,8 +8,6 @@#include <asm/arch/base_addr_ac5.h> -#define CONFIG_HW_WATCHDOG -/* Memory configurations */ #define PHYS_SDRAM_1_SIZE 0x40000000/* 1GiB on SoCDK */ include/configs/socfpga_socrates.h +0
-2@@ -8,8 +8,6 @@#include <asm/arch/base_addr_ac5.h> -#define CONFIG_HW_WATCHDOG -/* Memory configurations */ #define PHYS_SDRAM_1_SIZE 0x40000000/* 1GiB on SoCrates */ include/configs/socfpga_sr1500.h +0
-2@@ -8,8 +8,6 @@#include <asm/arch/base_addr_ac5.h> -#define CONFIG_HW_WATCHDOG -/* Memory configurations */ #define PHYS_SDRAM_1_SIZE 0x40000000/* 1GiB on SR1500 */ include/configs/socfpga_vining_fpga.h +0
-2@@ -8,8 +8,6 @@#include <asm/arch/base_addr_ac5.h> -#define CONFIG_HW_WATCHDOG -/* Memory configurations */ #define PHYS_SDRAM_1_SIZE 0x40000000/* 1GiB on VINING_FPGA */
PATCH v2 3/4 Convert socfpga: select CONFIG_HW_WATCHDOG support for ARCH_SOCFPGA
Hi Simon,
Quoted 10 lines · Lukasz Majewski
Quoted 4 lines
All Socfpga boards from
./include/configs/socfpga_*defineCONFIG_HW_WATCHDOG.
To easeCONFIG_HW_WATCHDOGconversion toKconfigselect it in configARCH_SOCFPGA(arch/arm/Kconfig) section.I do have board configs where the internal watchdog is not used and should be disabled (because there's an external one). Also, given that this is an FPGA, I suppose having non-upstreamed boards is not uncommon.
I must admit that this patch I did after looking on the socfpga pattern in the current upstream.
It seems like all boards there use HW_WATCHDOG.
Quoted 4 lines
I'm not too familiar with these settings though: can I leave the watchdog disabled when
CONFIG_HW_WATCHDOGis off? Before, I just haven't enabled this in my own board config...
I think that I will prepare next revision of this patch with just simple ./tools/moveconfig.py output (without blindly selecting HW_WATCHDOG on all socfpga devices).
In that way we will preserve the current behaviour.
Best regards,
Łukasz Majewski
Quoted 186 lines
Simon
Quoted 183 lines
Signed-off-by Lukasz Majewski <[email protected]>---
Changes in v2:
- Nonearch/arm/Kconfig | 1 + include/configs/socfpga_arria10_socdk.h | 2 -- include/configs/socfpga_arria5_socdk.h | 2 -- include/configs/socfpga_cyclone5_socdk.h | 2 -- include/configs/socfpga_de0_nano_soc.h | 2 -- include/configs/socfpga_de10_nano.h | 2 -- include/configs/socfpga_de1_soc.h | 2 -- include/configs/socfpga_is1.h | 2 -- include/configs/socfpga_mcvevk.h | 2 -- include/configs/socfpga_sockit.h | 2 -- include/configs/socfpga_socrates.h | 2 -- include/configs/socfpga_sr1500.h | 2 -- include/configs/socfpga_vining_fpga.h | 2 -- 13 files changed, 1 insertion(+), 24 deletions(-)arch/arm/Kconfig +1
-0@@ -702,6 +702,7 @@ config ARCH_SOCFPGA select DM_SPI_FLASH select DM_SPI select ENABLE_ARM_SOC_BOOT0_HOOK + select HW_WATCHDOG select ARCH_EARLY_INIT_R select ARCH_MISC_INIT select SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION(quoted diff) +0
-0
b/include/configs/socfpga_arria10_socdk.hindex83718dd2c9..82bb48b277100644 ---a/include/configs/socfpga_arria10_socdk.h+++b/include/configs/socfpga_arria10_socdk.h@@ -9,8 +9,6 @@#include <asm/arch/base_addr_a10.h>include/configs/socfpga_arria10_socdk.h +0
-2-#define CONFIG_HW_WATCHDOG -/* Booting Linux */ #define CONFIG_LOADADDR 0x01000000#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR(quoted diff) +0
-0
b/include/configs/socfpga_arria5_socdk.hindex6b6d54b97b..cd5aac65e9100644 ---a/include/configs/socfpga_arria5_socdk.h+++b/include/configs/socfpga_arria5_socdk.h@@ -8,8 +8,6 @@#include <asm/arch/base_addr_ac5.h>include/configs/socfpga_arria5_socdk.h +0
-2-#define CONFIG_HW_WATCHDOG -/* Memory configurations */ #define PHYS_SDRAM_1_SIZE 0x40000000/* 1GiB on SoCDK */
(quoted diff) +0
-0
b/include/configs/socfpga_cyclone5_socdk.hindex018a0c3bb4..9c5bd648e3100644 ---a/include/configs/socfpga_cyclone5_socdk.h+++b/include/configs/socfpga_cyclone5_socdk.h@@ -8,8 +8,6 @@#include <asm/arch/base_addr_ac5.h>include/configs/socfpga_arria5_socdk.h +0
-2-#define CONFIG_HW_WATCHDOG -/* Memory configurations */ #define PHYS_SDRAM_1_SIZE 0x40000000/* 1GiB on SoCDK */
(quoted diff) +0
-0
b/include/configs/socfpga_de0_nano_soc.hindex275ed7ffeb..e5db00e366100644 ---a/include/configs/socfpga_de0_nano_soc.h+++b/include/configs/socfpga_de0_nano_soc.h@@ -8,8 +8,6 @@#include <asm/arch/base_addr_ac5.h>include/configs/socfpga_arria5_socdk.h +0
-2-#define CONFIG_HW_WATCHDOG -/* Memory configurations */ #define PHYS_SDRAM_1_SIZE 0x40000000/* 1GiB */
(quoted diff) +0
-0
b/include/configs/socfpga_de10_nano.hindexbb50fcf1ff..656af1104d100644 ---a/include/configs/socfpga_de10_nano.h
+++b/include/configs/socfpga_de10_nano.hinclude/configs/socfpga_arria5_socdk.h +0
-2@@ -8,8 +8,6 @@#include <asm/arch/base_addr_ac5.h> -#define CONFIG_HW_WATCHDOG -/* Memory configurations */ #define PHYS_SDRAM_1_SIZE 0x40000000/* 1GiB */
(quoted diff) +0
-0
b/include/configs/socfpga_de1_soc.hindex05975c9bde..f57b950425100644 ---a/include/configs/socfpga_de1_soc.h
+++b/include/configs/socfpga_de1_soc.hinclude/configs/socfpga_arria5_socdk.h +0
-2@@ -8,8 +8,6 @@#include <asm/arch/base_addr_ac5.h> -#define CONFIG_HW_WATCHDOG -/* Memory configurations */ #define PHYS_SDRAM_1_SIZE 0x40000000/* 1GiB */
(quoted diff) +0
-0
b/include/configs/socfpga_is1.hindex46f5f135dd..dc318e50dc100644include/configs/socfpga_is1.h +0
-2@@ -9,8 +9,6 @@#include <asm/arch/base_addr_ac5.h> -#define CONFIG_HW_WATCHDOG -/* Memory configurations */ #define PHYS_SDRAM_1_SIZE 0x10000000(quoted diff) +0
-0
b/include/configs/socfpga_mcvevk.hindex404f064e94..f13463b8b0100644 ---a/include/configs/socfpga_mcvevk.h
+++b/include/configs/socfpga_mcvevk.hinclude/configs/socfpga_arria5_socdk.h +0
-2@@ -8,8 +8,6 @@#include <asm/arch/base_addr_ac5.h> -#define CONFIG_HW_WATCHDOG -/* Memory configurations */ #define PHYS_SDRAM_1_SIZE 0x40000000/* 1GiB on MCV */
(quoted diff) +0
-0
b/include/configs/socfpga_sockit.hindexb4f31c42c5..0bbc7e0105100644 ---a/include/configs/socfpga_sockit.h
+++b/include/configs/socfpga_sockit.hinclude/configs/socfpga_arria5_socdk.h +0
-2@@ -8,8 +8,6 @@#include <asm/arch/base_addr_ac5.h> -#define CONFIG_HW_WATCHDOG -/* Memory configurations */ #define PHYS_SDRAM_1_SIZE 0x40000000/* 1GiB on SoCDK */
(quoted diff) +0
-0
b/include/configs/socfpga_socrates.hindexebb9ac588d..b66108d0cc100644 ---a/include/configs/socfpga_socrates.h
+++b/include/configs/socfpga_socrates.hinclude/configs/socfpga_arria5_socdk.h +0
-2@@ -8,8 +8,6 @@#include <asm/arch/base_addr_ac5.h> -#define CONFIG_HW_WATCHDOG -/* Memory configurations */ #define PHYS_SDRAM_1_SIZE 0x40000000/* 1GiB on SoCrates */
(quoted diff) +0
-0
b/include/configs/socfpga_sr1500.hindex39bf612291..871f587d45100644 ---a/include/configs/socfpga_sr1500.h
+++b/include/configs/socfpga_sr1500.hinclude/configs/socfpga_arria5_socdk.h +0
-2@@ -8,8 +8,6 @@#include <asm/arch/base_addr_ac5.h> -#define CONFIG_HW_WATCHDOG -/* Memory configurations */ #define PHYS_SDRAM_1_SIZE 0x40000000/* 1GiB on SR1500 */
(quoted diff) +0
-0
b/include/configs/socfpga_vining_fpga.hindex0c76a77525..1197b40b58100644 ---a/include/configs/socfpga_vining_fpga.h+++b/include/configs/socfpga_vining_fpga.h@@ -8,8 +8,6 @@
Quoted 8 lines
Quoted 7 lines
#include <asm/arch/base_addr_ac5.h>include/configs/socfpga_arria5_socdk.h +0
-2-#define CONFIG_HW_WATCHDOG -/* Memory configurations */ #define PHYS_SDRAM_1_SIZE 0x40000000/* 1GiB on
VINING_FPGA*/
Best regards,
Lukasz Majewski
--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de -------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 488 bytes
Desc: OpenPGP digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20180212/1ec290a9/attachment.sig>
PATCH v2 3/4 Convert socfpga: select CONFIG_HW_WATCHDOG support for ARCH_SOCFPGA
Quoted 23 lines · Lukasz Majewski
Hi Simon,
Quoted 10 lines · Lukasz Majewski
Quoted 4 lines
All Socfpga boards from
./include/configs/socfpga_*defineCONFIG_HW_WATCHDOG.
To easeCONFIG_HW_WATCHDOGconversion toKconfigselect it in configARCH_SOCFPGA(arch/arm/Kconfig) section.I do have board configs where the internal watchdog is not used and should be disabled (because there's an external one). Also, given that this is an FPGA, I suppose having non-upstreamed boards is not uncommon.
I must admit that this patch I did after looking on the socfpga pattern in the current upstream.
It seems like all boards there use
HW_WATCHDOG.Quoted 4 lines
I'm not too familiar with these settings though: can I leave the watchdog disabled when
CONFIG_HW_WATCHDOGis off? Before, I just haven't enabled this in my own board config...
Quoted 5 lines
I think that I will prepare next revision of this patch with just simple
./tools/moveconfig.pyoutput (without blindly selectingHW_WATCHDOGon all socfpga devices).In that way we will preserve the current behaviour.
You should probably use imply for features that are common, but optional.
Signature · 1 line
Tom
PATCH v2 3/4 Convert socfpga: select CONFIG_HW_WATCHDOG support for ARCH_SOCFPGA
Quoted 24 lines · On Sun, 11 Feb 2018 19:06:32 -0500 Tom Rini <[email protected]> wrote:
Quoted 23 lines · Lukasz Majewski
Hi Simon,
Quoted 10 lines · Lukasz Majewski
Quoted 4 lines
All Socfpga boards from
./include/configs/socfpga_*defineCONFIG_HW_WATCHDOG.
To easeCONFIG_HW_WATCHDOGconversion toKconfigselect it in configARCH_SOCFPGA(arch/arm/Kconfig) section.I do have board configs where the internal watchdog is not used and should be disabled (because there's an external one). Also, given that this is an FPGA, I suppose having non-upstreamed boards is not uncommon.
I must admit that this patch I did after looking on the socfpga pattern in the current upstream.
It seems like all boards there use
HW_WATCHDOG.Quoted 4 lines
I'm not too familiar with these settings though: can I leave the watchdog disabled when
CONFIG_HW_WATCHDOGis off? Before, I just haven't enabled this in my own board config...
Quoted 9 lines
Quoted 5 lines
I think that I will prepare next revision of this patch with just simple
./tools/moveconfig.pyoutput (without blindly selectingHW_WATCHDOGon all socfpga devices).In that way we will preserve the current behaviour.
You should probably use imply for features that are common, but optional.
Thanks for the suggestion.
Best regards,
Lukasz Majewski
--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de -------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 488 bytes
Desc: OpenPGP digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20180212/9c3ff058/attachment.sig>
PATCH v2 3/4 Convert socfpga: select CONFIG_HW_WATCHDOG support for ARCH_SOCFPGA
In reply to Lukasz MajewskiHello Lukasz,
Am 09.02.2018 um 23:14 schrieb Lukasz Majewski:
Quoted 11 lines
All Socfpga boards from
./include/configs/socfpga_*defineCONFIG_HW_WATCHDOG.
To easeCONFIG_HW_WATCHDOGconversion toKconfigselect it in configARCH_SOCFPGA(arch/arm/Kconfig) section.Signed-off-by Lukasz Majewski <[email protected]>---
Changes in v2:
- None
Quoted 14 lines
arch/arm/Kconfig | 1 + include/configs/socfpga_arria10_socdk.h | 2 -- include/configs/socfpga_arria5_socdk.h | 2 -- include/configs/socfpga_cyclone5_socdk.h | 2 -- include/configs/socfpga_de0_nano_soc.h | 2 -- include/configs/socfpga_de10_nano.h | 2 -- include/configs/socfpga_de1_soc.h | 2 -- include/configs/socfpga_is1.h | 2 -- include/configs/socfpga_mcvevk.h | 2 -- include/configs/socfpga_sockit.h | 2 -- include/configs/socfpga_socrates.h | 2 -- include/configs/socfpga_sr1500.h | 2 -- include/configs/socfpga_vining_fpga.h | 2 -- 13 files changed, 1 insertion(+), 24 deletions(-)
Thanks!
bye,
Heiko
Signature · 3 lines
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-52 Fax: +49-8142-66989-80 Email: hs at denx.de
PATCH v2 4/4 Convert CONFIG_HW_WATCHDOG to Kconfig
In reply to Lukasz MajewskiThe CONFIG_HW_WATCHDOG declaration has been converted to Kconfig
---
Changes in v2:
- None
configs/axm_defconfig | 1 + configs/calimain_defconfig | 1 + configs/microblaze-generic_defconfig | 1 + configs/nokia_rx51_defconfig | 1 + configs/picosam9g45_defconfig | 1 + configs/smartweb_defconfig | 1 + configs/taurus_defconfig | 1 + configs/ts4800_defconfig | 1 + include/configs/M5475EVB.h | 1 - include/configs/M5485EVB.h | 1 - include/configs/calimain.h | 1 - include/configs/controlcenterd.h | 1 - include/configs/eb_cpu5282.h | 2 -- include/configs/microblaze-generic.h | 1 - include/configs/nokia_rx51.h | 1 - include/configs/picosam9g45.h | 1 - include/configs/smartweb.h | 3 --- include/configs/taurus.h | 1 - include/configs/ts4800.h | 2 -- 19 files changed, 8 insertions(+), 15 deletions(-)
configs/axm_defconfig +1 -0
@@ -39,3 +39,4 @@ CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_PHYLIB=y CONFIG_USE_TINY_PRINTF=y +CONFIG_HW_WATCHDOG=y
configs/calimain_defconfig +1 -0
@@ -23,3 +23,4 @@ CONFIG_ENV_IS_IN_FLASH=y # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y CONFIG_SYS_NS16550=y +CONFIG_HW_WATCHDOG=y
configs/microblaze-generic_defconfig +1 -0
@@ -58,3 +58,4 @@ CONFIG_XILINX_AXIEMAC=y CONFIG_XILINX_EMACLITE=y CONFIG_SYS_NS16550=y CONFIG_XILINX_UARTLITE=y +CONFIG_HW_WATCHDOG=y
configs/nokia_rx51_defconfig +1 -0
@@ -33,3 +33,4 @@ CONFIG_TWL4030_USB=y CONFIG_VIDEO=y CONFIG_CFB_CONSOLE_ANSI=y # CONFIG_VGA_AS_SINGLE_DEVICE is not set +CONFIG_HW_WATCHDOG=y
configs/picosam9g45_defconfig +1 -0
@@ -37,3 +37,4 @@ CONFIG_USB_EHCI_HCD=y CONFIG_USB_STORAGE=y CONFIG_LCD=y CONFIG_OF_LIBFDT=y +CONFIG_HW_WATCHDOG=y
configs/smartweb_defconfig +1 -0
@@ -54,3 +54,4 @@ CONFIG_USB_HOST_ETHER=y CONFIG_USB_ETHER_ASIX=y CONFIG_USB_ETHER_MCS7830=y # CONFIG_EFI_LOADER is not set +CONFIG_HW_WATCHDOG=y
configs/taurus_defconfig +1 -0
@@ -56,3 +56,4 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0908 CONFIG_USB_GADGET_PRODUCT_NUM=0x02d2 CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_USE_TINY_PRINTF=y +CONFIG_HW_WATCHDOG=y
configs/ts4800_defconfig +1 -0
@@ -15,3 +15,4 @@ CONFIG_CMD_FAT=y CONFIG_ENV_IS_IN_MMC=y CONFIG_PHYLIB=y CONFIG_OF_LIBFDT=y +CONFIG_HW_WATCHDOG=y
include/configs/M5475EVB.h +0 -1
@@ -22,7 +22,6 @@#define CONFIG_MCFUART #define CONFIG_SYS_UART_PORT (0) -#undef CONFIG_HW_WATCHDOG#define CONFIG_WATCHDOG_TIMEOUT 5000/* timeout in milliseconds, max timeout is 6.71sec */ #define CONFIG_SLTTMR
include/configs/M5485EVB.h +0 -1
@@ -22,7 +22,6 @@#define CONFIG_MCFUART #define CONFIG_SYS_UART_PORT (0) -#undef CONFIG_HW_WATCHDOG#define CONFIG_WATCHDOG_TIMEOUT 5000/* timeout in milliseconds, max timeout is 6.71sec */ #define CONFIG_SLTTMR
include/configs/calimain.h +0 -1
@@ -29,7 +29,6 @@#define CONFIG_SYS_TEXT_BASE 0x60000000#define CONFIG_ARCH_CPU_INIT #define CONFIG_DA8XX_GPIO -#define CONFIG_HW_WATCHDOG #define CONFIG_SYS_WDTTIMERBASE DAVINCI_TIMER1_BASE#define CONFIG_SYS_WDT_PERIOD_LOW \ (60 * CONFIG_SYS_OSCIN_FREQ)/* 60 s heartbeat */
include/configs/controlcenterd.h +0 -1
@@ -339,7 +339,6 @@/* * Miscellaneous configurable options */ -#define CONFIG_HW_WATCHDOG #define CONFIG_LOADS_ECHO #define CONFIG_SYS_LOADS_BAUD_CHANGE
include/configs/eb_cpu5282.h +0 -2
@@ -32,8 +32,6 @@#define CONFIG_RESET_TO_RETRY #define CONFIG_SPLASH_SCREEN -#define CONFIG_HW_WATCHDOG -#define STATUS_LED_ACTIVE 0/*----------------------------------------------------------------------*
include/configs/microblaze-generic.h +0 -1
@@ -50,7 +50,6 @@# 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
include/configs/nokia_rx51.h +0 -1
@@ -159,7 +159,6 @@#endif /* Watchdog support */ -#define CONFIG_HW_WATCHDOG /* * Framebuffer
include/configs/picosam9g45.h +0 -1
@@ -67,7 +67,6 @@/* Enable the watchdog */ #define CONFIG_AT91SAM9_WATCHDOG -#define CONFIG_HW_WATCHDOG /* * Command line configuration.
include/configs/smartweb.h +0 -3
@@ -125,9 +125,6 @@/* Enable the watchdog */ #define CONFIG_AT91SAM9_WATCHDOG -#if !defined(CONFIG_SPL_BUILD ) -#define CONFIG_HW_WATCHDOG -#endif #define CONFIG_AT91_HW_WDT_TIMEOUT 15#if !defined(CONFIG_SPL_BUILD )
include/configs/taurus.h +0 -1
@@ -94,7 +94,6 @@#define CONFIG_AT91_HW_WDT_TIMEOUT 15#if !defined(CONFIG_SPL_BUILD )/* Enable the watchdog */ -#define CONFIG_HW_WATCHDOG #endif /* USB */
include/configs/ts4800.h +0 -2
@@ -17,8 +17,6 @@#define CONFIG_SKIP_LOWLEVEL_INIT /* U-Boot is a 2nd stage bootloader */ -#define CONFIG_HW_WATCHDOG -#define CONFIG_MACH_TYPE MACH_TYPE_TS48XX/* text base address used when linking */
Signature · 1 line
2.11.0
PATCH v2 4/4 Convert CONFIG_HW_WATCHDOG to Kconfig
Hello Lukasz,
Am 09.02.2018 um 23:14 schrieb Lukasz Majewski:
Quoted 29 lines
The
CONFIG_HW_WATCHDOGdeclaration has been converted toKconfigSigned-off-by Lukasz Majewski <[email protected]>---
Changes in v2:
- Noneconfigs/axm_defconfig | 1 + configs/calimain_defconfig | 1 + configs/microblaze-generic_defconfig | 1 + configs/nokia_rx51_defconfig | 1 + configs/picosam9g45_defconfig | 1 + configs/smartweb_defconfig | 1 + configs/taurus_defconfig | 1 + configs/ts4800_defconfig | 1 + include/configs/M5475EVB.h | 1 - include/configs/M5485EVB.h | 1 - include/configs/calimain.h | 1 - include/configs/controlcenterd.h | 1 - include/configs/eb_cpu5282.h | 2 -- include/configs/microblaze-generic.h | 1 - include/configs/nokia_rx51.h | 1 - include/configs/picosam9g45.h | 1 - include/configs/smartweb.h | 3 --- include/configs/taurus.h | 1 - include/configs/ts4800.h | 2 -- 19 files changed, 8 insertions(+), 15 deletions(-)
[...]
include/configs/microblaze-generic.h line 55
Quoted 12 lines
include/configs/microblaze-generic.h +0
-1@@ -50,7 +50,6 @@# 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
Hmm... does this mean now, that HW_WATCHDOG is also in SPL enabled for microblaze?
Did you checked that the resulting images (if you do a reproducible build with SOURCE_DATE_EPOCH set) are the same?
IIRC, I prepared a tbot testcase to check exatly this ... let me search ... ah, yes:
https://github.com/hsdenx/tbot/blob/master/src/tc/uboot/tc_uboot_check_kconfig.py
include/configs/smartweb.h line 128
Quoted 12 lines
include/configs/smartweb.h +0
-3@@ -125,9 +125,6 @@/* Enable the watchdog */ #define CONFIG_AT91SAM9_WATCHDOG -#if !defined(CONFIG_SPL_BUILD ) -#define CONFIG_HW_WATCHDOG -#endif #define CONFIG_AT91_HW_WDT_TIMEOUT 15
Huch ... here too ... the smartweb board has extremly low sram, and now we have WDT enabled in SPL ...
include/configs/taurus.h line 97
Quoted 11 lines
include/configs/smartweb.h +0
-0#if !defined(CONFIG_SPL_BUILD )include/configs/taurus.h +0
-1@@ -94,7 +94,6 @@#define CONFIG_AT91_HW_WDT_TIMEOUT 15#if !defined(CONFIG_SPL_BUILD )/* Enable the watchdog */ -#define CONFIG_HW_WATCHDOG #endif
and here ...
I tried to apply your patchset to current mainline, I get this error for this patch:
pollux:u-boot-smartweb hs [master] $ git am mbox
Wende an: Convert CONFIG_HW_WATCHDOG to Kconfig
error: Anwendung des Patches fehlgeschlagen: include/configs/calimain.h:29
error: include/configs/calimain.h: Patch konnte nicht angewendet werden
Please rebase this patch. Nevertheless I fixed it fast locally and tried your patches with tbot on the smartweb board, all worked fine, no size problems!
Uh ... no ... board is now resetting all 15 seconds if no input over console!
reverted this patcheset, and resets are gone ... hmm... I cannot see how your patches produce this behaviour ... May I find time to look here closer, but I have to leave now ...
bye,
Heiko
Signature · 3 lines
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-52 Fax: +49-8142-66989-80 Email: hs at denx.de