qi-hardware/xburst-tools
1
0
Fork 0
mirror of git://projects.qi-hardware.com/xburst-tools.git synced 2024-11-23 02:50:16 +02:00
Code

qi-fix-only-init-same-block-device-once.patch

Browse Source 
If we're accessing the same device, we don't need to keep init-ing it

Signed-off-by: Andy Green <andy@openmoko.com>
This commit is contained in:
Andy Green 2008-12-01 01:26:07 +00:00 committed by Andy Green
parent 513fb7d0fc
commit b4d381380c
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
qiboot/src/phase2.c
View File

@ -105,6 +105,8 @@ void bootloader_second_phase(void)
unsigned int initramfs_len = 0; unsigned int initramfs_len = 0;
static char commandline_rootfs_append[512] = ""; static char commandline_rootfs_append[512] = "";
int ret; int ret;
void * last_block_init = NULL;
int last_block_init_result = 0;
/* we try the possible kernels for this board in order */ /* we try the possible kernels for this board in order */
@ -132,14 +134,26 @@ void bootloader_second_phase(void)
indicate(UI_IND_MOUNT_PART); indicate(UI_IND_MOUNT_PART);
/* if this device needs initializing, try to init it */ /* if this device needs initializing, try to init it */
if (this_kernel->block_init) if (this_kernel->block_init) {
if ((this_kernel->block_init)()) { /*
* cache result to limit attempts for same
* block device to one time
*/
if (this_kernel->block_init != last_block_init)
last_block_init_result =
(this_kernel->block_init)();
if (last_block_init_result) {
puts("block device init failed\n"); puts("block device init failed\n");
if (this_kernel->block_init != last_block_init)
indicate(UI_IND_MOUNT_FAIL);
this_kernel = &this_board-> this_kernel = &this_board->
kernel_source[kernel++]; kernel_source[kernel++];
indicate(UI_IND_MOUNT_FAIL); last_block_init = this_kernel->block_init;
continue; continue;
} }
last_block_init = this_kernel->block_init;
}
/* if there's a partition table implied, parse it, otherwise /* if there's a partition table implied, parse it, otherwise
* just use a fixed offset * just use a fixed offset