colin/u-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fpga: fix alignment on fpga cmd usage info

Browse Source 
The current implementation generates some alignment issues as well as
some overlapping when all the fpga command options are enabled. The fix
is intended to improve readability of the usage info.

Signed-off-by: Ibai Erkiaga <ibai.erkiaga-elorza@amd.com>
Acked-by: Alexander Dahl <ada@thorsis.com>
Link: https://lore.kernel.org/r/20250121130138.1999916-2-ibai.erkiaga-elorza@amd.com
Signed-off-by: Michal Simek <michal.simek@amd.com>
This commit is contained in:
Ibai Erkiaga
2025-01-21 13:01:30 +00:00
committed by Michal Simek
parent 135d2926d2
commit c0fed34e0e
1 changed files with 28 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
cmd/fpga.c
View File

@@ -408,49 +408,44 @@ U_BOOT_CMD(fpga, 9, 1, do_fpga_wrapper,
#else #else
U_BOOT_CMD(fpga, 6, 1, do_fpga_wrapper, U_BOOT_CMD(fpga, 6, 1, do_fpga_wrapper,
#endif #endif
"loadable FPGA image support", "loadable FPGA image support",
"[operation type] [device number] [image address] [image size]\n" "info [dev] List known device information\n"
"fpga operations:\n" "fpga dump <dev> <address> <size> Load device to memory buffer\n"
" dump\t[dev] [address] [size]\tLoad device to memory buffer\n" "fpga load <dev> <address> <size> Load device from memory buffer\n"
" info\t[dev]\t\t\tlist known device information\n"
" load\t[dev] [address] [size]\tLoad device from memory buffer\n"
#if defined(CONFIG_CMD_FPGA_LOADP) #if defined(CONFIG_CMD_FPGA_LOADP)
" loadp\t[dev] [address] [size]\t" "fpga loadp <dev> <address> <size> Load device from memory buffer\n"
"Load device from memory buffer with partial bitstream\n" " with partial bitstream\n"
#endif #endif
" loadb\t[dev] [address] [size]\t" "fpga loadb <dev> <address> <size> Load device from bitstream buffer\n"
"Load device from bitstream buffer (Xilinx only)\n" " (Xilinx only)\n"
#if defined(CONFIG_CMD_FPGA_LOADBP) #if defined(CONFIG_CMD_FPGA_LOADBP)
" loadbp\t[dev] [address] [size]\t" "fpga loadbp <dev> <address> <size> Load device from bitstream buffer\n"
"Load device from bitstream buffer with partial bitstream" " with partial bitstream (Xilinx only)\n"
"(Xilinx only)\n"
#endif #endif
#if defined(CONFIG_CMD_FPGA_LOADFS) #if defined(CONFIG_CMD_FPGA_LOADFS)
"Load device from filesystem (FAT by default) (Xilinx only)\n" "fpga loadfs <dev> <address> <size> <blocksize> <interface> [<dev[:part]>] <filename>\n"
" loadfs [dev] [address] [image size] [blocksize] <interface>\n" " Load device from filesystem (FAT by default) (Xilinx only)\n"
" [<dev[:part]>] <filename>\n"
#endif #endif
#if defined(CONFIG_CMD_FPGA_LOADMK) #if defined(CONFIG_CMD_FPGA_LOADMK)
" loadmk [dev] [address]\tLoad device generated with mkimage" "fpga loadmk <dev> <address> Load device generated with mkimage\n"
#if defined(CONFIG_FIT) #if defined(CONFIG_FIT)
"\n" " NOTE: loadmk operating on FIT must include subimage unit\n"
"\tFor loadmk operating on FIT format uImage address must include\n" " name in the form of addr:<subimg_uname>\n"
"\tsubimage unit name in the form of addr:<subimg_uname>"
#endif #endif
#endif #endif
#if defined(CONFIG_CMD_FPGA_LOAD_SECURE) #if defined(CONFIG_CMD_FPGA_LOAD_SECURE)
"Load encrypted bitstream (Xilinx only)\n" "fpga loads <dev> <address> <size> <auth-OCM-0/DDR-1/noauth-2>\n"
" loads [dev] [address] [size] [auth-OCM-0/DDR-1/noauth-2]\n" " <enc-devkey(0)/userkey(1)/nenc(2> [Userkey address]\n"
" [enc-devkey(0)/userkey(1)/nenc(2) [Userkey address]\n" " Loads the secure bistreams(authenticated/encrypted/both\n"
"Loads the secure bistreams(authenticated/encrypted/both\n" " authenticated and encrypted) of [size] from [address]\n"
"authenticated and encrypted) of [size] from [address].\n" " (Xilinx only)\n"
"The auth-OCM/DDR flag specifies to perform authentication\n" " -The auth-OCM/DDR flag specifies to perform authentication\n"
"in OCM or in DDR. 0 for OCM, 1 for DDR, 2 for no authentication.\n" " in OCM or in DDR. 0 for OCM, 1 for DDR, 2 for no authentication\n"
"The enc flag specifies which key to be used for decryption\n" " -The enc flag specifies which key to be used for decryption\n"
"0-device key, 1-user key, 2-no encryption.\n" " 0-device key, 1-user key, 2-no encryption.\n"
"The optional Userkey address specifies from which address key\n" " -The optional Userkey address specifies from which address key\n"
"has to be used for decryption if user key is selected.\n" " has to be used for decryption if user key is selected.\n"
"NOTE: the secure bitstream has to be created using Xilinx\n" " NOTE: the secure bitstream has to be created using Xilinx\n"
"bootgen tool only.\n" " bootgen tool only.\n"
#endif #endif
); );