[U-Boot] [PATCH v3 10/13] ARM: HYP/non-sec/PSCI: emit DT nodes

Ian Campbell ijc at hellion.org.uk
Wed May 7 21:24:00 CEST 2014


On Sat, 2014-02-15 at 13:36 +0000, Marc Zyngier wrote:
> @@ -32,5 +33,11 @@ int arch_fixup_fdt(void *blob)
>  		size[bank] = bd->bi_dram[bank].size;
>  	}
>  
> -	return fdt_fixup_memory_banks(blob, start, size, CONFIG_NR_DRAM_BANKS);
> +	ret = fdt_fixup_memory_banks(blob, start, size, CONFIG_NR_DRAM_BANKS);
> +	if (ret)
> +		return ret;
> +
> +#if defined(CONFIG_ARMV7_NONSEC) || defined(CONFIG_ARMV7_VIRT)
> +	return armv7_update_dt(blob);
> +#endif

For platforms where neither of these CONFIG_* are set this results in:
arch/arm/lib/bootm-fdt.c: In function ‘arch_fixup_fdt’:
arch/arm/lib/bootm-fdt.c:43:1: warning: control reaches end of non-void function [-Wreturn-type]
 }

Ian.



More information about the U-Boot mailing list