summaryrefslogtreecommitdiff
path: root/configs/B4860QDS_SPIFLASH_defconfig
diff options
context:
space:
mode:
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>2015-07-07 11:38:44 +0200
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2015-07-07 11:38:44 +0200
commit6f43ba70d15e15a08c25b3d956c70addb6740737 (patch)
treee5ddc8498043c0c47559737ea60e4d7fc866e20a /configs/B4860QDS_SPIFLASH_defconfig
parent003b09dad492ebc385b28067b8028a0c0ff9323f (diff)
parent9c6b05cb724e18d1db3f9e1a75b2272572f06fbd (diff)
downloadu-boot-imx-6f43ba70d15e15a08c25b3d956c70addb6740737.zip
u-boot-imx-6f43ba70d15e15a08c25b3d956c70addb6740737.tar.gz
u-boot-imx-6f43ba70d15e15a08c25b3d956c70addb6740737.tar.bz2
Merge branch 'u-boot/master' into 'u-boot-arm/master'
Diffstat (limited to 'configs/B4860QDS_SPIFLASH_defconfig')
-rw-r--r--configs/B4860QDS_SPIFLASH_defconfig3
1 files changed, 1 insertions, 2 deletions
diff --git a/configs/B4860QDS_SPIFLASH_defconfig b/configs/B4860QDS_SPIFLASH_defconfig
index ea8101d..18c3d94 100644
--- a/configs/B4860QDS_SPIFLASH_defconfig
+++ b/configs/B4860QDS_SPIFLASH_defconfig
@@ -2,5 +2,4 @@ CONFIG_PPC=y
CONFIG_MPC85xx=y
CONFIG_TARGET_B4860QDS=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_B4860,RAMBOOT_PBL,SPIFLASH,SYS_TEXT_BASE=0xFFF40000"
-CONFIG_CMD_SETEXPR=y
-CONFIG_CMD_NET=y
+CONFIG_SPI_FLASH=y