diff options
author | Tom Rini <trini@konsulko.com> | 2019-12-05 01:13:35 +0300 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2019-12-05 01:13:35 +0300 |
commit | c1c6e4a9da674bce5980d82f8a70a56e023e58c3 (patch) | |
tree | 46548095b9e4baaa3a7de1d0ce8d07168ad3c01a /include/configs/omap3_beagle.h | |
parent | 94d022bb400890f22fe35220d2519c3bce73f05e (diff) | |
parent | fb4384490df4e753dcac0478bdb5e912994ef9d6 (diff) | |
download | u-boot-c1c6e4a9da674bce5980d82f8a70a56e023e58c3.tar.xz |
Merge branch '2019-10-27-mtd-cleanup'
- Merge the series to clean up our MTD Kconfig and Makefile logic
Diffstat (limited to 'include/configs/omap3_beagle.h')
-rw-r--r-- | include/configs/omap3_beagle.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h index 800e22b486..4157d7614f 100644 --- a/include/configs/omap3_beagle.h +++ b/include/configs/omap3_beagle.h @@ -24,7 +24,7 @@ #define CONFIG_REVISION_TAG /* NAND */ -#if defined(CONFIG_NAND) +#if defined(CONFIG_MTD_RAW_NAND) #define CONFIG_SYS_FLASH_BASE NAND_BASE #define CONFIG_SYS_MAX_NAND_DEVICE 1 #define CONFIG_SYS_NAND_5_ADDR_CYCLE @@ -45,7 +45,7 @@ #if defined(CONFIG_SPL_OS_BOOT) #define CONFIG_SYS_NAND_SPL_KERNEL_OFFS 0x2a0000 #endif /* CONFIG_SPL_OS_BOOT */ -#endif /* CONFIG_NAND */ +#endif /* CONFIG_MTD_RAW_NAND */ /* USB EHCI */ #define CONFIG_OMAP_EHCI_PHY1_RESET_GPIO 147 @@ -67,7 +67,7 @@ #define BOOTENV_DEV_NAME_LEGACY_MMC(devtypeu, devtypel, instance) \ #devtypel #instance " " -#if defined(CONFIG_NAND) +#if defined(CONFIG_MTD_RAW_NAND) #define BOOTENV_DEV_NAND(devtypeu, devtypel, instance) \ "bootcmd_" #devtypel #instance "=" \ @@ -85,13 +85,13 @@ func(UBIFS, ubifs, 0) \ func(NAND, nand, 0) -#else /* !CONFIG_NAND */ +#else /* !CONFIG_MTD_RAW_NAND */ #define BOOT_TARGET_DEVICES(func) \ func(MMC, mmc, 0) \ func(LEGACY_MMC, legacy_mmc, 0) -#endif /* CONFIG_NAND */ +#endif /* CONFIG_MTD_RAW_NAND */ #include <config_distro_bootcmd.h> |