summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorTom Rini <[email protected]>2022-05-11 13:27:44 -0400
committerTom Rini <[email protected]>2022-05-11 13:27:44 -0400
commitc387e62614713d0cc9e3ed022b86c9f320b02853 (patch)
treeb4a66ef7e1e2c15ee7ae8d3576225eed29880b93 /include
parent21e25992c86306b41caafcf85efc47d66f5efa6e (diff)
parentdb26c507c925f8ae0ebad9e22b67b2df8ae2184b (diff)
Merge branch '2022-05-11-Kconfig-cleanups-etc'
- Migrate CONFIG_MTD_CONCAT to Kconfig, use CONFIG_VAL/IS_ENABLED in more places, rename SPL_LEGACY_IMAGE_SUPPORT to SPL_LEGACY_IMAGE_FORMAT and update some related dependencies for TI platforms.
Diffstat (limited to 'include')
-rw-r--r--include/configs/etamin.h1
-rw-r--r--include/configs/octeontx_common.h1
2 files changed, 0 insertions, 2 deletions
diff --git a/include/configs/etamin.h b/include/configs/etamin.h
index dc83ab71908..9cf93924df9 100644
--- a/include/configs/etamin.h
+++ b/include/configs/etamin.h
@@ -151,7 +151,6 @@
#define ETAMIN_NAND_GPMC_CONFIG4 0x16051807
#define ETAMIN_NAND_GPMC_CONFIG5 0x00151e1e
#define ETAMIN_NAND_GPMC_CONFIG6 0x16000f80
-#define CONFIG_MTD_CONCAT
/* Default env settings */
#define CONFIG_EXTRA_ENV_SETTINGS \
diff --git a/include/configs/octeontx_common.h b/include/configs/octeontx_common.h
index bcf8b41cfb6..81dbff2d672 100644
--- a/include/configs/octeontx_common.h
+++ b/include/configs/octeontx_common.h
@@ -64,7 +64,6 @@
/** EMMC specific defines */
#if defined(CONFIG_NAND_OCTEONTX)
-/*#define CONFIG_MTD_CONCAT */
#define CONFIG_SYS_MAX_NAND_DEVICE 8
#endif