| Message ID | 20191212112952.28682-1-simon.k.r.goldschmidt@gmail.com |
|---|---|
| State | Accepted |
| Commit | cb068cae0dffd29445a2008ee11def2e4baf316f |
| Delegated to: | Simon Goldschmidt |
| Headers | show |
| Series | configs: socfpga: fix building Stratix10 and Agilex | expand |
Marek, On Thu, Dec 12, 2019 at 12:29 PM <simon.k.r.goldschmidt@gmail.com> wrote: > > From: Simon Goldschmidt <simon.k.r.goldschmidt@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.goldschmidt@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 >
On 12/12/19 12:29 PM, simon.k.r.goldschmidt@gmail.com wrote: > From: Simon Goldschmidt <simon.k.r.goldschmidt@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.goldschmidt@gmail.com> > --- > > 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 */ > Applied to socfpga/next, thanks.
On Fri, Dec 13, 2019 at 1:59 AM Marek Vasut <marex@denx.de> wrote: > > On 12/12/19 12:29 PM, simon.k.r.goldschmidt@gmail.com wrote: > > From: Simon Goldschmidt <simon.k.r.goldschmidt@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.goldschmidt@gmail.com> > > --- > > > > 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 */ > > > > Applied to socfpga/next, thanks. OK, thanks. And sorry for the mess.
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 */