Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 517066a7094499712f7fc6f1d5c116427bdced08

Authored by Xiaoliang Yang
Committed by Stefano Babic
1 parent f767a4e82e
Exists in smarc_8mq_lf_v2020.04 and in 11 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0

Kconfig: Convert CONFIG_IMX_WATCHDOG to Kconfig 

Move this option to Kconfig and tidy up the config file of eight
boards which use it.

Signed-off-by: Xiaoliang Yang <xiaoliang.yang_1@nxp.com>

Showing 21 changed files with 18 additions and 18 deletions Side-by-side Diff

configs/aristainetos2_defconfig
Diff comments   View file @ 517066a
... ... @@ -50,5 +50,6 @@
50 50 CONFIG_USB_STORAGE=y
51 51 CONFIG_VIDEO=y
52 52 # CONFIG_VIDEO_SW_CURSOR is not set
  53 +CONFIG_IMX_WATCHDOG=y
53 54 CONFIG_OF_LIBFDT=y
configs/aristainetos2b_defconfig
Diff comments   View file @ 517066a
... ... @@ -50,5 +50,6 @@
50 50 CONFIG_USB_STORAGE=y
51 51 CONFIG_VIDEO=y
52 52 # CONFIG_VIDEO_SW_CURSOR is not set
  53 +CONFIG_IMX_WATCHDOG=y
53 54 CONFIG_OF_LIBFDT=y
configs/aristainetos_defconfig
Diff comments   View file @ 517066a
... ... @@ -49,5 +49,6 @@
49 49 CONFIG_USB_STORAGE=y
50 50 CONFIG_VIDEO=y
51 51 # CONFIG_VIDEO_SW_CURSOR is not set
  52 +CONFIG_IMX_WATCHDOG=y
52 53 CONFIG_OF_LIBFDT=y
configs/dh_imx6_defconfig
Diff comments   View file @ 517066a
... ... @@ -59,5 +59,6 @@
59 59 CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
60 60 CONFIG_CI_UDC=y
61 61 CONFIG_USB_GADGET_DOWNLOAD=y
  62 +CONFIG_IMX_WATCHDOG=y
62 63 CONFIG_OF_LIBFDT=y
configs/display5_defconfig
Diff comments   View file @ 517066a
... ... @@ -75,4 +75,5 @@
75 75 CONFIG_MXC_UART=y
76 76 CONFIG_SPI=y
77 77 CONFIG_MXC_SPI=y
  78 +CONFIG_IMX_WATCHDOG=y
configs/display5_factory_defconfig
Diff comments   View file @ 517066a
... ... @@ -82,5 +82,6 @@
82 82 CONFIG_USB_GADGET_PRODUCT_NUM=0x4000
83 83 CONFIG_CI_UDC=y
84 84 CONFIG_USB_GADGET_DOWNLOAD=y
  85 +CONFIG_IMX_WATCHDOG=y
85 86 CONFIG_OF_LIBFDT=y
configs/ge_bx50v3_defconfig
Diff comments   View file @ 517066a
... ... @@ -41,6 +41,7 @@
41 41 CONFIG_MII=y
42 42 CONFIG_SPI=y
43 43 CONFIG_MXC_SPI=y
  44 +CONFIG_IMX_WATCHDOG=y
44 45 CONFIG_OF_LIBFDT=y
45 46 # CONFIG_EFI_LOADER is not set
configs/kp_imx6q_tpc_defconfig
Diff comments   View file @ 517066a
... ... @@ -40,5 +40,6 @@
40 40 CONFIG_IMX_THERMAL=y
41 41 CONFIG_USB=y
42 42 CONFIG_USB_STORAGE=y
  43 +CONFIG_IMX_WATCHDOG=y
43 44 CONFIG_OF_LIBFDT=y
configs/mx53ppd_defconfig
Diff comments   View file @ 517066a
... ... @@ -37,5 +37,6 @@
37 37 CONFIG_USB_STORAGE=y
38 38 CONFIG_VIDEO=y
39 39 # CONFIG_VIDEO_SW_CURSOR is not set
  40 +CONFIG_IMX_WATCHDOG=y
40 41 CONFIG_OF_LIBFDT=y
configs/tqma6s_wru4_mmc_defconfig
Diff comments   View file @ 517066a
... ... @@ -65,5 +65,6 @@
65 65 CONFIG_USB_STORAGE=y
66 66 CONFIG_USB_HOST_ETHER=y
67 67 CONFIG_USB_ETHER_SMSC95XX=y
  68 +CONFIG_IMX_WATCHDOG=y
68 69 CONFIG_OF_LIBFDT=y
configs/warp_defconfig
Diff comments   View file @ 517066a
... ... @@ -37,5 +37,6 @@
37 37 CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
38 38 CONFIG_CI_UDC=y
39 39 CONFIG_USB_GADGET_DOWNLOAD=y
  40 +CONFIG_IMX_WATCHDOG=y
