build: fix quilt for mixed package/host builds
[openwrt/openwrt.git] / target / linux / octeon / patches-4.4 / 100-ubnt_edgerouter2_support.patch
1 --- a/arch/mips/include/asm/octeon/cvmx-bootinfo.h
2 +++ b/arch/mips/include/asm/octeon/cvmx-bootinfo.h
3 @@ -283,6 +283,8 @@ enum cvmx_board_types_enum {
4 */
5 CVMX_BOARD_TYPE_CUST_PRIVATE_MIN = 20001,
6 CVMX_BOARD_TYPE_UBNT_E100 = 20002,
7 + CVMX_BOARD_TYPE_UBNT_E200 = 20003,
8 + CVMX_BOARD_TYPE_UBNT_E220 = 20005,
9 CVMX_BOARD_TYPE_CUST_DSR1000N = 20006,
10 CVMX_BOARD_TYPE_KONTRON_S1901 = 21901,
11 CVMX_BOARD_TYPE_CUST_PRIVATE_MAX = 30000,
12 @@ -384,6 +386,8 @@ static inline const char *cvmx_board_typ
13 /* Customer private range */
14 ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_CUST_PRIVATE_MIN)
15 ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_UBNT_E100)
16 + ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_UBNT_E200)
17 + ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_UBNT_E220)
18 ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_CUST_DSR1000N)
19 ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_KONTRON_S1901)
20 ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_CUST_PRIVATE_MAX)
21 --- a/arch/mips/cavium-octeon/executive/cvmx-helper-board.c
22 +++ b/arch/mips/cavium-octeon/executive/cvmx-helper-board.c
23 @@ -195,6 +195,8 @@ int cvmx_helper_board_get_mii_address(in
24 return 8;
25 else
26 return -1;
27 + case CVMX_BOARD_TYPE_UBNT_E200:
28 + return -1;
29 case CVMX_BOARD_TYPE_KONTRON_S1901:
30 if (ipd_port == CVMX_HELPER_BOARD_MGMT_IPD_PORT)
31 return 1;