Merge remote-tracking branch 'remotes/tx6/tx6' into karo-tx-uboot