Browse Source

Replace CONFIG_SYS_GBL_DATA_SIZE by auto-generated value

CONFIG_SYS_GBL_DATA_SIZE has always been just a bad workarond for not
being able to use "sizeof(struct global_data)" in assembler files.
Recent experience has shown that manual synchronization is not
reliable enough.  This patch renames CONFIG_SYS_GBL_DATA_SIZE into
GENERATED_GBL_DATA_SIZE which gets automatically generated by the
asm-offsets tool.  In the result, all definitions of this value can be
deleted from the board config files.  We have to make sure that all
files that reference such data include the new <asm-offsets.h> file.

No other changes have been done yet, but it is obvious that similar
changes / simplifications can be done for other, related macro
definitions as well.

Signed-off-by: Wolfgang Denk <wd@denx.de>
Acked-by: Kumar Gala <galak@kernel.crashing.org>
master
Wolfgang Denk 10 years ago
parent
commit
25ddd1fb0a
560 changed files with 518 additions and 956 deletions
  1. +5
    -4
      arch/arm/cpu/arm1136/start.S
  2. +5
    -4
      arch/arm/cpu/arm1176/start.S
  3. +4
    -4
      arch/arm/cpu/arm720t/start.S
  4. +4
    -3
      arch/arm/cpu/arm920t/start.S
  5. +4
    -4
      arch/arm/cpu/arm925t/start.S
  6. +4
    -4
      arch/arm/cpu/arm926ejs/start.S
  7. +4
    -4
      arch/arm/cpu/arm946es/start.S
  8. +4
    -4
      arch/arm/cpu/arm_intcm/start.S
  9. +5
    -4
      arch/arm/cpu/armv7/start.S
  10. +4
    -3
      arch/arm/cpu/ixp/start.S
  11. +4
    -5
      arch/arm/cpu/lh7a40x/start.S
  12. +3
    -2
      arch/arm/cpu/pxa/start.S
  13. +2
    -3
      arch/arm/cpu/s3c44b0/start.S
  14. +4
    -5
      arch/arm/cpu/sa1100/start.S
  15. +1
    -1
      arch/arm/include/asm/global_data.h
  16. +1
    -1
      arch/arm/lib/interrupts.c
  17. +1
    -0
      arch/avr32/cpu/start.S
  18. +1
    -1
      arch/avr32/include/asm/global_data.h
  19. +1
    -4
      arch/blackfin/include/asm/config.h
  20. +1
    -1
      arch/blackfin/include/asm/global_data.h
  21. +2
    -2
      arch/blackfin/lib/board.c
  22. +1
    -1
      arch/i386/include/asm/global_data.h
  23. +1
    -0
      arch/m68k/cpu/mcf5227x/start.S
  24. +1
    -0
      arch/m68k/cpu/mcf523x/start.S
  25. +1
    -0
      arch/m68k/cpu/mcf52x2/start.S
  26. +1
    -0
      arch/m68k/cpu/mcf532x/start.S
  27. +1
    -0
      arch/m68k/cpu/mcf5445x/start.S
  28. +1
    -0
      arch/m68k/cpu/mcf547x_8x/start.S
  29. +1
    -1
      arch/m68k/include/asm/global_data.h
  30. +1
    -0
      arch/microblaze/cpu/start.S
  31. +1
    -1
      arch/microblaze/include/asm/global_data.h
  32. +1
    -1
      arch/microblaze/lib/board.c
  33. +1
    -0
      arch/mips/cpu/cache.S
  34. +1
    -0
      arch/mips/cpu/start.S
  35. +1
    -1
      arch/mips/include/asm/global_data.h
  36. +1
    -1
      arch/nios2/cpu/start.S
  37. +1
    -1
      arch/nios2/lib/board.c
  38. +1
    -0
      arch/powerpc/cpu/74xx_7xx/start.S
  39. +1
    -0
      arch/powerpc/cpu/mpc512x/start.S
  40. +1
    -0
      arch/powerpc/cpu/mpc5xx/start.S
  41. +1
    -0
      arch/powerpc/cpu/mpc5xxx/start.S
  42. +1
    -0
      arch/powerpc/cpu/mpc8220/start.S
  43. +1
    -0
      arch/powerpc/cpu/mpc824x/start.S
  44. +1
    -0
      arch/powerpc/cpu/mpc8260/start.S
  45. +1
    -0
      arch/powerpc/cpu/mpc83xx/start.S
  46. +1
    -0
      arch/powerpc/cpu/mpc85xx/release.S
  47. +1
    -0
      arch/powerpc/cpu/mpc85xx/start.S
  48. +1
    -0
      arch/powerpc/cpu/mpc86xx/start.S
  49. +1
    -0
      arch/powerpc/cpu/mpc8xx/start.S
  50. +2
    -1
      arch/powerpc/cpu/ppc4xx/start.S
  51. +1
    -1
      arch/powerpc/include/asm/global_data.h
  52. +3
    -2
      arch/sh/cpu/sh2/start.S
  53. +3
    -2
      arch/sh/cpu/sh3/start.S
  54. +3
    -2
      arch/sh/cpu/sh4/start.S
  55. +2
    -2
      arch/sh/lib/board.c
  56. +1
    -0
      arch/sparc/cpu/leon2/start.S
  57. +1
    -0
      arch/sparc/cpu/leon3/start.S
  58. +1
    -1
      arch/sparc/include/asm/global_data.h
  59. +1
    -1
      arch/sparc/lib/board.c
  60. +1
    -0
      board/amcc/bamboo/init.S
  61. +1
    -0
      board/amcc/bluestone/init.S
  62. +1
    -0
      board/amcc/canyonlands/init.S
  63. +1
    -0
      board/amcc/sequoia/init.S
  64. +1
    -0
      board/amcc/yosemite/init.S
  65. +1
    -0
      board/barco/early_init.S
  66. +1
    -0
      board/esd/du440/init.S
  67. +1
    -0
      board/esd/pmc440/init.S
  68. +1
    -2
      board/fads/fads.h
  69. +1
    -0
      board/gdsys/gdppc440etx/init.S
  70. +1
    -0
      board/gdsys/intip/init.S
  71. +1
    -0
      board/hidden_dragon/early_init.S
  72. +1
    -0
      board/korat/init.S
  73. +1
    -0
      board/lwmon5/init.S
  74. +1
    -0
      board/pcs440ep/init.S
  75. +1
    -0
      board/prodrive/alpr/init.S
  76. +1
    -0
      board/sandpoint/early_init.S
  77. +1
    -0
      board/t3corp/init.S
  78. +1
    -1
      common/cmd_bdinfo.c
  79. +4
    -0
      include/asm-offsets.h
  80. +1
    -0
      include/common.h
  81. +1
    -3
      include/configs/A3000.h
  82. +1
    -2
      include/configs/ADCIOP.h
  83. +1
    -2
      include/configs/AMX860.h
  84. +1
    -2
      include/configs/AP1000.h
  85. +1
    -2
      include/configs/APC405.h
  86. +1
    -2
      include/configs/AR405.h
  87. +1
    -2
      include/configs/ASH405.h
  88. +1
    -2
      include/configs/ATUM8548.h
  89. +1
    -2
      include/configs/Adder.h
  90. +1
    -2
      include/configs/Alaska8220.h
  91. +0
    -1
      include/configs/B2.h
  92. +1
    -2
      include/configs/BAB7xx.h
  93. +1
    -2
      include/configs/BC3450.h
  94. +1
    -2
      include/configs/BMW.h
  95. +1
    -2
      include/configs/CANBT.h
  96. +1
    -2
      include/configs/CATcenter.h
  97. +1
    -2
      include/configs/CMS700.h
  98. +1
    -2
      include/configs/CPC45.h
  99. +1
    -2
      include/configs/CPCI2DP.h
  100. +1
    -2
      include/configs/CPCI405.h

