sysmo-bts
/
barebox
9
0
Fork 0
Code Releases Activity

svn_rev_153 

remove global data #2
This commit is contained in:
Sascha Hauer 2007-07-05 18:01:28 +02:00 committed by Sascha Hauer
parent a8421600d1
commit 2e8ca97d8d
4 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
common/cmd_bootm.c
View File

@ -957,8 +957,9 @@ do_bootm_netbsd (cmd_tbl_t *cmdtp, int flag,
int verify)
{
image_header_t *hdr = &header;
#if 0
void (*loader)(bd_t *, image_header_t *, char *, char *);
#endif
image_header_t *img_addr;
char *consdev;
char *cmdline;
@ -1009,12 +1010,12 @@ do_bootm_netbsd (cmd_tbl_t *cmdtp, int flag,
} else if ((cmdline = getenv("bootargs")) == NULL) {
cmdline = "";
}
#if 0
loader = (void (*)(bd_t *, image_header_t *, char *, char *)) ntohl(hdr->ih_ep);
printf ("## Transferring control to NetBSD stage-2 loader (at address %08lx) ...\n",
(ulong)loader);
#endif
SHOW_BOOT_PROGRESS (15);
/*
@ -1475,13 +1476,14 @@ do_bootm_rtems (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[],
ulong addr, ulong *len_ptr, int verify)
{
image_header_t *hdr = &header;
#if 0
void (*entry_point)(bd_t *);
entry_point = (void (*)(bd_t *)) ntohl(hdr->ih_ep);
printf ("## Transferring control to RTEMS (at address %08lx) ...\n",
(ulong)entry_point);
#endif
SHOW_BOOT_PROGRESS (15);
/*

2
include/asm-arm/global_data.h
View File

@ -24,8 +24,6 @@
#ifndef __ASM_GBL_DATA_H
#define __ASM_GBL_DATA_H
typedef struct global_data {} gd_t;
#define DECLARE_GLOBAL_DATA_PTR
#endif /* __ASM_GBL_DATA_H */

9
include/asm-arm/u-boot.h
View File

@ -36,13 +36,6 @@
#ifndef _U_BOOT_H_
#define _U_BOOT_H_ 1
typedef struct bd_info {
int bi_baudrate; /* serial console baudrate */
ulong bi_arch_number; /* unique id for this board */
ulong bi_boot_params; /* where this board expects params */
} bd_t;
#define bi_env_data bi_env->data
#define bi_env_crc bi_env->crc
//typedef struct bd_info {} bd_t;
#endif /* _U_BOOT_H_ */

4
include/common.h
View File

@ -196,7 +196,7 @@ void reset_cmd_timeout(void);
/* lib_$(ARCH)/board.c */
void board_init_f (ulong);
void board_init_r (gd_t *, ulong);
//void board_init_r (gd_t *, ulong);
int checkboard (void);
int checkflash (void);
int checkdram (void);
@ -368,7 +368,7 @@ void icache_disable(void);
int dcache_status (void);
void dcache_enable (void);
void dcache_disable(void);
void relocate_code (ulong, gd_t *, ulong);
//void relocate_code (ulong, gd_t *, ulong);
ulong get_endaddr (void);
void trap_init (ulong);
#if defined (CONFIG_4xx) || \