GFLT400: Syncing boardID values with uboot
When Marvell upgraded their SDK from RC32 -> thunderbolt_v1, they added a
new ID. We did not upgrade the uboot half. This means the IDs are
out of sync. Since uboot doesn't have this ID at all, we manually move
the extra one in the kernel to the end of list so that every other boardID
still lines up.
Change-Id: Ic557a092fb7e1e48cba91b11b67402d07679aa25
diff --git a/arch/arm/mach-feroceon-kw2/kw2_family/boardEnv/mvBoardEnvSpec.c b/arch/arm/mach-feroceon-kw2/kw2_family/boardEnv/mvBoardEnvSpec.c
index 7a9c1ee..bd55fb0 100755
--- a/arch/arm/mach-feroceon-kw2/kw2_family/boardEnv/mvBoardEnvSpec.c
+++ b/arch/arm/mach-feroceon-kw2/kw2_family/boardEnv/mvBoardEnvSpec.c
@@ -1995,8 +1995,8 @@
&rd88f6601Info,
&gflt200Info,
&gflt110Info,
- &rd88f6601MC2LInfo,
- &rd88f6601SFPInfo,
+ &rd88f6601MC2LInfo, /* disabled (NULL) in uboot */
&gflt300Info,
&gflt400Info,
+ &rd88f6601SFPInfo /* not present in uboot, moved to back of list */
};
diff --git a/arch/arm/mach-feroceon-kw2/kw2_family/boardEnv/mvBoardEnvSpec.h b/arch/arm/mach-feroceon-kw2/kw2_family/boardEnv/mvBoardEnvSpec.h
index 436f6ae..2cdda78 100755
--- a/arch/arm/mach-feroceon-kw2/kw2_family/boardEnv/mvBoardEnvSpec.h
+++ b/arch/arm/mach-feroceon-kw2/kw2_family/boardEnv/mvBoardEnvSpec.h
@@ -115,9 +115,15 @@
#define GFLT200_ID DB_CUSTOMER_ID
#define GFLT110_ID (BOARD_ID_BASE+0x8)
#define RD_88F6601_MC2L_ID (BOARD_ID_BASE+0x9)
-#define RD_88F6601_SFP_ID (BOARD_ID_BASE+0xA)
-#define GFLT300_ID (BOARD_ID_BASE+0xB)
-#define GFLT400_ID (BOARD_ID_BASE+0xC)
+#define GFLT300_ID (BOARD_ID_BASE+0xA)
+#define GFLT400_ID (BOARD_ID_BASE+0xB)
+// When Marvell upgraded their SDK from RC32 -> thunderbolt_v1, they added a
+// new ID. We did not upgrade the uboot half of our SDK. This means the IDs are
+// out of sync. Since uboot doesn't have this ID at all, we manually move it
+// in the kernel half to the end of list so that it stays out of the way, and
+// every other boardID still lines up.
+#define RD_88F6601_SFP_ID (BOARD_ID_BASE+0xC)
+
#define MV_MAX_BOARD_ID (DB_CUSTOMER_ID + 6)
// These are Marvells defines, we should switch to match these in
// uboot to make future merges easier.