+ 5
- 4
arch/arm/cpu/arm1136/start.S View File

@ -28,6 +28,7 @@
* MA 02111-1307 USA
*/
#include <asm-offsets.h>
#include <config.h>
#include <version.h>
.globl _start
@ -380,7 +381,7 @@ stack_setup:
sub sp, r0, #128 /* leave 32 words for abort-stack */
#else
sub r0, r0, #CONFIG_SYS_MALLOC_LEN /* malloc area */
sub r0, r0, #CONFIG_SYS_GBL_DATA_SIZE /* bdinfo */
sub r0, r0, #GENERATED_GBL_DATA_SIZE /* bdinfo */
#ifdef CONFIG_USE_IRQ
sub r0, r0, #(CONFIG_STACKSIZE_IRQ+CONFIG_STACKSIZE_FIQ)
#endif
@ -510,7 +511,7 @@ cpu_init_crit:
#else
adr r2, _start
sub r2, r2, #(CONFIG_SYS_MALLOC_LEN)
sub r2, r2, #(CONFIG_SYS_GBL_DATA_SIZE+8) @ set base 2 words into abort stack
sub r2, r2, #(GENERATED_GBL_DATA_SIZE+8) @ set base 2 words into abort stack
#endif
ldmia r2, {r2 - r3} @ get values for "aborted" pc and cpsr (into parm regs)
add r0, sp, #S_FRAME_SIZE @ grab pointer to old stack
@ -547,7 +548,7 @@ cpu_init_crit:
#else
adr r13, _start @ setup our mode stack (enter in banked mode)
sub r13, r13, #(CONFIG_STACKSIZE+CONFIG_SYS_MALLOC_LEN) @ move past malloc pool
sub r13, r13, #(CONFIG_SYS_GBL_DATA_SIZE+8) @ move to reserved a couple spots for abort stack
sub r13, r13, #(GENERATED_GBL_DATA_SIZE+8) @ move to reserved a couple spots for abort stack
#endif
str lr, [r13] @ save caller lr in position 0 of saved stack
@ -569,7 +570,7 @@ cpu_init_crit:
#else
ldr r0, _armboot_start @ get data regions start
sub r0, r0, #(CONFIG_SYS_MALLOC_LEN) @ move past malloc pool
sub r0, r0, #(CONFIG_SYS_GBL_DATA_SIZE+8) @ move past gbl and a couple spots for abort stack
sub r0, r0, #(GENERATED_GBL_DATA_SIZE+8) @ move past gbl and a couple spots for abort stack
#endif
str lr, [r0] @ save caller lr in position 0 of saved stack
mrs r0, spsr @ get the spsr


+ 5
- 4
arch/arm/cpu/arm1176/start.S View File

@ -30,6 +30,7 @@
* Base codes by scsuh (sc.suh)
*/
#include <asm-offsets.h>
#include <config.h>
#include <version.h>
#ifdef CONFIG_ENABLE_MMU
@ -546,7 +547,7 @@ skip_hw_init:
stack_setup:
ldr r0, =CONFIG_SYS_UBOOT_BASE /* base of copy in DRAM */
sub r0, r0, #CONFIG_SYS_MALLOC_LEN /* malloc area */
sub r0, r0, #CONFIG_SYS_GBL_DATA_SIZE /* bdinfo */
sub r0, r0, #GENERATED_GBL_DATA_SIZE /* bdinfo */
sub sp, r0, #12 /* leave 3 words for abort-stack */
bic sp, sp, #7 /* 8-byte alignment for ABI compliance */
@ -663,7 +664,7 @@ phy_last_jump:
ldr r2, _armboot_start
sub r2, r2, #(CONFIG_SYS_MALLOC_LEN)
/* set base 2 words into abort stack */
sub r2, r2, #(CONFIG_SYS_GBL_DATA_SIZE+8)
sub r2, r2, #(GENERATED_GBL_DATA_SIZE+8)
#else
ldr r2, IRQ_STACK_START_IN
#endif
@ -687,7 +688,7 @@ phy_last_jump:
/* move past malloc pool */
sub r13, r13, #(CONFIG_SYS_MALLOC_LEN)
/* move to reserved a couple spots for abort stack */
sub r13, r13, #(CONFIG_SYS_GBL_DATA_SIZE + 8)
sub r13, r13, #(GENERATED_GBL_DATA_SIZE + 8)
#else
ldr r13, IRQ_STACK_START_IN @ setup our mode stack
#endif
@ -721,7 +722,7 @@ phy_last_jump:
/* move past malloc pool */
sub r0, r0, #(CONFIG_SYS_MALLOC_LEN)
/* move past gbl and a couple spots for abort stack */
sub r0, r0, #(CONFIG_SYS_GBL_DATA_SIZE + 8)
sub r0, r0, #(GENERATED_GBL_DATA_SIZE + 8)
#else
ldr r13, IRQ_STACK_START_IN @ setup our mode stack
#endif


+ 4
- 4
arch/arm/cpu/arm720t/start.S View File

@ -23,7 +23,7 @@
* MA 02111-1307 USA
*/
#include <asm-offsets.h>
#include <config.h>
#include <version.h>
#include <asm/hardware.h>
@ -327,7 +327,7 @@ copy_loop:
stack_setup:
ldr r0, _TEXT_BASE /* upper 128 KiB: relocated uboot */
sub r0, r0, #CONFIG_SYS_MALLOC_LEN /* malloc area */
sub r0, r0, #CONFIG_SYS_GBL_DATA_SIZE /* bdinfo */
sub r0, r0, #GENERATED_GBL_DATA_SIZE /* bdinfo */
#ifdef CONFIG_USE_IRQ
sub r0, r0, #(CONFIG_STACKSIZE_IRQ+CONFIG_STACKSIZE_FIQ)
#endif
@ -609,7 +609,7 @@ lock_loop:
#if defined(CONFIG_SYS_ARM_WITHOUT_RELOC)
ldr r2, _armboot_start
sub r2, r2, #(CONFIG_STACKSIZE+CONFIG_SYS_MALLOC_LEN)
sub r2, r2, #(CONFIG_SYS_GBL_DATA_SIZE+8) @ set base 2 words into abort stack
sub r2, r2, #(GENERATED_GBL_DATA_SIZE+8) @ set base 2 words into abort stack
#else
ldr r2, IRQ_STACK_START_IN
#endif
@ -646,7 +646,7 @@ lock_loop:
#if defined(CONFIG_SYS_ARM_WITHOUT_RELOC)
ldr r13, _armboot_start @ setup our mode stack
sub r13, r13, #(CONFIG_STACKSIZE+CONFIG_SYS_MALLOC_LEN)
sub r13, r13, #(CONFIG_SYS_GBL_DATA_SIZE+8) @ reserved a couple spots in abort stack
sub r13, r13, #(GENERATED_GBL_DATA_SIZE+8) @ reserved a couple spots in abort stack
#else
ldr r13, IRQ_STACK_START_IN @ setup our mode stack
#endif


