From c4e9d827ee75b32e1e9d5a8aad1c07d6cf2aa33d Mon Sep 17 00:00:00 2001 From: Sandrine Bailleux Date: Wed, 30 Jan 2019 16:27:16 +0100 Subject: Remove dead code related to LOAD_IMAGE_V2=0 Commit ed51b51f7a9163a ("Remove build option LOAD_IMAGE_V2") intended to remove all code related to LOAD_IMAGE_V2=0 but missed a few things. Change-Id: I16aaf52779dd4af1e134e682731328c5f1e5d622 Signed-off-by: Sandrine Bailleux --- common/bl_common.c | 86 ------------------------------------------------------ 1 file changed, 86 deletions(-) (limited to 'common') diff --git a/common/bl_common.c b/common/bl_common.c index b2d22c19..84ff99c8 100644 --- a/common/bl_common.c +++ b/common/bl_common.c @@ -58,92 +58,6 @@ uintptr_t page_align(uintptr_t value, unsigned dir) return value; } -/****************************************************************************** - * Determine whether the memory region delimited by 'addr' and 'size' is free, - * given the extents of free memory. - * Return 1 if it is free, 0 if it is not free or if the input values are - * invalid. - *****************************************************************************/ -int is_mem_free(uintptr_t free_base, size_t free_size, - uintptr_t addr, size_t size) -{ - uintptr_t free_end, requested_end; - - /* - * Handle corner cases first. - * - * The order of the 2 tests is important, because if there's no space - * left (i.e. free_size == 0) but we don't ask for any memory - * (i.e. size == 0) then we should report that the memory is free. - */ - if (size == 0) - return 1; /* A zero-byte region is always free */ - if (free_size == 0) - return 0; - - /* - * Check that the end addresses don't overflow. - * If they do, consider that this memory region is not free, as this - * is an invalid scenario. - */ - if (check_uptr_overflow(free_base, free_size - 1)) - return 0; - free_end = free_base + (free_size - 1); - - if (check_uptr_overflow(addr, size - 1)) - return 0; - requested_end = addr + (size - 1); - - /* - * Finally, check that the requested memory region lies within the free - * region. - */ - return (addr >= free_base) && (requested_end <= free_end); -} - -/* Generic function to return the size of an image */ -size_t get_image_size(unsigned int image_id) -{ - uintptr_t dev_handle; - uintptr_t image_handle; - uintptr_t image_spec; - size_t image_size = 0U; - int io_result; - - /* Obtain a reference to the image by querying the platform layer */ - io_result = plat_get_image_source(image_id, &dev_handle, &image_spec); - if (io_result != 0) { - WARN("Failed to obtain reference to image id=%u (%i)\n", - image_id, io_result); - return 0; - } - - /* Attempt to access the image */ - io_result = io_open(dev_handle, image_spec, &image_handle); - if (io_result != 0) { - WARN("Failed to access image id=%u (%i)\n", - image_id, io_result); - return 0; - } - - /* Find the size of the image */ - io_result = io_size(image_handle, &image_size); - if ((io_result != 0) || (image_size == 0U)) { - WARN("Failed to determine the size of the image id=%u (%i)\n", - image_id, io_result); - } - io_result = io_close(image_handle); - /* Ignore improbable/unrecoverable error in 'close' */ - - /* TODO: Consider maintaining open device connection from this - * bootloader stage - */ - io_result = io_dev_close(dev_handle); - /* Ignore improbable/unrecoverable error in 'dev_close' */ - - return image_size; -} - /******************************************************************************* * Internal function to load an image at a specific address given * an image ID and extents of free memory. -- cgit v1.2.3