From a51ec63b85edbc6f8987069d0a60eec09d4f35c8 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Thu, 16 May 2013 13:53:22 +0000 Subject: image: Use fit_image_load() to load ramdisk Use the new common code to load a ramdisk. The functionality should not change. Signed-off-by: Simon Glass --- common/image-fit.c | 62 ------------------------------------------------------ 1 file changed, 62 deletions(-) (limited to 'common/image-fit.c') diff --git a/common/image-fit.c b/common/image-fit.c index 9f56b5d303..16fb196534 100644 --- a/common/image-fit.c +++ b/common/image-fit.c @@ -1370,25 +1370,6 @@ int fit_conf_get_kernel_node(const void *fit, int noffset) return fit_conf_get_prop_node(fit, noffset, FIT_KERNEL_PROP); } -/** - * fit_conf_get_ramdisk_node - get ramdisk image node offset that corresponds to - * a given configuration - * @fit: pointer to the FIT format image header - * @noffset: configuration node offset - * - * fit_conf_get_ramdisk_node() retrives ramdisk image node unit name from - * configuration FIT_KERNEL_PROP property and translates it to the node - * offset. - * - * returns: - * image node offset when found (>=0) - * negative number on failure (FDT_ERR_* code) - */ -int fit_conf_get_ramdisk_node(const void *fit, int noffset) -{ - return fit_conf_get_prop_node(fit, noffset, FIT_RAMDISK_PROP); -} - /** * fit_conf_get_fdt_node - get fdt image node offset that corresponds to * a given configuration @@ -1467,49 +1448,6 @@ int fit_image_select(const void *fit, int rd_noffset, int verify) return 0; } -/** - * fit_check_ramdisk - verify FIT format ramdisk subimage - * @fit_hdr: pointer to the FIT ramdisk header - * @rd_noffset: ramdisk subimage node offset within FIT image - * @arch: requested ramdisk image architecture type - * @verify: data CRC verification flag - * - * fit_check_ramdisk() verifies integrity of the ramdisk subimage and from - * specified FIT image. - * - * returns: - * 1, on success - * 0, on failure - */ -int fit_check_ramdisk(const void *fit, int rd_noffset, uint8_t arch, - int verify) -{ - fit_image_print(fit, rd_noffset, " "); - - if (verify) { - puts(" Verifying Hash Integrity ... "); - if (!fit_image_verify(fit, rd_noffset)) { - puts("Bad Data Hash\n"); - bootstage_error(BOOTSTAGE_ID_FIT_RD_HASH); - return 0; - } - puts("OK\n"); - } - - bootstage_mark(BOOTSTAGE_ID_FIT_RD_CHECK_ALL); - if (!fit_image_check_os(fit, rd_noffset, IH_OS_LINUX) || - !fit_image_check_arch(fit, rd_noffset, arch) || - !fit_image_check_type(fit, rd_noffset, IH_TYPE_RAMDISK)) { - printf("No Linux %s Ramdisk Image\n", - genimg_get_arch_name(arch)); - bootstage_error(BOOTSTAGE_ID_FIT_RD_CHECK_ALL); - return 0; - } - - bootstage_mark(BOOTSTAGE_ID_FIT_RD_CHECK_ALL_OK); - return 1; -} - int fit_get_node_from_config(bootm_headers_t *images, const char *prop_name, ulong addr) { -- cgit v1.2.1