diff options
| author | Tom Rini <trini@konsulko.com> | 2021-01-06 00:20:26 +0300 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-01-06 00:20:26 +0300 |
| commit | 720620e6916ba40b9a173bb07706d2c73f3c23e7 (patch) | |
| tree | b085821f1d1137d80e9bb73f405ea0680db338b9 /include/configs/km | |
| parent | c86b18074c9d40bfa63cda1068b6dfb810d4377d (diff) | |
| parent | 62b07b5173e3d04fabfac42cf1f4779d021f94ad (diff) | |
| download | u-boot-720620e6916ba40b9a173bb07706d2c73f3c23e7.tar.xz | |
Merge tag 'v2021.01-rc5' into next
Prepare v2021.01-rc5
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'include/configs/km')
| -rw-r--r-- | include/configs/km/keymile-common.h | 3 | ||||
| -rw-r--r-- | include/configs/km/km-powerpc.h | 2 |
2 files changed, 0 insertions, 5 deletions
diff --git a/include/configs/km/keymile-common.h b/include/configs/km/keymile-common.h index e084862518..d321ebdb63 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 7bfe12fecb..3be926c103 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 */ |