projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.denx.de/u-boot-arm
[platform/kernel/u-boot.git]
/
include
/
common.h
diff --git
a/include/common.h
b/include/common.h
index
ea3e5ed
..
96a45a6
100644
(file)
--- a/
include/common.h
+++ b/
include/common.h
@@
-302,9
+302,16
@@
int checkdram (void);
int last_stage_init(void);
extern ulong monitor_flash_len;
int mac_read_from_eeprom(void);
int last_stage_init(void);
extern ulong monitor_flash_len;
int mac_read_from_eeprom(void);
-extern u8 _
binary_dt_dtb_start[];
/* embedded device tree blob */
+extern u8 _
_dtb_dt_begin[];
/* embedded device tree blob */
int set_cpu_clk_info(void);
int set_cpu_clk_info(void);
+#if defined(CONFIG_DISPLAY_CPUINFO)
int print_cpuinfo(void);
int print_cpuinfo(void);
+#else
+static inline int print_cpuinfo(void)
+{
+ return 0;
+}
+#endif
int update_flash_size(int flash_size);
/**
int update_flash_size(int flash_size);
/**
@@
-454,6
+461,7
@@
void api_init (void);
/* common/memsize.c */
long get_ram_size (long *, long);
/* common/memsize.c */
long get_ram_size (long *, long);
+phys_size_t get_effective_memsize(void);
/* $(BOARD)/$(BOARD).c */
void reset_phy (void);
/* $(BOARD)/$(BOARD).c */
void reset_phy (void);