merge code from svn server: hardware,software

Signed-off-by: chaoyi <chaoyi_1986@sina.com>