mirror of
https://github.com/Fishwaldo/u-boot.git
synced 2025-03-27 09:31:32 +00:00
Changed gcc-4.0 global data pointer fix to conform with the fix for this on
other platforms (see c75eba3b41
)
This commit is contained in:
parent
b3c36e6b94
commit
b2b43463af
2 changed files with 3 additions and 6 deletions
|
@ -61,7 +61,7 @@ typedef struct global_data {
|
|||
#define GD_FLG_DEVINIT 0x00002 /* Devices have been initialized */
|
||||
#define GD_FLG_SILENT 0x00004 /* Silent mode */
|
||||
|
||||
#define GCC_4_SCREW_GDP 1
|
||||
#undef GCC_4_SCREW_GDP
|
||||
#ifdef GCC_4_SCREW_GDP
|
||||
# define DECLARE_GLOBAL_DATA_PTR register gd_t* volatile gd asm ("r8");
|
||||
#else
|
||||
|
|
|
@ -54,6 +54,8 @@
|
|||
#include "../drivers/lan91c96.h"
|
||||
#endif
|
||||
|
||||
DECLARE_GLOBAL_DATA_PTR;
|
||||
|
||||
#if (CONFIG_COMMANDS & CFG_CMD_NAND)
|
||||
void nand_init (void);
|
||||
#endif
|
||||
|
@ -121,8 +123,6 @@ void *sbrk (ptrdiff_t increment)
|
|||
|
||||
static int init_baudrate (void)
|
||||
{
|
||||
DECLARE_GLOBAL_DATA_PTR;
|
||||
|
||||
uchar tmp[64]; /* long enough for environment variables */
|
||||
int i = getenv_r ("baudrate", tmp, sizeof (tmp));
|
||||
gd->bd->bi_baudrate = gd->baudrate = (i > 0)
|
||||
|
@ -157,7 +157,6 @@ static int display_banner (void)
|
|||
*/
|
||||
static int display_dram_config (void)
|
||||
{
|
||||
DECLARE_GLOBAL_DATA_PTR;
|
||||
int i;
|
||||
|
||||
#ifdef DEBUG
|
||||
|
@ -236,8 +235,6 @@ init_fnc_t *init_sequence[] = {
|
|||
|
||||
void start_armboot (void)
|
||||
{
|
||||
DECLARE_GLOBAL_DATA_PTR;
|
||||
|
||||
ulong size;
|
||||
init_fnc_t **init_fnc_ptr;
|
||||
char *s;
|
||||
|
|
Loading…
Add table
Reference in a new issue