diff options
| author | Tom Rini <[email protected]> | 2020-12-03 09:43:47 -0500 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2020-12-03 09:43:47 -0500 |
| commit | ee1e04558ff8c8ed812b986939447f129bb0b0bb (patch) | |
| tree | 3a8e867ec03a87263834725b5815c43465a81f88 /include/configs | |
| parent | ab31883ae7e54ded8396b13a9057f861bf916ea4 (diff) | |
| parent | a6cd384b9c37596ca9035f26922dd65991ddcb85 (diff) | |
Merge branch '2020-12-02-master-imports'
- Assorted minor fixes
Diffstat (limited to 'include/configs')
| -rw-r--r-- | include/configs/ethernut5.h | 1 | ||||
| -rw-r--r-- | include/configs/km/keymile-common.h | 3 | ||||
| -rw-r--r-- | include/configs/km/km-powerpc.h | 2 | ||||
| -rw-r--r-- | include/configs/kmp204x.h | 3 | ||||
| -rw-r--r-- | include/configs/pm9263.h | 1 | ||||
| -rw-r--r-- | include/configs/stmark2.h | 1 |
6 files changed, 0 insertions, 11 deletions
diff --git a/include/configs/ethernut5.h b/include/configs/ethernut5.h index b513b4bc68a..ca249d9d2b5 100644 --- a/include/configs/ethernut5.h +++ b/include/configs/ethernut5.h @@ -62,7 +62,6 @@ /* JFFS2 */ #ifdef CONFIG_CMD_JFFS2 -#define CONFIG_JFFS2_CMDLINE #define CONFIG_JFFS2_NAND #endif diff --git a/include/configs/km/keymile-common.h b/include/configs/km/keymile-common.h index 851b13e063d..ad0041d8a94 100644 --- a/include/configs/km/keymile-common.h +++ b/include/configs/km/keymile-common.h @@ -32,9 +32,6 @@ */ #define CONFIG_BOOTP_BOOTFILESIZE -/* UBI Support for all Keymile boards */ -#define CONFIG_MTD_CONCAT - #ifndef CONFIG_KM_DEF_ENV_BOOTPARAMS #define CONFIG_KM_DEF_ENV_BOOTPARAMS \ "actual_bank=0\0" diff --git a/include/configs/km/km-powerpc.h b/include/configs/km/km-powerpc.h index 7bfe12fecbb..3be926c1031 100644 --- a/include/configs/km/km-powerpc.h +++ b/include/configs/km/km-powerpc.h @@ -9,8 +9,6 @@ /* Do boardspecific init for all boards */ -#define CONFIG_JFFS2_CMDLINE - /* EEprom support 24C08, 24C16, 24C64 */ #define CONFIG_SYS_EEPROM_PAGE_WRITE_ENABLE #define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS 3 /* 8 Byte write page */ diff --git a/include/configs/kmp204x.h b/include/configs/kmp204x.h index ec1254e747b..d1eb7b574b4 100644 --- a/include/configs/kmp204x.h +++ b/include/configs/kmp204x.h @@ -337,9 +337,6 @@ int get_scl(void); * additionnal command line configuration. */ -/* we don't need flash support */ -#undef CONFIG_JFFS2_CMDLINE - /* * For booting Linux, the board info and command line data * have to be in the first 64 MB of memory, since this is diff --git a/include/configs/pm9263.h b/include/configs/pm9263.h index 0ed4b1aaa27..6c882b6ff94 100644 --- a/include/configs/pm9263.h +++ b/include/configs/pm9263.h @@ -190,7 +190,6 @@ #endif -#define CONFIG_JFFS2_CMDLINE 1 #define CONFIG_JFFS2_NAND 1 #define CONFIG_JFFS2_DEV "nand0" /* NAND device jffs2 lives on */ #define CONFIG_JFFS2_PART_OFFSET 0 /* start of jffs2 partition */ diff --git a/include/configs/stmark2.h b/include/configs/stmark2.h index d9a2f75e738..da162cbb114 100644 --- a/include/configs/stmark2.h +++ b/include/configs/stmark2.h @@ -49,7 +49,6 @@ #define CONFIG_SYS_MCFRRTC_BASE 0xFC0A8000 /* spi not partitions */ -#define CONFIG_JFFS2_CMDLINE #define CONFIG_JFFS2_DEV "nor0" /* Timer */ |