summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2012-03-30 20:17:02 +0200
committerWolfgang Denk <wd@denx.de>2012-03-30 20:17:02 +0200
commita939ea3ab459d5fb3d1eaaec289c6ca85f2f74c1 (patch)
treeb343c2aeb1dbfbd9a64cfb9da9f39d70e6d077f9 /include
parentbc6f6c87b685bcdcd5bef522982d15209b6b9601 (diff)
parentf3e6110a10b694b3beb1ba7704fb7632cc371844 (diff)
downloadu-boot-imx-a939ea3ab459d5fb3d1eaaec289c6ca85f2f74c1.zip
u-boot-imx-a939ea3ab459d5fb3d1eaaec289c6ca85f2f74c1.tar.gz
u-boot-imx-a939ea3ab459d5fb3d1eaaec289c6ca85f2f74c1.tar.bz2
Merge branch 'agust@denx.de' of git://git.denx.de/u-boot-staging
* 'agust@denx.de' of git://git.denx.de/u-boot-staging: lzma: fix printf warnings Remove CONFIG_SYS_EXTBDINFO from snapper9260.h cmd_pxe.c: fix strict-aliasing warnings net: smc91111: use mdelay() doc: Fix some typos in different files disk/part.c: Fix device enumeration through API mkenvimage: Really set the redundant byte when applicable mkenvimage: Don't try to detect comments in the input file mkenvimage: Use mmap() when reading from a regular file mkenvimage: Read/Write from/to stdin/out by default or if the filename is "-" mkenvimage: More error handling mkenvimage: Correct an include and add a missing one mkenvimage: correct and clarify comments and error messages MAKEALL: display SPL size if present ARMV7/Vexpress: add missing get_ticks() and get_tbclk() mkenvimage: fix usage message cmd_fat: add FAT write command fs/fat/fat_write.c: Fix GCC 4.6 warnings FAT write: Fix compile errors
Diffstat (limited to 'include')
-rw-r--r--include/configs/snapper9260.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/include/configs/snapper9260.h b/include/configs/snapper9260.h
index cb3c674..cee65d1 100644
--- a/include/configs/snapper9260.h
+++ b/include/configs/snapper9260.h
@@ -157,7 +157,6 @@
#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \
sizeof(CONFIG_SYS_PROMPT) + 16)
#define CONFIG_SYS_LONGHELP
-#define CONFIG_SYS_EXTBDINFO
#define CONFIG_CMDLINE_EDITING
#define CONFIG_AUTO_COMPLETE
#define CONFIG_SYS_HUSH_PARSER