Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 1218abf1b5817a39a82399b4b928b00750575bda

Authored by Wolfgang Denk
1 parent 66b3f24d66
Exists in master and in 55 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, emb_lf_v2023.04, imx_v2015.04_4.1.15_1.0.0_ga, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-emmc-imx_v2014.04_3.10.53_1.1.0_ga, smarc-emmc-imx_v2014.04_3.14.28_1.0.0_ga, smarc-imx-l5.0.0_1.0.0-ga, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2017.03_4.9.11_1.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2014.04_3.14.28_1.0.0_ga, smarc-imx_v2015.04_4.1.15_1.0.0_ga, smarc-imx_v2017.03_4.9.11_1.0.0_ga, smarc-imx_v2017.03_4.9.88_2.0.0_ga, smarc-imx_v2017.03_o8.1.0_1.3.0_8m, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_2.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0, smarc_8mq_lf_v2020.04, ti-u-boot-2015.07, u-boot-2013.01.y, v2013.10, v2013.10-smarct33, v2013.10-smartmen, v2014.01, v2014.04, v2014.04-smarct33, v2014.04-smarct33-emmc, v2014.04-smartmen, v2014.07, v2014.07-smarct33, v2014.07-smartmen, v2015.07-smarct33, v2015.07-smarct33-emmc, v2015.07-smarct4x, v2016.05-dlt, v2016.05-smarct3x, v2016.05-smarct3x-emmc, v2016.05-smarct4x, v2017.01-smarct3x, v2017.01-smarct3x-emmc, v2017.01-smarct4x

Fix cases where DECLARE_GLOBAL_DATA_PTR was not declared as global 

Signed-off-by: Wolfgang Denk <wd@denx.de>

Showing 30 changed files with 51 additions and 70 deletions Side-by-side Diff

board/amcc/katmai/katmai.c
Diff comments   View file @ 1218abf
... ... @@ -34,6 +34,8 @@
34 34 #undef PCIE_ENDPOINT
35 35 /* #define PCIE_ENDPOINT 1 */
36 36  
  37 +DECLARE_GLOBAL_DATA_PTR;
  38 +
