mips: octeon: tools: Add update_octeon_header tool
PATCH v3 5/5 mips: octeon: tools: Add update_octeon_header tool
Add a tool to update or insert an Octeon specific header into the U-Boot image. This is needed e.g. for booting via SPI NOR, eMMC and NAND.
While working on this, move enum cvmx_board_types_enum and cvmx_board_type_to_string() to cvmx-bootloader.h and remove the unreferenced (unsupported) board definition.
---
v3:
- Add .gitignore entry
- Use compiletime_assert() instead of adhoc-coded compile_time_assert()
- Dropped forward declarations
- All functions now static
- Used prinf instead of debug in most places to make the output more verbose and descriptive
- Used "fprintf(stderr" for error messages
- Dropped cvmx_cpu_to_be64
- Removed crashes as suggested by Daniel
v2:
- No change
- Azure build success here:
https://dev.azure.com/sr0718/u-boot/_build/results?buildId=59&view=results
.../mach-octeon/include/mach/cvmx-bootinfo.h | 222 --------- .../include/mach/cvmx-bootloader.h | 172 +++++++ tools/.gitignore | 1 + tools/Makefile | 3 + tools/update_octeon_header.c | 456 ++++++++++++++++++ 5 files changed, 632 insertions(+), 222 deletions(-) create mode 100644 arch/mips/mach-octeon/include/mach/cvmx-bootloader.h create mode 100644 tools/update_octeon_header.c
arch/mips/mach-octeon/include/mach/cvmx-bootinfo.h +0 -222
@@ -125,226 +125,4 @@ struct cvmx_bootinfo {#endif /* (CVMX_BOOTINFO_MAJ_VER == 1) */ -/* Type defines for board and chip types */ -enum cvmx_board_types_enum { -CVMX_BOARD_TYPE_NULL =0 , -CVMX_BOARD_TYPE_SIM =1 , -CVMX_BOARD_TYPE_EBT3000 =2 , -CVMX_BOARD_TYPE_KODAMA =3 , -CVMX_BOARD_TYPE_NIAGARA =4 , -CVMX_BOARD_TYPE_NAC38 =5 ,/* formerly NAO38 */ -CVMX_BOARD_TYPE_THUNDER =6 , -CVMX_BOARD_TYPE_TRANTOR =7 , -CVMX_BOARD_TYPE_EBH3000 =8 , -CVMX_BOARD_TYPE_EBH3100 =9 , -CVMX_BOARD_TYPE_HIKARI =10 , -CVMX_BOARD_TYPE_CN3010_EVB_HS5 =11 , -CVMX_BOARD_TYPE_CN3005_EVB_HS5 =12 , -CVMX_BOARD_TYPE_KBP =13 , -/* Deprecated, CVMX_BOARD_TYPE_CN3010_EVB_HS5 supports the CN3020 */ -CVMX_BOARD_TYPE_CN3020_EVB_HS5 =14 , -CVMX_BOARD_TYPE_EBT5800 =15 , -CVMX_BOARD_TYPE_NICPRO2 =16 , -CVMX_BOARD_TYPE_EBH5600 =17 , -CVMX_BOARD_TYPE_EBH5601 =18 , -CVMX_BOARD_TYPE_EBH5200 =19 , -CVMX_BOARD_TYPE_BBGW_REF =20 , -CVMX_BOARD_TYPE_NIC_XLE_4G =21 , -CVMX_BOARD_TYPE_EBT5600 =22 , -CVMX_BOARD_TYPE_EBH5201 =23 , -CVMX_BOARD_TYPE_EBT5200 =24 , -CVMX_BOARD_TYPE_CB5600 =25 , -CVMX_BOARD_TYPE_CB5601 =26 , -CVMX_BOARD_TYPE_CB5200 =27 , -/* Special 'generic' board type, supports many boards */ -CVMX_BOARD_TYPE_GENERIC =28 , -CVMX_BOARD_TYPE_EBH5610 =29 , -CVMX_BOARD_TYPE_LANAI2_A =30 , -CVMX_BOARD_TYPE_LANAI2_U =31 , -CVMX_BOARD_TYPE_EBB5600 =32 , -CVMX_BOARD_TYPE_EBB6300 =33 , -CVMX_BOARD_TYPE_NIC_XLE_10G =34 , -CVMX_BOARD_TYPE_LANAI2_G =35 , -CVMX_BOARD_TYPE_EBT5810 =36 , -CVMX_BOARD_TYPE_NIC10E =37 , -CVMX_BOARD_TYPE_EP6300C =38 , -CVMX_BOARD_TYPE_EBB6800 =39 , -CVMX_BOARD_TYPE_NIC4E =40 , -CVMX_BOARD_TYPE_NIC2E =41 , -CVMX_BOARD_TYPE_EBB6600 =42 , -CVMX_BOARD_TYPE_REDWING =43 , -CVMX_BOARD_TYPE_NIC68_4 =44 , -CVMX_BOARD_TYPE_NIC10E_66 =45 , -CVMX_BOARD_TYPE_MAX , - -/* -* The range from CVMX_BOARD_TYPE_MAX to -* CVMX_BOARD_TYPE_CUST_DEFINED_MIN is reserved for future -* SDK use. -*/ - -/* -* Set aside a range for customer boards. These numbers are managed -* by Cavium. -*/ -CVMX_BOARD_TYPE_CUST_DEFINED_MIN =10000 , -CVMX_BOARD_TYPE_CUST_WSX16 =10001 , -CVMX_BOARD_TYPE_CUST_NS0216 =10002 , -CVMX_BOARD_TYPE_CUST_NB5 =10003 , -CVMX_BOARD_TYPE_CUST_WMR500 =10004 , -CVMX_BOARD_TYPE_CUST_ITB101 =10005 , -CVMX_BOARD_TYPE_CUST_NTE102 =10006 , -CVMX_BOARD_TYPE_CUST_AGS103 =10007 , -CVMX_BOARD_TYPE_CUST_GST104 =10008 , -CVMX_BOARD_TYPE_CUST_GCT105 =10009 , -CVMX_BOARD_TYPE_CUST_AGS106 =10010 , -CVMX_BOARD_TYPE_CUST_SGM107 =10011 , -CVMX_BOARD_TYPE_CUST_GCT108 =10012 , -CVMX_BOARD_TYPE_CUST_AGS109 =10013 , -CVMX_BOARD_TYPE_CUST_GCT110 =10014 , -CVMX_BOARD_TYPE_CUST_L2_AIR_SENDER =10015 , -CVMX_BOARD_TYPE_CUST_L2_AIR_RECEIVER =10016 , -CVMX_BOARD_TYPE_CUST_L2_ACCTON2_TX =10017 , -CVMX_BOARD_TYPE_CUST_L2_ACCTON2_RX =10018 , -CVMX_BOARD_TYPE_CUST_L2_WSTRNSNIC_TX =10019 , -CVMX_BOARD_TYPE_CUST_L2_WSTRNSNIC_RX =10020 , -CVMX_BOARD_TYPE_CUST_L2_ZINWELL =10021 , -CVMX_BOARD_TYPE_CUST_DEFINED_MAX =20000 , - -/* -* Set aside a range for customer private use. The SDK won't -* use any numbers in this range. -*/ -CVMX_BOARD_TYPE_CUST_PRIVATE_MIN =20001 , -CVMX_BOARD_TYPE_UBNT_E100 =20002 , -CVMX_BOARD_TYPE_CUST_DSR1000N =20006 , -CVMX_BOARD_TYPE_KONTRON_S1901 =21901 , -CVMX_BOARD_TYPE_CUST_PRIVATE_MAX =30000 , - -/* The remaining range is reserved for future use. */ -}; - -enum cvmx_chip_types_enum { -CVMX_CHIP_TYPE_NULL =0 , -CVMX_CHIP_SIM_TYPE_DEPRECATED =1 , -CVMX_CHIP_TYPE_OCTEON_SAMPLE =2 , -CVMX_CHIP_TYPE_MAX , -}; - -/* -* Compatibility alias for NAC38 name change, planned to be removed -* from SDK 1.7 -*/ -#define CVMX_BOARD_TYPE_NAO38 CVMX_BOARD_TYPE_NAC38 - -/* Functions to return string based on type */ -#define ENUM_BRD_TYPE_CASE (x) \ - case x: \ - return(#x + 16)/* Skip CVMX_BOARD_TYPE_ */ - -static inline const char *cvmx_board_type_to_string (enum -cvmx_board_types_enum type) -{ -switch (type) { -ENUM_BRD_TYPE_CASE (CVMX_BOARD_TYPE_NULL ); -ENUM_BRD_TYPE_CASE (CVMX_BOARD_TYPE_SIM ); -ENUM_BRD_TYPE_CASE (CVMX_BOARD_TYPE_EBT3000 ); -ENUM_BRD_TYPE_CASE (CVMX_BOARD_TYPE_KODAMA ); -ENUM_BRD_TYPE_CASE (CVMX_BOARD_TYPE_NIAGARA ); -ENUM_BRD_TYPE_CASE (CVMX_BOARD_TYPE_NAC38 ); -ENUM_BRD_TYPE_CASE (CVMX_BOARD_TYPE_THUNDER ); -ENUM_BRD_TYPE_CASE (CVMX_BOARD_TYPE_TRANTOR ); -ENUM_BRD_TYPE_CASE (CVMX_BOARD_TYPE_EBH3000 ); -ENUM_BRD_TYPE_CASE (CVMX_BOARD_TYPE_EBH3100 ); -ENUM_BRD_TYPE_CASE (CVMX_BOARD_TYPE_HIKARI ); -ENUM_BRD_TYPE_CASE (CVMX_BOARD_TYPE_CN3010_EVB_HS5 ); -ENUM_BRD_TYPE_CASE (CVMX_BOARD_TYPE_CN3005_EVB_HS5 ); -ENUM_BRD_TYPE_CASE (CVMX_BOARD_TYPE_KBP ); -ENUM_BRD_TYPE_CASE (CVMX_BOARD_TYPE_CN3020_EVB_HS5 ); -ENUM_BRD_TYPE_CASE (CVMX_BOARD_TYPE_EBT5800 ); -ENUM_BRD_TYPE_CASE (CVMX_BOARD_TYPE_NICPRO2 ); -ENUM_BRD_TYPE_CASE (CVMX_BOARD_TYPE_EBH5600 ); -ENUM_BRD_TYPE_CASE (CVMX_BOARD_TYPE_EBH5601 ); -ENUM_BRD_TYPE_CASE (CVMX_BOARD_TYPE_EBH5200 ); -ENUM_BRD_TYPE_CASE (CVMX_BOARD_TYPE_BBGW_REF ); -ENUM_BRD_TYPE_CASE (CVMX_BOARD_TYPE_NIC_XLE_4G ); -ENUM_BRD_TYPE_CASE (CVMX_BOARD_TYPE_EBT5600 ); -ENUM_BRD_TYPE_CASE (CVMX_BOARD_TYPE_EBH5201 ); -ENUM_BRD_TYPE_CASE (CVMX_BOARD_TYPE_EBT5200 ); -ENUM_BRD_TYPE_CASE (CVMX_BOARD_TYPE_CB5600 ); -ENUM_BRD_TYPE_CASE (CVMX_BOARD_TYPE_CB5601 ); -ENUM_BRD_TYPE_CASE (CVMX_BOARD_TYPE_CB5200 ); -ENUM_BRD_TYPE_CASE (CVMX_BOARD_TYPE_GENERIC ); -ENUM_BRD_TYPE_CASE (CVMX_BOARD_TYPE_EBH5610 ); -ENUM_BRD_TYPE_CASE (CVMX_BOARD_TYPE_LANAI2_A ); -ENUM_BRD_TYPE_CASE (CVMX_BOARD_TYPE_LANAI2_U ); -ENUM_BRD_TYPE_CASE (CVMX_BOARD_TYPE_EBB5600 ); -ENUM_BRD_TYPE_CASE (CVMX_BOARD_TYPE_EBB6300 ); -ENUM_BRD_TYPE_CASE (CVMX_BOARD_TYPE_NIC_XLE_10G ); -ENUM_BRD_TYPE_CASE (CVMX_BOARD_TYPE_LANAI2_G ); -ENUM_BRD_TYPE_CASE (CVMX_BOARD_TYPE_EBT5810 ); -ENUM_BRD_TYPE_CASE (CVMX_BOARD_TYPE_NIC10E ); -ENUM_BRD_TYPE_CASE (CVMX_BOARD_TYPE_EP6300C ); -ENUM_BRD_TYPE_CASE (CVMX_BOARD_TYPE_EBB6800 ); -ENUM_BRD_TYPE_CASE (CVMX_BOARD_TYPE_NIC4E ); -ENUM_BRD_TYPE_CASE (CVMX_BOARD_TYPE_NIC2E ); -ENUM_BRD_TYPE_CASE (CVMX_BOARD_TYPE_EBB6600 ); -ENUM_BRD_TYPE_CASE (CVMX_BOARD_TYPE_REDWING ); -ENUM_BRD_TYPE_CASE (CVMX_BOARD_TYPE_NIC68_4 ); -ENUM_BRD_TYPE_CASE (CVMX_BOARD_TYPE_NIC10E_66 ); -ENUM_BRD_TYPE_CASE (CVMX_BOARD_TYPE_MAX ); - -/* Customer boards listed here */ -ENUM_BRD_TYPE_CASE (CVMX_BOARD_TYPE_CUST_DEFINED_MIN ); -ENUM_BRD_TYPE_CASE (CVMX_BOARD_TYPE_CUST_WSX16 ); -ENUM_BRD_TYPE_CASE (CVMX_BOARD_TYPE_CUST_NS0216 ); -ENUM_BRD_TYPE_CASE (CVMX_BOARD_TYPE_CUST_NB5 ); -ENUM_BRD_TYPE_CASE (CVMX_BOARD_TYPE_CUST_WMR500 ); -ENUM_BRD_TYPE_CASE (CVMX_BOARD_TYPE_CUST_ITB101 ); -ENUM_BRD_TYPE_CASE (CVMX_BOARD_TYPE_CUST_NTE102 ); -ENUM_BRD_TYPE_CASE (CVMX_BOARD_TYPE_CUST_AGS103 ); -ENUM_BRD_TYPE_CASE (CVMX_BOARD_TYPE_CUST_GST104 ); -ENUM_BRD_TYPE_CASE (CVMX_BOARD_TYPE_CUST_GCT105 ); -ENUM_BRD_TYPE_CASE (CVMX_BOARD_TYPE_CUST_AGS106 ); -ENUM_BRD_TYPE_CASE (CVMX_BOARD_TYPE_CUST_SGM107 ); -ENUM_BRD_TYPE_CASE (CVMX_BOARD_TYPE_CUST_GCT108 ); -ENUM_BRD_TYPE_CASE (CVMX_BOARD_TYPE_CUST_AGS109 ); -ENUM_BRD_TYPE_CASE (CVMX_BOARD_TYPE_CUST_GCT110 ); -ENUM_BRD_TYPE_CASE (CVMX_BOARD_TYPE_CUST_L2_AIR_SENDER ); -ENUM_BRD_TYPE_CASE (CVMX_BOARD_TYPE_CUST_L2_AIR_RECEIVER ); -ENUM_BRD_TYPE_CASE (CVMX_BOARD_TYPE_CUST_L2_ACCTON2_TX ); -ENUM_BRD_TYPE_CASE (CVMX_BOARD_TYPE_CUST_L2_ACCTON2_RX ); -ENUM_BRD_TYPE_CASE (CVMX_BOARD_TYPE_CUST_L2_WSTRNSNIC_TX ); -ENUM_BRD_TYPE_CASE (CVMX_BOARD_TYPE_CUST_L2_WSTRNSNIC_RX ); -ENUM_BRD_TYPE_CASE (CVMX_BOARD_TYPE_CUST_L2_ZINWELL ); -ENUM_BRD_TYPE_CASE (CVMX_BOARD_TYPE_CUST_DEFINED_MAX ); - -/* Customer private range */ -ENUM_BRD_TYPE_CASE (CVMX_BOARD_TYPE_CUST_PRIVATE_MIN ); -ENUM_BRD_TYPE_CASE (CVMX_BOARD_TYPE_UBNT_E100 ); -ENUM_BRD_TYPE_CASE (CVMX_BOARD_TYPE_CUST_DSR1000N ); -ENUM_BRD_TYPE_CASE (CVMX_BOARD_TYPE_KONTRON_S1901 ); -ENUM_BRD_TYPE_CASE (CVMX_BOARD_TYPE_CUST_PRIVATE_MAX ); - } - -return NULL ; -} - -#define ENUM_CHIP_TYPE_CASE (x) \ - case x: \ - return(#x + 15)/* Skip CVMX_CHIP_TYPE */ - -static inline const char *cvmx_chip_type_to_string (enum -cvmx_chip_types_enum type) -{ -switch (type) { -ENUM_CHIP_TYPE_CASE (CVMX_CHIP_TYPE_NULL ); -ENUM_CHIP_TYPE_CASE (CVMX_CHIP_SIM_TYPE_DEPRECATED ); -ENUM_CHIP_TYPE_CASE (CVMX_CHIP_TYPE_OCTEON_SAMPLE ); -ENUM_CHIP_TYPE_CASE (CVMX_CHIP_TYPE_MAX ); - } - -return "Unsupported Chip" ; -} -#endif /* __CVMX_BOOTINFO_H__ */
arch/mips/mach-octeon/include/mach/cvmx-bootloader.h new file +172 -0
172 lines not on this page · raw message
tools/.gitignore +1 -0
@@ -32,5 +32,6 @@ /spl_size_limit /sunxi-spl-image-builder /ubsha1 +/update_octeon_header /version.h /xway-swap-bytes
tools/Makefile +3 -0
@@ -206,6 +206,9 @@ hostprogs-y += proftool hostprogs-$(CONFIG_STATIC_RELA) += relocate-rela hostprogs-$(CONFIG_RISCV) += prelink-riscv +hostprogs-$(CONFIG_ARCH_OCTEON) += update_octeon_header +update_octeon_header-objs := update_octeon_header.o lib/crc32.o + hostprogs-y += fdtgrep fdtgrep-objs += $(LIBFDT_OBJS) common/fdt_region.o fdtgrep.o
tools/update_octeon_header.c new file +456 -0
456 lines not on this page · raw message
Signature · 1 line
2.29.2
PATCH v3 5/5 mips: octeon: tools: Add update_octeon_header tool
Am Montag, den 30.11.2020, 13:14 +0100 schrieb Stefan Roese:
Quoted 28 lines
Add a tool to update or insert an Octeon specific header into the U-Boot image. This is needed e.g. for booting via SPI NOR, eMMC and NAND.
While working on this, move enum
cvmx_board_types_enumandcvmx_board_type_to_string()tocvmx-bootloader.hand remove the unreferenced (unsupported) board definition.Signed-off-by Stefan Roese <[email protected]>Cc Aaron Williams <[email protected]>Cc Chandrakala Chavva <[email protected]>Cc Daniel Schwierzeck <[email protected]>---
v3:
- Add .gitignore entry
- Usecompiletime_assert()instead of adhoc-codedcompile_time_assert()
- Dropped forward declarations
- All functions now static
- Used prinf instead of debug in most places to make the output more verbose and descriptive
- Used "fprintf(stderr" for error messages
- Droppedcvmx_cpu_to_be64
- Removed crashes as suggested by Danielv2:
- No change
- Azure build success here:
https://dev.azure.com/sr0718/u-boot/_build/results?buildId=59&view=results
Quoted 9 lines
.../mach-octeon/include/mach/cvmx-bootinfo.h | 222 --------- .../include/mach/cvmx-bootloader.h | 172 +++++++ tools/.gitignore | 1 + tools/Makefile | 3 + tools/update_octeon_header.c | 456 ++++++++++++++++++ 5 files changed, 632 insertions(+), 222 deletions(-) create mode 100644 arch/mips/mach-octeon/include/mach/cvmx-bootloader.h create mode 100644 tools/update_octeon_header.c
Signature · 1 line
- Daniel