summaryrefslogtreecommitdiffstats
path: root/include/configs/mx51_efikamx.h
diff options
context:
space:
mode:
authorStefano Babic <sbabic@denx.de>2015-07-10 09:21:44 +0200
committerStefano Babic <sbabic@denx.de>2015-07-10 09:21:44 +0200
commit1254ff97abb7606ccd0d7bdcd9f22581c50fe535 (patch)
tree61b31e61173154abd38aaa6584e84ea77314b861 /include/configs/mx51_efikamx.h
parent54e0f96f764f662be186baae7d6c2c97423bc29d (diff)
parentf3edfd30541d6f245d7dfa6fa7354cc916cc53e1 (diff)
downloadtalos-obmc-uboot-1254ff97abb7606ccd0d7bdcd9f22581c50fe535.tar.gz
talos-obmc-uboot-1254ff97abb7606ccd0d7bdcd9f22581c50fe535.zip
Merge branch 'master' of git://git.denx.de/u-boot
Diffstat (limited to 'include/configs/mx51_efikamx.h')
-rw-r--r--include/configs/mx51_efikamx.h7
1 files changed, 0 insertions, 7 deletions
diff --git a/include/configs/mx51_efikamx.h b/include/configs/mx51_efikamx.h
index e3386ac52b..22aec4f176 100644
--- a/include/configs/mx51_efikamx.h
+++ b/include/configs/mx51_efikamx.h
@@ -11,8 +11,6 @@
#ifndef __CONFIG_H
#define __CONFIG_H
-#include <config_cmd_default.h>
-
/*
* High Level Board Configuration Options
*/
@@ -42,7 +40,6 @@
#define CONFIG_CMD_EXT2
#define CONFIG_CMD_IDE
#define CONFIG_CMD_DATE
-#undef CONFIG_CMD_IMLS
/*
* Environmental settings
@@ -93,7 +90,6 @@
/* SPI FLASH */
#ifdef CONFIG_CMD_SF
-#define CONFIG_SPI_FLASH
#define CONFIG_SPI_FLASH_SST
#define CONFIG_SF_DEFAULT_CS 1
#define CONFIG_SF_DEFAULT_MODE (SPI_MODE_0)
@@ -198,9 +194,6 @@
*/
#ifdef CONFIG_CMD_FAT
#define CONFIG_DOS_PARTITION
-#ifdef CONFIG_CMD_NET
-#define CONFIG_CMD_NFS
-#endif
#endif
/*
OpenPOWER on IntegriCloud