diff options
| -rw-r--r-- | board/starfive/visionfive2/visionfive2-i2c-eeprom.c | 7 | ||||
| -rw-r--r-- | include/configs/starfive-devkits.h | 2 | ||||
| -rw-r--r-- | include/configs/starfive-evb.h | 2 | ||||
| -rw-r--r-- | include/configs/starfive-visionfive2.h | 2 |
4 files changed, 12 insertions, 1 deletions
diff --git a/board/starfive/visionfive2/visionfive2-i2c-eeprom.c b/board/starfive/visionfive2/visionfive2-i2c-eeprom.c index 8b8516f8c0..1c20c2c375 100644 --- a/board/starfive/visionfive2/visionfive2-i2c-eeprom.c +++ b/board/starfive/visionfive2/visionfive2-i2c-eeprom.c @@ -689,6 +689,7 @@ static int print_usage(void) int do_mac(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { char *cmd; + int ret; if (argc == 1) { show_eeprom(&einfo); @@ -703,7 +704,11 @@ int do_mac(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) /* Commands with no argument */ if (!strcmp(cmd, "read_eeprom")) { has_been_read = 0; - return read_eeprom(eeprom_wp_buff); + ret = read_eeprom(eeprom_wp_buff); + if (!ret) + show_eeprom(&einfo); + + return ret; } else if (!strcmp(cmd, "initialize")) { init_local_copy(eeprom_wp_buff); return 0; diff --git a/include/configs/starfive-devkits.h b/include/configs/starfive-devkits.h index 794da8d03f..581346541a 100644 --- a/include/configs/starfive-devkits.h +++ b/include/configs/starfive-devkits.h @@ -261,6 +261,7 @@ "distro_mmc_test_and_boot=" \ "if mmc dev ${devnum}; then " \ "echo Try booting from MMC${devnum} ...; " \ + "setenv sdev_blk mmcblk${devnum}p${rootpart}; " \ "run bootcmd_distro;" \ "fi;\0" \ "distro_bootenv_mmc=" \ @@ -289,6 +290,7 @@ "if nvme dev ${devnum}; then " \ "echo Try booting from NVME${devnum} ...; " \ "setenv bootdev nvme;" \ + "setenv sdev_blk nvme${devnum}n1p${rootpart}; " \ "run bootcmd_distro; " \ "fi; " \ "done; " \ diff --git a/include/configs/starfive-evb.h b/include/configs/starfive-evb.h index 6f6e4b0b4c..4bd206f40b 100644 --- a/include/configs/starfive-evb.h +++ b/include/configs/starfive-evb.h @@ -274,6 +274,7 @@ "distro_mmc_test_and_boot=" \ "if mmc dev ${devnum}; then " \ "echo Try booting from MMC${devnum} ...; " \ + "setenv sdev_blk mmcblk${devnum}p${rootpart}; " \ "run bootcmd_distro;" \ "fi;\0" \ "distro_bootenv_mmc=" \ @@ -302,6 +303,7 @@ "if nvme dev ${devnum}; then " \ "echo Try booting from NVME${devnum} ...; " \ "setenv bootdev nvme;" \ + "setenv sdev_blk nvme${devnum}n1p${rootpart}; " \ "run bootcmd_distro; " \ "fi; " \ "done; " \ diff --git a/include/configs/starfive-visionfive2.h b/include/configs/starfive-visionfive2.h index 2cb74c5850..c7099af02a 100644 --- a/include/configs/starfive-visionfive2.h +++ b/include/configs/starfive-visionfive2.h @@ -304,6 +304,7 @@ "distro_mmc_test_and_boot=" \ "if mmc dev ${devnum}; then " \ "echo Try booting from MMC${devnum} ...; " \ + "setenv sdev_blk mmcblk${devnum}p${rootpart}; " \ "run bootcmd_distro;" \ "fi;\0" \ "distro_bootenv_mmc=" \ @@ -332,6 +333,7 @@ "if nvme dev ${devnum}; then " \ "echo Try booting from NVME${devnum} ...; " \ "setenv bootdev nvme;" \ + "setenv sdev_blk nvme${devnum}n1p${rootpart}; " \ "run bootcmd_distro; " \ "fi; " \ "done; " \ |