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
ppc: Clean up calling of misc_init_r() during init
[platform/kernel/u-boot.git]
/
include
/
common.h
diff --git
a/include/common.h
b/include/common.h
index
afee188
..
f7c93bf
100644
(file)
--- a/
include/common.h
+++ b/
include/common.h
@@
-1,5
+1,5
@@
/*
/*
- * (C) Copyright 2000-200
7
+ * (C) Copyright 2000-200
9
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
*
* See file CREDITS for list of people who contributed to this
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
*
* See file CREDITS for list of people who contributed to this
@@
-27,6
+27,8
@@
#undef _LINUX_CONFIG_H
#define _LINUX_CONFIG_H 1 /* avoid reading Linux autoconf.h file */
#undef _LINUX_CONFIG_H
#define _LINUX_CONFIG_H 1 /* avoid reading Linux autoconf.h file */
+#ifndef __ASSEMBLY__ /* put C only stuff in this section */
+
typedef unsigned char uchar;
typedef volatile unsigned long vu_long;
typedef volatile unsigned short vu_short;
typedef unsigned char uchar;
typedef volatile unsigned long vu_long;
typedef volatile unsigned short vu_short;
@@
-66,7
+68,6
@@
typedef volatile unsigned char vu_char;
#elif defined(CONFIG_MPC5xxx)
#include <mpc5xxx.h>
#elif defined(CONFIG_MPC512X)
#elif defined(CONFIG_MPC5xxx)
#include <mpc5xxx.h>
#elif defined(CONFIG_MPC512X)
-#include <mpc512x.h>
#include <asm/immap_512x.h>
#elif defined(CONFIG_MPC8220)
#include <asm/immap_8220.h>
#include <asm/immap_512x.h>
#elif defined(CONFIG_MPC8220)
#include <asm/immap_8220.h>
@@
-90,7
+91,7
@@
typedef volatile unsigned char vu_char;
#include <mpc85xx.h>
#include <asm/immap_85xx.h>
#endif
#include <mpc85xx.h>
#include <asm/immap_85xx.h>
#endif
-#ifdef CONFIG_MPC83
XX
+#ifdef CONFIG_MPC83
xx
#include <mpc83xx.h>
#include <asm/immap_83xx.h>
#endif
#include <mpc83xx.h>
#include <asm/immap_83xx.h>
#endif
@@
-234,8
+235,8
@@
int mac_read_from_eeprom(void);
/* common/flash.c */
void flash_perror (int);
/* common/flash.c */
void flash_perror (int);
-/* common/cmd_
autoscript
.c */
-int
autoscript
(ulong addr, const char *fit_uname);
+/* common/cmd_
source
.c */
+int
source
(ulong addr, const char *fit_uname);
extern ulong load_addr; /* Default Load Address */
extern ulong load_addr; /* Default Load Address */
@@
-269,13
+270,15
@@
void forceenv (char *, char *);
#ifdef CONFIG_AUTO_COMPLETE
int env_complete(char *var, int maxv, char *cmdv[], int maxsz, char *buf);
#endif
#ifdef CONFIG_AUTO_COMPLETE
int env_complete(char *var, int maxv, char *cmdv[], int maxsz, char *buf);
#endif
+int get_env_id (void);
void pci_init (void);
void pci_init_board(void);
void pciinfo (int, int);
#if defined(CONFIG_PCI) && (defined(CONFIG_4xx) && !defined(CONFIG_AP1000))
void pci_init (void);
void pci_init_board(void);
void pciinfo (int, int);
#if defined(CONFIG_PCI) && (defined(CONFIG_4xx) && !defined(CONFIG_AP1000))
- int pci_pre_init (struct pci_controller * );
+ int pci_pre_init (struct pci_controller *);
+ int is_pci_host (struct pci_controller *);
#endif
#if defined(CONFIG_PCI) && (defined(CONFIG_440) || defined(CONFIG_405EX))
#endif
#if defined(CONFIG_PCI) && (defined(CONFIG_440) || defined(CONFIG_405EX))
@@
-285,7
+288,6
@@
void pciinfo (int, int);
# if defined(CONFIG_SYS_PCI_MASTER_INIT)
void pci_master_init (struct pci_controller *);
# endif
# if defined(CONFIG_SYS_PCI_MASTER_INIT)
void pci_master_init (struct pci_controller *);
# endif
- int is_pci_host (struct pci_controller *);
#if defined(CONFIG_440SPE) || \
defined(CONFIG_460EX) || defined(CONFIG_460GT) || \
defined(CONFIG_405EX)
#if defined(CONFIG_440SPE) || \
defined(CONFIG_460EX) || defined(CONFIG_460GT) || \
defined(CONFIG_405EX)
@@
-299,6
+301,9
@@
int misc_init_r (void);
/* common/exports.c */
void jumptable_init(void);
/* common/exports.c */
void jumptable_init(void);
+/* common/kallsysm.c */
+const char *symbol_lookup(unsigned long addr, unsigned long *caddr);
+
/* api/api.c */
void api_init (void);
/* api/api.c */
void api_init (void);
@@
-351,13
+356,6
@@
void board_serial_init (void);
void board_ether_init (void);
#endif
void board_ether_init (void);
#endif
-#if defined(CONFIG_RPXCLASSIC) || defined(CONFIG_MBX) || \
- defined(CONFIG_IAD210) || defined(CONFIG_XPEDITE1K) || \
- defined(CONFIG_METROBOX) || defined(CONFIG_KAREF) || \
- defined(CONFIG_V38B)
-void board_get_enetaddr (uchar *addr);
-#endif
-
#ifdef CONFIG_HERMES
/* $(BOARD)/hermes.c */
void hermes_start_lxt980 (int speed);
#ifdef CONFIG_HERMES
/* $(BOARD)/hermes.c */
void hermes_start_lxt980 (int speed);
@@
-370,8
+368,6
@@
void display_mem_map(void);
void perform_soft_reset(void);
#endif
void perform_soft_reset(void);
#endif
-void load_sernum_ethaddr (void);
-
/* $(BOARD)/$(BOARD).c */
int board_early_init_f (void);
int board_late_init (void);
/* $(BOARD)/$(BOARD).c */
int board_early_init_f (void);
int board_late_init (void);
@@
-418,7
+414,7
@@
void trap_init (ulong);
defined (CONFIG_MPC8220) || \
defined (CONFIG_MPC85xx) || \
defined (CONFIG_MPC86xx) || \
defined (CONFIG_MPC8220) || \
defined (CONFIG_MPC85xx) || \
defined (CONFIG_MPC86xx) || \
- defined (CONFIG_MPC83
XX
)
+ defined (CONFIG_MPC83
xx
)
unsigned char in8(unsigned int);
void out8(unsigned int, unsigned char);
unsigned short in16(unsigned int);
unsigned char in8(unsigned int);
void out8(unsigned int, unsigned char);
unsigned short in16(unsigned int);
@@
-439,12
+435,14
@@
unsigned short in16(unsigned int);
void out16(unsigned int, unsigned short value);
#endif
void out16(unsigned int, unsigned short value);
#endif
-#if defined (CONFIG_MPC83
XX
)
+#if defined (CONFIG_MPC83
xx
)
void ppcDWload(unsigned int *addr, unsigned int *ret);
void ppcDWstore(unsigned int *addr, unsigned int *value);
#endif
/* $(CPU)/cpu.c */
void ppcDWload(unsigned int *addr, unsigned int *ret);
void ppcDWstore(unsigned int *addr, unsigned int *value);
#endif
/* $(CPU)/cpu.c */
+int cpu_numcores (void);
+int probecpu (void);
int checkcpu (void);
int checkicache (void);
int checkdcache (void);
int checkcpu (void);
int checkicache (void);
int checkdcache (void);
@@
-461,6
+459,7
@@
void ft_pci_setup(void *blob, bd_t *bd);
/* $(CPU)/serial.c */
int serial_init (void);
/* $(CPU)/serial.c */
int serial_init (void);
+void serial_exit (void);
void serial_addr (unsigned int);
void serial_setbrg (void);
void serial_putc (const char);
void serial_addr (unsigned int);
void serial_setbrg (void);
void serial_putc (const char);
@@
-498,8
+497,6
@@
ulong get_PCI_freq (void);
#endif
#if defined(CONFIG_S3C2400) || defined(CONFIG_S3C2410) || \
defined(CONFIG_LH7A40X) || defined(CONFIG_S3C6400)
#endif
#if defined(CONFIG_S3C2400) || defined(CONFIG_S3C2410) || \
defined(CONFIG_LH7A40X) || defined(CONFIG_S3C6400)
-void s3c2410_irq(void);
-#define ARM920_IRQ_CALLBACK s3c2410_irq
ulong get_FCLK (void);
ulong get_HCLK (void);
ulong get_PCLK (void);
ulong get_FCLK (void);
ulong get_HCLK (void);
ulong get_PCLK (void);
@@
-555,7
+552,7
@@
void cpu_init_f (void);
int cpu_init_r (void);
#if defined(CONFIG_8260)
int prt_8260_rsr (void);
int cpu_init_r (void);
#if defined(CONFIG_8260)
int prt_8260_rsr (void);
-#elif defined(CONFIG_MPC83
XX
)
+#elif defined(CONFIG_MPC83
xx
)
int prt_83xx_rsr (void);
#endif
int prt_83xx_rsr (void);
#endif
@@
-627,9
+624,7
@@
int vsprintf(char *buf, const char *fmt, va_list args);
char * strmhz(char *buf, long hz);
/* lib_generic/crc32.c */
char * strmhz(char *buf, long hz);
/* lib_generic/crc32.c */
-uint32_t crc32 (uint32_t, const unsigned char *, uint);
-uint32_t crc32_wd (uint32_t, const unsigned char *, uint, uint);
-uint32_t crc32_no_comp (uint32_t, const unsigned char *, uint);
+#include <u-boot/crc.h>
/* common/console.c */
int console_init_f(void); /* Before relocation; uses the serial stuff */
/* common/console.c */
int console_init_f(void); /* Before relocation; uses the serial stuff */
@@
-643,11
+638,9
@@
int disable_ctrlc (int); /* 1 to disable, 0 to enable Control-C detect */
/*
* STDIO based functions (can always be used)
*/
/*
* STDIO based functions (can always be used)
*/
-
/* serial stuff */
void serial_printf (const char *fmt, ...)
__attribute__ ((format (__printf__, 1, 2)));
/* serial stuff */
void serial_printf (const char *fmt, ...)
__attribute__ ((format (__printf__, 1, 2)));
-
/* stdin */
int getc(void);
int tstc(void);
/* stdin */
int getc(void);
int tstc(void);
@@
-667,7
+660,6
@@
void vprintf(const char *fmt, va_list args);
/*
* FILE based functions (can only be used AFTER relocation!)
*/
/*
* FILE based functions (can only be used AFTER relocation!)
*/
-
#define stdin 0
#define stdout 1
#define stderr 2
#define stdin 0
#define stdout 1
#define stderr 2
@@
-695,7
+687,22
@@
int pcmcia_init (void);
/*
* Board-specific Platform code can reimplement show_boot_progress () if needed
*/
/*
* Board-specific Platform code can reimplement show_boot_progress () if needed
*/
-void __attribute__((weak)) show_boot_progress (int val);
+void show_boot_progress(int val);
+
+/* Multicore arch functions */
+#ifdef CONFIG_MP
+int cpu_status(int nr);
+int cpu_reset(int nr);
+int cpu_release(int nr, int argc, char *argv[]);
+#endif
+
+#endif /* __ASSEMBLY__ */
+
+/* Put only stuff here that the assembler can digest */
+
+#ifdef CONFIG_POST
+#define CONFIG_HAS_POST
+#endif
#ifdef CONFIG_INIT_CRITICAL
#error CONFIG_INIT_CRITICAL is deprecated!
#ifdef CONFIG_INIT_CRITICAL
#error CONFIG_INIT_CRITICAL is deprecated!
@@
-704,6
+711,7
@@
void __attribute__((weak)) show_boot_progress (int val);
#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
+#define ROUND(a,b) (((a) + (b)) & ~((b) - 1))
#define DIV_ROUND(n,d) (((n) + ((d)/2)) / (d))
#define DIV_ROUND_UP(n,d) (((n) + (d) - 1) / (d))
#define roundup(x, y) ((((x) + ((y) - 1)) / (y)) * (y))
#define DIV_ROUND(n,d) (((n) + ((d)/2)) / (d))
#define DIV_ROUND_UP(n,d) (((n) + (d) - 1) / (d))
#define roundup(x, y) ((((x) + ((y) - 1)) / (y)) * (y))
@@
-711,15
+719,4
@@
void __attribute__((weak)) show_boot_progress (int val);
#define ALIGN(x,a) __ALIGN_MASK((x),(typeof(x))(a)-1)
#define __ALIGN_MASK(x,mask) (((x)+(mask))&~(mask))
#define ALIGN(x,a) __ALIGN_MASK((x),(typeof(x))(a)-1)
#define __ALIGN_MASK(x,mask) (((x)+(mask))&~(mask))
-/* Multicore arch functions */
-#ifdef CONFIG_MP
-int cpu_status(int nr);
-int cpu_reset(int nr);
-int cpu_release(int nr, int argc, char *argv[]);
-#endif
-
-#ifdef CONFIG_POST
-#define CONFIG_HAS_POST
-#endif
-
#endif /* __COMMON_H_ */
#endif /* __COMMON_H_ */