diff options
| author | Tom Rini <trini@konsulko.com> | 2019-07-27 09:35:05 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-07-27 09:35:05 -0400 |
| commit | df9a7a195bdf0722399199bf373afc8309ae3ad7 (patch) | |
| tree | 5bf1e2e3388725131640aac7d120647820ca5b48 /include/asm-generic | |
| parent | 222701e157176a66628e4f399f52ca3307b018c9 (diff) | |
| parent | 4a6f5b4f56b8bc6f36736fc0a07c5c4f9069e69b (diff) | |
| download | u-boot-df9a7a195bdf0722399199bf373afc8309ae3ad7.tar.gz | |
Merge tag 'u-boot-imx-20190719' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx
u-boot-imx-20190719
- CCF for i.MX6
- nandbcb command to write SPL into NAND
- Switch to DM (i.MX28)
- Boards: Toradex, engicam, DH
- Fixes for i.MX8
- Fixes for i.MX7ULP
Travis: https://travis-ci.org/sbabic/u-boot-imx/builds/561147504
Diffstat (limited to 'include/asm-generic')
| -rw-r--r-- | include/asm-generic/global_data.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-generic/global_data.h b/include/asm-generic/global_data.h index 02a3ed6838..7c2220643b 100644 --- a/include/asm-generic/global_data.h +++ b/include/asm-generic/global_data.h @@ -137,7 +137,7 @@ typedef struct global_data { #if defined(CONFIG_TRANSLATION_OFFSET) fdt_addr_t translation_offset; /* optional translation offset */ #endif -#if defined(CONFIG_WDT) +#if CONFIG_IS_ENABLED(WDT) struct udevice *watchdog_dev; #endif } gd_t; |