
Hi Christian,
I got below error when try to apply:
Applying: arm: dts: rockchip: rk3399: nanopi-r4s: Provide smbios sysinfo error: sha1 information is lacking or useless (configs/nanopi-r4s-rk3399_defconfig). error: could not build fake ancestor hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0001 arm: dts: rockchip: rk3399: nanopi-r4s: Provide smbios sysinfo
Could you resend this patch?
Thanks,
- Kever
On 2022/10/17 21:21, Kever Yang wrote:
On 2022/9/29 08:15, Christian Kohlschütter wrote:
Provide human-readable manufacturer and product names for the FriendlyELEC NanoPi R4S.
Enable CONFIG_SYSINFO and CONFIG_SYSINFO_SMBIOS by default.
Signed-off-by: Christian Kohlschütter christian@kohlschutter.com
Reviewed-by: Kever Yang kever.yang@rock-chips.com
Thanks,
- Kever
arch/arm/dts/rk3399-nanopi-r4s-u-boot.dtsi | 22 ++++++++++++++++++++++ configs/nanopi-r4s-rk3399_defconfig | 2 ++ 2 files changed, 24 insertions(+)
diff --git a/arch/arm/dts/rk3399-nanopi-r4s-u-boot.dtsi b/arch/arm/dts/rk3399-nanopi-r4s-u-boot.dtsi index cd1642527b..69800cc368 100644 --- a/arch/arm/dts/rk3399-nanopi-r4s-u-boot.dtsi +++ b/arch/arm/dts/rk3399-nanopi-r4s-u-boot.dtsi @@ -14,3 +14,25 @@ #include "rk3399-nanopi4-u-boot.dtsi" #include "rk3399-sdram-lpddr4-100.dtsi"
+/ { + smbios { + compatible = "u-boot,sysinfo-smbios";
+ smbios { + system { + manufacturer = "FriendlyELEC"; + product = "NanoPi R4S"; + };
+ baseboard { + manufacturer = "FriendlyELEC"; + product = "NanoPi R4S"; + };
+ chassis { + manufacturer = "FriendlyELEC"; + }; + }; + }; +}; diff --git a/configs/nanopi-r4s-rk3399_defconfig b/configs/nanopi-r4s-rk3399_defconfig index dd2579d2e0..502f007e6e 100644 --- a/configs/nanopi-r4s-rk3399_defconfig +++ b/configs/nanopi-r4s-rk3399_defconfig @@ -75,3 +75,5 @@ CONFIG_MISC=y CONFIG_MISC_INIT_R=y CONFIG_ROCKCHIP_EFUSE=y CONFIG_ROCKCHIP_OTP=y +CONFIG_SYSINFO=y +CONFIG_SYSINFO_SMBIOS=y