diff options
| author | Tom Rini <trini@konsulko.com> | 2021-07-27 18:42:31 +0300 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-07-27 18:42:31 +0300 |
| commit | 55efa84d0f523b0609d6947d232c000824315a68 (patch) | |
| tree | 00ff791d9b5d50dd2859300d08728826f84cf6da /board | |
| parent | 0d4823fbebae6ebbf558a9325d86b37c67d848d9 (diff) | |
| parent | 24d2aea19b8069fb124313435cffcbb07c8317a1 (diff) | |
| download | u-boot-55efa84d0f523b0609d6947d232c000824315a68.tar.xz | |
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
Diffstat (limited to 'board')
| -rw-r--r-- | board/amlogic/vim3/vim3.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/board/amlogic/vim3/vim3.c b/board/amlogic/vim3/vim3.c index 6cd5f2e115..18ef146218 100644 --- a/board/amlogic/vim3/vim3.c +++ b/board/amlogic/vim3/vim3.c @@ -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); |