From 1f5bcda2a8b182cb3f6de3afdfc6e600f094c573 Mon Sep 17 00:00:00 2001 From: Joseph Chen Date: Tue, 23 Jan 2018 11:18:00 +0800 Subject: [PATCH] android: replace CONFIG_ROCKCHIP_BOOTLOADER with CONFIG_RKIMG_BOOTLOADER Change-Id: I24db85313652bd21aada68cd472bdf888b7d022d Signed-off-by: Joseph Chen --- common/android_bootloader.c | 2 +- common/image-android.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/common/android_bootloader.c b/common/android_bootloader.c index 3388f22578..102ed9215e 100644 --- a/common/android_bootloader.c +++ b/common/android_bootloader.c @@ -43,7 +43,7 @@ int android_bootloader_message_load( return -1; } -#ifdef CONFIG_ROCKCHIP_BOOTLOADER +#ifdef CONFIG_RKIMG_BOOTLOADER if (blk_dread(dev_desc, part_info->start + BOOTLOADER_MESSAGE_BLK_OFFSET, message_blocks, message) != #else diff --git a/common/image-android.c b/common/image-android.c index cc416e522d..382157af16 100644 --- a/common/image-android.c +++ b/common/image-android.c @@ -163,7 +163,7 @@ int android_image_get_fdt(const struct andr_img_hdr *hdr, *rd_data += hdr->page_size; *rd_data += ALIGN(hdr->kernel_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)) * 512; #endif