From 88718be3001055fa2801a44ab10570279b3f2cb7 Mon Sep 17 00:00:00 2001 From: Miquel Raynal Date: Thu, 3 Oct 2019 19:50:03 +0200 Subject: mtd: rename CONFIG_NAND -> CONFIG_MTD_RAW_NAND Add more clarity by changing the Kconfig entry name. Signed-off-by: Miquel Raynal [trini: Re-run migration, update a few more cases] Signed-off-by: Tom Rini Reviewed-by: Boris Brezillon --- board/bosch/guardian/board.c | 2 +- board/bosch/guardian/mux.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'board/bosch/guardian') diff --git a/board/bosch/guardian/board.c b/board/bosch/guardian/board.c index 072aa4ebb8..32ebaf4231 100644 --- a/board/bosch/guardian/board.c +++ b/board/bosch/guardian/board.c @@ -180,7 +180,7 @@ int board_init(void) gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100; -#ifdef CONFIG_NAND +#ifdef CONFIG_MTD_RAW_NAND gpmc_init(); #endif return 0; diff --git a/board/bosch/guardian/mux.c b/board/bosch/guardian/mux.c index 20a1f2522f..9c81f29f9f 100644 --- a/board/bosch/guardian/mux.c +++ b/board/bosch/guardian/mux.c @@ -39,7 +39,7 @@ static struct module_pin_mux guardian_interfaces_pin_mux[] = { {-1}, }; -#ifdef CONFIG_NAND +#ifdef CONFIG_MTD_RAW_NAND static struct module_pin_mux nand_pin_mux[] = { {OFFSET(gpmc_ad0), (MODE(0) | PULLUDDIS | RXACTIVE)}, {OFFSET(gpmc_ad1), (MODE(0) | PULLUDDIS | RXACTIVE)}, @@ -82,7 +82,7 @@ void enable_i2c0_pin_mux(void) void enable_board_pin_mux(void) { -#ifdef CONFIG_NAND +#ifdef CONFIG_MTD_RAW_NAND configure_module_pin_mux(nand_pin_mux); #endif configure_module_pin_mux(guardian_interfaces_pin_mux); -- cgit