qiurui
/
rv1126-uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

android: replace CONFIG_ROCKCHIP_BOOTLOADER with CONFIG_RKIMG_BOOTLOADER 

Change-Id: I24db85313652bd21aada68cd472bdf888b7d022d
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
This commit is contained in:
Joseph Chen 2018-01-23 11:18:00 +08:00 committed by Kever Yang
parent aae0febba5
commit 1f5bcda2a8
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/android_bootloader.c
View File

@ -43,7 +43,7 @@ int android_bootloader_message_load(
return -1; return -1;
} }
#ifdef CONFIG_ROCKCHIP_BOOTLOADER #ifdef CONFIG_RKIMG_BOOTLOADER
if (blk_dread(dev_desc, part_info->start + BOOTLOADER_MESSAGE_BLK_OFFSET, if (blk_dread(dev_desc, part_info->start + BOOTLOADER_MESSAGE_BLK_OFFSET,
message_blocks, message) != message_blocks, message) !=
#else #else

2
common/image-android.c
View File

@ -163,7 +163,7 @@ int android_image_get_fdt(const struct andr_img_hdr *hdr,
*rd_data += hdr->page_size; *rd_data += hdr->page_size;
*rd_data += ALIGN(hdr->kernel_size, hdr->page_size); *rd_data += ALIGN(hdr->kernel_size, hdr->page_size);
*rd_data += ALIGN(hdr->ramdisk_size, hdr->page_size); *rd_data += ALIGN(hdr->ramdisk_size, hdr->page_size);
#ifdef CONFIG_ROCKCHIP_BOOTLOADER #ifdef CONFIG_RKIMG_BOOTLOADER
*rd_data += (rockchip_get_resource_file(*rd_data, ANDROID_ARG_FDT_FILENAME)) *rd_data += (rockchip_get_resource_file(*rd_data, ANDROID_ARG_FDT_FILENAME))
* 512; * 512;
#endif #endif