diff options
author | Stefano Babic <sbabic@denx.de> | 2015-07-10 09:21:44 +0200 |
---|---|---|
committer | Stefano Babic <sbabic@denx.de> | 2015-07-10 09:21:44 +0200 |
commit | 1254ff97abb7606ccd0d7bdcd9f22581c50fe535 (patch) | |
tree | 61b31e61173154abd38aaa6584e84ea77314b861 /include/configs/P1022DS.h | |
parent | 54e0f96f764f662be186baae7d6c2c97423bc29d (diff) | |
parent | f3edfd30541d6f245d7dfa6fa7354cc916cc53e1 (diff) | |
download | u-boot-imx-1254ff97abb7606ccd0d7bdcd9f22581c50fe535.zip u-boot-imx-1254ff97abb7606ccd0d7bdcd9f22581c50fe535.tar.gz u-boot-imx-1254ff97abb7606ccd0d7bdcd9f22581c50fe535.tar.bz2 |
Merge branch 'master' of git://git.denx.de/u-boot
Diffstat (limited to 'include/configs/P1022DS.h')
-rw-r--r-- | include/configs/P1022DS.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/include/configs/P1022DS.h b/include/configs/P1022DS.h index 0f5915d..6ddf447 100644 --- a/include/configs/P1022DS.h +++ b/include/configs/P1022DS.h @@ -479,7 +479,6 @@ /* * eSPI - Enhanced SPI */ -#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_SPANSION #define CONFIG_HARD_SPI @@ -680,8 +679,6 @@ /* * Command line configuration. */ -#include <config_cmd_default.h> - #define CONFIG_CMD_ELF #define CONFIG_CMD_ERRATA #define CONFIG_CMD_IRQ |