| Message ID | 20200130131005.4092249-1-hs@denx.de |
|---|---|
| State | Accepted |
| Commit | 0c054753a9c4c2d851e705844534ccd8676a06aa |
| Delegated to: | Stefano Babic |
| Headers | show |
| Series | imx6: aristainetos: fix NAND detection with latest mainline | expand |
> commit 88718be30010 ("mtd: rename CONFIG_NAND -> CONFIG_MTD_RAW_NAND") > moved CONFIG_NAND -> CONFIG_MTD_RAW_NAND. Adapt board code to this > change, as last merge did not respect the above commit. > Signed-off-by: Heiko Schocher <hs@denx.de> Applied to u-boot-imx, master, thanks ! Best regards, Stefano Babic
diff --git a/board/aristainetos/aristainetos.c b/board/aristainetos/aristainetos.c index c79ac1d339..3541717873 100644 --- a/board/aristainetos/aristainetos.c +++ b/board/aristainetos/aristainetos.c @@ -521,7 +521,7 @@ struct display_info_t const displays[] = { }; size_t display_count = ARRAY_SIZE(displays); -#if defined(CONFIG_NAND) +#if defined(CONFIG_MTD_RAW_NAND) iomux_v3_cfg_t nfc_pads[] = { MX6_PAD_NANDF_CLE__NAND_CLE | MUX_PAD_CTRL(NO_PAD_CTRL), MX6_PAD_NANDF_ALE__NAND_ALE | MUX_PAD_CTRL(NO_PAD_CTRL),
commit 88718be30010 ("mtd: rename CONFIG_NAND -> CONFIG_MTD_RAW_NAND") moved CONFIG_NAND -> CONFIG_MTD_RAW_NAND. Adapt board code to this change, as last merge did not respect the above commit. Signed-off-by: Heiko Schocher <hs@denx.de> --- board/aristainetos/aristainetos.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)