sync with my faraday git

Signed-off-by: Kuo-Jung Su <dantesu@faraday-tech.com>