commit | caf529454d23765debf6e24ecf4d1b7b5e4237c1 | [log] [tgz] |
---|---|---|
author | Chris Gibson <cgibson@google.com> | Fri Apr 15 00:50:11 2016 +0000 |
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Fri Apr 15 00:50:11 2016 +0000 |
tree | 84d8e946999093e96a473b3feef5467f307187d3 | |
parent | 119d4c29612d74fd74ecf031b8615b5aefdfc2a9 [diff] | |
parent | 1b5c06d2a58887de3ff89b4db6e80acde0a4bdf2 [diff] |
Merge "uboot/prism: add hnvram support"
diff --git a/board/mv_feroceon/mv_kw2/kw2_family/boardEnv/mvBoardEnvSpec.c b/board/mv_feroceon/mv_kw2/kw2_family/boardEnv/mvBoardEnvSpec.c index 36adfc2..ace6787 100644 --- a/board/mv_feroceon/mv_kw2/kw2_family/boardEnv/mvBoardEnvSpec.c +++ b/board/mv_feroceon/mv_kw2/kw2_family/boardEnv/mvBoardEnvSpec.c
@@ -1706,5 +1706,6 @@ &rd88f6601Info, &gflt200Info, &gflt110Info, + NULL, /* unsupported RD_88F6601_MC2L_ID */ &gflt300Info, };
diff --git a/board/mv_feroceon/mv_kw2/kw2_family/boardEnv/mvBoardEnvSpec.h b/board/mv_feroceon/mv_kw2/kw2_family/boardEnv/mvBoardEnvSpec.h index d56db53..a12ad38 100644 --- a/board/mv_feroceon/mv_kw2/kw2_family/boardEnv/mvBoardEnvSpec.h +++ b/board/mv_feroceon/mv_kw2/kw2_family/boardEnv/mvBoardEnvSpec.h
@@ -110,8 +110,9 @@ #define DB_CUSTOMER_ID (BOARD_ID_BASE+0x7) #define GFLT200_ID DB_CUSTOMER_ID #define GFLT110_ID DB_CUSTOMER_ID + 1 -#define GFLT300_ID DB_CUSTOMER_ID + 2 -#define MV_MAX_BOARD_ID (DB_CUSTOMER_ID + 3) +#define RD_88F6601_MC2L_ID DB_CUSTOMER_ID + 2 /* for an upstream kernel */ +#define GFLT300_ID DB_CUSTOMER_ID + 3 +#define MV_MAX_BOARD_ID (DB_CUSTOMER_ID + 4) /*************************************************************************** ** RD-88F6510-SFU