Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-10 07:04:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Add SMBIOS info for Khadas VIM boards

Browse source 
- 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
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEPVPGJshWBf4d9CyLd9zb2sjISdEFAmD/0m0ACgkQd9zb2sjI
 SdHOuhAAzKV5VKWFjz+kxAWLhIeVqK1DixVkA8qMLNE9LYfF2ibv89yM0jaTQv84
 Zs4J9ak9xC2/LQPX7ui9CzAZ53yi7qM28aQd4MzRPBha0al8dehRZdcGNTRV/WBb
 CnbwW5inx2J1e+KSZ2PVqOnCTVX39ZMdEbZnxIJmSCcgrwj1eCPUzMv0wD0fqhyq
 piAbOpKLO6v1k/p4veTCa8gEimpp1Ni4QKqeLxkZ54hrt+uvrQbb7HxqfXuGwNG4
 IWnkfocZXN6nUbjNh7NitGgRZCMtiKJSgXrwlmluXoi0OyUNwxX7Fbn9JqsbWpMR
 lqFVJxbJ4jGozWK5wb5jcT5PArVkYgr+FN7lmqefysEltBjpv0JWqdxKH44RteyA
 wA4yPz/5Oe/iZJu9h2GzHuFHma2Dr8z43NrsIO/cTKN5uG9gzbKbp8IxV2P715OZ
 R5XPzSHLFD1Q/A855yKxvF1tlizSDdKo2pXZ2BfvLBZEljd37QmVkRSy+gPL3QhD
 bMICPJ1opuJZb9dEi0L54yk9+tm4ImWTuYRNOsFc4p9EGT4P9yydqMkpzuuHXRJb
 GcLoD+TXgoxK8PijX9QWdQPnb0FkFKShwWMXOn9zyzIDIzT4HlZN8HtyPCYmbyD1
 6uFWiQQEfvbzInPmQpgk5mZoblskMSI/pN+4KHKlH3X4yWK5YGQ=
 =zrJm
 -----END PGP SIGNATURE-----

Merge tag 'u-boot-amlogic-20210727' of https://source.denx.de/u-boot/custodians/u-boot-amlogic

- 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
This commit is contained in:
Tom Rini 2021-07-27 11:42:31 -04:00
commit 55efa84d0f
12 changed files with 113 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
arch/arm/dts/meson-g12b-a311d-khadas-vim3-u-boot.dtsi
View file

@ -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";
};
};
};
};

23
arch/arm/dts/meson-gxl-s905x-khadas-vim-u-boot.dtsi
View file

@ -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";
};
};
};
};

21
arch/arm/dts/meson-gxm-khadas-vim2-u-boot.dtsi
View file

@ -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 {

23
arch/arm/dts/meson-sm1-khadas-vim3l-u-boot.dtsi
View file

@ -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";
};
};
};
};

14
board/amlogic/vim3/vim3.c
View file

@ -19,9 +19,15 @@
int mmc_get_env_dev(void)
{
if (meson_get_boot_device() == BOOT_DEVICE_EMMC)
switch (meson_get_boot_device()) {
case BOOT_DEVICE_EMMC:
return 2;
return 1;
case BOOT_DEVICE_SD:
return 1;
default:
/* boot device is not EMMC|SD */
return -1;
}
}
/*
@ -98,8 +104,8 @@ int meson_ft_board_setup(void *blob, struct bd_info *bd)
}
/* Update PHY names (mandatory to disable USB3.0) */
len = strlcpy(data, "usb2-phy0", 32) + 1;
len += strlcpy(&data[len], "usb2-phy1", 32 - len) + 1;
len = strlcpy(data, "usb2-phy0", 32);
len += strlcpy(&data[len], "usb2-phy1", 32 - len);
ret = fdt_setprop(blob, node, "phy-names", data, len);
if (ret < 0) {
printf("vim3: failed to update usb phy names property (%d)\n", ret);

2
configs/khadas-vim2_defconfig
View file

@ -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

2
configs/khadas-vim3_defconfig
View file

@ -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

2
configs/khadas-vim3l_defconfig
View file

@ -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

2
configs/khadas-vim_defconfig
View file

@ -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_USB_XHCI_HCD=y
CONFIG_USB_XHCI_DWC3=y

2
drivers/phy/meson-axg-mipi-dphy.c
View file

@ -389,5 +389,5 @@ U_BOOT_DRIVER(meson_axg_mipi_dphy) = {
.of_match = meson_axg_mipi_dphy_ids,
.probe = meson_axg_mipi_dphy_probe,
.ops = &meson_axg_mipi_dphy_ops,
.priv_auto_alloc_size = sizeof(struct phy_meson_axg_mipi_dphy_priv),
.priv_auto = sizeof(struct phy_meson_axg_mipi_dphy_priv),
};

4
drivers/phy/meson-axg-mipi-pcie-analog.c
View file

@ -211,7 +211,7 @@ int meson_axg_mipi_pcie_analog_probe(struct udevice *dev)
{
struct phy_meson_axg_mipi_pcie_analog_priv *priv = dev_get_priv(dev);
priv->regmap = syscon_node_to_regmap(dev_get_parent(dev)->node);
priv->regmap = syscon_node_to_regmap(dev_ofnode(dev_get_parent(dev)));
if (IS_ERR(priv->regmap))
return PTR_ERR(priv->regmap);
@ -229,5 +229,5 @@ U_BOOT_DRIVER(meson_axg_mipi_pcie_analog) = {
.of_match = meson_axg_mipi_pcie_analog_ids,
.probe = meson_axg_mipi_pcie_analog_probe,
.ops = &meson_axg_mipi_pcie_analog_ops,
.priv_auto_alloc_size = sizeof(struct phy_meson_axg_mipi_pcie_analog_priv),
.priv_auto = sizeof(struct phy_meson_axg_mipi_pcie_analog_priv),
};

2
include/configs/meson64.h
View file

@ -83,6 +83,8 @@
"stdin=" STDIN_CFG "\0" \
"stdout=" STDOUT_CFG "\0" \
"stderr=" STDOUT_CFG "\0" \
"kernel_comp_addr_r=0x0d080000\0" \
"kernel_comp_size=0x2000000\0" \
"fdt_addr_r=0x08008000\0" \
"scriptaddr=0x08000000\0" \
"kernel_addr_r=0x08080000\0" \