diff options
| author | Tom Rini <[email protected]> | 2022-12-13 11:34:59 -0500 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2022-12-13 11:34:59 -0500 |
| commit | 9c955393f7a27ded250fef7688e0065b44a3343f (patch) | |
| tree | a7096081a780e5a5b8d474f81e128681c9789d13 /cmd | |
| parent | 259420703b594c56844bc018e1c902484a3837aa (diff) | |
| parent | aeb13924f4579bd200d538fcb82628101822a833 (diff) | |
Merge branch '2022-12-12-build-related-updates' into next
- Updates to the keymile platforms for DM_I2C and text based
environment migration
- Finish migration of MTDPART/MTDIDS_DEFAULT to defconfig
- Disable warning about RWX segments with gcc-12.2
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/mtdparts.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/cmd/mtdparts.c b/cmd/mtdparts.c index bab75a262f3..0984158f41e 100644 --- a/cmd/mtdparts.c +++ b/cmd/mtdparts.c @@ -111,20 +111,17 @@ DECLARE_GLOBAL_DATA_PTR; #define MTD_WRITEABLE_CMD 1 /* default values for mtdids and mtdparts variables */ -#if !defined(MTDIDS_DEFAULT) #ifdef CONFIG_MTDIDS_DEFAULT #define MTDIDS_DEFAULT CONFIG_MTDIDS_DEFAULT #else #define MTDIDS_DEFAULT NULL #endif -#endif -#if !defined(MTDPARTS_DEFAULT) #ifdef CONFIG_MTDPARTS_DEFAULT #define MTDPARTS_DEFAULT CONFIG_MTDPARTS_DEFAULT #else #define MTDPARTS_DEFAULT NULL #endif -#endif + #if defined(CONFIG_SYS_MTDPARTS_RUNTIME) extern void board_mtdparts_default(const char **mtdids, const char **mtdparts); #endif |