+ 4
- 3
arch/arm/cpu/arm920t/start.S View File

@ -24,6 +24,7 @@
* MA 02111-1307 USA
*/
#include <asm-offsets.h>
#include <common.h>
#include <config.h>
@ -414,7 +415,7 @@ copy_loop:
stack_setup:
ldr r0, _TEXT_BASE /* upper 128 KiB: relocated uboot */
sub r0, r0, #CONFIG_SYS_MALLOC_LEN /* malloc area */
sub r0, r0, #CONFIG_SYS_GBL_DATA_SIZE /* bdinfo */
sub r0, r0, #GENERATED_GBL_DATA_SIZE /* bdinfo */
#ifdef CONFIG_USE_IRQ
sub r0, r0, #(CONFIG_STACKSIZE_IRQ+CONFIG_STACKSIZE_FIQ)
#endif
@ -529,7 +530,7 @@ cpu_init_crit:
sub r2, r2, #(CONFIG_STACKSIZE)
sub r2, r2, #(CONFIG_SYS_MALLOC_LEN)
/* set base 2 words into abort stack */
sub r2, r2, #(CONFIG_SYS_GBL_DATA_SIZE+8)
sub r2, r2, #(GENERATED_GBL_DATA_SIZE+8)
#else
ldr r2, IRQ_STACK_START_IN
#endif
@ -569,7 +570,7 @@ cpu_init_crit:
sub r13, r13, #(CONFIG_STACKSIZE)
sub r13, r13, #(CONFIG_SYS_MALLOC_LEN)
/* reserve a couple spots in abort stack */
sub r13, r13, #(CONFIG_SYS_GBL_DATA_SIZE+8)
sub r13, r13, #(GENERATED_GBL_DATA_SIZE+8)
#else
ldr r13, IRQ_STACK_START_IN @ setup our mode stack
#endif


+ 4
- 4
arch/arm/cpu/arm925t/start.S View File

@ -30,7 +30,7 @@
* MA 02111-1307 USA
*/
#include <asm-offsets.h>
#include <config.h>
#include <version.h>
@ -385,7 +385,7 @@ copy_loop:
stack_setup:
ldr r0, _TEXT_BASE /* upper 128 KiB: relocated uboot */
sub r0, r0, #CONFIG_SYS_MALLOC_LEN /* malloc area */
sub r0, r0, #CONFIG_SYS_GBL_DATA_SIZE /* bdinfo */
sub r0, r0, #GENERATED_GBL_DATA_SIZE /* bdinfo */
#ifdef CONFIG_USE_IRQ
sub r0, r0, #(CONFIG_STACKSIZE_IRQ+CONFIG_STACKSIZE_FIQ)
#endif
@ -492,7 +492,7 @@ cpu_init_crit:
#if defined(CONFIG_SYS_ARM_WITHOUT_RELOC)
ldr r2, _armboot_start
sub r2, r2, #(CONFIG_STACKSIZE+CONFIG_SYS_MALLOC_LEN)
sub r2, r2, #(CONFIG_SYS_GBL_DATA_SIZE+8) @ set base 2 words into abort stack
sub r2, r2, #(GENERATED_GBL_DATA_SIZE+8) @ set base 2 words into abort stack
#else
ldr r2, IRQ_STACK_START_IN
#endif
@ -529,7 +529,7 @@ cpu_init_crit:
#if defined(CONFIG_SYS_ARM_WITHOUT_RELOC)
ldr r13, _armboot_start @ setup our mode stack
sub r13, r13, #(CONFIG_STACKSIZE+CONFIG_SYS_MALLOC_LEN)
sub r13, r13, #(CONFIG_SYS_GBL_DATA_SIZE+8) @ reserved a couple spots in abort stack
sub r13, r13, #(GENERATED_GBL_DATA_SIZE+8) @ reserved a couple spots in abort stack
#else
ldr r13, IRQ_STACK_START_IN
#endif


+ 4
- 4
arch/arm/cpu/arm926ejs/start.S View File

@ -31,7 +31,7 @@
* MA 02111-1307 USA
*/
#include <asm-offsets.h>
#include <config.h>
#include <common.h>
#include <version.h>
@ -349,7 +349,7 @@ stack_setup:
sub sp, r0, #128 /* leave 32 words for abort-stack */
#ifndef CONFIG_PRELOADER
sub r0, r0, #CONFIG_SYS_MALLOC_LEN /* malloc area */
sub r0, r0, #CONFIG_SYS_GBL_DATA_SIZE /* bdinfo */
sub r0, r0, #GENERATED_GBL_DATA_SIZE /* bdinfo */
#ifdef CONFIG_USE_IRQ
sub r0, r0, #(CONFIG_STACKSIZE_IRQ+CONFIG_STACKSIZE_FIQ)
#endif
@ -475,7 +475,7 @@ cpu_init_crit:
#if defined(CONFIG_SYS_ARM_WITHOUT_RELOC)
adr r2, _start
sub r2, r2, #(CONFIG_STACKSIZE+CONFIG_SYS_MALLOC_LEN)
sub r2, r2, #(CONFIG_SYS_GBL_DATA_SIZE+8) @ set base 2 words into abort stack
sub r2, r2, #(GENERATED_GBL_DATA_SIZE+8) @ set base 2 words into abort stack
#else
ldr r2, IRQ_STACK_START_IN
#endif
@ -513,7 +513,7 @@ cpu_init_crit:
#if defined(CONFIG_SYS_ARM_WITHOUT_RELOC)
adr r13, _start @ setup our mode stack
sub r13, r13, #(CONFIG_STACKSIZE+CONFIG_SYS_MALLOC_LEN)
sub r13, r13, #(CONFIG_SYS_GBL_DATA_SIZE+8) @ reserved a couple spots in abort stack
sub r13, r13, #(GENERATED_GBL_DATA_SIZE+8) @ reserved a couple spots in abort stack
#else
ldr r13, IRQ_STACK_START_IN @ setup our mode stack
#endif


+ 4
- 4
arch/arm/cpu/arm946es/start.S View File

