Skip to contentSkip to conversation

configs: socfpga: fix building Stratix10 and Agilex

PATCH New simon.k.r.goldschmidt at gmail.com 2 participants 4 messages Dec 12, 2019 – Dec 13, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 configs: socfpga: fix building Stratix10 and Agilex

From: Simon Goldschmidt <[email protected]>

This fixes a merge error that accidentally left CONFIG_MTD_DEVICE active by removing it from the config file.

---

 include/configs/socfpga_soc64_common.h | 1 -
 1 file changed, 1 deletion(-)
include/configs/socfpga_soc64_common.h +0 -1
index 4b27483788..4afadafd35 100644
@@ -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 */
Signature · 1 line
2.11.0
#1 lore raw

PATCH 1/1 configs: socfpga: fix building Stratix10 and Agilex

Marek,

Quoted 7 lines · On Thu, Dec 12, 2019 at 12:29 PM <[email protected]> wrote:

From: Simon Goldschmidt <[email protected]>

This fixes a merge error that accidentally left CONFIG_MTD_DEVICE active by removing it from the config file.

This applies to and fixes u-boot-socfpga/next.

Regards,
Simon

Quoted 20 lines

---

 include/configs/socfpga_soc64_common.h | 1 -
 1 file changed, 1 deletion(-)
include/configs/socfpga_soc64_common.h +0 -2
index 4b27483788..4afadafd35 100644
@@ -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

Applied
#2 lore raw

PATCH 1/1 configs: socfpga: fix building Stratix10 and Agilex

In reply to simon.k.r.goldschmidt at gmail.com
Quoted 17 lines · simon.k.r.goldschmidt at gmail.com

From: Simon Goldschmidt <[email protected]>

This fixes a merge error that accidentally left CONFIG_MTD_DEVICE active by removing it from the config file.

---

 include/configs/socfpga_soc64_common.h | 1 -
 1 file changed, 1 deletion(-)
include/configs/socfpga_soc64_common.h +0 -0
index 4b27483788..4afadafd35 100644

include/configs/socfpga_soc64_common.h line 67

Quoted 7 lines
include/configs/socfpga_soc64_common.h +0 -1
@@ -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.

#3 lore raw

PATCH 1/1 configs: socfpga: fix building Stratix10 and Agilex

Quoted 20 lines · Marek Vasut
Quoted 18 lines · simon.k.r.goldschmidt at gmail.com

From: Simon Goldschmidt <[email protected]>

This fixes a merge error that accidentally left CONFIG_MTD_DEVICE active by removing it from the config file.

---

 include/configs/socfpga_soc64_common.h | 1 -
 1 file changed, 1 deletion(-)
include/configs/socfpga_soc64_common.h +0 -0
index 4b27483788..4afadafd35 100644
@@ -62,7 +62,6 @@
 /*#define CONFIG_ENV_IS_IN_SPI_FLASH*/
 
Quoted 8 lines

include/configs/socfpga_soc64_common.h line 67

Quoted 6 lines
include/configs/socfpga_soc64_common.h +0 -1
 #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.