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
[platform/kernel/u-boot.git]
/
arch
/
avr32
/
include
/
asm
/
u-boot.h
diff --git
a/arch/avr32/include/asm/u-boot.h
b/arch/avr32/include/asm/u-boot.h
index
bff17d5
..
8b047ec
100644
(file)
--- a/
arch/avr32/include/asm/u-boot.h
+++ b/
arch/avr32/include/asm/u-boot.h
@@
-6,8
+6,12
@@
#ifndef __ASM_U_BOOT_H__
#define __ASM_U_BOOT_H__ 1
#ifndef __ASM_U_BOOT_H__
#define __ASM_U_BOOT_H__ 1
+#ifdef CONFIG_SYS_GENERIC_BOARD
+/* Use the generic board which requires a unified bd_info */
+#include <asm-generic/u-boot.h>
+#else
+
typedef struct bd_info {
typedef struct bd_info {
- unsigned int bi_baudrate;
unsigned char bi_phy_id[4];
unsigned long bi_board_number;
void *bi_boot_params;
unsigned char bi_phy_id[4];
unsigned long bi_board_number;
void *bi_boot_params;
@@
-23,7
+27,12
@@
typedef struct bd_info {
#define bi_memstart bi_dram[0].start
#define bi_memsize bi_dram[0].size
#define bi_memstart bi_dram[0].start
#define bi_memsize bi_dram[0].size
+#endif
+
/* For image.h:image_check_target_arch() */
#define IH_ARCH_DEFAULT IH_ARCH_AVR32
/* For image.h:image_check_target_arch() */
#define IH_ARCH_DEFAULT IH_ARCH_AVR32
+int arch_cpu_init(void);
+int dram_init(void);
+
#endif /* __ASM_U_BOOT_H__ */
#endif /* __ASM_U_BOOT_H__ */