Skip to contentSkip to conversation

ARM: dts: meson: Use devicetree for SMBIOS settings for Khadas VIM boards

PATCH In review Artem Lapkin 2 participants 4 messages Jul 27, 2021

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ARM: dts: meson: Use devicetree for SMBIOS settings for Khadas VIM boards

Khadas vim series: Use devicetree for SMBIOS settings
Add settings and enable the default sysinfo driver so that these can come from the device tree.

---
 .../meson-g12b-a311d-khadas-vim3-u-boot.dtsi  | 23 +++++++++++++++++++
 .../meson-gxl-s905x-khadas-vim-u-boot.dtsi    | 23 +++++++++++++++++++
 .../arm/dts/meson-gxm-khadas-vim2-u-boot.dtsi | 21 +++++++++++++++++
 .../dts/meson-sm1-khadas-vim3l-u-boot.dtsi    | 23 +++++++++++++++++++
 4 files changed, 90 insertions(+)
arch/arm/dts/meson-g12b-a311d-khadas-vim3-u-boot.dtsi +23 -0
index 489efa15..fcd6f053 100644
@@ -6,3 +6,26 @@
 
 #include "meson-g12-common-u-boot.dtsi"
 #include "meson-khadas-vim3-u-boot.dtsi"
+
+/ {
+	smbios {
+		compatible = "u-boot,sysinfo-smbios";
+
+		smbios {
+			system {
+				manufacturer = "khadas";
+				product = "VIM3";
+			};
+
+			baseboard {
+				manufacturer = "khadas";
+				product = "VIM3";
+			};
+
+			chassis {
+				manufacturer = "khadas";
+				product = "VIM3";
+			};
+		};
+	};
+};
arch/arm/dts/meson-gxl-s905x-khadas-vim-u-boot.dtsi +23 -0
index 39270ea7..20e36d1b 100644
@@ -5,3 +5,26 @@
  */
 
 #include "meson-gxl-u-boot.dtsi"
+
+/ {
+	smbios {
+		compatible = "u-boot,sysinfo-smbios";
+
+		smbios {
+			system {
+				manufacturer = "khadas";
+				product = "VIM";
+			};
+
+			baseboard {
+				manufacturer = "khadas";
+				product = "VIM";
+			};
+
+			chassis {
+				manufacturer = "khadas";
+				product = "VIM";
+			};
+		};
+	};
+};
arch/arm/dts/meson-gxm-khadas-vim2-u-boot.dtsi +21 -0
index c1763336..41480c9a 100644
@@ -10,6 +10,27 @@
 	aliases {
 		spi0 = &spifc;
 	};
