diff options
| author | Tom Rini <trini@konsulko.com> | 2023-10-16 10:25:11 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-10-16 14:26:00 -0400 |
| commit | e0caea4f9c15d44f871218b3d19e99e3ccd6d1f5 (patch) | |
| tree | 14a8802b57ad0da442ac9c0aba7059f2e46ffdf8 /board/freescale/common | |
| parent | 2e1577e8360d8e467bf28009f6763a2ac511f743 (diff) | |
| parent | 1b377a9ffeb5bf5716f75d6f52bc3fe6a00adc8c (diff) | |
Merge branch '2023-10-16-assorted-cmd-updates'
- Update the mac command a bit, to be more widely useful and add a
helper macro to declare CONFIG_SYS_LONGHELP text
Diffstat (limited to 'board/freescale/common')
| -rw-r--r-- | board/freescale/common/ngpixis.c | 6 | ||||
| -rw-r--r-- | board/freescale/common/sys_eeprom.c | 26 |
2 files changed, 27 insertions, 5 deletions
diff --git a/board/freescale/common/ngpixis.c b/board/freescale/common/ngpixis.c index 37a6f775a05..7be1ccee638 100644 --- a/board/freescale/common/ngpixis.c +++ b/board/freescale/common/ngpixis.c @@ -234,15 +234,13 @@ int pixis_reset_cmd(struct cmd_tbl *cmdtp, int flag, int argc, return 0; } -#ifdef CONFIG_SYS_LONGHELP -static char pixis_help_text[] = +U_BOOT_LONGHELP(pixis, "- hard reset to default bank\n" "pixis_reset altbank - reset to alternate bank\n" #ifdef DEBUG "pixis_reset dump - display the PIXIS registers\n" #endif - "pixis_reset sysclk <SYSCLK_freq> - reset with SYSCLK frequency(KHz)\n"; -#endif + "pixis_reset sysclk <SYSCLK_freq> - reset with SYSCLK frequency(KHz)\n"); U_BOOT_CMD( pixis_reset, CONFIG_SYS_MAXARGS, 1, pixis_reset_cmd, diff --git a/board/freescale/common/sys_eeprom.c b/board/freescale/common/sys_eeprom.c index 431f8caeb03..64139d4659f 100644 --- a/board/freescale/common/sys_eeprom.c +++ b/board/freescale/common/sys_eeprom.c @@ -424,7 +424,7 @@ int do_mac(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) prog_eeprom(); break; default: - return cmd_usage(cmdtp); + return CMD_RET_USAGE; } return 0; @@ -623,3 +623,27 @@ unsigned int get_cpu_board_revision(void) return MPC85XX_CPU_BOARD_REV(be.major, be.minor); } #endif + +U_BOOT_LONGHELP(mac, + "[read|save|id|num|errata|date|ports|port_number]\n" + "mac read\n" + " - read EEPROM content into memory data structure\n" + "mac save\n" + " - save memory data structure to the EEPROM\n" + "mac id\n" + " - program system id per hard coded value\n" + "mac num string\n" + " - program system serial number to value string\n" + "mac errata string\n" + " - program errata data to value string\n" + "mac date YYMMDDhhmmss\n" + " - program date to string value YYMMDDhhmmss\n" + "mac ports N\n" + " - program the number of network ports to integer N\n" + "mac X string\n" + " - program MAC addr for port X [X=0,1..] to colon separated string"); + +U_BOOT_CMD( + mac, 3, 1, do_mac, + "display and program the system ID and MAC addresses in EEPROM", + mac_help_text); |