| Message ID | 20220929001520.9095-1-christian@kohlschutter.com |
|---|---|
| State | Superseded |
| Delegated to: | Kever Yang |
| Headers | show |
| Series | arm: dts: rockchip: rk3399: nanopi-r4s: Provide smbios sysinfo | expand |
On Wed, 28 Sept 2022 at 18:15, Christian Kohlschütter <christian@kohlschutter.com> 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> > --- > arch/arm/dts/rk3399-nanopi-r4s-u-boot.dtsi | 22 ++++++++++++++++++++++ > configs/nanopi-r4s-rk3399_defconfig | 2 ++ > 2 files changed, 24 insertions(+) Reviewed-by: Simon Glass <sjg@chromium.org> > > 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 Is the ordering right, here? Regards, Simon > -- > 2.36.2 >
> On 29. Sep 2022, at 04:36, Simon Glass <sjg@chromium.org> wrote: > > On Wed, 28 Sept 2022 at 18:15, Christian Kohlschütter > <christian@kohlschutter.com> 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> >> --- >> arch/arm/dts/rk3399-nanopi-r4s-u-boot.dtsi | 22 ++++++++++++++++++++++ >> configs/nanopi-r4s-rk3399_defconfig | 2 ++ >> 2 files changed, 24 insertions(+) > > Reviewed-by: Simon Glass <sjg@chromium.org> > >> >> 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 > > Is the ordering right, here? > > Regards, > Simon Is there a tool to sort these values in a certain order? Should these not be in alphabetical order? Thanks, Christian
Hi Christian, On Thu, 29 Sept 2022 at 08:30, Christian Kohlschütter <christian@kohlschutter.com> wrote: > > > On 29. Sep 2022, at 04:36, Simon Glass <sjg@chromium.org> wrote: > > > > On Wed, 28 Sept 2022 at 18:15, Christian Kohlschütter > > <christian@kohlschutter.com> 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> > >> --- > >> arch/arm/dts/rk3399-nanopi-r4s-u-boot.dtsi | 22 ++++++++++++++++++++++ > >> configs/nanopi-r4s-rk3399_defconfig | 2 ++ > >> 2 files changed, 24 insertions(+) > > > > Reviewed-by: Simon Glass <sjg@chromium.org> > > > >> > >> 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 > > > > Is the ordering right, here? > > > > Regards, > > Simon > > Is there a tool to sort these values in a certain order? $ echo nanopi-r4s-rk3399_defconfig >asc $ ./tools/moveconfig.py -s -d asc (it could use a new flag to just specific the board, if you want to send a patch) Should these not be in alphabetical order? No it is in order of the Kconfig tree (use 'make menuconfig' or 'make xconfig' to see it). Regards, Simon
On 30. Sep 2022, at 01:55, Simon Glass <sjg@chromium.org> wrote: ... >> Is there a tool to sort these values in a certain order? > > $ echo nanopi-r4s-rk3399_defconfig >asc > $ ./tools/moveconfig.py -s -d asc > > (it could use a new flag to just specific the board, if you want to > send a patch) > > Should these not be in alphabetical order? > > No it is in order of the Kconfig tree (use 'make menuconfig' or 'make > xconfig' to see it). > > Regards, > Simon I tried the above commands to no avail. moveconfig hangs. I assume you meant "cat" instead of "echo"? But even then it doesn't sort the values. Fixing that I just got a bunch of "no defconfig matched" warnings. What is the motivation of sorting these values in Kconfig order? Is it just for the sake of keeping comments in the right place? Would sorting in alphabetical order cause other issues? Should there perhaps be a make target to take care of automatically cleaning up defconfig files?
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
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
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
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> --- arch/arm/dts/rk3399-nanopi-r4s-u-boot.dtsi | 22 ++++++++++++++++++++++ configs/nanopi-r4s-rk3399_defconfig | 2 ++ 2 files changed, 24 insertions(+)