43 lines
1.7 KiB
Diff
43 lines
1.7 KiB
Diff
|
--- a/arch/mips/include/asm/octeon/cvmx-bootinfo.h
|
||
|
|
+++ b/arch/mips/include/asm/octeon/cvmx-bootinfo.h
|
||
|
|
@@ -297,7 +297,7 @@ enum cvmx_board_types_enum {
|
||
|
|
CVMX_BOARD_TYPE_UBNT_E100 = 20002,
|
||
|
|
CVMX_BOARD_TYPE_UBNT_E200 = 20003,
|
||
|
|
CVMX_BOARD_TYPE_UBNT_E220 = 20005,
|
||
|
|
- CVMX_BOARD_TYPE_CUST_DSR1000N = 20006,
|
||
|
|
+ CVMX_BOARD_TYPE_ITUS_SHIELD = 20006,
|
||
|
|
CVMX_BOARD_TYPE_KONTRON_S1901 = 21901,
|
||
|
|
CVMX_BOARD_TYPE_CUST_PRIVATE_MAX = 30000,
|
||
|
|
|
||
|
|
@@ -400,7 +400,7 @@ static inline const char *cvmx_board_typ
|
||
|
|
ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_UBNT_E100)
|
||
|
|
ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_UBNT_E200)
|
||
|
|
ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_UBNT_E220)
|
||
|
|
- ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_CUST_DSR1000N)
|
||
|
|
+ ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_ITUS_SHIELD)
|
||
|
|
ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_KONTRON_S1901)
|
||
|
|
ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_CUST_PRIVATE_MAX)
|
||
|
|
}
|
||
|
|
--- a/arch/mips/cavium-octeon/octeon-platform.c
|
||
|
|
+++ b/arch/mips/cavium-octeon/octeon-platform.c
|
||
|
|
@@ -771,7 +771,7 @@ int __init octeon_prune_device_tree(void
|
||
|
|
if (fdt_check_header(initial_boot_params))
|
||
|
|
panic("Corrupt Device Tree.");
|
||
|
|
|
||
|
|
- WARN(octeon_bootinfo->board_type == CVMX_BOARD_TYPE_CUST_DSR1000N,
|
||
|
|
+ WARN(octeon_bootinfo->board_type == CVMX_BOARD_TYPE_ITUS_SHIELD,
|
||
|
|
"Built-in DTB booting is deprecated on %s. Please switch to use appended DTB.",
|
||
|
|
cvmx_board_type_to_string(octeon_bootinfo->board_type));
|
||
|
|
|
||
|
|
--- a/arch/mips/pci/pci-octeon.c
|
||
|
|
+++ b/arch/mips/pci/pci-octeon.c
|
||
|
|
@@ -211,8 +211,6 @@ const char *octeon_get_pci_interrupts(vo
|
||
|
|
return "AAABAAAAAAAAAAAAAAAAAAAAAAAAAAAA";
|
||
|
|
case CVMX_BOARD_TYPE_BBGW_REF:
|
||
|
|
return "AABCD";
|
||
|
|
- case CVMX_BOARD_TYPE_CUST_DSR1000N:
|
||
|
|
- return "CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC";
|
||
|
|
case CVMX_BOARD_TYPE_THUNDER:
|
||
|
|
case CVMX_BOARD_TYPE_EBH3000:
|
||
|
|
default:
|