diff options
| author | Simon Glass <sjg@chromium.org> | 2017-05-17 03:25:37 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-05-22 12:45:30 -0400 |
| commit | b8682a7fcf69344ac5a2d57c75f9c93bfdc93142 (patch) | |
| tree | f709005094650daeda2238aab8dde34209f818dd /include/configs/motionpro.h | |
| parent | 7d0f5c1300555101e1625ed7256ee6c3502e8482 (diff) | |
| download | u-boot-b8682a7fcf69344ac5a2d57c75f9c93bfdc93142.tar.gz | |
Convert CONFIG_CMD_JFFS2 to Kconfig
This converts the following to Kconfig:
CONFIG_CMD_JFFS2
Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'include/configs/motionpro.h')
| -rw-r--r-- | include/configs/motionpro.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/include/configs/motionpro.h b/include/configs/motionpro.h index 035f1dc5f9..75633f66ef 100644 --- a/include/configs/motionpro.h +++ b/include/configs/motionpro.h @@ -33,7 +33,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_JFFS2 #define CONFIG_CMD_REGINFO /* @@ -265,13 +264,6 @@ #define LED_ON 0x00000010 /* -<<<<<<< 4ba57299158b7a7020d2bd3b8d8369884696a0ae -======= - * Temperature sensor - */ - -/* ->>>>>>> Drop digital thermometer and thermostat (DTT) drivers * Environment settings */ #define CONFIG_ENV_IS_IN_FLASH 1 |