d1552ce449
Move the /memreserve/ processing and dtb memory reservations into early_init_fdt_scan_reserved_mem. This converts arm, arm64, and powerpc as they are the only users of early_init_fdt_scan_reserved_mem. memblock_reserve is safe to call on the same region twice, so the reservation check for the dtb in powerpc 32-bit reservations is safe to remove. Signed-off-by: Rob Herring <robh@kernel.org> Tested-by: Michal Simek <michal.simek@xilinx.com> Cc: Russell King <linux@arm.linux.org.uk> Cc: Catalin Marinas <catalin.marinas@arm.com> Cc: Will Deacon <will.deacon@arm.com> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: Paul Mackerras <paulus@samba.org> Tested-by: Grant Likely <grant.likely@linaro.org> Tested-by: Stephen Chivers <schivers@csc.com>
30 lines
715 B
C
30 lines
715 B
C
/*
|
|
* arch/arm/include/asm/prom.h
|
|
*
|
|
* Copyright (C) 2009 Canonical Ltd. <jeremy.kerr@canonical.com>
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License version 2 as
|
|
* published by the Free Software Foundation.
|
|
*
|
|
*/
|
|
#ifndef __ASMARM_PROM_H
|
|
#define __ASMARM_PROM_H
|
|
|
|
#ifdef CONFIG_OF
|
|
|
|
extern const struct machine_desc *setup_machine_fdt(unsigned int dt_phys);
|
|
extern void __init arm_dt_init_cpu_maps(void);
|
|
|
|
#else /* CONFIG_OF */
|
|
|
|
static inline const struct machine_desc *setup_machine_fdt(unsigned int dt_phys)
|
|
{
|
|
return NULL;
|
|
}
|
|
|
|
static inline void arm_dt_init_cpu_maps(void) { }
|
|
|
|
#endif /* CONFIG_OF */
|
|
#endif /* ASMARM_PROM_H */
|