-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge git://git.infradead.org/mtd-2.6
* git://git.infradead.org/mtd-2.6: (82 commits) mtd: fix build error in m25p80.c mtd: Remove redundant mutex from mtd_blkdevs.c MTD: Fix wrong check register_blkdev return value Revert "mtd: cleanup Kconfig dependencies" mtd: cfi_cmdset_0002: make sector erase command variable mtd: cfi_cmdset_0002: add CFI detection for SST 38VF640x chips mtd: cfi_util: add support for switching SST 39VF640xB chips into QRY mode mtd: cfi_cmdset_0001: use defined value of P_ID_INTEL_PERFORMANCE instead of hardcoded one block2mtd: dubious assignment P4080/mtd: Fix the freescale lbc issue with 36bit mode P4080/eLBC: Make Freescale elbc interrupt common to elbc devices mtd: phram: use KBUILD_MODNAME mtd: OneNAND: S5PC110: Fix double call suspend & resume function mtd: nand: fix MTD_MODE_RAW writes jffs2: use kmemdup mtd: sm_ftl: cosmetic, use bool when possible mtd: r852: remove useless pci powerup/down from suspend/resume routines mtd: blktrans: fix a race vs kthread_stop mtd: blktrans: kill BKL mtd: allow to unload the mtdtrans module if its block devices aren't open ... Fix up trivial whitespace-introduced conflict in drivers/mtd/mtdchar.c
- Loading branch information
Showing
71 changed files
with
3,412 additions
and
1,159 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,97 @@ | ||
| #ifndef __BCM963XX_TAG_H | ||
| #define __BCM963XX_TAG_H | ||
|
|
||
| #define TAGVER_LEN 4 /* Length of Tag Version */ | ||
| #define TAGLAYOUT_LEN 4 /* Length of FlashLayoutVer */ | ||
| #define SIG1_LEN 20 /* Company Signature 1 Length */ | ||
| #define SIG2_LEN 14 /* Company Signature 2 Lenght */ | ||
| #define BOARDID_LEN 16 /* Length of BoardId */ | ||
| #define ENDIANFLAG_LEN 2 /* Endian Flag Length */ | ||
| #define CHIPID_LEN 6 /* Chip Id Length */ | ||
| #define IMAGE_LEN 10 /* Length of Length Field */ | ||
| #define ADDRESS_LEN 12 /* Length of Address field */ | ||
| #define DUALFLAG_LEN 2 /* Dual Image flag Length */ | ||
| #define INACTIVEFLAG_LEN 2 /* Inactie Flag Length */ | ||
| #define RSASIG_LEN 20 /* Length of RSA Signature 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 TAGINFO2_LEN 16 /* Length of vendor information field2 in tag */ | ||
| #define CRC_LEN 4 /* Length of CRC in bytes */ | ||
| #define ALTTAGINFO_LEN 54 /* Alternate length for vendor information; Pirelli */ | ||
|
|
||
| #define NUM_PIRELLI 2 | ||
| #define IMAGETAG_CRC_START 0xFFFFFFFF | ||
|
|
||
| #define PIRELLI_BOARDS { \ | ||
| "AGPF-S0", \ | ||
| "DWV-S0", \ | ||
| } | ||
|
|
||
| /* | ||
| * The broadcom firmware assumes the rootfs starts the image, | ||
| * therefore uses the rootfs start (flash_image_address) | ||
| * to determine where to flash the image. Since we have the kernel first | ||
| * we have to give it the kernel address, but the crc uses the length | ||
| * associated with this address (root_length), which is added to the kernel | ||
| * length (kernel_length) to determine the length of image to flash and thus | ||
| * needs to be rootfs + deadcode (jffs2 EOF marker) | ||
| */ | ||
|
|
||
| struct bcm_tag { | ||
| /* 0-3: Version of the image tag */ | ||
| char tag_version[TAGVER_LEN]; | ||
| /* 4-23: Company Line 1 */ | ||
| char sig_1[SIG1_LEN]; | ||
| /* 24-37: Company Line 2 */ | ||
| char sig_2[SIG2_LEN]; | ||
| /* 38-43: Chip this image is for */ | ||
| char chip_id[CHIPID_LEN]; | ||
| /* 44-59: Board name */ | ||
| char board_id[BOARDID_LEN]; | ||
| /* 60-61: Map endianness -- 1 BE 0 LE */ | ||
| char big_endian[ENDIANFLAG_LEN]; | ||
| /* 62-71: Total length of image */ | ||
| char total_length[IMAGE_LEN]; | ||
| /* 72-83: Address in memory of CFE */ | ||
| char cfe__address[ADDRESS_LEN]; | ||
| /* 84-93: Size of CFE */ | ||
| char cfe_length[IMAGE_LEN]; | ||
| /* 94-105: Address in memory of image start | ||
| * (kernel for OpenWRT, rootfs for stock firmware) | ||
| */ | ||
| char flash_image_start[ADDRESS_LEN]; | ||
| /* 106-115: Size of rootfs */ | ||
| char root_length[IMAGE_LEN]; | ||
| /* 116-127: Address in memory of kernel */ | ||
| char kernel_address[ADDRESS_LEN]; | ||
| /* 128-137: Size of kernel */ | ||
| char kernel_length[IMAGE_LEN]; | ||
| /* 138-139: Unused at the moment */ | ||
| char dual_image[DUALFLAG_LEN]; | ||
| /* 140-141: Unused at the moment */ | ||
| char inactive_flag[INACTIVEFLAG_LEN]; | ||
| /* 142-161: RSA Signature (not used; some vendors may use this) */ | ||
| char rsa_signature[RSASIG_LEN]; | ||
| /* 162-191: Compilation and related information (not used in OpenWrt) */ | ||
| char information1[TAGINFO1_LEN]; | ||
| /* 192-195: Version flash layout */ | ||
| char flash_layout_ver[FLASHLAYOUTVER_LEN]; | ||
| /* 196-199: kernel+rootfs CRC32 */ | ||
| char fskernel_crc[CRC_LEN]; | ||
| /* 200-215: Unused except on Alice Gate where is is information */ | ||
| char information2[TAGINFO2_LEN]; | ||
| /* 216-219: CRC32 of image less imagetag (kernel for Alice Gate) */ | ||
| char image_crc[CRC_LEN]; | ||
| /* 220-223: CRC32 of rootfs partition */ | ||
| char rootfs_crc[CRC_LEN]; | ||
| /* 224-227: CRC32 of kernel partition */ | ||
| char kernel_crc[CRC_LEN]; | ||
| /* 228-235: Unused at present */ | ||
| char reserved1[8]; | ||
| /* 236-239: CRC32 of header excluding tagVersion */ | ||
| char header_crc[CRC_LEN]; | ||
| /* 240-255: Unused at present */ | ||
| char reserved2[16]; | ||
| }; | ||
|
|
||
| #endif /* __BCM63XX_TAG_H */ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.