37 39 int ppc440spe_init_pcie_rootport(int port);
38 40 void ppc440spe_setup_pcie(struct pci_controller *hose, int port);
39 41  
... ... @@ -322,8 +324,6 @@
322 324 #if defined(CONFIG_PCI) && defined(CFG_PCI_TARGET_INIT)
323 325 void pci_target_init(struct pci_controller * hose )
324 326 {
325   - DECLARE_GLOBAL_DATA_PTR;
326   -
327 327 /*-------------------------------------------------------------------+
328 328 * Disable everything
329 329 *-------------------------------------------------------------------*/
board/amcc/taishan/taishan.c
Diff comments   View file @ 1218abf
... ... @@ -32,6 +32,8 @@
32 32 void show_reset_reg(void);
33 33 #endif
34 34  
  35 +DECLARE_GLOBAL_DATA_PTR;
  36 +
35 37 int lcd_init(void);
36 38  
37 39 int board_early_init_f (void)
... ... @@ -266,8 +268,6 @@
266 268 #if defined(CONFIG_PCI) && defined(CFG_PCI_TARGET_INIT)
267 269 void pci_target_init(struct pci_controller * hose )
268 270 {
269   - DECLARE_GLOBAL_DATA_PTR;
270   -
271 271 /*--------------------------------------------------------------------------+
272 272 * Disable everything
273 273 *--------------------------------------------------------------------------*/
board/amcc/yucca/yucca.c
Diff comments   View file @ 1218abf
... ... @@ -34,6 +34,8 @@
34 34 #include "yucca.h"
35 35 #include "../cpu/ppc4xx/440spe_pcie.h"
36 36  
  37 +DECLARE_GLOBAL_DATA_PTR;
  38 +
37 39 #undef PCIE_ENDPOINT
38 40 /* #define PCIE_ENDPOINT 1 */
39 41  
... ... @@ -668,8 +670,6 @@
668 670 #if defined(CONFIG_PCI) && defined(CFG_PCI_TARGET_INIT)
669 671 void pci_target_init(struct pci_controller * hose )
670 672 {
671   - DECLARE_GLOBAL_DATA_PTR;
672   -
673 673 /*-------------------------------------------------------------------+
674 674 * Disable everything
675 675 *-------------------------------------------------------------------*/
board/bf533-ezkit/bf533-ezkit.c
Diff comments   View file @ 1218abf
... ... @@ -30,6 +30,8 @@
30 30 #include "psd4256.h"
31 31 #endif
32 32  
  33 +DECLARE_GLOBAL_DATA_PTR;
  34 +
33 35 int checkboard(void)
34 36 {
35 37 #if (BFIN_CPU == ADSP_BF531)
... ... @@ -46,7 +48,6 @@
46 48  
47 49 long int initdram(int board_type)
48 50 {
49   - DECLARE_GLOBAL_DATA_PTR;
50 51 #ifdef DEBUG
51 52 int brate;
52 53 char *tmp = getenv("baudrate");
board/bf533-stamp/bf533-stamp.c
Diff comments   View file @ 1218abf
... ... @@ -30,6 +30,8 @@
30 30 #include <asm/io.h>
31 31 #include "bf533-stamp.h"
32 32  
  33 +DECLARE_GLOBAL_DATA_PTR;
  34 +
33 35 #define STATUS_LED_OFF 0
34 36 #define STATUS_LED_ON 1
35 37  
... ... @@ -55,7 +57,6 @@
55 57  
56 58 long int initdram(int board_type)
57 59 {
58   - DECLARE_GLOBAL_DATA_PTR;
59 60 #ifdef DEBUG
60 61 printf("SDRAM attributes:\n");
61 62 printf
board/bf537-stamp/bf537-stamp.c
Diff comments   View file @ 1218abf
... ... @@ -32,6 +32,8 @@
32 32 #include <asm/io.h>
33 33 #include "ether_bf537.h"
34 34  
  35 +DECLARE_GLOBAL_DATA_PTR;
  36 +
35 37 #define POST_WORD_ADDR 0xFF903FFC
36 38  
37 39 /*
... ... @@ -132,7 +134,6 @@
132 134  
133 135 long int initdram(int board_type)
134 136 {
135   - DECLARE_GLOBAL_DATA_PTR;
136 137 #ifdef DEBUG
137 138 int brate;
138 139 char *tmp = getenv("baudrate");
board/bf561-ezkit/bf561-ezkit.c
Diff comments   View file @ 1218abf
... ... @@ -29,6 +29,8 @@
29 29 #include <common.h>
30 30 #include <asm/io.h>
31 31  
  32 +DECLARE_GLOBAL_DATA_PTR;
  33 +
32 34 int checkboard(void)
33 35 {
34 36 printf("CPU: ADSP BF561\n");
... ... @@ -39,7 +41,6 @@
39 41  
40 42 long int initdram(int board_type)
41 43 {
42   - DECLARE_GLOBAL_DATA_PTR;
43 44 #ifdef DEBUG
44 45 int brate;
45 46 char *tmp = getenv("baudrate");
board/freescale/mpc8313erdb/sdram.c
Diff comments   View file @ 1218abf
... ... @@ -33,10 +33,11 @@
33 33  
34 34 #include <asm/processor.h>
35 35  
  36 +DECLARE_GLOBAL_DATA_PTR;
  37 +
36 38 #ifndef CFG_8313ERDB_BROKEN_PMC
37 39 static void resume_from_sleep(void)
38 40 {
39   - DECLARE_GLOBAL_DATA_PTR;
40 41 u32 magic = *(u32 *)0;
41 42  
42 43 typedef void (*func_t)(void);
board/lpc2292sodimm/lpc2292sodimm.c
Diff comments   View file @ 1218abf
... ... @@ -28,17 +28,14 @@
28 28 #include <common.h>
29 29 #include <clps7111.h>
30 30  
31   -/* ------------------------------------------------------------------------- */
  31 +DECLARE_GLOBAL_DATA_PTR;
32 32  
33   -
34 33 /*
35 34 * Miscelaneous platform dependent initialisations
36 35 */
37 36  
38 37 int board_init (void)
39 38 {
40   - DECLARE_GLOBAL_DATA_PTR;
41   -
42 39 /* Activate LED flasher */
43 40 IO_LEDFLSH = 0x40;
44 41  
... ... @@ -53,8 +50,6 @@
53 50  
54 51 int dram_init (void)
55 52 {
56   - DECLARE_GLOBAL_DATA_PTR;
57   -
58 53 gd->bd->bi_dram[0].start = PHYS_SDRAM_1;
59 54 gd->bd->bi_dram[0].size = PHYS_SDRAM_1_SIZE;
60 55  
board/mpc7448hpc2/mpc7448hpc2.c
Diff comments   View file @ 1218abf
... ... @@ -38,6 +38,8 @@
38 38  
39 39 #undef DEBUG
40 40  
  41 +DECLARE_GLOBAL_DATA_PTR;
  42 +
41 43 extern void flush_data_cache (void);
42 44 extern void invalidate_l1_instruction_cache (void);
43 45 extern void tsi108_init_f (void);
... ... @@ -46,8 +48,6 @@
46 48  
47 49 void after_reloc (ulong dest_addr)
48 50 {
49   - DECLARE_GLOBAL_DATA_PTR;
50   -
51 51 /*
52 52 * Jump to the main U-Boot board init code
53 53 */
board/mpc7448hpc2/tsi108_init.c
Diff comments   View file @ 1218abf
... ... @@ -33,6 +33,8 @@
33 33 #include <asm/processor.h>
34 34 #include <tsi108.h>
35 35  
  36 +DECLARE_GLOBAL_DATA_PTR;
  37 +
36 38 extern void mpicInit (int verbose);
37 39  
38 40 /*
... ... @@ -141,7 +143,6 @@
141 143  
142 144 int board_early_init_f (void)
143 145 {
144   - DECLARE_GLOBAL_DATA_PTR;
145 146 ulong i;
146 147  
147 148 gd->mem_clk = 0;
... ... @@ -583,7 +584,6 @@
583 584  
584 585 int misc_init_r (void)
585 586 {
586   - DECLARE_GLOBAL_DATA_PTR;
587 587 #ifdef CFG_CLK_SPREAD /* Initialize Spread-Spectrum Clock generation */
588 588 ulong i;
589 589  
board/mpl/vcma9/cmd_vcma9.c
Diff comments   View file @ 1218abf
... ... @@ -40,6 +40,8 @@
40 40  
41 41 #endif
42 42  
  43 +DECLARE_GLOBAL_DATA_PTR;
  44 +
43 45 extern void print_vcma9_info(void);
44 46 extern int vcma9_cantest(int);
45 47 extern int vcma9_nandtest(void);
... ... @@ -53,8 +55,6 @@
53 55  
54 56 int do_vcma9(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
55 57 {
56   - DECLARE_GLOBAL_DATA_PTR;
57   -
58 58 if (strcmp(argv[1], "info") == 0)
59 59 {
60 60 print_vcma9_info();
board/sbc2410x/sbc2410x.c
Diff comments   View file @ 1218abf
... ... @@ -35,7 +35,7 @@
35 35 #include <linux/mtd/nand.h>
36 36 #endif
37 37  
38   -/* ------------------------------------------------------------------------- */
  38 +DECLARE_GLOBAL_DATA_PTR;
39 39  
40 40 #define FCLK_SPEED 1
41 41  
... ... @@ -74,7 +74,6 @@
74 74  
75 75 int board_init (void)
76 76 {
77   - DECLARE_GLOBAL_DATA_PTR;
78 77 S3C24X0_CLOCK_POWER * const clk_power = S3C24X0_GetBase_CLOCK_POWER();
79 78 S3C24X0_GPIO * const gpio = S3C24X0_GetBase_GPIO();
80 79  
... ... @@ -128,8 +127,6 @@
128 127  
129 128 int dram_init (void)
130 129 {
131   - DECLARE_GLOBAL_DATA_PTR;
132   -
133 130 gd->bd->bi_dram[0].start = PHYS_SDRAM_1;
134 131 gd->bd->bi_dram[0].size = PHYS_SDRAM_1_SIZE;
135 132  
board/siemens/SMN42/smn42.c
Diff comments   View file @ 1218abf
... ... @@ -31,17 +31,14 @@
31 31 #include <common.h>
32 32 #include <clps7111.h>
33 33  
34   -/* ------------------------------------------------------------------------- */
  34 +DECLARE_GLOBAL_DATA_PTR;
35 35  
36   -
37 36 /*
38 37 * Miscellaneous platform dependent initialisations
39 38 */
40 39  
41 40 int board_init (void)
42 41 {
43   - DECLARE_GLOBAL_DATA_PTR;
44   -
45 42 /* arch number MACH_TYPE_ARMADILLO - not official*/
46 43 gd->bd->bi_arch_number = 83;
47 44  
... ... @@ -53,8 +50,6 @@
53 50  
54 51 int dram_init (void)
55 52 {
56   - DECLARE_GLOBAL_DATA_PTR;
57   -
58 53 gd->bd->bi_dram[0].start = PHYS_SDRAM_1;
59 54 gd->bd->bi_dram[0].size = PHYS_SDRAM_1_SIZE;
60 55  
board/tqm5200/tqm5200.c
Diff comments   View file @ 1218abf
... ... @@ -43,6 +43,8 @@
43 43 #include "mt48lc16m16a2-75.h"
44 44 #endif
45 45  
  46 +DECLARE_GLOBAL_DATA_PTR;
  47 +
46 48 #ifdef CONFIG_PS2MULT
47 49 void ps2mult_early_init(void);
48 50 #endif
... ... @@ -477,8 +479,6 @@
477 479  
478 480 int board_early_init_f (void)
479 481 {
480   - DECLARE_GLOBAL_DATA_PTR;
481   -
482 482 if (silent_boot())
483 483 gd->flags |= GD_FLG_SILENT;
484 484  
cpu/arm720t/serial.c
Diff comments   View file @ 1218abf
... ... @@ -129,8 +129,6 @@
129 129  
130 130 void serial_setbrg (void)
131 131 {
132   - DECLARE_GLOBAL_DATA_PTR;
133   -
134 132 unsigned short divisor = 0;
135 133  
136 134 switch (gd->baudrate) {
... ... @@ -76,7 +76,6 @@
76 76 void serial_setbrg(void)
77 77 {
78 78 int i;
79   - DECLARE_GLOBAL_DATA_PTR;
80 79  
81 80 calc_baud();
82 81  
... ... @@ -22,6 +22,8 @@
22 22 #include <i2c.h>
23 23 #include <asm/io.h>
24 24  
  25 +DECLARE_GLOBAL_DATA_PTR;
  26 +
25 27 #define bfin_read16(addr) ({ unsigned __v; \
26 28 __asm__ __volatile__ (\
27 29 "%0 = w[%1] (z);\n\t"\
... ... @@ -68,7 +70,6 @@
68 70  
69 71 #ifdef DEBUG_I2C
70 72 #define PRINTD(fmt,args...) do { \
71   - DECLARE_GLOBAL_DATA_PTR; \
72 73 if (gd->have_console) \
73 74 printf(fmt ,##args); \
74 75 } while (0)
... ... @@ -52,6 +52,8 @@
52 52 #include <asm/io.h>
53 53 #include "serial.h"
54 54  
  55 +DECLARE_GLOBAL_DATA_PTR;
  56 +
55 57 unsigned long pll_div_fact;
56 58  
57 59 void calc_baud(void)
... ... @@ -74,7 +76,6 @@
74 76 void serial_setbrg(void)
75 77 {
76 78 int i;
77   - DECLARE_GLOBAL_DATA_PTR;
78 79  
79 80 calc_baud();
80 81  
... ... @@ -52,6 +52,8 @@
52 52 #include "serial.h"
53 53 #include <asm/io.h>
54 54  
  55 +DECLARE_GLOBAL_DATA_PTR;
  56 +
55 57 unsigned long pll_div_fact;
56 58  
57 59 void calc_baud(void)
... ... @@ -74,7 +76,6 @@
74 76 void serial_setbrg(void)
75 77 {
76 78 int i;
77   - DECLARE_GLOBAL_DATA_PTR;
78 79  
79 80 calc_baud();
80 81  
... ... @@ -31,6 +31,8 @@
31 31  
32 32 #include <asm/immap.h>
33 33  
  34 +DECLARE_GLOBAL_DATA_PTR;
  35 +
34 36 int do_reset(cmd_tbl_t * cmdtp, bd_t * bd, int flag, int argc, char *argv[])
35 37 {
36 38 volatile wdog_t *wdp = (wdog_t *) (MMAP_WDOG);
... ... @@ -48,8 +50,6 @@
48 50  
49 51 int checkcpu(void)
50 52 {
51   - DECLARE_GLOBAL_DATA_PTR;
52   -
53 53 volatile ccm_t *ccm = (ccm_t *) MMAP_CCM;
54 54 u16 msk;
55 55 u16 id = 0;
... ... @@ -30,6 +30,8 @@
30 30  
31 31 #include <asm/immap.h>
32 32  
  33 +DECLARE_GLOBAL_DATA_PTR;
  34 +
33 35 /* PLL min/max specifications */
34 36 #define MAX_FVCO 500000 /* KHz */
35 37 #define MAX_FSYS 80000 /* KHz */
... ... @@ -208,8 +210,6 @@
208 210 */
209 211 int get_clocks(void)
210 212 {
211   - DECLARE_GLOBAL_DATA_PTR;
212   -
213 213 gd->bus_clk = clock_pll(CFG_CLK / 1000, 0) * 1000;
214 214 gd->cpu_clk = (gd->bus_clk * 3);
215 215 return (0);
cpu/mpc86xx/cpu_init.c
Diff comments   View file @ 1218abf
... ... @@ -29,6 +29,8 @@
29 29 #include <common.h>
30 30 #include <mpc86xx.h>
31 31  
  32 +DECLARE_GLOBAL_DATA_PTR;
  33 +
32 34 /*
33 35 * Breathe some life into the CPU...
34 36 *
... ... @@ -38,7 +40,6 @@
38 40  
39 41 void cpu_init_f(void)
40 42 {
41   - DECLARE_GLOBAL_DATA_PTR;
42 43 volatile immap_t *immap = (immap_t *)CFG_IMMR;
43 44 volatile ccsr_lbc_t *memctl = &immap->im_lbc;
44 45  
... ... @@ -29,6 +29,7 @@
29 29 #include <mpc86xx.h>
30 30 #include <asm/processor.h>
31 31  
  32 +DECLARE_GLOBAL_DATA_PTR;
32 33  
33 34 void get_sys_info(sys_info_t *sysInfo)
34 35 {
... ... @@ -96,7 +97,6 @@
96 97  
97 98 int get_clocks(void)
98 99 {
99   - DECLARE_GLOBAL_DATA_PTR;
100 100 sys_info_t sys_info;
101 101  
102 102 get_sys_info(&sys_info);
... ... @@ -34,6 +34,8 @@
34 34 #include <command.h>
35 35 #include <asm/processor.h>
36 36  
  37 +DECLARE_GLOBAL_DATA_PTR;
  38 +
37 39 #if defined(CONFIG_CMD_KGDB)
38 40 int (*debugger_exception_handler)(struct pt_regs *) = 0;
39 41 #endif
... ... @@ -50,8 +52,6 @@
50 52 void
51 53 print_backtrace(unsigned long *sp)
52 54 {
53   - DECLARE_GLOBAL_DATA_PTR;
54   -
55 55 int cnt = 0;
56 56 unsigned long i;
57 57  
... ... @@ -30,6 +30,8 @@
30 30 qe_map_t *qe_immr = NULL;
31 31 static qe_snum_t snums[QE_NUM_OF_SNUM];
32 32  
  33 +DECLARE_GLOBAL_DATA_PTR;
  34 +
33 35 void qe_issue_cmd(uint cmd, uint sbc, u8 mcn, u32 cmd_data)
34 36 {
35 37 u32 cecr;
... ... @@ -51,8 +53,6 @@
51 53  
52 54 uint qe_muram_alloc(uint size, uint align)
53 55 {
54   - DECLARE_GLOBAL_DATA_PTR;
55   -
56 56 uint retloc;
57 57 uint align_mask, off;
58 58 uint savebase;
... ... @@ -158,8 +158,6 @@
158 158  
159 159 void qe_init(uint qe_base)
160 160 {
161   - DECLARE_GLOBAL_DATA_PTR;
162   -
163 161 /* Init the QE IMMR base */
164 162 qe_immr = (qe_map_t *)qe_base;
165 163  
... ... @@ -204,7 +202,6 @@
204 202  
205 203 int qe_set_brg(uint brg, uint rate)
206 204 {
207   - DECLARE_GLOBAL_DATA_PTR;
208 205 volatile uint *bp;
209 206 u32 divisor;
210 207 int div16 = 0;
drivers/usbdcore_mpc8xx.c
Diff comments   View file @ 1218abf
... ... @@ -64,6 +64,8 @@
64 64 #include "usbdcore_mpc8xx.h"
65 65 #include "usbdcore_ep0.h"
66 66  
  67 +DECLARE_GLOBAL_DATA_PTR;
  68 +
67 69 #define ERR(fmt, args...)\
68 70 serial_printf("ERROR : [%s] %s:%d: "fmt,\
69 71 __FILE__,__FUNCTION__,__LINE__, ##args)
... ... @@ -1216,7 +1218,6 @@
1216 1218 #elif defined(CFG_USB_BRGCLK)
1217 1219  
1218 1220 /* This has been tested with brgclk == 50MHz */
1219   - DECLARE_GLOBAL_DATA_PTR;
1220 1221 int divisor = 0;
1221 1222  
1222 1223 if (gd->cpu_clk < 48000000L) {
include/configs/atstk1002.h
Diff comments   View file @ 1218abf
... ... @@ -183,10 +183,9 @@
183 183 #define CFG_LONGHELP 1
184 184  
185 185 #define CFG_MEMTEST_START \
186   - ({ DECLARE_GLOBAL_DATA_PTR; gd->bd->bi_dram[0].start; })
  186 + ({ gd->bd->bi_dram[0].start; })
187 187 #define CFG_MEMTEST_END \
188 188 ({ \
189   - DECLARE_GLOBAL_DATA_PTR; \
190 189 gd->bd->bi_dram[0].start + gd->bd->bi_dram[0].size; \
191 190 })
192 191 #define CFG_BAUDRATE_TABLE { 115200, 38400, 19200, 9600, 2400 }
lib_blackfin/board.c
Diff comments   View file @ 1218abf
... ... @@ -42,6 +42,8 @@
42 42 int post_flag;
43 43 #endif
44 44  
  45 +DECLARE_GLOBAL_DATA_PTR;
  46 +
45 47 #ifndef CFG_NO_FLASH
46 48 extern flash_info_t flash_info[];
47 49 #endif
... ... @@ -126,8 +128,6 @@
126 128  
127 129 static int init_baudrate(void)
128 130 {
129   - DECLARE_GLOBAL_DATA_PTR;
130   -
131 131 char tmp[64];
132 132 int i = getenv_r("baudrate", tmp, sizeof(tmp));
133 133 gd->bd->bi_baudrate = gd->baudrate = (i > 0)
... ... @@ -139,7 +139,6 @@
139 139 #ifdef DEBUG
140 140 static void display_global_data(void)
141 141 {
142   - DECLARE_GLOBAL_DATA_PTR;
143 142 bd_t *bd;
144 143 bd = gd->bd;
145 144 printf("--flags:%x\n", gd->flags);
... ... @@ -256,7 +255,6 @@
256 255  
257 256 void board_init_f(ulong bootflag)
258 257 {
259   - DECLARE_GLOBAL_DATA_PTR;
260 258 ulong addr;
261 259 bd_t *bd;
262 260 int i;
... ... @@ -325,7 +323,6 @@
325 323  
326 324 void board_init_r(gd_t * id, ulong dest_addr)
327 325 {
328   - DECLARE_GLOBAL_DATA_PTR;
329 326 ulong size;
330 327 extern void malloc_bin_reloc(void);
331 328 char *s, *e;
... ... @@ -32,14 +32,14 @@
32 32  
33 33 #ifdef CONFIG_POST
34 34  
  35 +DECLARE_GLOBAL_DATA_PTR;
  36 +
35 37 #define POST_MAX_NUMBER 32
36 38  
37 39 #define BOOTMODE_MAGIC 0xDEAD0000
38 40  
39 41 int post_init_f(void)
40 42 {
41   - DECLARE_GLOBAL_DATA_PTR;
42   -
43 43 int res = 0;
44 44 unsigned int i;
45 45  
... ... @@ -62,7 +62,6 @@
62 62  
63 63 void post_bootmode_init(void)
64 64 {
65   - DECLARE_GLOBAL_DATA_PTR;
66 65 int bootmode = post_bootmode_get(0);
67 66 int newword;
68 67  
69 68  
70 69  
... ... @@ -109,20 +108,17 @@
109 108 /* POST tests run before relocation only mark status bits .... */
110 109 static void post_log_mark_start(unsigned long testid)
111 110 {
112   - DECLARE_GLOBAL_DATA_PTR;
113 111 gd->post_log_word |= (testid) << 16;
114 112 }
115 113  
116 114 static void post_log_mark_succ(unsigned long testid)
117 115 {
118   - DECLARE_GLOBAL_DATA_PTR;
119 116 gd->post_log_word |= testid;
120 117 }
121 118  
122 119 /* ... and the messages are output once we are relocated */
123 120 void post_output_backlog(void)
124 121 {
125   - DECLARE_GLOBAL_DATA_PTR;
126 122 int j;
127 123  
128 124 for (j = 0; j < post_list_size; j++) {
... ... @@ -372,8 +368,6 @@
372 368  
373 369 void post_reloc(void)
374 370 {
375   - DECLARE_GLOBAL_DATA_PTR;
376   -
377 371 unsigned int i;
378 372  
379 373 /*