@ -30,7 +30,7 @@
* MA 02111-1307 USA
*/
#include <asm-offsets.h>
#include <config.h>
#include <version.h>
@ -316,7 +316,7 @@ copy_loop:
stack_setup:
ldr r0, _TEXT_BASE /* upper 128 KiB: relocated uboot */
sub r0, r0, #CONFIG_SYS_MALLOC_LEN /* malloc area */
sub r0, r0, #CONFIG_SYS_GBL_DATA_SIZE /* bdinfo */
sub r0, r0, #GENERATED_GBL_DATA_SIZE /* bdinfo */
#ifdef CONFIG_USE_IRQ
sub r0, r0, #(CONFIG_STACKSIZE_IRQ+CONFIG_STACKSIZE_FIQ)
#endif
@ -427,7 +427,7 @@ cpu_init_crit:
#if defined(CONFIG_SYS_ARM_WITHOUT_RELOC)
ldr r2, _armboot_start
sub r2, r2, #(CONFIG_STACKSIZE+CONFIG_SYS_MALLOC_LEN)
sub r2, r2, #(CONFIG_SYS_GBL_DATA_SIZE+8) @ set base 2 words into abort stack
sub r2, r2, #(GENERATED_GBL_DATA_SIZE+8) @ set base 2 words into abort stack
#else
ldr r2, IRQ_STACK_START_IN
#endif
@ -465,7 +465,7 @@ cpu_init_crit:
#if defined(CONFIG_SYS_ARM_WITHOUT_RELOC)
ldr r13, _armboot_start @ setup our mode stack
sub r13, r13, #(CONFIG_STACKSIZE+CONFIG_SYS_MALLOC_LEN)
sub r13, r13, #(CONFIG_SYS_GBL_DATA_SIZE+8) @ reserved a couple spots in abort stack
sub r13, r13, #(GENERATED_GBL_DATA_SIZE+8) @ reserved a couple spots in abort stack
#else
ldr r13, IRQ_STACK_START_IN @ setup our mode stack
#endif


+ 4
- 4
arch/arm/cpu/arm_intcm/start.S View File

@ -30,7 +30,7 @@
* MA 02111-1307 USA
*/
#include <asm-offsets.h>
#include <config.h>
#include <version.h>
@ -312,7 +312,7 @@ copy_loop:
stack_setup:
ldr r0, _TEXT_BASE /* upper 128 KiB: relocated uboot */
sub r0, r0, #CONFIG_SYS_MALLOC_LEN /* malloc area */
sub r0, r0, #CONFIG_SYS_GBL_DATA_SIZE /* bdinfo */
sub r0, r0, #GENERATED_GBL_DATA_SIZE /* bdinfo */
#ifdef CONFIG_USE_IRQ
sub r0, r0, #(CONFIG_STACKSIZE_IRQ+CONFIG_STACKSIZE_FIQ)
#endif
@ -403,7 +403,7 @@ cpu_init_crit:
#if defined(CONFIG_SYS_ARM_WITHOUT_RELOC)
ldr r2, _armboot_start
sub r2, r2, #(CONFIG_STACKSIZE+CONFIG_SYS_MALLOC_LEN)
sub r2, r2, #(CONFIG_SYS_GBL_DATA_SIZE+8) @ set base 2 words into abort stack
sub r2, r2, #(GENERATED_GBL_DATA_SIZE+8) @ set base 2 words into abort stack
#else
ldr r2, IRQ_STACK_START_IN
#endif
@ -441,7 +441,7 @@ cpu_init_crit:
#if defined(CONFIG_SYS_ARM_WITHOUT_RELOC)
ldr r13, _armboot_start @ setup our mode stack
sub r13, r13, #(CONFIG_STACKSIZE+CONFIG_SYS_MALLOC_LEN)
sub r13, r13, #(CONFIG_SYS_GBL_DATA_SIZE+8) @ reserved a couple spots in abort stack
sub r13, r13, #(GENERATED_GBL_DATA_SIZE+8) @ reserved a couple spots in abort stack
#else
ldr r13, IRQ_STACK_START_IN @ setup our mode stack
#endif


+ 5
- 4
arch/arm/cpu/armv7/start.S View File

