diff options
author | Tom Rini <trini@konsulko.com> | 2021-07-27 11:42:31 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2021-07-27 11:42:31 -0400 |
commit | 55efa84d0f523b0609d6947d232c000824315a68 (patch) | |
tree | 00ff791d9b5d50dd2859300d08728826f84cf6da /arch | |
parent | 0d4823fbebae6ebbf558a9325d86b37c67d848d9 (diff) | |
parent | 24d2aea19b8069fb124313435cffcbb07c8317a1 (diff) | |
download | u-boot-WIP/27Jul2021.zip u-boot-WIP/27Jul2021.tar.gz u-boot-WIP/27Jul2021.tar.bz2 |
Merge tag 'u-boot-amlogic-20210727' of https://source.denx.de/u-boot/custodians/u-boot-amlogicWIP/27Jul2021
- Add SMBIOS info for Khadas VIM boards
- Fix meson-axg-mipi PHY build
- Fix VIM3 board phy-names property setup
- Return correct value for non emmc boot sources on VIM3
- add kernel compression vars
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/dts/meson-g12b-a311d-khadas-vim3-u-boot.dtsi | 23 | ||||
-rw-r--r-- | arch/arm/dts/meson-gxl-s905x-khadas-vim-u-boot.dtsi | 23 | ||||
-rw-r--r-- | arch/arm/dts/meson-gxm-khadas-vim2-u-boot.dtsi | 21 | ||||
-rw-r--r-- | arch/arm/dts/meson-sm1-khadas-vim3l-u-boot.dtsi | 23 |
4 files changed, 90 insertions, 0 deletions
diff --git a/arch/arm/dts/meson-g12b-a311d-khadas-vim3-u-boot.dtsi b/arch/arm/dts/meson-g12b-a311d-khadas-vim3-u-boot.dtsi index 489efa1..b0909cf 100644 --- a/arch/arm/dts/meson-g12b-a311d-khadas-vim3-u-boot.dtsi +++ b/arch/arm/dts/meson-g12b-a311d-khadas-vim3-u-boot.dtsi @@ -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"; + }; + }; + }; +}; diff --git a/arch/arm/dts/meson-gxl-s905x-khadas-vim-u-boot.dtsi b/arch/arm/dts/meson-gxl-s905x-khadas-vim-u-boot.dtsi index 39270ea..6109088 100644 --- a/arch/arm/dts/meson-gxl-s905x-khadas-vim-u-boot.dtsi +++ b/arch/arm/dts/meson-gxl-s905x-khadas-vim-u-boot.dtsi @@ -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"; + }; + }; + }; +}; diff --git a/arch/arm/dts/meson-gxm-khadas-vim2-u-boot.dtsi b/arch/arm/dts/meson-gxm-khadas-vim2-u-boot.dtsi index c176333..e906bca 100644 --- a/arch/arm/dts/meson-gxm-khadas-vim2-u-boot.dtsi +++ b/arch/arm/dts/meson-gxm-khadas-vim2-u-boot.dtsi @@ -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 { diff --git a/arch/arm/dts/meson-sm1-khadas-vim3l-u-boot.dtsi b/arch/arm/dts/meson-sm1-khadas-vim3l-u-boot.dtsi index a591c0c..4b8ea3d 100644 --- a/arch/arm/dts/meson-sm1-khadas-vim3l-u-boot.dtsi +++ b/arch/arm/dts/meson-sm1-khadas-vim3l-u-boot.dtsi @@ -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"; + }; + }; + }; +}; |