40 41 CONFIG_OF_LIBFDT=y
drivers/watchdog/Kconfig
Diff comments   View file @ 517066a
... ... @@ -111,5 +111,12 @@
111 111 Select this to enable Xilinx Axi watchdog timer, which can be found on some
112 112 Xilinx Microblaze Platforms.
113 113  
  114 +config IMX_WATCHDOG
  115 + bool "Enable Watchdog Timer support for IMX and LSCH2 of NXP"
  116 + select HW_WATCHDOG
  117 + help
  118 + Select this to enable the IMX and LSCH2 of Layerscape watchdog
  119 + driver.
  120 +
114 121 endmenu
include/configs/aristainetos-common.h
Diff comments   View file @ 517066a
... ... @@ -192,9 +192,6 @@
192 192  
193 193 /* UBI support */
194 194  
195   -#define CONFIG_HW_WATCHDOG
196   -#define CONFIG_IMX_WATCHDOG
197   -
198 195 /* Framebuffer */
199 196 #define CONFIG_VIDEO_IPUV3
200 197 /* check this console not needed, after test remove it */
include/configs/dh_imx6.h
Diff comments   View file @ 517066a
... ... @@ -109,8 +109,6 @@
109 109 #endif
110 110  
111 111 /* Watchdog */
112   -#define CONFIG_HW_WATCHDOG
113   -#define CONFIG_IMX_WATCHDOG
114 112 #define CONFIG_WATCHDOG_TIMEOUT_MSECS 60000
115 113  
116 114 /* allow to overwrite serial and ethaddr */
include/configs/display5.h
Diff comments   View file @ 517066a
... ... @@ -368,8 +368,6 @@
368 368 /* Commands */
369 369  
370 370 /* Watchdog */
371   -#define CONFIG_HW_WATCHDOG
372   -#define CONFIG_IMX_WATCHDOG
373 371 #define CONFIG_WATCHDOG_TIMEOUT_MSECS 15000
374 372  
375 373 /* ENV config */
include/configs/ge_bx50v3.h
Diff comments   View file @ 517066a
... ... @@ -31,8 +31,6 @@
31 31 #define CONFIG_REVISION_TAG
32 32 #define CONFIG_SYS_MALLOC_LEN (10 * SZ_1M)
33 33  
34   -#define CONFIG_HW_WATCHDOG
35   -#define CONFIG_IMX_WATCHDOG
36 34 #define CONFIG_WATCHDOG_TIMEOUT_MSECS 6000
37 35  
38 36 #define CONFIG_MXC_UART
include/configs/kp_imx6q_tpc.h
Diff comments   View file @ 517066a
... ... @@ -67,8 +67,6 @@
67 67 #endif
68 68  
69 69 /* Watchdog */
70   -#define CONFIG_HW_WATCHDOG
71   -#define CONFIG_IMX_WATCHDOG
72 70 #define CONFIG_WATCHDOG_TIMEOUT_MSECS 60000
73 71  
74 72 /* allow to overwrite serial and ethaddr */
include/configs/mx53ppd.h
Diff comments   View file @ 517066a
... ... @@ -22,8 +22,6 @@
22 22 /* Size of malloc() pool */
23 23 #define CONFIG_SYS_MALLOC_LEN (10 * 1024 * 1024)
24 24  
25   -#define CONFIG_HW_WATCHDOG
26   -#define CONFIG_IMX_WATCHDOG
27 25 #define CONFIG_WATCHDOG_TIMEOUT_MSECS 8000
28 26  
29 27 #define CONFIG_BOARD_LATE_INIT
include/configs/tqma6_wru4.h
Diff comments   View file @ 517066a
... ... @@ -17,8 +17,6 @@
17 17 #define CONSOLE_DEV "ttymxc3"
18 18  
19 19 /* Watchdog */
20   -#define CONFIG_HW_WATCHDOG
21   -#define CONFIG_IMX_WATCHDOG
22 20 #define CONFIG_WATCHDOG_TIMEOUT_MSECS 60000
23 21  
24 22 /* Config on-board RTC */
include/configs/warp.h
Diff comments   View file @ 517066a
... ... @@ -26,8 +26,6 @@
26 26 #define CONFIG_SUPPORT_EMMC_BOOT
27 27  
28 28 /* Watchdog */
29   -#define CONFIG_HW_WATCHDOG
30   -#define CONFIG_IMX_WATCHDOG
31 29 #define CONFIG_WATCHDOG_TIMEOUT_MSECS 30000 /* 30s */
32 30  
33 31 #define CONFIG_SYS_MEMTEST_START 0x80000000
scripts/config_whitelist.txt
Diff comments   View file @ 517066a
... ... @@ -963,7 +963,6 @@
963 963 CONFIG_IMX_NAND
964 964 CONFIG_IMX_OTP
965 965 CONFIG_IMX_VIDEO_SKIP
966   -CONFIG_IMX_WATCHDOG
967 966 CONFIG_INETSPACE_V2
968 967 CONFIG_INITRD_TAG
969 968 CONFIG_INIT_CRITICAL