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 /drivers | |
| 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 'drivers')
| -rw-r--r-- | drivers/mtd/mtd_uboot.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/mtd/mtd_uboot.c b/drivers/mtd/mtd_uboot.c index dd0b0242f95..14ce726b10d 100644 --- a/drivers/mtd/mtd_uboot.c +++ b/drivers/mtd/mtd_uboot.c @@ -30,8 +30,6 @@ static const char *get_mtdids(void) #if defined(CONFIG_SYS_MTDPARTS_RUNTIME) board_mtdparts_default(&mtdids, &mtdparts); -#elif defined(MTDIDS_DEFAULT) - mtdids = MTDIDS_DEFAULT; #elif defined(CONFIG_MTDIDS_DEFAULT) mtdids = CONFIG_MTDIDS_DEFAULT; #endif @@ -147,8 +145,6 @@ static const char *get_mtdparts(void) #if defined(CONFIG_SYS_MTDPARTS_RUNTIME) board_mtdparts_default(&mtdids, &mtdparts); -#elif defined(MTDPARTS_DEFAULT) - mtdparts = MTDPARTS_DEFAULT; #elif defined(CONFIG_MTDPARTS_DEFAULT) mtdparts = CONFIG_MTDPARTS_DEFAULT; #endif |