common: Move board_get_usable_ram_top() out of common.h
Move this function into init.h which seems to be designed for this sort of thing. Also update the header to declare struct global_data so that it can be included without global_data.h being needed. Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
parent
428a6a18fe
commit
67c4e9f815
@ -6,6 +6,7 @@
|
||||
#include <common.h>
|
||||
#include <dm.h>
|
||||
#include <fdtdec.h>
|
||||
#include <init.h>
|
||||
#include <linux/libfdt.h>
|
||||
#include <linux/sizes.h>
|
||||
#include <pci.h>
|
||||
|
@ -5,6 +5,7 @@
|
||||
|
||||
#include <common.h>
|
||||
#include <dm.h>
|
||||
#include <init.h>
|
||||
#include <ram.h>
|
||||
#include <asm/io.h>
|
||||
#include <asm/arch-rockchip/sdram.h>
|
||||
|
@ -8,6 +8,7 @@
|
||||
#include <dm.h>
|
||||
#include <env.h>
|
||||
#include <errno.h>
|
||||
#include <init.h>
|
||||
#include <ns16550.h>
|
||||
#include <usb.h>
|
||||
#include <asm/io.h>
|
||||
|
@ -9,6 +9,7 @@
|
||||
#include <config.h>
|
||||
#include <common.h>
|
||||
#include <cpu_func.h>
|
||||
#include <init.h>
|
||||
#include <asm/io.h>
|
||||
#include <asm/sections.h>
|
||||
#include <mach/jz4780.h>
|
||||
|
@ -5,6 +5,7 @@
|
||||
|
||||
#include <common.h>
|
||||
#include <fdtdec.h>
|
||||
#include <init.h>
|
||||
#include <linux/sizes.h>
|
||||
|
||||
DECLARE_GLOBAL_DATA_PTR;
|
||||
|
@ -7,6 +7,7 @@
|
||||
|
||||
#include <common.h>
|
||||
#include <dm.h>
|
||||
#include <init.h>
|
||||
#include <pci.h>
|
||||
#include <syscon.h>
|
||||
#include <asm/cpu.h>
|
||||
|
@ -6,6 +6,7 @@
|
||||
*/
|
||||
|
||||
#include <common.h>
|
||||
#include <init.h>
|
||||
#include <asm/e820.h>
|
||||
#include <asm/arch/sysinfo.h>
|
||||
|
||||
|
@ -8,6 +8,7 @@
|
||||
#include <cpu_func.h>
|
||||
#include <efi.h>
|
||||
#include <errno.h>
|
||||
#include <init.h>
|
||||
#include <usb.h>
|
||||
#include <asm/bootparam.h>
|
||||
#include <asm/e820.h>
|
||||
|
@ -5,6 +5,7 @@
|
||||
|
||||
#include <common.h>
|
||||
#include <efi.h>
|
||||
#include <init.h>
|
||||
#include <asm/u-boot-x86.h>
|
||||
|
||||
DECLARE_GLOBAL_DATA_PTR;
|
||||
|
@ -5,6 +5,7 @@
|
||||
|
||||
#include <common.h>
|
||||
#include <dm.h>
|
||||
#include <init.h>
|
||||
#include <syscon.h>
|
||||
#include <asm/cpu.h>
|
||||
#include <asm/gpio.h>
|
||||
|
@ -12,6 +12,7 @@
|
||||
#include <common.h>
|
||||
#include <errno.h>
|
||||
#include <fdtdec.h>
|
||||
#include <init.h>
|
||||
#include <malloc.h>
|
||||
#include <net.h>
|
||||
#include <rtc.h>
|
||||
|
@ -4,6 +4,7 @@
|
||||
*/
|
||||
|
||||
#include <common.h>
|
||||
#include <init.h>
|
||||
#include <asm/post.h>
|
||||
#include <asm/arch/qemu.h>
|
||||
|
||||
|
@ -7,6 +7,7 @@
|
||||
#include <cpu_func.h>
|
||||
#include <errno.h>
|
||||
#include <fdtdec.h>
|
||||
#include <init.h>
|
||||
#include <malloc.h>
|
||||
#include <asm/mrccache.h>
|
||||
#include <asm/mtrr.h>
|
||||
|
@ -4,6 +4,7 @@
|
||||
*/
|
||||
|
||||
#include <common.h>
|
||||
#include <init.h>
|
||||
#include <linux/sizes.h>
|
||||
#include <asm/e820.h>
|
||||
#include <asm/arch/slimbootloader.h>
|
||||
|
@ -5,6 +5,7 @@
|
||||
|
||||
#include <common.h>
|
||||
#include <handoff.h>
|
||||
#include <init.h>
|
||||
#include <asm/fsp/fsp_support.h>
|
||||
#include <asm/e820.h>
|
||||
#include <asm/mrccache.h>
|
||||
|
@ -5,6 +5,7 @@
|
||||
*/
|
||||
|
||||
#include <common.h>
|
||||
#include <init.h>
|
||||
#include <linux/errno.h>
|
||||
#include <asm/mtrr.h>
|
||||
|
||||
|
@ -7,6 +7,7 @@
|
||||
*/
|
||||
|
||||
#include <common.h>
|
||||
#include <init.h>
|
||||
#include <jffs2/jffs2.h>
|
||||
#include <nand.h>
|
||||
#include <netdev.h>
|
||||
|
@ -4,6 +4,7 @@
|
||||
*/
|
||||
|
||||
#include <common.h>
|
||||
#include <init.h>
|
||||
|
||||
#include <asm/io.h>
|
||||
|
||||
|
@ -8,6 +8,7 @@
|
||||
|
||||
#include <common.h>
|
||||
#include <dm.h>
|
||||
#include <init.h>
|
||||
#include <asm/io.h>
|
||||
#include <asm/arch/imx-regs.h>
|
||||
#include <asm/arch/sys_proto.h>
|
||||
|
@ -10,6 +10,7 @@
|
||||
#include <efi_loader.h>
|
||||
#include <fdt_support.h>
|
||||
#include <fdt_simplefb.h>
|
||||
#include <init.h>
|
||||
#include <lcd.h>
|
||||
#include <memalign.h>
|
||||
#include <mmc.h>
|
||||
|
@ -9,6 +9,7 @@
|
||||
|
||||
#include <common.h>
|
||||
#include <dm.h>
|
||||
#include <init.h>
|
||||
#include <asm/arch/sys_proto.h>
|
||||
#include <asm/arch/hardware.h>
|
||||
#include <asm/gpio.h>
|
||||
|
@ -8,6 +8,7 @@
|
||||
*/
|
||||
|
||||
#include <common.h>
|
||||
#include <init.h>
|
||||
#include <asm/io.h>
|
||||
#include <spl.h>
|
||||
#include <asm/arch/sys_proto.h>
|
||||
|
@ -20,6 +20,7 @@
|
||||
#include <fdtdec.h>
|
||||
#include <fs.h>
|
||||
#include <i2c.h>
|
||||
#include <init.h>
|
||||
#include <initcall.h>
|
||||
#include <lcd.h>
|
||||
#include <malloc.h>
|
||||
|
@ -6,6 +6,7 @@
|
||||
* FSL DCU Framebuffer driver
|
||||
*/
|
||||
|
||||
#include <init.h>
|
||||
#include <asm/io.h>
|
||||
#include <common.h>
|
||||
#include <dm.h>
|
||||
|
@ -9,6 +9,7 @@
|
||||
#include <common.h>
|
||||
#include <cpu_func.h>
|
||||
#include <efi_loader.h>
|
||||
#include <init.h>
|
||||
#include <time.h>
|
||||
|
||||
#include <asm/arch/clock.h>
|
||||
|
@ -73,17 +73,6 @@ extern u8 __dtb_dt_begin[]; /* embedded device tree blob */
|
||||
extern u8 __dtb_dt_spl_begin[]; /* embedded device tree blob for SPL/TPL */
|
||||
int mdm_init(void);
|
||||
|
||||
/**
|
||||
* Get the uppermost pointer that is valid to access
|
||||
*
|
||||
* Some systems may not map all of their address space. This function allows
|
||||
* boards to indicate what their highest support pointer value is for DRAM
|
||||
* access.
|
||||
*
|
||||
* @param total_size Size of U-Boot (unused?)
|
||||
*/
|
||||
ulong board_get_usable_ram_top(ulong total_size);
|
||||
|
||||
/**
|
||||
* arch_fixup_fdt() - Write arch-specific information to fdt
|
||||
*
|
||||
|
@ -10,6 +10,8 @@
|
||||
#ifndef __INIT_H_
|
||||
#define __INIT_H_ 1
|
||||
|
||||
#include <linux/types.h>
|
||||
|
||||
#ifndef __ASSEMBLY__ /* put C only stuff in this section */
|
||||
|
||||
/*
|
||||
@ -149,6 +151,8 @@ ulong board_init_f_alloc_reserve(ulong top);
|
||||
*/
|
||||
void board_init_f_init_reserve(ulong base);
|
||||
|
||||
struct global_data;
|
||||
|
||||
/**
|
||||
* arch_setup_gd() - Set up the global_data pointer
|
||||
* @gd_ptr: Pointer to global data
|
||||
@ -160,10 +164,11 @@ void board_init_f_init_reserve(ulong base);
|
||||
*
|
||||
* gd = gd_ptr;
|
||||
*/
|
||||
void arch_setup_gd(gd_t *gd_ptr);
|
||||
void arch_setup_gd(struct global_data *gd_ptr);
|
||||
|
||||
/* common/board_r.c */
|
||||
void board_init_r(gd_t *id, ulong dest_addr) __attribute__ ((noreturn));
|
||||
void board_init_r(struct global_data *id, ulong dest_addr)
|
||||
__attribute__ ((noreturn));
|
||||
|
||||
int cpu_init_r(void);
|
||||
int last_stage_init(void);
|
||||
@ -181,6 +186,17 @@ int init_func_vid(void);
|
||||
int checkboard(void);
|
||||
int show_board_info(void);
|
||||
|
||||
/**
|
||||
* Get the uppermost pointer that is valid to access
|
||||
*
|
||||
* Some systems may not map all of their address space. This function allows
|
||||
* boards to indicate what their highest support pointer value is for DRAM
|
||||
* access.
|
||||
*
|
||||
* @param total_size Size of U-Boot (unused?)
|
||||
*/
|
||||
ulong board_get_usable_ram_top(ulong total_size);
|
||||
|
||||
#endif /* __ASSEMBLY__ */
|
||||
/* Put only stuff here that the assembler can digest */
|
||||
|
||||
|
@ -7,6 +7,7 @@
|
||||
|
||||
#include <common.h>
|
||||
#include <efi_loader.h>
|
||||
#include <init.h>
|
||||
#include <malloc.h>
|
||||
#include <mapmem.h>
|
||||
#include <watchdog.h>
|
||||
|
Loading…
Reference in New Issue
Block a user