andreacavalli/rkdeveloptool
1
0
Fork 0
mirror of https://github.com/sharkcz/rkdeveloptool.git synced 2025-02-13 22:36:47 +01:00
Code Issues Projects Releases Wiki Activity

1. idblock support rc4flag in ul handler

Browse Source 
2. cut off reset device in ul handler

Signed-off-by: liuyi <liuyi@rock-chips.com>
This commit is contained in:
liuyi 2017-08-02 10:06:45 +08:00
parent 2404a38a33
commit b38fe5fc11
1 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
main.cpp
View File

@ -516,14 +516,14 @@ void create_gpt_buffer(u8 *gpt, PARAM_ITEM_VECTOR &vecParts, u64 diskSectors)
gptHead->header_crc32 = cpu_to_le32(crc32_le(0, gpt + SECTOR_SIZE, sizeof(gpt_header))); gptHead->header_crc32 = cpu_to_le32(crc32_le(0, gpt + SECTOR_SIZE, sizeof(gpt_header)));
} }
bool MakeSector0(PBYTE pSector, USHORT usFlashDataSec, USHORT usFlashBootSec) bool MakeSector0(PBYTE pSector, USHORT usFlashDataSec, USHORT usFlashBootSec, bool rc4Flag)
{ {
PRK28_IDB_SEC0 pSec0; PRK28_IDB_SEC0 pSec0;
memset(pSector, 0, SECTOR_SIZE); memset(pSector, 0, SECTOR_SIZE);
pSec0 = (PRK28_IDB_SEC0)pSector; pSec0 = (PRK28_IDB_SEC0)pSector;
pSec0->dwTag = 0x0FF0AA55; pSec0->dwTag = 0x0FF0AA55;
pSec0->uiRc4Flag = 1; pSec0->uiRc4Flag = rc4Flag;
pSec0->usBootCode1Offset = 0x4; pSec0->usBootCode1Offset = 0x4;
pSec0->usBootCode2Offset = 0x4; pSec0->usBootCode2Offset = 0x4;
pSec0->usBootDataSize = usFlashDataSec; pSec0->usBootDataSize = usFlashDataSec;
@ -561,15 +561,15 @@ bool MakeSector3(PBYTE pSector)
return true; return true;
} }
int MakeIDBlockData(PBYTE pDDR, PBYTE pLoader, PBYTE lpIDBlock, USHORT usFlashDataSec, USHORT usFlashBootSec, DWORD dwLoaderDataSize, DWORD dwLoaderSize) int MakeIDBlockData(PBYTE pDDR, PBYTE pLoader, PBYTE lpIDBlock, USHORT usFlashDataSec, USHORT usFlashBootSec, DWORD dwLoaderDataSize, DWORD dwLoaderSize, bool rc4Flag)
{ {
RK28_IDB_SEC0 sector0Info; RK28_IDB_SEC0 sector0Info;
RK28_IDB_SEC1 sector1Info; RK28_IDB_SEC1 sector1Info;
RK28_IDB_SEC2 sector2Info; RK28_IDB_SEC2 sector2Info;
RK28_IDB_SEC3 sector3Info; RK28_IDB_SEC3 sector3Info;
UINT i; UINT i;
printf("rc4=%d\r\n\r\n\r\n",rc4Flag);
MakeSector0((PBYTE)&sector0Info, usFlashDataSec, usFlashBootSec); MakeSector0((PBYTE)&sector0Info, usFlashDataSec, usFlashBootSec, rc4Flag);
MakeSector1((PBYTE)&sector1Info); MakeSector1((PBYTE)&sector1Info);
if (!MakeSector2((PBYTE)&sector2Info)) { if (!MakeSector2((PBYTE)&sector2Info)) {
return -6; return -6;
@ -584,6 +584,14 @@ int MakeIDBlockData(PBYTE pDDR, PBYTE pLoader, PBYTE lpIDBlock, USHORT usFlashDa
memcpy(lpIDBlock, &sector0Info, SECTOR_SIZE); memcpy(lpIDBlock, &sector0Info, SECTOR_SIZE);
memcpy(lpIDBlock + SECTOR_SIZE, &sector1Info, SECTOR_SIZE); memcpy(lpIDBlock + SECTOR_SIZE, &sector1Info, SECTOR_SIZE);
memcpy(lpIDBlock + SECTOR_SIZE * 3, &sector3Info, SECTOR_SIZE); memcpy(lpIDBlock + SECTOR_SIZE * 3, &sector3Info, SECTOR_SIZE);
if (rc4Flag) {
for (i = 0; i < dwLoaderDataSize/SECTOR_SIZE; i++)
P_RC4(pDDR + i * SECTOR_SIZE, SECTOR_SIZE);
for (i = 0; i < dwLoaderSize/SECTOR_SIZE; i++)
P_RC4(pLoader + i * SECTOR_SIZE, SECTOR_SIZE);
}
memcpy(lpIDBlock + SECTOR_SIZE * 4, pDDR, dwLoaderDataSize); memcpy(lpIDBlock + SECTOR_SIZE * 4, pDDR, dwLoaderDataSize);
memcpy(lpIDBlock + SECTOR_SIZE * (4 + usFlashDataSec), pLoader, dwLoaderSize); memcpy(lpIDBlock + SECTOR_SIZE * (4 + usFlashDataSec), pLoader, dwLoaderSize);
@ -1608,7 +1616,7 @@ bool upgrade_loader(STRUCT_RKDEVICE_DESC &dev, char *szLoader)
goto Exit_UpgradeLoader; goto Exit_UpgradeLoader;
} }
memset(pIDBData, 0, dwSectorNum * SECTOR_SIZE); memset(pIDBData, 0, dwSectorNum * SECTOR_SIZE);
iRet = MakeIDBlockData(loaderDataBuffer, loaderCodeBuffer, pIDBData, usFlashDataSec, usFlashBootSec, dwLoaderDataSize, dwLoaderSize); iRet = MakeIDBlockData(loaderDataBuffer, loaderCodeBuffer, pIDBData, usFlashDataSec, usFlashBootSec, dwLoaderDataSize, dwLoaderSize, pBoot->Rc4DisableFlag);
if (iRet != 0) { if (iRet != 0) {
ERROR_COLOR_ATTR; ERROR_COLOR_ATTR;
printf("Making idblock failed!"); printf("Making idblock failed!");
@ -1616,11 +1624,13 @@ bool upgrade_loader(STRUCT_RKDEVICE_DESC &dev, char *szLoader)
printf("\r\n"); printf("\r\n");
goto Exit_UpgradeLoader; goto Exit_UpgradeLoader;
} }
if (g_pLogObject)
g_pLogObject->SaveBuffer("idblock.bin",pIDBData,dwSectorNum*SECTOR_SIZE);
iRet = pComm->RKU_WriteLBA(64, dwSectorNum, pIDBData); iRet = pComm->RKU_WriteLBA(64, dwSectorNum, pIDBData);
CURSOR_MOVEUP_LINE(1); CURSOR_MOVEUP_LINE(1);
CURSOR_DEL_LINE; CURSOR_DEL_LINE;
if (iRet == ERR_SUCCESS) { if (iRet == ERR_SUCCESS) {
pComm->Reset_Usb_Device(); //pComm->Reset_Usb_Device();
bSuccess = true; bSuccess = true;
printf("Upgrading loader succeeded.\r\n"); printf("Upgrading loader succeeded.\r\n");
} else { } else {