diff options
| author | Tom Rini <trini@konsulko.com> | 2017-10-22 17:55:07 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-11-05 11:21:35 -0500 |
| commit | 43ede0bca7fc1590b623832b743213b818257a27 (patch) | |
| tree | c7612aadc5ff9c2768b26d383858d83b7339b13b /include/configs/nokia_rx51.h | |
| parent | 804dcf771aacc75f595d3656be0ca6a7887b6672 (diff) | |
Kconfig: Migrate MTDIDS_DEFAULT / MTDPARTS_DEFAULT
We move all instances of CONFIG_MTDIDS_DEFAULT and
CONFIG_MTDPARTS_DEFAULT from the header files to the defconfig files.
There's a few cases here where we need to expand upon what was in the
header file.
Tested-by: Adam Ford <aford173@gmail.com> #omap3_logic
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'include/configs/nokia_rx51.h')
| -rw-r--r-- | include/configs/nokia_rx51.h | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h index 20b8c345f0..b7fe7341e4 100644 --- a/include/configs/nokia_rx51.h +++ b/include/configs/nokia_rx51.h @@ -164,15 +164,6 @@ #define CONFIG_MTD_DEVICE #define CONFIG_MTD_PARTITIONS -#define MTDIDS_DEFAULT "onenand0=onenand" -#define MTDPARTS_DEFAULT "mtdparts=onenand:" \ - __stringify(PART1_SIZE) PART1_SUFF "(" PART1_NAME ")ro," \ - __stringify(PART2_SIZE) PART2_SUFF "(" PART2_NAME ")," \ - __stringify(PART3_SIZE) PART3_SUFF "(" PART3_NAME ")," \ - __stringify(PART4_SIZE) PART4_SUFF "(" PART4_NAME ")," \ - __stringify(PART5_SIZE) PART5_SUFF "(" PART5_NAME ")," \ - "-(" PART6_NAME ")" - #endif /* Watchdog support */ @@ -198,13 +189,14 @@ int rx51_kp_tstc(struct stdio_dev *sdev); int rx51_kp_getc(struct stdio_dev *sdev); #endif -#ifndef MTDPARTS_DEFAULT -#define MTDPARTS_DEFAULT -#endif - /* Environment information */ +#ifdef CONFIG_MTDPARTS_DEFAULT +#define MTDPARTS "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" +#else +#define MTDPARTS +#endif #define CONFIG_EXTRA_ENV_SETTINGS \ - "mtdparts=" MTDPARTS_DEFAULT "\0" \ + MTDPARTS \ "usbtty=cdc_acm\0" \ "stdin=vga\0" \ "stdout=vga\0" \ |