Added minor changes to match MCB4300 board config
Merge branch 'master' of https://github.com/mlnx/u-boot

Conflicts:
	include/configs/keil-mcb4300.h