Marek, On Thu, Dec 12, 2019 at 12:29 PM <simon.k.r.goldschm...@gmail.com> wrote: > > From: Simon Goldschmidt <simon.k.r.goldschm...@gmail.com> > > This fixes a merge error that accidentally left CONFIG_MTD_DEVICE > active by removing it from the config file. > > Signed-off-by: Simon Goldschmidt <simon.k.r.goldschm...@gmail.com>
This applies to and fixes u-boot-socfpga/next. Regards, Simon > --- > > include/configs/socfpga_soc64_common.h | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/include/configs/socfpga_soc64_common.h > b/include/configs/socfpga_soc64_common.h > index 4b27483788..4afadafd35 100644 > --- a/include/configs/socfpga_soc64_common.h > +++ b/include/configs/socfpga_soc64_common.h > @@ -62,7 +62,6 @@ > /*#define CONFIG_ENV_IS_IN_SPI_FLASH*/ > > #ifndef CONFIG_SPL_BUILD > -#define CONFIG_MTD_DEVICE > #define CONFIG_MTD_PARTITIONS > #define MTDIDS_DEFAULT "nor0=ff705000.spi.0" > #endif /* CONFIG_SPL_BUILD */ > -- > 2.11.0 >
