diff --git a/sys/contrib/octeon-sdk/cvmx-app-init.h b/sys/contrib/octeon-sdk/cvmx-app-init.h
index ba62e0a1c403..11d83ae645f6 100644
--- a/sys/contrib/octeon-sdk/cvmx-app-init.h
+++ b/sys/contrib/octeon-sdk/cvmx-app-init.h
@@ -355,7 +355,7 @@ enum cvmx_chip_types_enum {
 #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_ */
+#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)
@@ -491,7 +491,7 @@ static inline const char *cvmx_board_type_to_string(enum cvmx_board_types_enum t
     return "Unsupported Board";
 }
 
-#define ENUM_CHIP_TYPE_CASE(x)   case x: return(#x + 15);   /* Skip CVMX_CHIP_TYPE */
+#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)