Merge with /home/hs/SC3/u-boot
Some code cleanup.