@ -29,6 +29,7 @@
* MA 02111-1307 USA
*/
#include <asm-offsets.h>
#include <config.h>
#include <version.h>
@ -357,7 +358,7 @@ copy_loop: @ copy 32 bytes at a time
stack_setup:
ldr r0, _TEXT_BASE @ upper 128 KiB: relocated uboot
sub r0, r0, #CONFIG_SYS_MALLOC_LEN @ malloc area
sub r0, r0, #CONFIG_SYS_GBL_DATA_SIZE @ bdinfo
sub r0, r0, #GENERATED_GBL_DATA_SIZE @ bdinfo
#ifdef CONFIG_USE_IRQ
sub r0, r0, #(CONFIG_STACKSIZE_IRQ + CONFIG_STACKSIZE_FIQ)
#endif
@ -464,7 +465,7 @@ cpu_init_crit:
#if defined(CONFIG_SYS_ARM_WITHOUT_RELOC)
ldr r2, _armboot_start
sub r2, r2, #(CONFIG_SYS_MALLOC_LEN)
sub r2, r2, #(CONFIG_SYS_GBL_DATA_SIZE + 8) @ set base 2 words into abort
sub r2, r2, #(GENERATED_GBL_DATA_SIZE + 8) @ set base 2 words into abort
#else
ldr r2, IRQ_STACK_START_IN @ set base 2 words into abort
@ stack
@ -507,7 +508,7 @@ cpu_init_crit:
#if defined(CONFIG_SYS_ARM_WITHOUT_RELOC)
ldr r13, _armboot_start @ setup our mode stack (enter
sub r13, r13, #(CONFIG_SYS_MALLOC_LEN) @ move past malloc pool
sub r13, r13, #(CONFIG_SYS_GBL_DATA_SIZE + 8) @ move to reserved a couple
sub r13, r13, #(GENERATED_GBL_DATA_SIZE + 8) @ move to reserved a couple
#else
ldr r13, IRQ_STACK_START_IN @ setup our mode stack (enter
@ in banked mode)
@ -535,7 +536,7 @@ cpu_init_crit:
#if defined(CONFIG_SYS_ARM_WITHOUT_RELOC)
ldr r0, _armboot_start @ get data regions start
sub r0, r0, #(CONFIG_SYS_MALLOC_LEN) @ move past malloc pool
sub r0, r0, #(CONFIG_SYS_GBL_DATA_SIZE + 8) @ move past gbl and a couple
sub r0, r0, #(GENERATED_GBL_DATA_SIZE + 8) @ move past gbl and a couple
#else
ldr r0, IRQ_STACK_START_IN @ get data regions start
@ spots for abort stack


+ 4
- 3
arch/arm/cpu/ixp/start.S View File

@ -27,6 +27,7 @@
* MA 02111-1307 USA
*/
#include <asm-offsets.h>
#include <config.h>
#include <version.h>
#include <asm/arch/ixp425.h>
@ -555,7 +556,7 @@ copy_loop:
stack_setup:
ldr r0, _TEXT_BASE /* upper 128 KiB: relocated uboot */
sub r0, r0, #CONFIG_SYS_MALLOC_LEN /* malloc area */
sub r0, r0, #CONFIG_SYS_GBL_DATA_SIZE /* bdinfo */
sub r0, r0, #GENERATED_GBL_DATA_SIZE /* bdinfo */
#ifdef CONFIG_USE_IRQ
sub r0, r0, #(CONFIG_STACKSIZE_IRQ+CONFIG_STACKSIZE_FIQ)
#endif
@ -620,7 +621,7 @@ _start_armboot: .word start_armboot
#if defined(CONFIG_SYS_ARM_WITHOUT_RELOC)
ldr r2, _armboot_start
sub r2, r2, #(CONFIG_STACKSIZE+CONFIG_SYS_MALLOC_LEN)
sub r2, r2, #(CONFIG_SYS_GBL_DATA_SIZE+8) @ set base 2 words into abort stack
sub r2, r2, #(GENERATED_GBL_DATA_SIZE+8) @ set base 2 words into abort stack
#else
ldr r2, IRQ_STACK_START_IN
#endif
@ -661,7 +662,7 @@ _start_armboot: .word start_armboot
#if defined(CONFIG_SYS_ARM_WITHOUT_RELOC)
ldr r13, _armboot_start @ setup our mode stack
sub r13, r13, #(CONFIG_STACKSIZE+CONFIG_SYS_MALLOC_LEN)
sub r13, r13, #(CONFIG_SYS_GBL_DATA_SIZE+8) @ reserved a couple spots in abort stack
sub r13, r13, #(GENERATED_GBL_DATA_SIZE+8) @ reserved a couple spots in abort stack
#else
ldr r13, IRQ_STACK_START_IN @ setup our mode stack
#endif


+ 4
- 5
arch/arm/cpu/lh7a40x/start.S View File

@ -24,11 +24,10 @@
* MA 02111-1307 USA
*/
#include <asm-offsets.h>
#include <config.h>
#include <version.h>
/*
*************************************************************************
*
@ -349,7 +348,7 @@ copy_loop:
stack_setup:
ldr r0, _TEXT_BASE /* upper 128 KiB: relocated uboot */
sub r0, r0, #CONFIG_SYS_MALLOC_LEN /* malloc area */
sub r0, r0, #CONFIG_SYS_GBL_DATA_SIZE /* bdinfo */
sub r0, r0, #GENERATED_GBL_DATA_SIZE /* bdinfo */
#ifdef CONFIG_USE_IRQ
sub r0, r0, #(CONFIG_STACKSIZE_IRQ+CONFIG_STACKSIZE_FIQ)
#endif
@ -464,7 +463,7 @@ cpu_init_crit:
#if defined(CONFIG_SYS_ARM_WITHOUT_RELOC)
ldr r2, _armboot_start
sub r2, r2, #(CONFIG_STACKSIZE+CONFIG_SYS_MALLOC_LEN)
sub r2, r2, #(CONFIG_SYS_GBL_DATA_SIZE+8) @ set base 2 words into abort stack
sub r2, r2, #(GENERATED_GBL_DATA_SIZE+8) @ set base 2 words into abort stack
#else
ldr r2, IRQ_STACK_START_IN
#endif
@ -501,7 +500,7 @@ cpu_init_crit:
#if defined(CONFIG_SYS_ARM_WITHOUT_RELOC)
ldr r13, _armboot_start @ setup our mode stack
sub r13, r13, #(CONFIG_STACKSIZE+CONFIG_SYS_MALLOC_LEN)
sub r13, r13, #(CONFIG_SYS_GBL_DATA_SIZE+8) @ reserved a couple spots in abort stack
sub r13, r13, #(GENERATED_GBL_DATA_SIZE+8) @ reserved a couple spots in abort stack
#else
ldr r13, IRQ_STACK_START_IN @ setup our mode stack
#endif


+ 3
- 2
arch/arm/cpu/pxa/start.S View File

@ -29,6 +29,7 @@
* MA 02111-1307 USA
*/
#include <asm-offsets.h>
#include <config.h>
#include <version.h>
#include <asm/arch/pxa-regs.h>
@ -419,7 +420,7 @@ reset:
#if defined(CONFIG_SYS_ARM_WITHOUT_RELOC)
ldr r2, _armboot_start
sub r2, r2, #(CONFIG_STACKSIZE+CONFIG_SYS_MALLOC_LEN)
sub r2, r2, #(CONFIG_SYS_GBL_DATA_SIZE+8) @ set base 2 words into abort stack
sub r2, r2, #(GENERATED_GBL_DATA_SIZE+8) @ set base 2 words into abort stack
#else
ldr r2, IRQ_STACK_START_IN
#endif
@ -460,7 +461,7 @@ reset:
#if defined(CONFIG_SYS_ARM_WITHOUT_RELOC)
ldr r13, _armboot_start @ setup our mode stack
sub r13, r13, #(CONFIG_STACKSIZE+CONFIG_SYS_MALLOC_LEN)
sub r13, r13, #(CONFIG_SYS_GBL_DATA_SIZE+8) @ reserved a couple spots in abort stack
sub r13, r13, #(GENERATED_GBL_DATA_SIZE+8) @ reserved a couple spots in abort stack
#else
ldr r13, IRQ_STACK_START_IN @ setup our mode stack
#endif


+ 2
- 3
arch/arm/cpu/s3c44b0/start.S View File

@ -27,11 +27,10 @@
* MA 02111-1307 USA
*/
#include <asm-offsets.h>
#include <config.h>
#include <version.h>
/*
* Jump vector table
*/
@ -331,7 +330,7 @@ vector_copy_loop:
stack_setup:
ldr r0, _TEXT_BASE /* upper 128 KiB: relocated uboot */
sub r0, r0, #CONFIG_SYS_MALLOC_LEN /* malloc area */
sub r0, r0, #CONFIG_SYS_GBL_DATA_SIZE /* bdinfo */
sub r0, r0, #GENERATED_GBL_DATA_SIZE /* bdinfo */
#ifdef CONFIG_USE_IRQ
sub r0, r0, #(CONFIG_STACKSIZE_IRQ+CONFIG_STACKSIZE_FIQ)
#endif


+ 4
- 5
arch/arm/cpu/sa1100/start.S View File

@ -25,11 +25,10 @@
* MA 02111-1307 USA
*/
#include <asm-offsets.h>
#include <config.h>
#include <version.h>
/*
*************************************************************************
*
@ -301,7 +300,7 @@ copy_loop:
stack_setup:
ldr r0, _TEXT_BASE /* upper 128 KiB: relocated uboot */
sub r0, r0, #CONFIG_SYS_MALLOC_LEN /* malloc area */
sub r0, r0, #CONFIG_SYS_GBL_DATA_SIZE /* bdinfo */
sub r0, r0, #GENERATED_GBL_DATA_SIZE /* bdinfo */
#ifdef CONFIG_USE_IRQ
sub r0, r0, #(CONFIG_STACKSIZE_IRQ+CONFIG_STACKSIZE_FIQ)
#endif
@ -445,7 +444,7 @@ cpu_init_crit:
#if defined(CONFIG_SYS_ARM_WITHOUT_RELOC)
ldr r2, _armboot_start
sub r2, r2, #(CONFIG_STACKSIZE+CONFIG_SYS_MALLOC_LEN)
sub r2, r2, #(CONFIG_SYS_GBL_DATA_SIZE+8) @ set base 2 words into abort stack
sub r2, r2, #(GENERATED_GBL_DATA_SIZE+8) @ set base 2 words into abort stack
#else
ldr r2, IRQ_STACK_START_IN
#endif
@ -482,7 +481,7 @@ cpu_init_crit:
#if defined(CONFIG_SYS_ARM_WITHOUT_RELOC)
ldr r13, _armboot_start @ setup our mode stack
sub r13, r13, #(CONFIG_STACKSIZE+CONFIG_SYS_MALLOC_LEN)
sub r13, r13, #(CONFIG_SYS_GBL_DATA_SIZE+8) @ reserved a couple spots in abort stack
sub r13, r13, #(GENERATED_GBL_DATA_SIZE+8) @ reserved a couple spots in abort stack
#else
ldr r13, IRQ_STACK_START_IN @ setup our mode stack
#endif


+ 1
- 1
arch/arm/include/asm/global_data.h View File

@ -30,7 +30,7 @@
* global variables during system initialization (until we have set
* up the memory controller so that we can use RAM).
*
* Keep it *SMALL* and remember to set CONFIG_SYS_GBL_DATA_SIZE > sizeof(gd_t)
* Keep it *SMALL* and remember to set GENERATED_GBL_DATA_SIZE > sizeof(gd_t)
*/
typedef struct global_data {


+ 1
- 1
arch/arm/lib/interrupts.c View File

@ -50,7 +50,7 @@ int interrupt_init (void)
IRQ_STACK_START = gd->irq_sp - 4;
IRQ_STACK_START_IN = gd->irq_sp + 8;
#else
IRQ_STACK_START = _armboot_start - CONFIG_SYS_MALLOC_LEN - CONFIG_SYS_GBL_DATA_SIZE - 4;
IRQ_STACK_START = _armboot_start - CONFIG_SYS_MALLOC_LEN - GENERATED_GBL_DATA_SIZE - 4;
#endif
FIQ_STACK_START = IRQ_STACK_START - CONFIG_STACKSIZE_IRQ;


+ 1
- 0
arch/avr32/cpu/start.S View File

@ -19,6 +19,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston,
* MA 02111-1307 USA
*/
#include <asm-offsets.h>
#include <config.h>
#include <asm/ptrace.h>
#include <asm/sysreg.h>


+ 1
- 1
arch/avr32/include/asm/global_data.h View File

@ -29,7 +29,7 @@
* global variables during system initialization (until we have set
* up the memory controller so that we can use RAM).
*
* Keep it *SMALL* and remember to set CONFIG_SYS_GBL_DATA_SIZE > sizeof(gd_t)
* Keep it *SMALL* and remember to set GENERATED_GBL_DATA_SIZE > sizeof(gd_t)
*/
typedef struct global_data {


+ 1
- 4
arch/blackfin/include/asm/config.h View File

@ -101,11 +101,8 @@
#ifndef CONFIG_SYS_MALLOC_BASE
# define CONFIG_SYS_MALLOC_BASE (CONFIG_SYS_MONITOR_BASE - CONFIG_SYS_MALLOC_LEN)
#endif
#ifndef CONFIG_SYS_GBL_DATA_SIZE
# define CONFIG_SYS_GBL_DATA_SIZE (128)
#endif
#ifndef CONFIG_SYS_GBL_DATA_ADDR
# define CONFIG_SYS_GBL_DATA_ADDR (CONFIG_SYS_MALLOC_BASE - CONFIG_SYS_GBL_DATA_SIZE)
# define CONFIG_SYS_GBL_DATA_ADDR (CONFIG_SYS_MALLOC_BASE - GENERATED_GBL_DATA_SIZE)
#endif
#ifndef CONFIG_STACKBASE
# define CONFIG_STACKBASE (CONFIG_SYS_GBL_DATA_ADDR - 4)


+ 1
- 1
arch/blackfin/include/asm/global_data.h View File

@ -37,7 +37,7 @@
* global variables during system initialization (until we have set
* up the memory controller so that we can use RAM).
*
* Keep it *SMALL* and remember to set CONFIG_SYS_GBL_DATA_SIZE > sizeof(gd_t)
* Keep it *SMALL* and remember to set GENERATED_GBL_DATA_SIZE > sizeof(gd_t)
*/
typedef struct global_data {
bd_t *bd;


+ 2
- 2
arch/blackfin/lib/board.c View File

@ -237,12 +237,12 @@ void board_init_f(ulong bootflag)
#endif
#ifdef DEBUG
if (CONFIG_SYS_GBL_DATA_SIZE < sizeof(*gd))
if (GENERATED_GBL_DATA_SIZE < sizeof(*gd))
hang();
#endif
serial_early_puts("Init global data\n");
gd = (gd_t *) (CONFIG_SYS_GBL_DATA_ADDR);
memset((void *)gd, 0, CONFIG_SYS_GBL_DATA_SIZE);
memset((void *)gd, 0, GENERATED_GBL_DATA_SIZE);
/* Board data initialization */
addr = (CONFIG_SYS_GBL_DATA_ADDR + sizeof(gd_t));


+ 1
- 1
arch/i386/include/asm/global_data.h View File

@ -30,7 +30,7 @@
* global variables during system initialization (until we have set
* up the memory controller so that we can use RAM).
*
* Keep it *SMALL* and remember to set CONFIG_SYS_GBL_DATA_SIZE > sizeof(gd_t)
* Keep it *SMALL* and remember to set GENERATED_GBL_DATA_SIZE > sizeof(gd_t)
*/
#ifndef __ASSEMBLY__


+ 1
- 0
arch/m68k/cpu/mcf5227x/start.S View File

@ -21,6 +21,7 @@
* MA 02111-1307 USA
*/
#include <asm-offsets.h>
#include <config.h>
#include <timestamp.h>
#include "version.h"


+ 1
- 0
arch/m68k/cpu/mcf523x/start.S View File

@ -21,6 +21,7 @@
* MA 02111-1307 USA
*/
#include <asm-offsets.h>
#include <config.h>
#include <timestamp.h>
#include "version.h"


+ 1
- 0
arch/m68k/cpu/mcf52x2/start.S View File

@ -21,6 +21,7 @@
* MA 02111-1307 USA
*/
#include <asm-offsets.h>
#include <config.h>
#include <timestamp.h>
#include "version.h"


+ 1
- 0
arch/m68k/cpu/mcf532x/start.S View File

@ -24,6 +24,7 @@
* MA 02111-1307 USA
*/
#include <asm-offsets.h>
#include <config.h>
#include <timestamp.h>
#include "version.h"


+ 1
- 0
arch/m68k/cpu/mcf5445x/start.S View File

@ -21,6 +21,7 @@
* MA 02111-1307 USA
*/
#include <asm-offsets.h>
#include <config.h>
#include <timestamp.h>
#include "version.h"


+ 1
- 0
arch/m68k/cpu/mcf547x_8x/start.S View File

@ -21,6 +21,7 @@
* MA 02111-1307 USA
*/
#include <asm-offsets.h>
#include <config.h>
#include <timestamp.h>
#include "version.h"


+ 1
- 1
arch/m68k/include/asm/global_data.h View File

@ -30,7 +30,7 @@
* global variables during system initialization (until we have set
* up the memory controller so that we can use RAM).
*
* Keep it *SMALL* and remember to set CONFIG_SYS_GBL_DATA_SIZE > sizeof(gd_t)
* Keep it *SMALL* and remember to set GENERATED_GBL_DATA_SIZE > sizeof(gd_t)
*/
typedef struct global_data {


+ 1
- 0
arch/microblaze/cpu/start.S View File

@ -24,6 +24,7 @@
* MA 02111-1307 USA
*/
#include <asm-offsets.h>
#include <config.h>
.text


+ 1
- 1
arch/microblaze/include/asm/global_data.h View File

@ -31,7 +31,7 @@
* global variables during system initialization (until we have set
* up the memory controller so that we can use RAM).
*
* Keep it *SMALL* and remember to set CONFIG_SYS_GBL_DATA_SIZE > sizeof(gd_t)
* Keep it *SMALL* and remember to set GENERATED_GBL_DATA_SIZE > sizeof(gd_t)
*/
typedef struct global_data {


+ 1
- 1
arch/microblaze/lib/board.c View File

@ -96,7 +96,7 @@ void board_init (void)
ulong flash_size = 0;
#endif
asm ("nop"); /* FIXME gd is not initialize - wait */
memset ((void *)gd, 0, CONFIG_SYS_GBL_DATA_SIZE);
memset ((void *)gd, 0, GENERATED_GBL_DATA_SIZE);
gd->bd = (bd_t *) (gd + 1); /* At end of global data */
gd->baudrate = CONFIG_BAUDRATE;
bd = gd->bd;


+ 1
- 0
arch/mips/cpu/cache.S View File

@ -22,6 +22,7 @@
* MA 02111-1307 USA
*/
#include <asm-offsets.h>
#include <config.h>
#include <asm/asm.h>
#include <asm/regdef.h>


+ 1
- 0
arch/mips/cpu/start.S View File

@ -22,6 +22,7 @@
* MA 02111-1307 USA
*/
#include <asm-offsets.h>
#include <config.h>
#include <asm/regdef.h>
#include <asm/mipsregs.h>


+ 1
- 1
arch/mips/include/asm/global_data.h View File

@ -33,7 +33,7 @@
* global variables during system initialization (until we have set
* up the memory controller so that we can use RAM).
*
* Keep it *SMALL* and remember to set CONFIG_SYS_GBL_DATA_SIZE > sizeof(gd_t)
* Keep it *SMALL* and remember to set GENERATED_GBL_DATA_SIZE > sizeof(gd_t)
*/
typedef struct global_data {


+ 1
- 1
arch/nios2/cpu/start.S View File

@ -21,7 +21,7 @@
* MA 02111-1307 USA
*/
#include <asm-offsets.h>
#include <config.h>
#include <timestamp.h>
#include <version.h>


+ 1
- 1
arch/nios2/lib/board.c View File

@ -95,7 +95,7 @@ void board_init (void)
/* compiler optimization barrier needed for GCC >= 3.4 */
__asm__ __volatile__("": : :"memory");
memset( gd, 0, CONFIG_SYS_GBL_DATA_SIZE );
memset( gd, 0, GENERATED_GBL_DATA_SIZE );
gd->bd = (bd_t *)(gd+1); /* At end of global data */
gd->baudrate = CONFIG_BAUDRATE;


+ 1
- 0
arch/powerpc/cpu/74xx_7xx/start.S View File

@ -32,6 +32,7 @@
* board_init lies at a quite high address and when the cpu has
* jumped there, everything is ok.
*/
#include <asm-offsets.h>
#include <config.h>
#include <74xx_7xx.h>
#include <timestamp.h>


+ 1
- 0
arch/powerpc/cpu/mpc512x/start.S View File

@ -29,6 +29,7 @@
* U-Boot - Startup Code for MPC512x based Embedded Boards
*/
#include <asm-offsets.h>
#include <config.h>
#include <timestamp.h>
#include <version.h>


+ 1
- 0
arch/powerpc/cpu/mpc5xx/start.S View File

@ -30,6 +30,7 @@
*
*/
#include <asm-offsets.h>
#include <config.h>
#include <mpc5xx.h>
#include <timestamp.h>


+ 1
- 0
arch/powerpc/cpu/mpc5xxx/start.S View File

@ -25,6 +25,7 @@
/*
* U-Boot - Startup Code for MPC5xxx CPUs
*/
#include <asm-offsets.h>
#include <config.h>
#include <mpc5xxx.h>
#include <timestamp.h>


+ 1
- 0
arch/powerpc/cpu/mpc8220/start.S View File

@ -25,6 +25,7 @@
/*
* U-Boot - Startup Code for MPC8220 CPUs
*/
#include <asm-offsets.h>
#include <config.h>
#include <mpc8220.h>
#include <timestamp.h>


+ 1
- 0
arch/powerpc/cpu/mpc824x/start.S View File

@ -37,6 +37,7 @@
* board_init will change CS0 to be positioned at the correct
* address and (s)dram will be positioned at address 0
*/
#include <asm-offsets.h>
#include <config.h>
#include <mpc824x.h>
#include <timestamp.h>


+ 1
- 0
arch/powerpc/cpu/mpc8260/start.S View File

@ -25,6 +25,7 @@
/*
* U-Boot - Startup Code for MPC8260 PowerPC based Embedded Boards
*/
#include <asm-offsets.h>
#include <config.h>
#include <mpc8260.h>
#include <timestamp.h>


+ 1
- 0
arch/powerpc/cpu/mpc83xx/start.S View File

@ -27,6 +27,7 @@
* U-Boot - Startup Code for MPC83xx PowerPC based Embedded Boards
*/
#include <asm-offsets.h>
#include <config.h>
#include <mpc83xx.h>
#include <timestamp.h>


+ 1
- 0
arch/powerpc/cpu/mpc85xx/release.S View File

@ -21,6 +21,7 @@
* MA 02111-1307 USA
*/
#include <asm-offsets.h>
#include <config.h>
#include <mpc85xx.h>
#include <version.h>


+ 1
- 0
arch/powerpc/cpu/mpc85xx/start.S View File

@ -28,6 +28,7 @@
*
*/
#include <asm-offsets.h>
#include <config.h>
#include <mpc85xx.h>
#include <timestamp.h>


+ 1
- 0
arch/powerpc/cpu/mpc86xx/start.S View File

@ -30,6 +30,7 @@
* board_init lies at a quite high address and when the cpu has
* jumped there, everything is ok.
*/
#include <asm-offsets.h>
#include <config.h>
#include <mpc86xx.h>
#include <timestamp.h>


+ 1
- 0
arch/powerpc/cpu/mpc8xx/start.S View File

@ -37,6 +37,7 @@
* board_init will change CS0 to be positioned at the correct
* address and (s)dram will be positioned at address 0
*/
#include <asm-offsets.h>
#include <config.h>
#include <mpc8xx.h>
#include <timestamp.h>


+ 2
- 1
arch/powerpc/cpu/ppc4xx/start.S View File

@ -63,6 +63,7 @@
* board_init will change CS0 to be positioned at the correct
* address and (s)dram will be positioned at address 0
*/
#include <asm-offsets.h>
#include <config.h>
#include <asm/ppc4xx.h>
#include <timestamp.h>
@ -1399,7 +1400,7 @@ relocate_code:
/* Flush initial global data range */
mr r3, r4
addi r4, r4, CONFIG_SYS_GBL_DATA_SIZE@l
addi r4, r4, GENERATED_GBL_DATA_SIZE@l
bl flush_dcache_range
#if defined(CONFIG_SYS_INIT_DCACHE_CS)


+ 1
- 1
arch/powerpc/include/asm/global_data.h View File

@ -34,7 +34,7 @@
* global variables during system initialization (until we have set
* up the memory controller so that we can use RAM).
*
* Keep it *SMALL* and remember to set CONFIG_SYS_GBL_DATA_SIZE > sizeof(gd_t)
* Keep it *SMALL* and remember to set GENERATED_GBL_DATA_SIZE > sizeof(gd_t)
*/
typedef struct global_data {


+ 3
- 2
arch/sh/cpu/sh2/start.S View File

@ -18,6 +18,7 @@
* MA 02111-1307 USA
*/
#include <asm-offsets.h>
#include <config.h>
#include <version.h>
@ -73,6 +74,6 @@ loop:
._reloc_dst_end: .long reloc_dst_end
._bss_start: .long bss_start
._bss_end: .long bss_end
._gd_init: .long (_start - CONFIG_SYS_GBL_DATA_SIZE)
._stack_init: .long (_start - CONFIG_SYS_GBL_DATA_SIZE - CONFIG_SYS_MALLOC_LEN - 16)
._gd_init: .long (_start - GENERATED_GBL_DATA_SIZE)
._stack_init: .long (_start - GENERATED_GBL_DATA_SIZE - CONFIG_SYS_MALLOC_LEN - 16)
._sh_generic_init: .long sh_generic_init

+ 3
- 2
arch/sh/cpu/sh3/start.S View File

@ -21,6 +21,7 @@
* MA 02111-1307 USA
*/
#include <asm-offsets.h>
#include <config.h>
#include <version.h>
@ -72,6 +73,6 @@ loop:
._reloc_dst_end: .long reloc_dst_end
._bss_start: .long bss_start
._bss_end: .long bss_end
._gd_init: .long (_start - CONFIG_SYS_GBL_DATA_SIZE)
._stack_init: .long (_start - CONFIG_SYS_GBL_DATA_SIZE - CONFIG_SYS_MALLOC_LEN - 16)
._gd_init: .long (_start - GENERATED_GBL_DATA_SIZE)
._stack_init: .long (_start - GENERATED_GBL_DATA_SIZE - CONFIG_SYS_MALLOC_LEN - 16)
._sh_generic_init: .long sh_generic_init

+ 3
- 2
arch/sh/cpu/sh4/start.S View File

@ -18,6 +18,7 @@
* MA 02111-1307 USA
*/
#include <asm-offsets.h>
#include <config.h>
#include <version.h>
@ -69,6 +70,6 @@ loop:
._reloc_dst_end: .long reloc_dst_end
._bss_start: .long bss_start
._bss_end: .long bss_end
._gd_init: .long (_start - CONFIG_SYS_GBL_DATA_SIZE)
._stack_init: .long (_start - CONFIG_SYS_GBL_DATA_SIZE - CONFIG_SYS_MALLOC_LEN - 16)
._gd_init: .long (_start - GENERATED_GBL_DATA_SIZE)
._stack_init: .long (_start - GENERATED_GBL_DATA_SIZE - CONFIG_SYS_MALLOC_LEN - 16)
._sh_generic_init: .long sh_generic_init

+ 2
- 2
arch/sh/lib/board.c View File

@ -89,7 +89,7 @@ static int sh_pci_init(void)
static int sh_mem_env_init(void)
{
mem_malloc_init(CONFIG_SYS_TEXT_BASE - CONFIG_SYS_GBL_DATA_SIZE -
mem_malloc_init(CONFIG_SYS_TEXT_BASE - GENERATED_GBL_DATA_SIZE -
CONFIG_SYS_MALLOC_LEN, CONFIG_SYS_MALLOC_LEN - 16);
env_relocate();
jumptable_init();
@ -144,7 +144,7 @@ void sh_generic_init(void)
bd_t *bd;
init_fnc_t **init_fnc_ptr;
memset(gd, 0, CONFIG_SYS_GBL_DATA_SIZE);
memset(gd, 0, GENERATED_GBL_DATA_SIZE);
gd->flags |= GD_FLG_RELOC; /* tell others: relocation done */


+ 1
- 0
arch/sparc/cpu/leon2/start.S View File

@ -21,6 +21,7 @@
* MA 02111-1307 USA
*/
#include <asm-offsets.h>
#include <config.h>
#include <asm/asmmacro.h>
#include <asm/winmacro.h>


+ 1
- 0
arch/sparc/cpu/leon3/start.S View File

@ -21,6 +21,7 @@
* MA 02111-1307 USA
*/
#include <asm-offsets.h>
#include <config.h>
#include <asm/asmmacro.h>
#include <asm/winmacro.h>


+ 1
- 1
arch/sparc/include/asm/global_data.h View File

@ -36,7 +36,7 @@
* global variables during system initialization (until we have set
* up the memory controller so that we can use RAM).
*
* Keep it *SMALL* and remember to set CONFIG_SYS_GBL_DATA_SIZE > sizeof(gd_t)
* Keep it *SMALL* and remember to set GENERATED_GBL_DATA_SIZE > sizeof(gd_t)
*/
typedef struct global_data {


+ 1
- 1
arch/sparc/lib/board.c View File

@ -244,7 +244,7 @@ void board_init_f(ulong bootflag)
printf("CONFIG_SYS_PROM_OFFSET: 0x%lx (%d)\n", CONFIG_SYS_PROM_OFFSET,
CONFIG_SYS_PROM_SIZE);
printf("CONFIG_SYS_GBL_DATA_OFFSET: 0x%lx (%d)\n", CONFIG_SYS_GBL_DATA_OFFSET,
CONFIG_SYS_GBL_DATA_SIZE);
GENERATED_GBL_DATA_SIZE);
#endif
#ifdef CONFIG_POST


+ 1
- 0
board/amcc/bamboo/init.S View File

@ -23,6 +23,7 @@
* MA 02111-1307 USA
*/
#include <asm-offsets.h>
#include <ppc_asm.tmpl>
#include <config.h>
#include <asm/mmu.h>


+ 1
- 0
board/amcc/bluestone/init.S View File

@ -21,6 +21,7 @@
* MA 02111-1307 USA
*/
#include <asm-offsets.h>
#include <ppc_asm.tmpl>
#include <config.h>
#include <asm/mmu.h>


+ 1
- 0
board/amcc/canyonlands/init.S View File

@ -21,6 +21,7 @@
* MA 02111-1307 USA
*/
#include <asm-offsets.h>
#include <ppc_asm.tmpl>
#include <config.h>
#include <asm/mmu.h>


+ 1
- 0
board/amcc/sequoia/init.S View File

@ -21,6 +21,7 @@
* MA 02111-1307 USA
*/
#include <asm-offsets.h>
#include <ppc_asm.tmpl>
#include <asm/mmu.h>
#include <config.h>


+ 1
- 0
board/amcc/yosemite/init.S View File

@ -19,6 +19,7 @@
* MA 02111-1307 USA
*/
#include <asm-offsets.h>
#include <ppc_asm.tmpl>
#include <asm/mmu.h>
#include <config.h>


+ 1
- 0
board/barco/early_init.S View File

@ -25,6 +25,7 @@
#define __ASSEMBLY__ 1
#endif
#include <asm-offsets.h>
#include <config.h>
#include <asm/processor.h>
#include <mpc824x.h>


+ 1
- 0
board/esd/du440/init.S View File

@ -21,6 +21,7 @@
* MA 02111-1307 USA
*/
#include <asm-offsets.h>