]> git.ipfire.org Git - thirdparty/u-boot.git/commitdiff
starfive: fix return code of `mac write_eeprom`
authorHeinrich Schuchardt <heinrich.schuchardt@canonical.com>
Sat, 9 Aug 2025 08:21:55 +0000 (10:21 +0200)
committerLeo Yu-Chi Liang <ycliang@andestech.com>
Thu, 14 Aug 2025 07:33:00 +0000 (15:33 +0800)
When writing the EEPROM fails, the command usage help text is displayed
after the error message. We should only display the error message instead.

If writing the EEPROM fails, return CMD_RET_FAILURE (1) instead of
CMD_RET_USAGE (-1).

Fixes: aea1bd95b61e ("eeprom: starfive: Enable ID EEPROM configuration")
Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
Acked-by: E Shattow <e@freeshell.de>
board/starfive/visionfive2/visionfive2-i2c-eeprom.c

index 010e386e64d72a5a585785e0a1adedf1ebd61147..17a44020bcf0be6abb23c7d5f677587f116c8c39 100644 (file)
@@ -275,7 +275,7 @@ static int prog_eeprom(unsigned int size)
 
        if (is_match_magic()) {
                printf("MAGIC ERROR, Please check the data@%p.\n", pbuf.buf);
-               return -1;
+               return CMD_RET_FAILURE;
        }
 
        ret = i2c_get_chip_for_busnum(CONFIG_SYS_EEPROM_BUS_NUM,
@@ -285,7 +285,7 @@ static int prog_eeprom(unsigned int size)
        if (ret) {
                printf("Get i2c bus:%d addr:%d fail.\n", CONFIG_SYS_EEPROM_BUS_NUM,
                       CONFIG_SYS_I2C_EEPROM_ADDR);
-               return ret;
+               return CMD_RET_FAILURE;
        }
 
        for (i = 0, p = (u8 *)pbuf.buf; i < size; ) {
@@ -314,11 +314,11 @@ static int prog_eeprom(unsigned int size)
        if (ret) {
                has_been_read = -1;
                printf("Programming failed.\n");
-               return -1;
+               return CMD_RET_FAILURE;
        }
 
        printf("Programming passed.\n");
-       return 0;
+       return CMD_RET_SUCCESS;
 }
 
 /**