mkexynosspl: fix uninitialized buffer
Subsystems (6)
PATCH v3 1/4 mkexynosspl: fix uninitialized buffer
mkexynos reads its input file which might be smaller than its read buffer, but always writes the whole buffer out. This does not affect the functionalyty of the output file, but it makes its content unpredictable as the end of the buffer is never initialized. Fix this by zeroing the buffer before reading the input file.
---
Changes in v3:
- fixed mkexynosspl uninitialized buffer
Changes in v2: None
tools/mkexynosspl.c | 2 ++ 1 file changed, 2 insertions(+)
tools/mkexynosspl.c +2 -0
@@ -72,6 +72,8 @@ int main(int argc, char **argv) count = (len <CHECKSUM_OFFSET ) ? len :CHECKSUM_OFFSET ; +memset (buffer,0 ,BUFSIZE ); +if (read (ifd, buffer, count) != count) {fprintf (stderr,"%s: Can't read %s: %s\n" , argv[0 ], argv[1 ],strerror (errno));
Signature · 1 line
1.8.3.2
PATCH v3 1/4 mkexynosspl: fix uninitialized buffer
(adding Minkyu as the Samsung custodian)
Quoted 1 line · Albert ARIBAUD
mkexynos reads its input file which might be smaller than
( typo: s/mkexynos/mkexynosspl/ -- wil fix when applying if thee is no other change to be made )
Quoted 5 lines
its read buffer, but always writes the whole buffer out. This does not affect the functionalyty of the output file, but it makes its content unpredictable as the end of the buffer is never initialized. Fix this by zeroing the buffer before reading the input file.
Minkyu: should the buffer be pre-filled with zeroes or should I use ones instead? Or maybe the output could be truncated to the size of the input?
Amicalement,
Albert.
Quoted 23 lines
Signed-off-by Albert ARIBAUD <[email protected]>---
Changes in v3:
- fixed mkexynosspl uninitialized bufferChanges in v2: None
tools/mkexynosspl.c | 2 ++ 1 file changed, 2 insertions(+)tools/mkexynosspl.c +2
-0@@ -72,6 +72,8 @@ int main(int argc, char **argv) count = (len <CHECKSUM_OFFSET ) ? len :CHECKSUM_OFFSET ; +memset (buffer,0 ,BUFSIZE ); +if (read (ifd, buffer, count) != count) {fprintf (stderr,"%s: Can't read %s: %s\n" , argv[0 ], argv[1 ],strerror (errno));
PATCH v3 1/4 mkexynosspl: fix uninitialized buffer
Dear Albert,
Quoted 16 lines · Albert ARIBAUD
(adding Minkyu as the Samsung custodian)
Quoted 1 line · Albert ARIBAUD
mkexynos reads its input file which might be smaller than
( typo: s/mkexynos/mkexynosspl/ -- wil fix when applying if thee is no other change to be made )
Quoted 5 lines
its read buffer, but always writes the whole buffer out. This does not affect the functionalyty of the output file, but it makes its content unpredictable as the end of the buffer is never initialized. Fix this by zeroing the buffer before reading the input file.
Quoted 3 lines
Minkyu: should the buffer be pre-filled with zeroes or should I use ones instead? Or maybe the output could be truncated to the size of the input?
Basically, the output file is fixed to 14K as same as buffer size. And the input file should be smaller than 14K.
It's the rule of exynos spl.
The role of mkexynosspl is just adding 4 byte checksum value to end of file. If the input file is bigger than 14K, output will be truncated.
Quoted 5 lines
Amicalement,
Albert.Quoted 1 line
Signed-off-by Albert ARIBAUD <[email protected]>
btw, this change looks reasonable to me.
Quoted 17 lines
Quoted 17 lines
---
Changes in v3:
- fixed mkexynosspl uninitialized bufferChanges in v2: None
tools/mkexynosspl.c | 2 ++ 1 file changed, 2 insertions(+)tools/mkexynosspl.c +0
-0@@ -72,6 +72,8 @@ int main(int argc, char **argv) count = (len <CHECKSUM_OFFSET ) ? len :CHECKSUM_OFFSET ;
Quoted 10 lines
tools/mkexynosspl.c int main(int argc, char **argv) · line 79
Quoted 5 lines
tools/mkexynosspl.c +2
-0+memset (buffer,0 ,BUFSIZE ); +if (read (ifd, buffer, count) != count) {fprintf (stderr,"%s: Can't read %s: %s\n" , argv[0 ], argv[1 ],strerror (errno));_______________________________________________
U-Boot mailing list
U-Boot at lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
Thanks,
Minkyu Kang.
PATCH v3 1/4 mkexynosspl: fix uninitialized buffer
Hi Minkyu,
Quoted 15 lines · Minkyu Kang
Dear Albert,
Quoted 12 lines · Albert ARIBAUD
(adding Minkyu as the Samsung custodian)
Quoted 1 line · Albert ARIBAUD
mkexynos reads its input file which might be smaller than
( typo: s/mkexynos/mkexynosspl/ -- wil fix when applying if thee is no other change to be made )
Quoted 2 lines
its read buffer, but always writes the whole buffer out. This does not affect the functionalyty of the output file,
... and s/functionalyty/functionality/, too.
Quoted 15 lines
Quoted 7 lines
Quoted 3 lines
but it makes its content unpredictable as the end of the buffer is never initialized. Fix this by zeroing the buffer before reading the input file.
Minkyu: should the buffer be pre-filled with zeroes or should I use ones instead? Or maybe the output could be truncated to the size of the input?
Basically, the output file is fixed to 14K as same as buffer size. And the input file should be smaller than 14K.
It's the rule of exynos spl.
The role of mkexynosspl is just adding 4 byte checksum value to end of file. If the input file is bigger than 14K, output will be truncated.Quoted 1 line
Quoted 8 lines
Quoted 4 lines
Amicalement,
Albert.Quoted 1 line
Signed-off-by Albert ARIBAUD <[email protected]>btw, this change looks reasonable to me.
Acked-by Minkyu Kang <[email protected]>
Thanks! If that's ok with you, I'll apply 1/4 to ARM, considering it a kind of bugfix, and remove it from V4 of the patch series if there is any.
Or if you prefer to apply 1/4 to u-boot-samsung, that's fine with me.
Quoted 2 lines
Thanks,
Minkyu Kang.
Amicalement,
Signature · 1 line
Albert.
PATCH v3 1/4 mkexynosspl: fix uninitialized buffer
Dear Albert ARIBAUD,
Quoted 45 lines · Albert ARIBAUD
Hi Minkyu,
Quoted 15 lines · Minkyu Kang
Dear Albert,
Quoted 12 lines · Albert ARIBAUD
(adding Minkyu as the Samsung custodian)
Quoted 1 line · Albert ARIBAUD
mkexynos reads its input file which might be smaller than
( typo: s/mkexynos/mkexynosspl/ -- wil fix when applying if thee is no other change to be made )
Quoted 2 lines
its read buffer, but always writes the whole buffer out. This does not affect the functionalyty of the output file,
... and s/functionalyty/functionality/, too.
Quoted 22 lines
Quoted 7 lines
Quoted 3 lines
but it makes its content unpredictable as the end of the buffer is never initialized. Fix this by zeroing the buffer before reading the input file.
Minkyu: should the buffer be pre-filled with zeroes or should I use ones instead? Or maybe the output could be truncated to the size of the input?
Basically, the output file is fixed to 14K as same as buffer size. And the input file should be smaller than 14K.
It's the rule of exynos spl.
The role of mkexynosspl is just adding 4 byte checksum value to end of file. If the input file is bigger than 14K, output will be truncated.Quoted 5 lines
Amicalement,
Albert.Quoted 1 line
Signed-off-by Albert ARIBAUD <[email protected]>btw, this change looks reasonable to me.
Quoted 7 lines
Quoted 1 line
Acked-by Minkyu Kang <[email protected]>Thanks! If that's ok with you, I'll apply 1/4 to ARM, considering it a kind of bugfix, and remove it from V4 of the patch series if there is any.
Or if you prefer to apply 1/4 to u-boot-samsung, that's fine with me.
please apply this patch to u-boot-arm.
Quoted 6 lines
Quoted 3 lines
Thanks,
Minkyu Kang.Amicalement,
Thanks,
Minkyu Kang.
PATCH v3 1/4 mkexynosspl: fix uninitialized buffer
Hi Albert,
Please refer the following patch:
"SPL: EXYNOS: Prepare for variable size SPL support"
http://patchwork.ozlabs.org/patch/298965/
I don't think after this patch is applied, the above patch would be required.
Regards,
Rajeshwari.
Quoted 71 lines · Minkyu Kang
Dear Albert ARIBAUD,
Quoted 45 lines · Albert ARIBAUD
Hi Minkyu,
Quoted 15 lines · Minkyu Kang
Dear Albert,
Quoted 12 lines · Albert ARIBAUD
(adding Minkyu as the Samsung custodian)
Quoted 1 line · Albert ARIBAUD
mkexynos reads its input file which might be smaller than
( typo: s/mkexynos/mkexynosspl/ -- wil fix when applying if thee is no other change to be made )
Quoted 2 lines
its read buffer, but always writes the whole buffer out. This does not affect the functionalyty of the output file,
... and s/functionalyty/functionality/, too.
Quoted 22 lines
Quoted 7 lines
Quoted 3 lines
but it makes its content unpredictable as the end of the buffer is never initialized. Fix this by zeroing the buffer before reading the input file.
Minkyu: should the buffer be pre-filled with zeroes or should I use ones instead? Or maybe the output could be truncated to the size of the input?
Basically, the output file is fixed to 14K as same as buffer size. And the input file should be smaller than 14K.
It's the rule of exynos spl.
The role of mkexynosspl is just adding 4 byte checksum value to end of file. If the input file is bigger than 14K, output will be truncated.Quoted 5 lines
Amicalement,
Albert.Quoted 1 line
Signed-off-by Albert ARIBAUD <[email protected]>btw, this change looks reasonable to me.
Quoted 7 lines
Quoted 1 line
Acked-by Minkyu Kang <[email protected]>Thanks! If that's ok with you, I'll apply 1/4 to ARM, considering it a kind of bugfix, and remove it from V4 of the patch series if there is any.
Or if you prefer to apply 1/4 to u-boot-samsung, that's fine with me.
please apply this patch to u-boot-arm.
Quoted 6 lines
Quoted 3 lines
Thanks,
Minkyu Kang.Amicalement,
Thanks,
Minkyu Kang.
_______________________________________________
U-Boot mailing list
U-Boot at lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
Signature · 2 lines
Regards, Rajeshwari Shinde
PATCH v3 1/4 mkexynosspl: fix uninitialized buffer
Hi Rajeshwari,
Quoted 9 lines · Rajeshwari Birje
Hi Albert,
Please refer the following patch:
"SPL: EXYNOS: Prepare for variable size SPL support"
http://patchwork.ozlabs.org/patch/298965/
I don't think after this patch is applied, the above patch would be required.
Thanks for pointing this out.
Minkyu, have you planned a PR to me with this patch already?
Quoted 2 lines
Regards,
Rajeshwari.
Amicalement,
Signature · 1 line
Albert.
PATCH v3 1/4 mkexynosspl: fix uninitialized buffer
Quoted 11 lines · Albert ARIBAUD
Hi Rajeshwari,
Quoted 6 lines · Rajeshwari Birje
Hi Albert,
Please refer the following patch:
"SPL: EXYNOS: Prepare for variable size SPL support"
Quoted 7 lines
Quoted 3 lines
http://patchwork.ozlabs.org/patch/298965/
I don't think after this patch is applied, the above patch would be required.
Thanks for pointing this out.
Minkyu, have you planned a PR to me with this patch already?
Maybe next weekend?
PATCH v3 2/4 cm_t335: fix linker file to produce full ELF
In reply to Albert ARIBAUDNewly added cm_t335 was missed in commit 47ed5dd0 which made ARM targets produce full ELF files. Fix its linker script.
This change is binary-invariant when only .dynsym, .dynstr, .dynamic, .plt, .interp and .gun sections are declared.
Sections .hash, .got.plt, .dynbss and .ARM.exidx are also declared so that their (unused) content is moved out of the u-boot binary.
---
Changes in v3:
- fixed cm_t335 linker script
Changes in v2: None
board/compulab/cm_t335/u-boot.lds | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-)
board/compulab/cm_t335/u-boot.lds +10 -6
@@ -92,10 +92,14 @@ SECTIONS KEEP(*(.__bss_end)); } - /DISCARD/ : { *(.dynsym) } - /DISCARD/ : { *(.dynstr*) } - /DISCARD/ : { *(.dynamic*) } - /DISCARD/ : { *(.plt*) } - /DISCARD/ : { *(.interp*) } - /DISCARD/ : { *(.gnu*) } + .dynsym _end : { *(.dynsym) } + .hash : { *(.hash) } + .got.plt : { *(.got.plt) } + .dynbss : { *(.dynbss) } + .dynstr : { *(.dynstr*) } + .dynamic : { *(.dynamic*) } + .plt : { *(.plt*) } + .interp : { *(.interp*) } + .gnu : { *(.gnu*) } + .ARM.exidx : { *(.ARM.exidx*) } }
Signature · 1 line
1.8.3.2
PATCH v3 3/4 arm: make _end compiler-generated
This prevents references to _end from generating absolute relocation records.
This change is binary invariant for ARM targets.
---
Changes in v3:
- Replace _end in linker scripts with _image_binary_end
Changes in v2: None
arch/arm/cpu/arm1136/u-boot-spl.lds | 6 +++++- arch/arm/cpu/arm920t/ep93xx/u-boot.lds | 5 ++++- arch/arm/cpu/arm926ejs/mxs/u-boot-spl.lds | 9 +++++++-- arch/arm/cpu/arm926ejs/spear/u-boot-spl.lds | 9 +++++++-- arch/arm/cpu/armv7/am33xx/u-boot-spl.lds | 6 +++++- arch/arm/cpu/armv7/omap-common/u-boot-spl.lds | 6 +++++- arch/arm/cpu/armv7/socfpga/u-boot-spl.lds | 6 +++++- arch/arm/cpu/at91-common/u-boot-spl.lds | 6 +++++- arch/arm/cpu/ixp/u-boot.lds | 9 +++++++-- arch/arm/cpu/u-boot-spl.lds | 9 +++++++-- arch/arm/cpu/u-boot.lds | 9 +++++++-- arch/arm/lib/Makefile | 2 +- arch/arm/lib/sections.c | 1 + board/Barix/ipam390/u-boot-spl-ipam390.lds | 6 +++++- board/actux1/u-boot.lds | 9 +++++++-- board/actux2/u-boot.lds | 9 +++++++-- board/actux3/u-boot.lds | 9 +++++++-- board/ait/cam_enc_4xx/u-boot-spl.lds | 6 +++++- board/compulab/cm_t335/u-boot.lds | 9 +++++++-- board/davinci/da8xxevm/u-boot-spl-da850evm.lds | 6 +++++- board/davinci/da8xxevm/u-boot-spl-hawk.lds | 5 ++++- board/dvlhost/u-boot.lds | 9 +++++++-- board/freescale/mx31ads/u-boot.lds | 9 +++++++-- board/samsung/common/exynos-uboot-spl.lds | 6 +++++- board/ti/am335x/u-boot.lds | 9 +++++++-- board/vpac270/u-boot-spl.lds | 9 +++++++-- 26 files changed, 146 insertions(+), 38 deletions(-)
arch/arm/cpu/arm1136/u-boot-spl.lds +5 -1
@@ -33,7 +33,11 @@ SECTIONS .data : { *(SORT_BY_ALIGNMENT(.data*)) } >.sram . = ALIGN(4); __image_copy_end = .; - _end = .; + + .end : + { + *(.__end) + } .bss : {
arch/arm/cpu/arm920t/ep93xx/u-boot.lds +4 -1
@@ -50,5 +50,8 @@ SECTIONS .bss : { *(.bss*) } __bss_end = .; - _end = .; + .end : + { + *(.__end) + } }
arch/arm/cpu/arm926ejs/mxs/u-boot-spl.lds +7 -2
@@ -49,9 +49,14 @@ SECTIONS __bss_end = .; } - _end = .; + .end : + { + *(.__end) + } + + _image_binary_end = .; - .dynsym _end : { *(.dynsym) } + .dynsym _image_binary_end : { *(.dynsym) } .dynbss : { *(.dynbss) } .dynstr : { *(.dynstr*) } .dynamic : { *(.dynamic*) }
arch/arm/cpu/arm926ejs/spear/u-boot-spl.lds +7 -2
@@ -49,9 +49,14 @@ SECTIONS __bss_end = .; } - _end = .; + .end : + { + *(.__end) + } + + _image_binary_end = .; - .dynsym _end : { *(.dynsym) } + .dynsym _image_binary_end : { *(.dynsym) } .dynbss : { *(.dynbss) } .dynstr : { *(.dynstr*) } .dynamic : { *(.dynamic*) }
arch/arm/cpu/armv7/am33xx/u-boot-spl.lds +5 -1
@@ -38,7 +38,11 @@ SECTIONS . = ALIGN(4); __image_copy_end = .; - _end = .; + + .end : + { + *(.__end) + } >.sram .bss : {
arch/arm/cpu/armv7/omap-common/u-boot-spl.lds +5 -1
@@ -34,7 +34,11 @@ SECTIONS . = ALIGN(4); __image_copy_end = .; - _end = .; + + .end : + { + *(.__end) + } .bss : {
arch/arm/cpu/armv7/socfpga/u-boot-spl.lds +5 -1
@@ -28,7 +28,11 @@ SECTIONS . = ALIGN(4); __image_copy_end = .; - _end = .; + + .end : + { + *(.__end) + } .bss : { . = ALIGN(4);
arch/arm/cpu/at91-common/u-boot-spl.lds +5 -1
@@ -37,7 +37,11 @@ SECTIONS . = ALIGN(4); __image_copy_end = .; - _end = .; + + .end : + { + *(.__end) + } >.sram .bss : {
arch/arm/cpu/ixp/u-boot.lds +7 -2
@@ -58,7 +58,12 @@ SECTIONS *(.__rel_dyn_end) } - _end = .; + .end : + { + *(.__end) + } + + _image_binary_end = .; /* * Compiler-generated __bss_start and __bss_end, see arch/arm/lib/bss.c
@@ -79,7 +84,7 @@ SECTIONS KEEP(*(.__bss_end)); } - .dynsym _end : { *(.dynsym) } + .dynsym _image_binary_end : { *(.dynsym) } .dynbss : { *(.dynbss) } .dynstr : { *(.dynstr*) } .dynamic : { *(.dynamic*) }
arch/arm/cpu/u-boot-spl.lds +7 -2
@@ -42,7 +42,12 @@ SECTIONS __rel_dyn_end = .; } - _end = .; + .end : + { + *(.__end) + } + + _image_binary_end = .; .bss __rel_dyn_start (OVERLAY) : { __bss_start = .;
@@ -51,7 +56,7 @@ SECTIONS __bss_end = .; } - .dynsym _end : { *(.dynsym) } + .dynsym _image_binary_end : { *(.dynsym) } .dynbss : { *(.dynbss) } .dynstr : { *(.dynstr*) } .dynamic : { *(.dynamic*) }
arch/arm/cpu/u-boot.lds +7 -2
@@ -60,7 +60,12 @@ SECTIONS *(.__rel_dyn_end) } - _end = .; + .end : + { + *(.__end) + } + + _image_binary_end = .; /* * Deprecated: this MMU section is used by pxa at present but
@@ -91,7 +96,7 @@ SECTIONS KEEP(*(.__bss_end)); } - .dynsym _end : { *(.dynsym) } + .dynsym _image_binary_end : { *(.dynsym) } .hash : { *(.hash) } .got.plt : { *(.got.plt) } .dynbss : { *(.dynbss) }
arch/arm/lib/Makefile +1 -1
@@ -24,7 +24,6 @@ obj-y += relocate.o ifndef CONFIG_SYS_GENERIC_BOARD obj-y += board.o endif -obj-y += sections.o obj-$(CONFIG_OF_LIBFDT) += bootm-fdt.o obj-$(CONFIG_CMD_BOOTM) += bootm.o
@@ -35,6 +34,7 @@ else obj-$(CONFIG_SPL_FRAMEWORK) += spl.o endif +obj-y += sections.o obj-y += interrupts.o obj-y += reset.o
arch/arm/lib/sections.c +1 -0
@@ -25,3 +25,4 @@ char __image_copy_start[0] __attribute__((section(".__image_copy_start"))); char __image_copy_end[0] __attribute__((section(".__image_copy_end"))); char __rel_dyn_start[0] __attribute__((section(".__rel_dyn_start"))); char __rel_dyn_end[0] __attribute__((section(".__rel_dyn_end"))); +char _end[0] __attribute__((section(".__end")));
board/Barix/ipam390/u-boot-spl-ipam390.lds +5 -1
@@ -49,5 +49,9 @@ SECTIONS } >.sram __image_copy_end = .; - _end = .; + + .end : + { + *(.__end) + } >.sram }
board/actux1/u-boot.lds +7 -2
@@ -66,7 +66,12 @@ SECTIONS *(.__rel_dyn_end) } - _end = .; + .end : + { + *(.__end) + } + + _image_binary_end = .; /* * Compiler-generated __bss_start and __bss_end, see arch/arm/lib/bss.c
@@ -87,7 +92,7 @@ SECTIONS KEEP(*(.__bss_end)); } - .dynsym _end : { *(.dynsym) } + .dynsym _image_binary_end : { *(.dynsym) } .dynbss : { *(.dynbss) } .dynstr : { *(.dynstr*) } .dynamic : { *(.dynamic*) }
board/actux2/u-boot.lds +7 -2
@@ -66,7 +66,12 @@ SECTIONS *(.__rel_dyn_end) } - _end = .; + .end : + { + *(.__end) + } + + _image_binary_end = .; /* * Compiler-generated __bss_start and __bss_end, see arch/arm/lib/bss.c
@@ -87,7 +92,7 @@ SECTIONS KEEP(*(.__bss_end)); } - .dynsym _end : { *(.dynsym) } + .dynsym _image_binary_end : { *(.dynsym) } .dynbss : { *(.dynbss) } .dynstr : { *(.dynstr*) } .dynamic : { *(.dynamic*) }
board/actux3/u-boot.lds +7 -2
@@ -66,7 +66,12 @@ SECTIONS *(.__rel_dyn_end) } - _end = .; + .end : + { + *(.__end) + } + + _image_binary_end = .; /* * Compiler-generated __bss_start and __bss_end, see arch/arm/lib/bss.c
@@ -87,7 +92,7 @@ SECTIONS KEEP(*(.__bss_end)); } - .dynsym _end : { *(.dynsym) } + .dynsym _image_binary_end : { *(.dynsym) } .dynbss : { *(.dynbss) } .dynstr : { *(.dynstr*) } .dynamic : { *(.dynamic*) }
board/ait/cam_enc_4xx/u-boot-spl.lds +5 -1
@@ -48,5 +48,9 @@ SECTIONS } >.sram __image_copy_end = .; - _end = .; + + .end : + { + *(.__end) + } }
board/compulab/cm_t335/u-boot.lds +7 -2
@@ -61,7 +61,12 @@ SECTIONS *(.__rel_dyn_end) } - _end = .; + .end : + { + *(.__end) + } + + _image_binary_end = .; /* * Deprecated: this MMU section is used by pxa at present but
@@ -92,7 +97,7 @@ SECTIONS KEEP(*(.__bss_end)); } - .dynsym _end : { *(.dynsym) } + .dynsym _image_binary_end : { *(.dynsym) } .hash : { *(.hash) } .got.plt : { *(.got.plt) } .dynbss : { *(.dynbss) }
board/davinci/da8xxevm/u-boot-spl-da850evm.lds +5 -1
@@ -49,5 +49,9 @@ SECTIONS } >.sram __image_copy_end = .; - _end = .; + + .end : + { + *(.__end) + } }
board/davinci/da8xxevm/u-boot-spl-hawk.lds +4 -1
@@ -61,5 +61,8 @@ SECTIONS __bss_end = .; } - _end = .; + .end : + { + *(.__end) + } }
board/dvlhost/u-boot.lds +7 -2
@@ -66,7 +66,12 @@ SECTIONS *(.__rel_dyn_end) } - _end = .; + .end : + { + *(.__end) + } + + _image_binary_end = .; /* * Compiler-generated __bss_start and __bss_end, see arch/arm/lib/bss.c
@@ -87,7 +92,7 @@ SECTIONS KEEP(*(.__bss_end)); } - .dynsym _end : { *(.dynsym) } + .dynsym _image_binary_end : { *(.dynsym) } .dynbss : { *(.dynbss) } .dynstr : { *(.dynstr*) } .dynamic : { *(.dynamic*) }
board/freescale/mx31ads/u-boot.lds +7 -2
@@ -69,7 +69,12 @@ SECTIONS *(.__rel_dyn_end) } - _end = .; + .end : + { + *(.__end) + } + + _image_binary_end = .; /* * Compiler-generated __bss_start and __bss_end, see arch/arm/lib/bss.c
@@ -90,7 +95,7 @@ SECTIONS KEEP(*(.__bss_end)); } - .dynsym _end : { *(.dynsym) } + .dynsym _image_binary_end : { *(.dynsym) } .dynbss : { *(.dynbss) } .dynstr : { *(.dynstr*) } .dynamic : { *(.dynamic*) }
board/samsung/common/exynos-uboot-spl.lds +5 -1
@@ -42,7 +42,11 @@ SECTIONS . = ALIGN(4); __image_copy_end = .; - _end = .; + + .end : + { + *(.__end) + } >.sram .bss : {
board/ti/am335x/u-boot.lds +7 -2
@@ -77,7 +77,12 @@ SECTIONS *(.__rel_dyn_end) } - _end = .; + .end : + { + *(.__end) + } + + _image_binary_end = .; /* * Deprecated: this MMU section is used by pxa at present but
@@ -108,7 +113,7 @@ SECTIONS KEEP(*(.__bss_end)); } - .dynsym _end : { *(.dynsym) } + .dynsym _image_binary_end : { *(.dynsym) } .dynbss : { *(.dynbss) } .dynstr : { *(.dynstr*) } .dynamic : { *(.dynamic*) }
board/vpac270/u-boot-spl.lds +7 -2
@@ -53,7 +53,12 @@ SECTIONS . = ALIGN(0x800); - _end = .; + .end : + { + *(.__end) + } + + _image_binary_end = .; .bss __rel_dyn_start (OVERLAY) : { __bss_start = .;
@@ -62,7 +67,7 @@ SECTIONS __bss_end = .; } - .dynsym _end : { *(.dynsym) } + .dynsym _image_binary_end : { *(.dynsym) } .dynbss : { *(.dynbss) } .dynstr : { *(.dynstr*) } .dynamic : { *(.dynamic*) }
Signature · 1 line
1.8.3.2
PATCH v3 4/4 arm: remove unneeded symbol offsets and _TEXT_BASE
Remove the last uses of symbol offsets in ARM U-Boot. Remove some needless uses of _TEXT_BASE. Remove all _TEXT_BASE definitions.
---
Changes in v3: None
Changes in v2:
- fixed use of _rel_dyn_end instead of _end
README | 6 ------ arch/arm/cpu/arm1136/start.S | 27 --------------------------- arch/arm/cpu/arm1176/start.S | 27 --------------------------- arch/arm/cpu/arm720t/start.S | 26 -------------------------- arch/arm/cpu/arm920t/start.S | 26 -------------------------- arch/arm/cpu/arm926ejs/at91/lowlevel_init.S | 14 +------------- arch/arm/cpu/arm926ejs/mxs/start.S | 27 --------------------------- arch/arm/cpu/arm926ejs/start.S | 27 --------------------------- arch/arm/cpu/arm946es/start.S | 26 -------------------------- arch/arm/cpu/arm_intcm/start.S | 26 -------------------------- arch/arm/cpu/armv7/omap3/lowlevel_init.S | 3 --- arch/arm/cpu/armv7/start.S | 23 ----------------------- arch/arm/cpu/ixp/start.S | 26 -------------------------- arch/arm/cpu/pxa/start.S | 27 --------------------------- arch/arm/cpu/sa1100/start.S | 26 -------------------------- arch/arm/lib/board.c | 12 ++++++------ board/armltd/integrator/lowlevel_init.S | 2 +- board/cm4008/flash.c | 2 +- board/cm41xx/flash.c | 2 +- board/mpl/vcma9/lowlevel_init.S | 5 +---- board/mx1ads/lowlevel_init.S | 4 ---- board/samsung/goni/lowlevel_init.S | 3 --- board/samsung/smdk2410/lowlevel_init.S | 5 +---- board/samsung/smdk5250/lowlevel_init.S | 5 +---- board/samsung/smdkc100/lowlevel_init.S | 3 --- board/ti/omap5912osk/lowlevel_init.S | 4 ---- common/board_f.c | 14 +++----------- common/board_r.c | 4 ++-- include/asm-generic/sections.h | 26 +++++++------------------- 29 files changed, 25 insertions(+), 403 deletions(-)
README +0 -6
@@ -3585,12 +3585,6 @@ Configuration Settings: its config.mk file). If you find problems enabling this option on your board please report the problem and send patches! -- CONFIG_SYS_SYM_OFFSETS - This is set by architectures that use offsets for link symbols - instead of absolute values. So bss_start is obtained using an - offset _bss_start_ofs from CONFIG_SYS_TEXT_BASE, rather than - directly. You should not need to touch this setting. - - CONFIG_OMAP_PLATFORM_RESET_TIME_MAX_USEC (OMAP only) This is set by OMAP boards for the max time that reset should be asserted. See doc/README.omap-reset-time for details on how
arch/arm/cpu/arm1136/start.S +0 -27
@@ -70,32 +70,6 @@ _end_vect: ************************************************************************* */ -.globl _TEXT_BASE -_TEXT_BASE: -#if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_TEXT_BASE) - .word CONFIG_SPL_TEXT_BASE -#else - .word CONFIG_SYS_TEXT_BASE -#endif - -/* - * These are defined in the board-specific linker script. - * Subtracting _start from them lets the linker put their - * relative position in the executable instead of leaving - * them null. - */ -.globl _bss_start_ofs -_bss_start_ofs: - .word __bss_start - _start - -.globl _bss_end_ofs -_bss_end_ofs: - .word __bss_end - _start - -.globl _end_ofs -_end_ofs: - .word _end - _start - #ifdef CONFIG_USE_IRQ /* IRQ stack memory (calculated at run-time) */ .globl IRQ_STACK_START
@@ -295,7 +269,6 @@ cpu_init_crit: #ifdef CONFIG_SPL_BUILD .align 5 do_hang: - ldr sp, _TEXT_BASE /* use 32 words about stack */ bl hang /* hang and never return */ #else /* !CONFIG_SPL_BUILD */ .align 5
arch/arm/cpu/arm1176/start.S +0 -27
@@ -77,33 +77,6 @@ _end_vect: ************************************************************************* */ -.globl _TEXT_BASE -_TEXT_BASE: -#if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_TEXT_BASE) - .word CONFIG_SPL_TEXT_BASE -#else - .word CONFIG_SYS_TEXT_BASE -#endif - -/* - * These are defined in the board-specific linker script. - * Subtracting _start from them lets the linker put their - * relative position in the executable instead of leaving - * them null. - */ - -.globl _bss_start_ofs -_bss_start_ofs: - .word __bss_start - _start - -.globl _bss_end_ofs -_bss_end_ofs: - .word __bss_end - _start - -.globl _end_ofs -_end_ofs: - .word _end - _start - /* IRQ stack memory (calculated at run-time) + 8 bytes */ .globl IRQ_STACK_START_IN IRQ_STACK_START_IN:
arch/arm/cpu/arm720t/start.S +0 -26
@@ -67,32 +67,6 @@ _pad: .word 0x12345678 /* now 16*4=64 */ ************************************************************************* */ -.globl _TEXT_BASE -_TEXT_BASE: -#if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_TEXT_BASE) - .word CONFIG_SPL_TEXT_BASE -#else - .word CONFIG_SYS_TEXT_BASE -#endif - -/* - * These are defined in the board-specific linker script. - * Subtracting _start from them lets the linker put their - * relative position in the executable instead of leaving - * them null. - */ -.globl _bss_start_ofs -_bss_start_ofs: - .word __bss_start - _start - -.globl _bss_end_ofs -_bss_end_ofs: - .word __bss_end - _start - -.globl _end_ofs -_end_ofs: - .word _end - _start - #ifdef CONFIG_USE_IRQ /* IRQ stack memory (calculated at run-time) */ .globl IRQ_STACK_START
arch/arm/cpu/arm920t/start.S +0 -26
@@ -55,32 +55,6 @@ _fiq: .word fiq ************************************************************************* */ -.globl _TEXT_BASE -_TEXT_BASE: -#if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_TEXT_BASE) - .word CONFIG_SPL_TEXT_BASE -#else - .word CONFIG_SYS_TEXT_BASE -#endif - -/* - * These are defined in the board-specific linker script. - * Subtracting _start from them lets the linker put their - * relative position in the executable instead of leaving - * them null. - */ -.globl _bss_start_ofs -_bss_start_ofs: - .word __bss_start - _start - -.globl _bss_end_ofs -_bss_end_ofs: - .word __bss_end - _start - -.globl _end_ofs -_end_ofs: - .word _end - _start - #ifdef CONFIG_USE_IRQ /* IRQ stack memory (calculated at run-time) */ .globl IRQ_STACK_START
arch/arm/cpu/arm926ejs/at91/lowlevel_init.S +1 -13
@@ -26,27 +26,18 @@ #define CONFIG_SYS_MATRIX_EBICSA_VAL CONFIG_SYS_MATRIX_EBI0CSA_VAL #endif -_TEXT_BASE: - .word CONFIG_SYS_TEXT_BASE - .globl lowlevel_init .type lowlevel_init,function lowlevel_init: - mov r5, pc /* r5 = POS1 + 4 current */ POS1: + adr r5, POS1 /* r5 = POS1 run time */ ldr r0, =POS1 /* r0 = POS1 compile */ - ldr r2, _TEXT_BASE - sub r0, r0, r2 /* r0 = POS1-_TEXT_BASE (POS1 relative) */ sub r5, r5, r0 /* r0 = CONFIG_SYS_TEXT_BASE-1 */ - sub r5, r5, #4 /* r1 = text base - current */ /* memory control configuration 1 */ ldr r0, =SMRDATA ldr r2, =SMRDATA1 - ldr r1, _TEXT_BASE - sub r0, r0, r1 - sub r2, r2, r1 add r0, r0, r5 add r2, r2, r5 0:
@@ -149,9 +140,6 @@ PLL_setup_end: ldr r0, =SMRDATA1 ldr r2, =SMRDATA2 - ldr r1, _TEXT_BASE - sub r0, r0, r1 - sub r2, r2, r1 add r0, r0, r5 add r2, r2, r5 2:
arch/arm/cpu/arm926ejs/mxs/start.S +0 -27
@@ -101,32 +101,6 @@ fiq: ************************************************************************* */ -.globl _TEXT_BASE -_TEXT_BASE: -#ifdef CONFIG_SPL_TEXT_BASE - .word CONFIG_SPL_TEXT_BASE -#else - .word CONFIG_SYS_TEXT_BASE -#endif - -/* - * These are defined in the board-specific linker script. - * Subtracting _start from them lets the linker put their - * relative position in the executable instead of leaving - * them null. - */ -.globl _bss_start_ofs -_bss_start_ofs: - .word __bss_start - _start - -.globl _bss_end_ofs -_bss_end_ofs: - .word __bss_end - _start - -.globl _end_ofs -_end_ofs: - .word _end - _start - #ifdef CONFIG_USE_IRQ /* IRQ stack memory (calculated at run-time) */ .globl IRQ_STACK_START
@@ -207,6 +181,5 @@ _reset: bx lr _hang: - ldr sp, _TEXT_BASE /* switch to abort stack */ 1: bl 1b /* hang and never return */
arch/arm/cpu/arm926ejs/start.S +0 -27
@@ -102,32 +102,6 @@ _fiq: ************************************************************************* */ -.globl _TEXT_BASE -_TEXT_BASE: -#if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_TEXT_BASE) - .word CONFIG_SPL_TEXT_BASE -#else - .word CONFIG_SYS_TEXT_BASE -#endif - -/* - * These are defined in the board-specific linker script. - * Subtracting _start from them lets the linker put their - * relative position in the executable instead of leaving - * them null. - */ -.globl _bss_start_ofs -_bss_start_ofs: - .word __bss_start - _start - -.globl _bss_end_ofs -_bss_end_ofs: - .word __bss_end - _start - -.globl _end_ofs -_end_ofs: - .word _end - _start - #ifdef CONFIG_USE_IRQ /* IRQ stack memory (calculated at run-time) */ .globl IRQ_STACK_START
@@ -330,7 +304,6 @@ flush_dcache: #ifdef CONFIG_SPL_BUILD .align 5 do_hang: - ldr sp, _TEXT_BASE /* switch to abort stack */ 1: bl 1b /* hang and never return */ #else /* !CONFIG_SPL_BUILD */
arch/arm/cpu/arm946es/start.S +0 -26
@@ -71,32 +71,6 @@ _vectors_end: ************************************************************************* */ -.globl _TEXT_BASE -_TEXT_BASE: -#if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_TEXT_BASE) - .word CONFIG_SPL_TEXT_BASE -#else - .word CONFIG_SYS_TEXT_BASE -#endif - -/* - * These are defined in the board-specific linker script. - * Subtracting _start from them lets the linker put their - * relative position in the executable instead of leaving - * them null. - */ -.globl _bss_start_ofs -_bss_start_ofs: - .word __bss_start - _start - -.globl _bss_end_ofs -_bss_end_ofs: - .word __bss_end - _start - -.globl _end_ofs -_end_ofs: - .word _end - _start - #ifdef CONFIG_USE_IRQ /* IRQ stack memory (calculated at run-time) */ .globl IRQ_STACK_START
arch/arm/cpu/arm_intcm/start.S +0 -26
@@ -67,32 +67,6 @@ _fiq: ************************************************************************* */ -.globl _TEXT_BASE -_TEXT_BASE: -#if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_TEXT_BASE) - .word CONFIG_SPL_TEXT_BASE -#else - .word CONFIG_SYS_TEXT_BASE -#endif - -/* - * These are defined in the board-specific linker script. - * Subtracting _start from them lets the linker put their - * relative position in the executable instead of leaving - * them null. - */ -.globl _bss_start_ofs -_bss_start_ofs: - .word __bss_start - _start - -.globl _bss_end_ofs -_bss_end_ofs: - .word __bss_end - _start - -.globl _end_ofs -_end_ofs: - .word _end - _start - #ifdef CONFIG_USE_IRQ /* IRQ stack memory (calculated at run-time) */ .globl IRQ_STACK_START
arch/arm/cpu/armv7/omap3/lowlevel_init.S +0 -3
@@ -17,9 +17,6 @@ #include <asm/arch/clocks_omap3.h> #include <linux/linkage.h> -_TEXT_BASE: - .word CONFIG_SYS_TEXT_BASE /* sdram load addr from config.mk */ - #ifdef CONFIG_SPL_BUILD ENTRY(save_boot_params) ldr r4, =omap3_boot_device
arch/arm/cpu/armv7/start.S +0 -23
@@ -63,29 +63,6 @@ _end_vect: * *************************************************************************/ -.globl _TEXT_BASE -_TEXT_BASE: -#if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_TEXT_BASE) - .word CONFIG_SPL_TEXT_BASE -#else - .word CONFIG_SYS_TEXT_BASE -#endif - -/* - * These are defined in the board-specific linker script. - */ -.globl _bss_start_ofs -_bss_start_ofs: - .word __bss_start - _start - -.globl _bss_end_ofs -_bss_end_ofs: - .word __bss_end - _start - -.globl _end_ofs -_end_ofs: - .word _end - _start - #ifdef CONFIG_USE_IRQ /* IRQ stack memory (calculated at run-time) */ .globl IRQ_STACK_START
arch/arm/cpu/ixp/start.S +0 -26
@@ -80,32 +80,6 @@ _fiq: .word fiq * - jump to second stage */ -.globl _TEXT_BASE -_TEXT_BASE: -#if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_TEXT_BASE) - .word CONFIG_SPL_TEXT_BASE -#else - .word CONFIG_SYS_TEXT_BASE -#endif - -/* - * These are defined in the board-specific linker script. - * Subtracting _start from them lets the linker put their - * relative position in the executable instead of leaving - * them null. - */ -.globl _bss_start_ofs -_bss_start_ofs: - .word __bss_start - _start - -.globl _bss_end_ofs -_bss_end_ofs: - .word __bss_end - _start - -.globl _end_ofs -_end_ofs: - .word _end - _start - #ifdef CONFIG_USE_IRQ /* IRQ stack memory (calculated at run-time) */ .globl IRQ_STACK_START
arch/arm/cpu/pxa/start.S +0 -27
@@ -84,32 +84,6 @@ _end_vect: ************************************************************************* */ -.globl _TEXT_BASE -_TEXT_BASE: -#if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_TEXT_BASE) - .word CONFIG_SPL_TEXT_BASE -#else - .word CONFIG_SYS_TEXT_BASE -#endif - -/* - * These are defined in the board-specific linker script. - * Subtracting _start from them lets the linker put their - * relative position in the executable instead of leaving - * them null. - */ -.globl _bss_start_ofs -_bss_start_ofs: - .word __bss_start - _start - -.globl _bss_end_ofs -_bss_end_ofs: - .word __bss_end - _start - -.globl _end_ofs -_end_ofs: - .word _end - _start - #ifdef CONFIG_USE_IRQ /* IRQ stack memory (calculated at run-time) */ .globl IRQ_STACK_START
@@ -316,7 +290,6 @@ cpu_init_crit: #ifdef CONFIG_SPL_BUILD .align 5 do_hang: - ldr sp, _TEXT_BASE /* use 32 words about stack */ bl hang /* hang and never return */ #else /* !CONFIG_SPL_BUILD */ .align 5
arch/arm/cpu/sa1100/start.S +0 -26
@@ -56,32 +56,6 @@ _fiq: .word fiq ************************************************************************* */ -.globl _TEXT_BASE -_TEXT_BASE: -#if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_TEXT_BASE) - .word CONFIG_SPL_TEXT_BASE -#else - .word CONFIG_SYS_TEXT_BASE -#endif - -/* - * These are defined in the board-specific linker script. - * Subtracting _start from them lets the linker put their - * relative position in the executable instead of leaving - * them null. - */ -.globl _bss_start_ofs -_bss_start_ofs: - .word __bss_start - _start - -.globl _bss_end_ofs -_bss_end_ofs: - .word __bss_end - _start - -.globl _end_ofs -_end_ofs: - .word _end - _start - #ifdef CONFIG_USE_IRQ /* IRQ stack memory (calculated at run-time) */ .globl IRQ_STACK_START
arch/arm/lib/board.c +6 -6
@@ -105,8 +105,8 @@ static int display_banner(void) {printf ("\n\n%s\n\n" , version_string);debug ("U-Boot code: %08lX -> %08lX BSS: -> %08lX\n" , - _TEXT_BASE, - _bss_start_ofs + _TEXT_BASE, _bss_end_ofs + _TEXT_BASE); + (ulong)&_start, + (ulong)&__bss_start, (ulong)&__bss_end);#ifdef CONFIG_MODEM_SUPPORT debug ("Modem Support enabled\n" );#endif
@@ -277,13 +277,13 @@ void board_init_f(ulong bootflag)memset ((void *)gd,0 ,sizeof (gd_t)); - gd->mon_len = _bss_end_ofs; + gd->mon_len = (ulong )&__bss_end - (ulong )_start;#ifdef CONFIG_OF_EMBED /* Get a pointer to the FDT */ gd->fdt_blob = _binary_dt_dtb_start;#elif definedCONFIG_OF_SEPARATE /* FDT is at end of image */ - gd->fdt_blob = (void *)(_end_ofs + _TEXT_BASE); + gd->fdt_blob = &_end;#endif /* Allow the early environment to override the fdt address */ gd->fdt_blob = (void *)getenv_ulong("fdtcontroladdr", 16,
@@ -451,7 +451,7 @@ void board_init_f(ulong bootflag) gd->relocaddr = addr; gd->start_addr_sp = addr_sp; - gd->reloc_off = addr - _TEXT_BASE; + gd->reloc_off = addr - (ulong)&_start;debug ("relocation Offset is: %08lx\n" , gd->reloc_off);if (new_fdt) {memcpy (new_fdt, gd->fdt_blob, fdt_size);
@@ -516,7 +516,7 @@ void board_init_r(gd_t *id, ulong dest_addr) gd->flags |=GD_FLG_RELOC ;/* tell others: relocation done */ bootstage_mark_name (BOOTSTAGE_ID_START_UBOOT_R ,"board_init_r" ); - monitor_flash_len = _end_ofs; + monitor_flash_len = (ulong )&__rel_dyn_end - (ulong )_start;/* Enable caches */ enable_caches ();
board/armltd/integrator/lowlevel_init.S +1 -1
@@ -183,7 +183,7 @@ cm_remap: /* Now 0x00000000 is writeable, replace the vectors */ ldr r0, =_start /* r0 <- start of vectors */ - ldr r2, =_TEXT_BASE /* r2 <- past vectors */ + add r2, r0, #64 /* r2 <- past vectors */ sub r1,r1,r1 /* destination 0x00000000 */ copy_vec:
board/cm4008/flash.c +1 -1
@@ -57,7 +57,7 @@ unsigned long flash_init (void)*/ flash_protect (FLAG_PROTECT_SET ,CONFIG_SYS_FLASH_BASE , -CONFIG_SYS_FLASH_BASE + _bss_start_ofs, +CONFIG_SYS_FLASH_BASE + (__bss_end - __bss_start), &flash_info[0 ]);return size;
board/cm41xx/flash.c +1 -1
@@ -57,7 +57,7 @@ unsigned long flash_init (void)*/ flash_protect (FLAG_PROTECT_SET ,CONFIG_SYS_FLASH_BASE , -CONFIG_SYS_FLASH_BASE + _bss_start_ofs, +CONFIG_SYS_FLASH_BASE + (__bss_end - __bss_start), &flash_info[0 ]);return size;
board/mpl/vcma9/lowlevel_init.S +1 -4
@@ -197,13 +197,10 @@ #define REFCNT_266 0 /**************************************/ -_TEXT_BASE: - .word CONFIG_SYS_TEXT_BASE - .globl lowlevel_init lowlevel_init: /* use r0 to relocate DATA read/write to flash rather than memory ! */ - ldr r0, _TEXT_BASE + ldr r0, =CONFIG_SYS_TEXT_BASE ldr r13, =BWSCON /* enable minimal access to PLD */
board/mx1ads/lowlevel_init.S +0 -4
@@ -16,10 +16,6 @@ #define SDCTL0 0x221000 #define SDCTL1 0x221004 - -_TEXT_BASE: - .word CONFIG_SYS_TEXT_BASE - .globl lowlevel_init lowlevel_init: /* memory controller init */
board/samsung/goni/lowlevel_init.S +0 -3
@@ -22,9 +22,6 @@ * r9 has Mobile DDR size, 1 means 1GiB, 2 means 2GiB and so on */ -_TEXT_BASE: - .word CONFIG_SYS_TEXT_BASE - .globl lowlevel_init lowlevel_init: mov r11, lr
board/samsung/smdk2410/lowlevel_init.S +1 -4
@@ -110,16 +110,13 @@ #define REFCNT 1113 /* period=15.6us, HCLK=60Mhz, (2048+1-15.6*60) */ /**************************************/ -_TEXT_BASE: - .word CONFIG_SYS_TEXT_BASE - .globl lowlevel_init lowlevel_init: /* memory control configuration */ /* make r0 relative the current location so that it */ /* reads SMRDATA out of FLASH rather than memory ! */ ldr r0, =SMRDATA - ldr r1, _TEXT_BASE + ldr r1, =CONFIG_SYS_TEXT_BASE sub r0, r0, r1 ldr r1, =BWSCON /* Bus Width Status Controller */ add r2, r0, #13*4
board/samsung/smdk5250/lowlevel_init.S +1 -4
@@ -10,9 +10,6 @@ #include <version.h> #include <asm/arch/cpu.h> -_TEXT_BASE: - .word CONFIG_SYS_TEXT_BASE - .globl lowlevel_init lowlevel_init:
@@ -47,7 +44,7 @@ lowlevel_init: ldr r0, =0x0ffffff /* r0 <- Mask Bits*/ bic r1, pc, r0 /* pc <- current addr of code */ /* r1 <- unmasked bits of pc */ - ldr r2, _TEXT_BASE /* r2 <- original base addr in ram */ + ldr r2, =CONFIG_SYS_TEXT_BASE /* r2 <- original base addr in ram */ bic r2, r2, r0 /* r2 <- unmasked bits of r2*/ cmp r1, r2 /* compare r1, r2 */ beq 1f /* r0 == r1 then skip sdram init */
board/samsung/smdkc100/lowlevel_init.S +0 -3
@@ -17,9 +17,6 @@ * r5 has zero always */ -_TEXT_BASE: - .word CONFIG_SYS_TEXT_BASE - .globl lowlevel_init lowlevel_init: mov r9, lr
board/ti/omap5912osk/lowlevel_init.S +0 -4
@@ -18,10 +18,6 @@ #include <./configs/omap1510.h> #endif - -_TEXT_BASE: - .word CONFIG_SYS_TEXT_BASE /* sdram load addr from config.mk */ - .globl lowlevel_init lowlevel_init:
common/board_f.c +3 -11
@@ -149,13 +149,9 @@ static int display_text_info(void)#ifndef CONFIG_SANDBOX ulong bss_start, bss_end; -#ifdef CONFIG_SYS_SYM_OFFSETS - bss_start = _bss_start_ofs + _TEXT_BASE; - bss_end = _bss_end_ofs + _TEXT_BASE; -#else bss_start = (ulong)&__bss_start; bss_end = (ulong)&__bss_end; -#endif +debug ("U-Boot code: %08X -> %08lX BSS: -> %08lX\n" ,CONFIG_SYS_TEXT_BASE , bss_start, bss_end);#endif
@@ -279,8 +275,8 @@ static int zero_global_data(void)static int setup_mon_len (void ) { -#ifdef CONFIG_SYS_SYM_OFFSETS - gd->mon_len = _bss_end_ofs; +#ifdef __ARM__ + gd->mon_len = (ulong )&__bss_end - (ulong )_start;#elif defined(CONFIG_SANDBOX ) gd->mon_len = (ulong )&_end - (ulong )_init;#else
@@ -362,11 +358,7 @@ static int setup_fdt(void) gd->fdt_blob = _binary_dt_dtb_start;#elif definedCONFIG_OF_SEPARATE /* FDT is at end of image */ -# ifdef CONFIG_SYS_SYM_OFFSETS - gd->fdt_blob = (void *)(_end_ofs +CONFIG_SYS_TEXT_BASE ); -# else gd->fdt_blob = (ulong *)&_end; -# endif #elif defined(CONFIG_OF_HOSTFILE )if (read_fdt_from_file ()) {puts ("Failed to read control FDT\n" );
common/board_r.c +2 -2
@@ -128,8 +128,8 @@ __weak int fixup_cpu(void)static int initr_reloc_global_data (void ) { -#ifdef CONFIG_SYS_SYM_OFFSETS - monitor_flash_len = _end_ofs; +#ifdef __ARM__ + monitor_flash_len = _end - __image_copy_start;#elif !defined(CONFIG_SANDBOX ) monitor_flash_len = (ulong )&__init_end - gd->relocaddr;#endif
include/asm-generic/sections.h +7 -19
@@ -63,28 +63,16 @@ extern char __image_copy_end[];extern void _start (void );/* -* ARM needs to use offsets for symbols, since the values of some symbols -* are not resolved prior to relocation (and are just 0). Maybe this can be -* resolved, or maybe other architectures are similar, iwc this should be -* promoted to an architecture option. +* ARM defines its symbols as char[]. Other arches define them as ulongs. */ #ifdef CONFIG_ARM -#define CONFIG_SYS_SYM_OFFSETS -#endif - -#ifdef CONFIG_SYS_SYM_OFFSETS -/* Start/end of the relocation entries, as an offset from _start */ -extern ulong _rel_dyn_start_ofs; -extern ulong _rel_dyn_end_ofs; - -/* End of the region to be relocated, as an offset form _start */ -extern ulong _image_copy_end_ofs; -extern ulong _bss_start_ofs;/* BSS start relative to _start */ -extern ulong _bss_end_ofs;/* BSS end relative to _start */ -extern ulong _end_ofs;/* end of image relative to _start */ - -extern ulong _TEXT_BASE;/* code start */ +extern char __bss_start[]; +extern char __bss_end[]; +extern char __image_copy_start[]; +extern char __image_copy_end[]; +extern char __rel_dyn_start[]; +extern char __rel_dyn_end[];#else /* don't use offsets: */
Signature · 1 line
1.8.3.2