+
+	smbios {
+		compatible = "u-boot,sysinfo-smbios";
+
+		smbios {
+			system {
+				manufacturer = "khadas";
+				product = "VIM2";
+			};
+
+			baseboard {
+				manufacturer = "khadas";
+				product = "VIM2";
+			};
+
+			chassis {
+				manufacturer = "khadas";
+				product = "VIM2";
+			};
+		};
+	};
 };
 
 &sd_emmc_c {
arch/arm/dts/meson-sm1-khadas-vim3l-u-boot.dtsi +23 -0
index a591c0c9..06b81f23 100644
@@ -6,3 +6,26 @@
 
 #include "meson-sm1-u-boot.dtsi"
 #include "meson-khadas-vim3-u-boot.dtsi"
+
+/ {
+	smbios {
+		compatible = "u-boot,sysinfo-smbios";
+
+		smbios {
+			system {
+				manufacturer = "khadas";
+				product = "VIM3L";
+			};
+
+			baseboard {
+				manufacturer = "khadas";
+				product = "VIM3L";
+			};
+
+			chassis {
+				manufacturer = "khadas";
+				product = "VIM3L";
+			};
+		};
+	};
+};
Signature · 1 line
2.25.1
#1 lore raw

PATCH 1/1 configs: Enable SMBIOS for Khadas VIM boards

Enable configs to support SMBIOS for all Khadas VIM boards

---
 configs/khadas-vim2_defconfig  | 2 ++
 configs/khadas-vim3_defconfig  | 2 ++
 configs/khadas-vim3l_defconfig | 2 ++
 configs/khadas-vim_defconfig   | 2 ++
 4 files changed, 8 insertions(+)
configs/khadas-vim2_defconfig +2 -0
index 32513998..5d673463 100644
@@ -50,6 +50,8 @@ CONFIG_DM_RESET=y
 CONFIG_DEBUG_UART_ANNOUNCE=y
 CONFIG_DEBUG_UART_SKIP_INIT=y
 CONFIG_MESON_SERIAL=y
+CONFIG_SYSINFO=y
+CONFIG_SYSINFO_SMBIOS=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_MESON_SPIFC=y
configs/khadas-vim3_defconfig +2 -0
index c4b24fc3..5a7a9006 100644
@@ -61,6 +61,8 @@ CONFIG_DM_RESET=y
 CONFIG_DEBUG_UART_ANNOUNCE=y
 CONFIG_DEBUG_UART_SKIP_INIT=y
 CONFIG_MESON_SERIAL=y
+CONFIG_SYSINFO=y
+CONFIG_SYSINFO_SMBIOS=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_MESON_SPIFC=y
configs/khadas-vim3l_defconfig +2 -0
index 0c731d4c..d719511f 100644
@@ -61,6 +61,8 @@ CONFIG_DM_RESET=y
 CONFIG_DEBUG_UART_ANNOUNCE=y
 CONFIG_DEBUG_UART_SKIP_INIT=y
 CONFIG_MESON_SERIAL=y
+CONFIG_SYSINFO=y
+CONFIG_SYSINFO_SMBIOS=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_MESON_SPIFC=y
configs/khadas-vim_defconfig +2 -0
index 2df00d54..dc6365fc 100644
@@ -44,6 +44,8 @@ CONFIG_DM_RESET=y
 CONFIG_DEBUG_UART_ANNOUNCE=y
 CONFIG_DEBUG_UART_SKIP_INIT=y
 CONFIG_MESON_SERIAL=y
+CONFIG_SYSINFO=y
+CONFIG_SYSINFO_SMBIOS=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_XHCI_HCD=y
Signature · 1 line
2.25.1
#2 lore raw

Re: [PATCH] configs: Enable SMBIOS for Khadas VIM boards

Quoted 56 lines · Artem Lapkin

Enable configs to support SMBIOS for all Khadas VIM boards

---
 configs/khadas-vim2_defconfig  | 2 ++
 configs/khadas-vim3_defconfig  | 2 ++
 configs/khadas-vim3l_defconfig | 2 ++
 configs/khadas-vim_defconfig   | 2 ++
 4 files changed, 8 insertions(+)
configs/khadas-vim2_defconfig +2 -0
index 32513998..5d673463 100644
@@ -50,6 +50,8 @@ CONFIG_DM_RESET=y
 CONFIG_DEBUG_UART_ANNOUNCE=y
 CONFIG_DEBUG_UART_SKIP_INIT=y
 CONFIG_MESON_SERIAL=y
+CONFIG_SYSINFO=y
+CONFIG_SYSINFO_SMBIOS=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_MESON_SPIFC=y
configs/khadas-vim3_defconfig +2 -0
index c4b24fc3..5a7a9006 100644
@@ -61,6 +61,8 @@ CONFIG_DM_RESET=y
 CONFIG_DEBUG_UART_ANNOUNCE=y
 CONFIG_DEBUG_UART_SKIP_INIT=y
 CONFIG_MESON_SERIAL=y
+CONFIG_SYSINFO=y
+CONFIG_SYSINFO_SMBIOS=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_MESON_SPIFC=y
configs/khadas-vim3l_defconfig +2 -0
index 0c731d4c..d719511f 100644
@@ -61,6 +61,8 @@ CONFIG_DM_RESET=y
 CONFIG_DEBUG_UART_ANNOUNCE=y
 CONFIG_DEBUG_UART_SKIP_INIT=y
 CONFIG_MESON_SERIAL=y
+CONFIG_SYSINFO=y
+CONFIG_SYSINFO_SMBIOS=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_MESON_SPIFC=y
configs/khadas-vim_defconfig +0 -0
index 2df00d54..dc6365fc 100644

configs/khadas-vim_defconfig CONFIG_DM_RESET=y · line 51

Quoted 8 lines
configs/khadas-vim_defconfig +2 -0
@@ -44,6 +44,8 @@ CONFIG_DM_RESET=y
 CONFIG_DEBUG_UART_ANNOUNCE=y
 CONFIG_DEBUG_UART_SKIP_INIT=y
 CONFIG_MESON_SERIAL=y
+CONFIG_SYSINFO=y
+CONFIG_SYSINFO_SMBIOS=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_XHCI_HCD=y

Applied to u-boot-amlogic,

Thanks,
Neil

#3 lore raw
In reply to Artem Lapkin
Quoted 129 lines · Artem Lapkin

Khadas vim series: Use devicetree for SMBIOS settings
Add settings and enable the default sysinfo driver so that these can come from the device tree.

---
 .../meson-g12b-a311d-khadas-vim3-u-boot.dtsi  | 23 +++++++++++++++++++
 .../meson-gxl-s905x-khadas-vim-u-boot.dtsi    | 23 +++++++++++++++++++
 .../arm/dts/meson-gxm-khadas-vim2-u-boot.dtsi | 21 +++++++++++++++++
 .../dts/meson-sm1-khadas-vim3l-u-boot.dtsi    | 23 +++++++++++++++++++
 4 files changed, 90 insertions(+)
arch/arm/dts/meson-g12b-a311d-khadas-vim3-u-boot.dtsi +23 -0
index 489efa15..fcd6f053 100644
@@ -6,3 +6,26 @@
 
 #include "meson-g12-common-u-boot.dtsi"
 #include "meson-khadas-vim3-u-boot.dtsi"
+
+/ {
+	smbios {
+		compatible = "u-boot,sysinfo-smbios";
+
+		smbios {
+			system {
+				manufacturer = "khadas";
+				product = "VIM3";
+			};
+
+			baseboard {
+				manufacturer = "khadas";
+				product = "VIM3";
+			};
+
+			chassis {
+				manufacturer = "khadas";
+				product = "VIM3";
+			};
+		};
+	};
+};
arch/arm/dts/meson-gxl-s905x-khadas-vim-u-boot.dtsi +23 -0
index 39270ea7..20e36d1b 100644
@@ -5,3 +5,26 @@
  */
 
 #include "meson-gxl-u-boot.dtsi"
+
+/ {
+	smbios {
+		compatible = "u-boot,sysinfo-smbios";
+
+		smbios {
+			system {
+				manufacturer = "khadas";
+				product = "VIM";
+			};
+
+			baseboard {
+				manufacturer = "khadas";
+				product = "VIM";
+			};
+
+			chassis {
+				manufacturer = "khadas";
+				product = "VIM";
+			};
+		};
+	};
+};
arch/arm/dts/meson-gxm-khadas-vim2-u-boot.dtsi +21 -0
index c1763336..41480c9a 100644
@@ -10,6 +10,27 @@
 	aliases {
 		spi0 = &spifc;
 	};
+
+	smbios {
+		compatible = "u-boot,sysinfo-smbios";
+
+		smbios {
+			system {
+				manufacturer = "khadas";
+				product = "VIM2";
+			};
+
+			baseboard {
+				manufacturer = "khadas";
+				product = "VIM2";
+			};
+
+			chassis {
+				manufacturer = "khadas";
+				product = "VIM2";
+			};
+		};
+	};
 };
 
 &sd_emmc_c {
arch/arm/dts/meson-sm1-khadas-vim3l-u-boot.dtsi +13 -0
index a591c0c9..06b81f23 100644
@@ -6,3 +6,26 @@
 
 #include "meson-sm1-u-boot.dtsi"
 #include "meson-khadas-vim3-u-boot.dtsi"
+
+/ {
+	smbios {
+		compatible = "u-boot,sysinfo-smbios";
+
+		smbios {
+			system {
+				manufacturer = "khadas";
+				product = "VIM3L";
+			};
+
+			baseboard {
+				manufacturer = "khadas";

arch/arm/dts/meson-sm1-khadas-vim3l-u-boot.dtsi line 31

Quoted 10 lines
arch/arm/dts/meson-sm1-khadas-vim3l-u-boot.dtsi +10 -0
+				product = "VIM3L";
+			};
+
+			chassis {
+				manufacturer = "khadas";
+				product = "VIM3L";
+			};
+		};
+	};
+};

Applied to u-boot-amlogic,

Thanks,
Neil