diff options
| author | Tom Rini <[email protected]> | 2019-12-04 17:13:35 -0500 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2019-12-04 17:13:35 -0500 |
| commit | c1c6e4a9da674bce5980d82f8a70a56e023e58c3 (patch) | |
| tree | 46548095b9e4baaa3a7de1d0ce8d07168ad3c01a /include/environment | |
| parent | 94d022bb400890f22fe35220d2519c3bce73f05e (diff) | |
| parent | fb4384490df4e753dcac0478bdb5e912994ef9d6 (diff) | |
Merge branch '2019-10-27-mtd-cleanup'
- Merge the series to clean up our MTD Kconfig and Makefile logic
Diffstat (limited to 'include/environment')
| -rw-r--r-- | include/environment/ti/dfu.h | 2 | ||||
| -rw-r--r-- | include/environment/ti/nand.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/environment/ti/dfu.h b/include/environment/ti/dfu.h index 9f7ea03226f..720c3453af0 100644 --- a/include/environment/ti/dfu.h +++ b/include/environment/ti/dfu.h @@ -39,7 +39,7 @@ "u-boot.img fat 1 1;" \ "uEnv.txt fat 1 1\0" -#ifdef CONFIG_NAND +#ifdef CONFIG_MTD_RAW_NAND #define DFU_ALT_INFO_NAND \ "dfu_alt_info_nand=" \ "SPL part 0 1;" \ diff --git a/include/environment/ti/nand.h b/include/environment/ti/nand.h index f838cb3ed1a..f2482e8c35e 100644 --- a/include/environment/ti/nand.h +++ b/include/environment/ti/nand.h @@ -5,7 +5,7 @@ * Environment variable definitions for NAND on TI boards. */ -#ifdef CONFIG_NAND +#ifdef CONFIG_MTD_RAW_NAND #define NANDARGS \ "mtdids=" CONFIG_MTDIDS_DEFAULT "\0" \ "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \ |