summaryrefslogtreecommitdiff
path: root/board/sheldon
diff options
context:
space:
mode:
authorHorst Kronstorfer <hkronsto@frequentis.com>2011-12-24 00:41:58 +0000
committerWolfgang Denk <wd@denx.de>2012-01-05 16:36:44 +0100
commit72ebafbe2bd5044eecbfdaa132390a1421db25be (patch)
tree9a5e40782cdf1cc63f6cd65c6024076aa3476a49 /board/sheldon
parent6f403bad80224b9cfc5c97cb2ac1b608d1777d0d (diff)
downloadu-boot-imx-72ebafbe2bd5044eecbfdaa132390a1421db25be.zip
u-boot-imx-72ebafbe2bd5044eecbfdaa132390a1421db25be.tar.gz
u-boot-imx-72ebafbe2bd5044eecbfdaa132390a1421db25be.tar.bz2
tools/mkenvimage.c: Fix a merge issue
With bfcc40bb09b05c90cc3b1496abb270eb8aa72134 'optopt' was reverted. Signed-off-by: Horst Kronstorfer <hkronsto@frequentis.com>
Diffstat (limited to 'board/sheldon')
0 files changed, 0 insertions, 0 deletions