From 786c514946d485b009f49f8cb2231b83dfb22718 Mon Sep 17 00:00:00 2001 From: Artem Lapkin Date: Thu, 27 May 2021 15:35:28 +0800 Subject: VIM3: mmc_get_env_dev correct non emmc boot sources need return -1 if boot source is not EMMC or SD ( for example it will be useful if we have multy env sources configuration and device was booted from SPI flash and env need read from SPI not from mmc ) Signed-off-by: Artem Lapkin Reviewed-by: Jaehoon Chung Signed-off-by: Neil Armstrong --- board/amlogic/vim3/vim3.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'board/amlogic/vim3/vim3.c') diff --git a/board/amlogic/vim3/vim3.c b/board/amlogic/vim3/vim3.c index 6cd5f2e115..71aaa0d804 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; + } } /* -- cgit v1.2.3 From 4f038ee6dca74254424c5e54ec4440450c1286ba Mon Sep 17 00:00:00 2001 From: Artem Lapkin Date: Tue, 13 Jul 2021 14:48:47 +0800 Subject: board: amlogic: vim3: fix phy-names property setup phy-names was improperly implemented resulting in an inoperable USB-OTG port. - phy-names = "usb2-phy0\0\0usb2-phy1\0"; + phy-names = "usb2-phy0\0usb2-phy1"; Signed-off-by: Artem Lapkin Acked-by: Neil Armstrong Signed-off-by: Neil Armstrong --- board/amlogic/vim3/vim3.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'board/amlogic/vim3/vim3.c') diff --git a/board/amlogic/vim3/vim3.c b/board/amlogic/vim3/vim3.c index 71aaa0d804..18ef146218 100644 --- a/board/amlogic/vim3/vim3.c +++ b/board/amlogic/vim3/vim3.c @@ -104,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); -- cgit v1.2.3