MIPS: bcm963xx: Update bcm_tag field image_sequence

The "dual_image" and "inactive_flag" fields should be merged into a single
"image_sequence" field.

Signed-off-by: Simon Arlott <simon@fire.lp0.eu>
Cc: David Woodhouse <dwmw2@infradead.org>
Cc: Brian Norris <computersforpeace@gmail.com>
Cc: Kevin Cernekee <cernekee@gmail.com>
Cc: Florian Fainelli <f.fainelli@gmail.com>
Cc: Jonas Gorski <jogo@openwrt.org>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Cc: MIPS Mailing List <linux-mips@linux-mips.org>
Cc: MTD Maling List <linux-mtd@lists.infradead.org>
Patchwork: https://patchwork.linux-mips.org/patch/11834/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
This commit is contained in:
Simon Arlott 2015-12-13 22:48:44 +00:00 committed by Ralf Baechle
parent 1f29cb19cb
commit 696569f759

View File

@ -12,8 +12,7 @@
#define CHIPID_LEN 6 /* Chip Id Length */ #define CHIPID_LEN 6 /* Chip Id Length */
#define IMAGE_LEN 10 /* Length of Length Field */ #define IMAGE_LEN 10 /* Length of Length Field */
#define ADDRESS_LEN 12 /* Length of Address field */ #define ADDRESS_LEN 12 /* Length of Address field */
#define DUALFLAG_LEN 2 /* Dual Image flag Length */ #define IMAGE_SEQUENCE_LEN 4 /* Image sequence Length */
#define INACTIVEFLAG_LEN 2 /* Inactie Flag Length */
#define RSASIG_LEN 20 /* Length of RSA Signature in tag */ #define RSASIG_LEN 20 /* Length of RSA Signature in tag */
#define TAGINFO1_LEN 30 /* Length of vendor information field1 in tag */ #define TAGINFO1_LEN 30 /* Length of vendor information field1 in tag */
#define FLASHLAYOUTVER_LEN 4 /* Length of Flash Layout Version String tag */ #define FLASHLAYOUTVER_LEN 4 /* Length of Flash Layout Version String tag */
@ -72,10 +71,10 @@ struct bcm_tag {
char kernel_address[ADDRESS_LEN]; char kernel_address[ADDRESS_LEN];
/* 128-137: Size of kernel */ /* 128-137: Size of kernel */
char kernel_length[IMAGE_LEN]; char kernel_length[IMAGE_LEN];
/* 138-139: Unused at the moment */ /* 138-141: Image sequence number
char dual_image[DUALFLAG_LEN]; * (to be incremented when flashed with a new image)
/* 140-141: Unused at the moment */ */
char inactive_flag[INACTIVEFLAG_LEN]; char image_sequence[IMAGE_SEQUENCE_LEN];
/* 142-161: RSA Signature (not used; some vendors may use this) */ /* 142-161: RSA Signature (not used; some vendors may use this) */
char rsa_signature[RSASIG_LEN]; char rsa_signature[RSASIG_LEN];
/* 162-191: Compilation and related information (not used in OpenWrt) */ /* 162-191: Compilation and related information (not used in OpenWrt) */