merge with testing_upstream

diff --cc common/board_r.c
Simple merge

diff --cc configs/baikal_bfk3_defconfig
index 67fd454255e7d62eabdd6804a4d0ac278cae7ea6,6e851d9aff8c66ddd0d9f504c7280eab53360fdd..27dfa5f67825321b5ab02a2bb58fd794997c6891
--- 1/configs/baikal_bfk3_defconfig
--- 2/configs/baikal_bfk3_defconfig
+++ b/configs/baikal_bfk3_defconfig
@@@ -114,5 -114,4 +114,6 @@@ CONFIG_SYS_BOOTM_LEN=0x0300000
  CONFIG_SYS_PBSIZE=256
  CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
  CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0xBBF90000
 +CONFIG_SYSINFO=y
 +CONFIG_BAIKAL_SMBIOS=y
+ CONFIG_CMD_NFS=y

diff --cc lib/Makefile
Simple merge