From 44c6e6591cb451ae606f8bde71dd5fb7b4002544 Mon Sep 17 00:00:00 2001 From: Po-Yu Chuang Date: Tue, 1 Mar 2011 22:59:59 +0000 Subject: [PATCH 01/17] rename _end to __bss_end__ Currently, _end is used for end of BSS section. We want _end to mean end of u-boot image, so we rename _end to __bss_end__ first. Signed-off-by: Po-Yu Chuang --- arch/arm/cpu/arm1136/start.S | 2 +- arch/arm/cpu/arm1136/u-boot.lds | 2 +- arch/arm/cpu/arm1176/start.S | 2 +- arch/arm/cpu/arm1176/u-boot.lds | 2 +- arch/arm/cpu/arm720t/start.S | 2 +- arch/arm/cpu/arm720t/u-boot.lds | 2 +- arch/arm/cpu/arm920t/ep93xx/u-boot.lds | 2 +- arch/arm/cpu/arm920t/start.S | 2 +- arch/arm/cpu/arm920t/u-boot.lds | 2 +- arch/arm/cpu/arm925t/start.S | 2 +- arch/arm/cpu/arm925t/u-boot.lds | 2 +- arch/arm/cpu/arm926ejs/start.S | 2 +- arch/arm/cpu/arm926ejs/u-boot.lds | 2 +- arch/arm/cpu/arm946es/start.S | 2 +- arch/arm/cpu/arm946es/u-boot.lds | 2 +- arch/arm/cpu/arm_intcm/start.S | 2 +- arch/arm/cpu/arm_intcm/u-boot.lds | 2 +- arch/arm/cpu/armv7/start.S | 2 +- arch/arm/cpu/armv7/u-boot.lds | 2 +- arch/arm/cpu/ixp/start.S | 2 +- arch/arm/cpu/ixp/u-boot.lds | 2 +- arch/arm/cpu/lh7a40x/start.S | 2 +- arch/arm/cpu/lh7a40x/u-boot.lds | 2 +- arch/arm/cpu/pxa/start.S | 2 +- arch/arm/cpu/pxa/u-boot.lds | 2 +- arch/arm/cpu/s3c44b0/start.S | 2 +- arch/arm/cpu/s3c44b0/u-boot.lds | 2 +- arch/arm/cpu/sa1100/start.S | 2 +- arch/arm/cpu/sa1100/u-boot.lds | 2 +- arch/avr32/cpu/start.S | 2 +- arch/avr32/include/asm/sections.h | 2 +- arch/avr32/lib/board.c | 4 ++-- arch/m68k/lib/board.c | 4 ++-- arch/nios2/cpu/start.S | 6 +++--- arch/nios2/cpu/u-boot.lds | 2 +- arch/powerpc/cpu/74xx_7xx/start.S | 4 ++-- arch/powerpc/cpu/74xx_7xx/u-boot.lds | 2 +- arch/powerpc/cpu/mpc512x/start.S | 4 ++-- arch/powerpc/cpu/mpc512x/u-boot.lds | 2 +- arch/powerpc/cpu/mpc5xx/start.S | 4 ++-- arch/powerpc/cpu/mpc5xx/u-boot.lds | 2 +- arch/powerpc/cpu/mpc5xxx/start.S | 4 ++-- arch/powerpc/cpu/mpc5xxx/u-boot-customlayout.lds | 2 +- arch/powerpc/cpu/mpc5xxx/u-boot.lds | 2 +- arch/powerpc/cpu/mpc8220/start.S | 4 ++-- arch/powerpc/cpu/mpc8220/u-boot.lds | 2 +- arch/powerpc/cpu/mpc824x/start.S | 4 ++-- arch/powerpc/cpu/mpc824x/u-boot.lds | 2 +- arch/powerpc/cpu/mpc8260/start.S | 4 ++-- arch/powerpc/cpu/mpc8260/u-boot.lds | 2 +- arch/powerpc/cpu/mpc83xx/start.S | 4 ++-- arch/powerpc/cpu/mpc83xx/u-boot.lds | 2 +- arch/powerpc/cpu/mpc85xx/start.S | 4 ++-- arch/powerpc/cpu/mpc85xx/u-boot-nand.lds | 2 +- arch/powerpc/cpu/mpc85xx/u-boot-nand_spl.lds | 2 +- arch/powerpc/cpu/mpc85xx/u-boot.lds | 2 +- arch/powerpc/cpu/mpc86xx/start.S | 4 ++-- arch/powerpc/cpu/mpc86xx/u-boot.lds | 2 +- arch/powerpc/cpu/mpc8xx/start.S | 4 ++-- arch/powerpc/cpu/ppc4xx/start.S | 4 ++-- arch/powerpc/cpu/ppc4xx/u-boot.lds | 2 +- arch/powerpc/lib/board.c | 4 ++-- arch/sh/cpu/sh2/u-boot.lds | 2 +- arch/sh/cpu/sh3/u-boot.lds | 2 +- arch/sh/cpu/sh4/u-boot.lds | 2 +- board/BuS/EB+MCF-EV123/u-boot.lds | 2 +- board/LEOX/elpt860/u-boot.lds | 2 +- board/LEOX/elpt860/u-boot.lds.debug | 2 +- board/RPXClassic/u-boot.lds | 2 +- board/RPXClassic/u-boot.lds.debug | 2 +- board/RPXlite/u-boot.lds | 2 +- board/RPXlite/u-boot.lds.debug | 2 +- board/RPXlite_dw/u-boot.lds | 2 +- board/RPXlite_dw/u-boot.lds.debug | 2 +- board/RRvision/u-boot.lds | 2 +- board/actux1/u-boot.lds | 2 +- board/actux2/u-boot.lds | 2 +- board/actux3/u-boot.lds | 2 +- board/adder/u-boot.lds | 2 +- board/altera/nios2-generic/u-boot.lds | 2 +- board/amcc/acadia/u-boot-nand.lds | 2 +- board/amcc/bamboo/u-boot-nand.lds | 2 +- board/amcc/canyonlands/u-boot-nand.lds | 2 +- board/amcc/kilauea/u-boot-nand.lds | 2 +- board/amcc/sequoia/u-boot-nand.lds | 2 +- board/amcc/sequoia/u-boot-ram.lds | 2 +- board/amirix/ap1000/u-boot.lds | 2 +- board/astro/mcf5373l/u-boot.lds | 2 +- board/atmel/atngw100/u-boot.lds | 2 +- board/atmel/atstk1000/u-boot.lds | 2 +- board/c2mon/u-boot.lds | 2 +- board/c2mon/u-boot.lds.debug | 2 +- board/cm5200/u-boot.lds | 2 +- board/cobra5272/u-boot.lds | 2 +- board/cogent/u-boot.lds | 2 +- board/cogent/u-boot.lds.debug | 2 +- board/cray/L1/u-boot.lds.debug | 2 +- board/dave/PPChameleonEVB/u-boot.lds | 2 +- board/earthlcd/favr-32-ezkit/u-boot.lds | 2 +- board/eltec/mhpc/u-boot.lds | 2 +- board/eltec/mhpc/u-boot.lds.debug | 2 +- board/emk/top860/u-boot.lds | 2 +- board/emk/top860/u-boot.lds.debug | 2 +- board/ep88x/u-boot.lds | 2 +- board/esd/dasa_sim/u-boot.lds | 2 +- board/esd/pmc440/u-boot-nand.lds | 2 +- board/esd/tasreg/u-boot.lds | 2 +- board/esteem192e/u-boot.lds | 2 +- board/etx094/u-boot.lds | 2 +- board/etx094/u-boot.lds.debug | 2 +- board/evb64260/u-boot.lds | 2 +- board/fads/u-boot.lds | 2 +- board/flagadm/u-boot.lds | 2 +- board/flagadm/u-boot.lds.debug | 2 +- board/freescale/m5208evbe/u-boot.lds | 2 +- board/freescale/m52277evb/u-boot.spa | 2 +- board/freescale/m52277evb/u-boot.stm | 2 +- board/freescale/m5235evb/u-boot.16 | 2 +- board/freescale/m5235evb/u-boot.32 | 2 +- board/freescale/m5249evb/u-boot.lds | 2 +- board/freescale/m5253demo/u-boot.lds | 2 +- board/freescale/m5253evbe/u-boot.lds | 2 +- board/freescale/m5271evb/u-boot.lds | 2 +- board/freescale/m5272c3/u-boot.lds | 2 +- board/freescale/m5275evb/u-boot.lds | 2 +- board/freescale/m5282evb/u-boot.lds | 2 +- board/freescale/m53017evb/u-boot.lds | 2 +- board/freescale/m5329evb/u-boot.lds | 2 +- board/freescale/m5373evb/u-boot.lds | 2 +- board/freescale/m54451evb/u-boot.spa | 2 +- board/freescale/m54451evb/u-boot.stm | 2 +- board/freescale/m54455evb/u-boot.atm | 2 +- board/freescale/m54455evb/u-boot.int | 2 +- board/freescale/m54455evb/u-boot.stm | 2 +- board/freescale/m547xevb/u-boot.lds | 2 +- board/freescale/m548xevb/u-boot.lds | 2 +- board/freescale/mx31ads/u-boot.lds | 2 +- board/gaisler/gr_cpci_ax2000/u-boot.lds | 2 +- board/gaisler/gr_ep2s60/u-boot.lds | 2 +- board/gaisler/gr_xc3s_1500/u-boot.lds | 2 +- board/gaisler/grsim/u-boot.lds | 2 +- board/gaisler/grsim_leon2/u-boot.lds | 2 +- board/gen860t/u-boot-flashenv.lds | 2 +- board/gen860t/u-boot.lds | 2 +- board/genietv/u-boot.lds | 2 +- board/genietv/u-boot.lds.debug | 2 +- board/hermes/u-boot.lds | 2 +- board/hermes/u-boot.lds.debug | 2 +- board/hymod/u-boot.lds | 2 +- board/hymod/u-boot.lds.debug | 2 +- board/icu862/u-boot.lds | 2 +- board/icu862/u-boot.lds.debug | 2 +- board/idmr/u-boot.lds | 2 +- board/ip860/u-boot.lds | 2 +- board/ip860/u-boot.lds.debug | 2 +- board/ivm/u-boot.lds | 2 +- board/ivm/u-boot.lds.debug | 2 +- board/jornada/u-boot.lds | 2 +- board/korat/u-boot-F7FC.lds | 2 +- board/kup/kup4k/u-boot.lds | 2 +- board/kup/kup4k/u-boot.lds.debug | 2 +- board/kup/kup4x/u-boot.lds | 2 +- board/kup/kup4x/u-boot.lds.debug | 2 +- board/lantec/u-boot.lds | 2 +- board/lantec/u-boot.lds.debug | 2 +- board/lwmon/u-boot.lds | 2 +- board/lwmon/u-boot.lds.debug | 2 +- board/manroland/uc100/u-boot.lds | 2 +- board/matrix_vision/mvsmr/u-boot.lds | 2 +- board/mbx8xx/u-boot.lds | 2 +- board/mbx8xx/u-boot.lds.debug | 2 +- board/mercury/mpq101/u-boot.lds | 2 +- board/mimc/mimc200/u-boot.lds | 2 +- board/miromico/hammerhead/u-boot.lds | 2 +- board/ml2/u-boot.lds | 2 +- board/ml2/u-boot.lds.debug | 2 +- board/mousse/u-boot.lds | 2 +- board/mousse/u-boot.lds.ram | 2 +- board/mousse/u-boot.lds.rom | 2 +- board/mpl/pip405/u-boot.lds.debug | 2 +- board/munices/u-boot.lds | 2 +- board/mvblue/u-boot.lds | 2 +- board/netphone/u-boot.lds | 2 +- board/netphone/u-boot.lds.debug | 2 +- board/netta/u-boot.lds | 2 +- board/netta/u-boot.lds.debug | 2 +- board/netta2/u-boot.lds | 2 +- board/netta2/u-boot.lds.debug | 2 +- board/netvia/u-boot.lds | 2 +- board/netvia/u-boot.lds.debug | 2 +- board/nx823/u-boot.lds | 2 +- board/nx823/u-boot.lds.debug | 2 +- board/quantum/u-boot.lds | 2 +- board/quantum/u-boot.lds.debug | 2 +- board/r360mpi/u-boot.lds | 2 +- board/rbc823/u-boot.lds | 2 +- board/renesas/sh7757lcr/u-boot.lds | 2 +- board/rmu/u-boot.lds | 2 +- board/rmu/u-boot.lds.debug | 2 +- board/rsdproto/u-boot.lds | 2 +- board/samsung/smdk6400/u-boot-nand.lds | 2 +- board/sandburst/karef/u-boot.lds.debug | 2 +- board/sandburst/metrobox/u-boot.lds.debug | 2 +- board/sandpoint/u-boot.lds | 2 +- board/sc3/u-boot.lds | 2 +- board/siemens/IAD210/u-boot.lds | 2 +- board/sixnet/u-boot.lds | 2 +- board/snmc/qs850/u-boot.lds | 2 +- board/snmc/qs860t/u-boot.lds | 2 +- board/spc1920/u-boot.lds | 2 +- board/spd8xx/u-boot.lds | 2 +- board/spd8xx/u-boot.lds.debug | 2 +- board/stx/stxxtc/u-boot.lds | 2 +- board/stx/stxxtc/u-boot.lds.debug | 2 +- board/svm_sc8xx/u-boot.lds | 2 +- board/svm_sc8xx/u-boot.lds.debug | 2 +- board/tqc/tqm8xx/u-boot.lds | 2 +- board/tqc/tqm8xx/u-boot.lds.debug | 2 +- board/trab/u-boot.lds | 2 +- board/v37/u-boot.lds | 2 +- board/w7o/u-boot.lds.debug | 2 +- board/westel/amx860/u-boot.lds | 2 +- board/westel/amx860/u-boot.lds.debug | 2 +- board/xes/xpedite1000/u-boot.lds.debug | 2 +- board/zipitz2/u-boot.lds | 2 +- examples/standalone/mips.lds | 2 +- examples/standalone/sparc.lds | 2 +- examples/standalone/stubs.c | 4 ++-- nand_spl/board/amcc/acadia/u-boot.lds | 2 +- nand_spl/board/amcc/bamboo/u-boot.lds | 2 +- nand_spl/board/amcc/canyonlands/u-boot.lds | 2 +- nand_spl/board/amcc/kilauea/u-boot.lds | 2 +- nand_spl/board/amcc/sequoia/u-boot.lds | 2 +- nand_spl/board/davinci/da8xxevm/u-boot.lds | 2 +- nand_spl/board/freescale/mpc8313erdb/u-boot.lds | 4 ++-- nand_spl/board/freescale/mpc8315erdb/u-boot.lds | 4 ++-- nand_spl/board/freescale/mx31pdk/u-boot.lds | 2 +- nand_spl/board/karo/tx25/u-boot.lds | 2 +- nand_spl/board/samsung/smdk6400/u-boot.lds | 2 +- nand_spl/board/sheldon/simpc8313/u-boot.lds | 4 ++-- onenand_ipl/board/apollon/u-boot.onenand.lds | 2 +- onenand_ipl/board/vpac270/u-boot.onenand.lds | 2 +- 242 files changed, 263 insertions(+), 263 deletions(-) diff --git a/arch/arm/cpu/arm1136/start.S b/arch/arm/cpu/arm1136/start.S index a05d36d726..64426fa2a8 100644 --- a/arch/arm/cpu/arm1136/start.S +++ b/arch/arm/cpu/arm1136/start.S @@ -102,7 +102,7 @@ _bss_start_ofs: .globl _bss_end_ofs _bss_end_ofs: - .word _end - _start + .word __bss_end__ - _start #ifdef CONFIG_USE_IRQ /* IRQ stack memory (calculated at run-time) */ diff --git a/arch/arm/cpu/arm1136/u-boot.lds b/arch/arm/cpu/arm1136/u-boot.lds index 253adbe479..1e0e90b4af 100644 --- a/arch/arm/cpu/arm1136/u-boot.lds +++ b/arch/arm/cpu/arm1136/u-boot.lds @@ -76,7 +76,7 @@ SECTIONS __bss_start = .; *(.bss) . = ALIGN(4); - _end = .; + __bss_end__ = .; } /DISCARD/ : { *(.dynstr*) } diff --git a/arch/arm/cpu/arm1176/start.S b/arch/arm/cpu/arm1176/start.S index 363329afbe..c1302df653 100644 --- a/arch/arm/cpu/arm1176/start.S +++ b/arch/arm/cpu/arm1176/start.S @@ -121,7 +121,7 @@ _bss_start_ofs: .globl _bss_end_ofs _bss_end_ofs: - .word _end - _start + .word __bss_end__ - _start /* IRQ stack memory (calculated at run-time) + 8 bytes */ .globl IRQ_STACK_START_IN diff --git a/arch/arm/cpu/arm1176/u-boot.lds b/arch/arm/cpu/arm1176/u-boot.lds index fe31800532..170e516550 100644 --- a/arch/arm/cpu/arm1176/u-boot.lds +++ b/arch/arm/cpu/arm1176/u-boot.lds @@ -65,7 +65,7 @@ SECTIONS __bss_start = .; *(.bss) . = ALIGN(4); - _end = .; + __bss_end__ = .; } /DISCARD/ : { *(.dynstr*) } diff --git a/arch/arm/cpu/arm720t/start.S b/arch/arm/cpu/arm720t/start.S index c0981185f6..c521753f3b 100644 --- a/arch/arm/cpu/arm720t/start.S +++ b/arch/arm/cpu/arm720t/start.S @@ -91,7 +91,7 @@ _bss_start_ofs: .globl _bss_end_ofs _bss_end_ofs: - .word _end - _start + .word __bss_end__ - _start #ifdef CONFIG_USE_IRQ /* IRQ stack memory (calculated at run-time) */ diff --git a/arch/arm/cpu/arm720t/u-boot.lds b/arch/arm/cpu/arm720t/u-boot.lds index 0686e423e2..deda9fb0db 100644 --- a/arch/arm/cpu/arm720t/u-boot.lds +++ b/arch/arm/cpu/arm720t/u-boot.lds @@ -66,7 +66,7 @@ SECTIONS __bss_start = .; *(.bss) . = ALIGN(4); - _end = .; + __bss_end__ = .; } /DISCARD/ : { *(.dynstr*) } diff --git a/arch/arm/cpu/arm920t/ep93xx/u-boot.lds b/arch/arm/cpu/arm920t/ep93xx/u-boot.lds index 5bfcb02317..4cc82a54b1 100644 --- a/arch/arm/cpu/arm920t/ep93xx/u-boot.lds +++ b/arch/arm/cpu/arm920t/ep93xx/u-boot.lds @@ -55,5 +55,5 @@ SECTIONS . = ALIGN(4); __bss_start = .; .bss : { *(.bss) } - _end = .; + __bss_end__ = .; } diff --git a/arch/arm/cpu/arm920t/start.S b/arch/arm/cpu/arm920t/start.S index 2fc0abc1a4..6db61c215c 100644 --- a/arch/arm/cpu/arm920t/start.S +++ b/arch/arm/cpu/arm920t/start.S @@ -87,7 +87,7 @@ _bss_start_ofs: .globl _bss_end_ofs _bss_end_ofs: - .word _end - _start + .word __bss_end__ - _start #ifdef CONFIG_USE_IRQ /* IRQ stack memory (calculated at run-time) */ diff --git a/arch/arm/cpu/arm920t/u-boot.lds b/arch/arm/cpu/arm920t/u-boot.lds index a6f8b56a3a..d6dc21c55d 100644 --- a/arch/arm/cpu/arm920t/u-boot.lds +++ b/arch/arm/cpu/arm920t/u-boot.lds @@ -75,7 +75,7 @@ SECTIONS __bss_start = .; *(.bss) . = ALIGN(4); - _end = .; + __bss_end__ = .; } /DISCARD/ : { *(.dynstr*) } diff --git a/arch/arm/cpu/arm925t/start.S b/arch/arm/cpu/arm925t/start.S index 20ecdd54c6..b89cf4ae81 100644 --- a/arch/arm/cpu/arm925t/start.S +++ b/arch/arm/cpu/arm925t/start.S @@ -97,7 +97,7 @@ _bss_start_ofs: .globl _bss_end_ofs _bss_end_ofs: - .word _end - _start + .word __bss_end__ - _start #ifdef CONFIG_USE_IRQ /* IRQ stack memory (calculated at run-time) */ diff --git a/arch/arm/cpu/arm925t/u-boot.lds b/arch/arm/cpu/arm925t/u-boot.lds index 7b53edb9be..4ad1f8ed07 100644 --- a/arch/arm/cpu/arm925t/u-boot.lds +++ b/arch/arm/cpu/arm925t/u-boot.lds @@ -70,7 +70,7 @@ SECTIONS __bss_start = .; *(.bss) . = ALIGN(4); - _end = .; + __bss_end__ = .; } /DISCARD/ : { *(.dynstr*) } diff --git a/arch/arm/cpu/arm926ejs/start.S b/arch/arm/cpu/arm926ejs/start.S index f4c177e523..7798ef82a9 100644 --- a/arch/arm/cpu/arm926ejs/start.S +++ b/arch/arm/cpu/arm926ejs/start.S @@ -131,7 +131,7 @@ _bss_start_ofs: .globl _bss_end_ofs _bss_end_ofs: - .word _end - _start + .word __bss_end__ - _start #ifdef CONFIG_USE_IRQ /* IRQ stack memory (calculated at run-time) */ diff --git a/arch/arm/cpu/arm926ejs/u-boot.lds b/arch/arm/cpu/arm926ejs/u-boot.lds index 28c91f937c..b7a5b9e66f 100644 --- a/arch/arm/cpu/arm926ejs/u-boot.lds +++ b/arch/arm/cpu/arm926ejs/u-boot.lds @@ -67,7 +67,7 @@ SECTIONS __bss_start = .; *(.bss) . = ALIGN(4); - _end = .; + __bss_end__ = .; } /DISCARD/ : { *(.dynstr*) } diff --git a/arch/arm/cpu/arm946es/start.S b/arch/arm/cpu/arm946es/start.S index 296effc7b7..1b6b188516 100644 --- a/arch/arm/cpu/arm946es/start.S +++ b/arch/arm/cpu/arm946es/start.S @@ -103,7 +103,7 @@ _bss_start_ofs: .globl _bss_end_ofs _bss_end_ofs: - .word _end - _start + .word __bss_end__ - _start #ifdef CONFIG_USE_IRQ /* IRQ stack memory (calculated at run-time) */ diff --git a/arch/arm/cpu/arm946es/u-boot.lds b/arch/arm/cpu/arm946es/u-boot.lds index eb91979711..fe4a646dfd 100644 --- a/arch/arm/cpu/arm946es/u-boot.lds +++ b/arch/arm/cpu/arm946es/u-boot.lds @@ -67,7 +67,7 @@ SECTIONS __bss_start = .; *(.bss) . = ALIGN(4); - _end = .; + __bss_end__ = .; } /DISCARD/ : { *(.dynstr*) } diff --git a/arch/arm/cpu/arm_intcm/start.S b/arch/arm/cpu/arm_intcm/start.S index e8518e261d..da2c265fcb 100644 --- a/arch/arm/cpu/arm_intcm/start.S +++ b/arch/arm/cpu/arm_intcm/start.S @@ -99,7 +99,7 @@ _bss_start_ofs: .globl _bss_end_ofs _bss_end_ofs: - .word _end - _start + .word __bss_end__ - _start #ifdef CONFIG_USE_IRQ /* IRQ stack memory (calculated at run-time) */ diff --git a/arch/arm/cpu/arm_intcm/u-boot.lds b/arch/arm/cpu/arm_intcm/u-boot.lds index 3b5c18d72a..899fab06ff 100644 --- a/arch/arm/cpu/arm_intcm/u-boot.lds +++ b/arch/arm/cpu/arm_intcm/u-boot.lds @@ -67,7 +67,7 @@ SECTIONS __bss_start = .; *(.bss) . = ALIGN(4); - _end = .; + __bss_end__ = .; } /DISCARD/ : { *(.dynstr*) } diff --git a/arch/arm/cpu/armv7/start.S b/arch/arm/cpu/armv7/start.S index cb4f92f3a9..bc7bae85c0 100644 --- a/arch/arm/cpu/armv7/start.S +++ b/arch/arm/cpu/armv7/start.S @@ -79,7 +79,7 @@ _bss_start_ofs: .globl _bss_end_ofs _bss_end_ofs: - .word _end - _start + .word __bss_end__ - _start #ifdef CONFIG_USE_IRQ /* IRQ stack memory (calculated at run-time) */ diff --git a/arch/arm/cpu/armv7/u-boot.lds b/arch/arm/cpu/armv7/u-boot.lds index 5725c30c69..de8024459d 100644 --- a/arch/arm/cpu/armv7/u-boot.lds +++ b/arch/arm/cpu/armv7/u-boot.lds @@ -70,7 +70,7 @@ SECTIONS __bss_start = .; *(.bss) . = ALIGN(4); - _end = .; + __bss_end__ = .; } /DISCARD/ : { *(.dynstr*) } diff --git a/arch/arm/cpu/ixp/start.S b/arch/arm/cpu/ixp/start.S index f71a398d31..f8bfed7cc6 100644 --- a/arch/arm/cpu/ixp/start.S +++ b/arch/arm/cpu/ixp/start.S @@ -110,7 +110,7 @@ _bss_start_ofs: .globl _bss_end_ofs _bss_end_ofs: - .word _end - _start + .word __bss_end__ - _start #ifdef CONFIG_USE_IRQ /* IRQ stack memory (calculated at run-time) */ diff --git a/arch/arm/cpu/ixp/u-boot.lds b/arch/arm/cpu/ixp/u-boot.lds index a55eb8a509..7029c6c7d9 100644 --- a/arch/arm/cpu/ixp/u-boot.lds +++ b/arch/arm/cpu/ixp/u-boot.lds @@ -67,7 +67,7 @@ SECTIONS __bss_start = .; *(.bss) . = ALIGN(4); - _end = .; + __bss_end__ = .; } /DISCARD/ : { *(.dynstr*) } diff --git a/arch/arm/cpu/lh7a40x/start.S b/arch/arm/cpu/lh7a40x/start.S index 1457427aae..bd821a270d 100644 --- a/arch/arm/cpu/lh7a40x/start.S +++ b/arch/arm/cpu/lh7a40x/start.S @@ -87,7 +87,7 @@ _bss_start_ofs: .globl _bss_end_ofs _bss_end_ofs: - .word _end - _start + .word __bss_end__ - _start #ifdef CONFIG_USE_IRQ /* IRQ stack memory (calculated at run-time) */ diff --git a/arch/arm/cpu/lh7a40x/u-boot.lds b/arch/arm/cpu/lh7a40x/u-boot.lds index 463237d916..b15ab1e572 100644 --- a/arch/arm/cpu/lh7a40x/u-boot.lds +++ b/arch/arm/cpu/lh7a40x/u-boot.lds @@ -67,7 +67,7 @@ SECTIONS __bss_start = .; *(.bss) . = ALIGN(4); - _end = .; + __bss_end__ = .; } /DISCARD/ : { *(.dynstr*) } diff --git a/arch/arm/cpu/pxa/start.S b/arch/arm/cpu/pxa/start.S index d2d391e6d2..ca072c4744 100644 --- a/arch/arm/cpu/pxa/start.S +++ b/arch/arm/cpu/pxa/start.S @@ -104,7 +104,7 @@ _bss_start_ofs: .globl _bss_end_ofs _bss_end_ofs: - .word _end - _start + .word __bss_end__ - _start #ifdef CONFIG_USE_IRQ /* IRQ stack memory (calculated at run-time) */ diff --git a/arch/arm/cpu/pxa/u-boot.lds b/arch/arm/cpu/pxa/u-boot.lds index 0818d0b6ea..dfb9b77535 100644 --- a/arch/arm/cpu/pxa/u-boot.lds +++ b/arch/arm/cpu/pxa/u-boot.lds @@ -67,7 +67,7 @@ SECTIONS __bss_start = .; *(.bss) . = ALIGN(4); - _end = .; + __bss_end__ = .; } /DISCARD/ : { *(.dynstr*) } diff --git a/arch/arm/cpu/s3c44b0/start.S b/arch/arm/cpu/s3c44b0/start.S index 9c9c3b3b88..ac1c4fb58e 100644 --- a/arch/arm/cpu/s3c44b0/start.S +++ b/arch/arm/cpu/s3c44b0/start.S @@ -78,7 +78,7 @@ _bss_start_ofs: .globl _bss_end_ofs _bss_end_ofs: - .word _end - _start + .word __bss_end__ - _start #ifdef CONFIG_USE_IRQ /* IRQ stack memory (calculated at run-time) */ diff --git a/arch/arm/cpu/s3c44b0/u-boot.lds b/arch/arm/cpu/s3c44b0/u-boot.lds index ac29440182..797edbc943 100644 --- a/arch/arm/cpu/s3c44b0/u-boot.lds +++ b/arch/arm/cpu/s3c44b0/u-boot.lds @@ -67,7 +67,7 @@ SECTIONS __bss_start = .; *(.bss) . = ALIGN(4); - _end = .; + __bss_end__ = .; } /DISCARD/ : { *(.dynstr*) } diff --git a/arch/arm/cpu/sa1100/start.S b/arch/arm/cpu/sa1100/start.S index 815d70488b..5cfe19bcc5 100644 --- a/arch/arm/cpu/sa1100/start.S +++ b/arch/arm/cpu/sa1100/start.S @@ -88,7 +88,7 @@ _bss_start_ofs: .globl _bss_end_ofs _bss_end_ofs: - .word _end - _start + .word __bss_end__ - _start #ifdef CONFIG_USE_IRQ /* IRQ stack memory (calculated at run-time) */ diff --git a/arch/arm/cpu/sa1100/u-boot.lds b/arch/arm/cpu/sa1100/u-boot.lds index fa6d05cdf7..0ac13296b9 100644 --- a/arch/arm/cpu/sa1100/u-boot.lds +++ b/arch/arm/cpu/sa1100/u-boot.lds @@ -70,7 +70,7 @@ SECTIONS __bss_start = .; *(.bss) . = ALIGN(4); - _end = .; + __bss_end__ = .; } /DISCARD/ : { *(.dynstr*) } diff --git a/arch/avr32/cpu/start.S b/arch/avr32/cpu/start.S index 97140e93eb..71cbc524c9 100644 --- a/arch/avr32/cpu/start.S +++ b/arch/avr32/cpu/start.S @@ -244,7 +244,7 @@ relocate_code: /* zero out .bss */ mov r0, 0 mov r1, 0 - lda.w r9, _end + lda.w r9, __bss_end__ sub r9, r8 1: st.d r10++, r0 sub r9, 8 diff --git a/arch/avr32/include/asm/sections.h b/arch/avr32/include/asm/sections.h index fe819b2db6..3f157888ee 100644 --- a/arch/avr32/include/asm/sections.h +++ b/arch/avr32/include/asm/sections.h @@ -27,6 +27,6 @@ extern char _text[], _etext[]; extern char _data[], __data_lma[], _edata[], __edata_lma[]; extern char __got_start[], __got_lma[], __got_end[]; -extern char _end[]; +extern char __bss_end__[]; #endif /* __ASM_AVR32_SECTIONS_H */ diff --git a/arch/avr32/lib/board.c b/arch/avr32/lib/board.c index 8b56237f18..5edef8fd39 100644 --- a/arch/avr32/lib/board.c +++ b/arch/avr32/lib/board.c @@ -118,7 +118,7 @@ static int display_banner (void) printf ("\n\n%s\n\n", version_string); printf ("U-Boot code: %08lx -> %08lx data: %08lx -> %08lx\n", (unsigned long)_text, (unsigned long)_etext, - (unsigned long)_data, (unsigned long)_end); + (unsigned long)_data, (unsigned long)__bss_end__); return 0; } @@ -190,7 +190,7 @@ void board_init_f(ulong board_type) * - stack */ addr = CONFIG_SYS_SDRAM_BASE + sdram_size; - monitor_len = _end - _text; + monitor_len = __bss_end__ - _text; /* * Reserve memory for u-boot code, data and bss. diff --git a/arch/m68k/lib/board.c b/arch/m68k/lib/board.c index 7867ba54b7..f824b34252 100644 --- a/arch/m68k/lib/board.c +++ b/arch/m68k/lib/board.c @@ -76,7 +76,7 @@ static char *failed = "*** failed ***\n"; #include extern ulong __init_end; -extern ulong _end; +extern ulong __bss_end__; extern void timer_init(void); @@ -252,7 +252,7 @@ board_init_f (ulong bootflag) * - monitor code * - board info struct */ - len = (ulong)&_end - CONFIG_SYS_MONITOR_BASE; + len = (ulong)&__bss_end__ - CONFIG_SYS_MONITOR_BASE; addr = CONFIG_SYS_SDRAM_BASE + gd->ram_size; diff --git a/arch/nios2/cpu/start.S b/arch/nios2/cpu/start.S index 9b0f52da56..bf5d672498 100644 --- a/arch/nios2/cpu/start.S +++ b/arch/nios2/cpu/start.S @@ -100,12 +100,12 @@ _cur: movhi r5, %hi(_cur - _start) 3: /* ZERO BSS/SBSS -- bss and sbss are assumed to be adjacent - * and between __bss_start and _end. + * and between __bss_start and __bss_end__. */ movhi r5, %hi(__bss_start) ori r5, r5, %lo(__bss_start) - movhi r6, %hi(_end) - ori r6, r6, %lo(_end) + movhi r6, %hi(__bss_end__) + ori r6, r6, %lo(__bss_end__) beq r5, r6, 5f 4: stwio r0, 0(r5) diff --git a/arch/nios2/cpu/u-boot.lds b/arch/nios2/cpu/u-boot.lds index fe4a2ebcc7..4856bd368d 100644 --- a/arch/nios2/cpu/u-boot.lds +++ b/arch/nios2/cpu/u-boot.lds @@ -103,7 +103,7 @@ SECTIONS *(.scommon) } . = ALIGN(4); - _end = .; + __bss_end__ = .; PROVIDE (end = .); /* DEBUG -- symbol table, string table, etc. etc. diff --git a/arch/powerpc/cpu/74xx_7xx/start.S b/arch/powerpc/cpu/74xx_7xx/start.S index 985e1ce70f..f6011fcaa8 100644 --- a/arch/powerpc/cpu/74xx_7xx/start.S +++ b/arch/powerpc/cpu/74xx_7xx/start.S @@ -77,7 +77,7 @@ GOT_ENTRY(transfer_to_handler) GOT_ENTRY(__init_end) - GOT_ENTRY(_end) + GOT_ENTRY(__bss_end__) GOT_ENTRY(__bss_start) END_GOT @@ -722,7 +722,7 @@ in_ram: * Now clear BSS segment */ lwz r3,GOT(__bss_start) - lwz r4,GOT(_end) + lwz r4,GOT(__bss_end__) cmplw 0, r3, r4 beq 6f diff --git a/arch/powerpc/cpu/74xx_7xx/u-boot.lds b/arch/powerpc/cpu/74xx_7xx/u-boot.lds index 8429f33192..24823cd20f 100644 --- a/arch/powerpc/cpu/74xx_7xx/u-boot.lds +++ b/arch/powerpc/cpu/74xx_7xx/u-boot.lds @@ -87,6 +87,6 @@ SECTIONS *(COMMON) . = ALIGN(4); } - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); } diff --git a/arch/powerpc/cpu/mpc512x/start.S b/arch/powerpc/cpu/mpc512x/start.S index 10557cf20f..9c2e4885de 100644 --- a/arch/powerpc/cpu/mpc512x/start.S +++ b/arch/powerpc/cpu/mpc512x/start.S @@ -79,7 +79,7 @@ GOT_ENTRY(transfer_to_handler) GOT_ENTRY(__init_end) - GOT_ENTRY(_end) + GOT_ENTRY(__bss_end__) GOT_ENTRY(__bss_start) END_GOT @@ -626,7 +626,7 @@ clear_bss: * Now clear BSS segment */ lwz r3,GOT(__bss_start) - lwz r4,GOT(_end) + lwz r4,GOT(__bss_end__) cmplw 0, r3, r4 beq 6f diff --git a/arch/powerpc/cpu/mpc512x/u-boot.lds b/arch/powerpc/cpu/mpc512x/u-boot.lds index ab9303f92a..7a4d9270df 100644 --- a/arch/powerpc/cpu/mpc512x/u-boot.lds +++ b/arch/powerpc/cpu/mpc512x/u-boot.lds @@ -82,7 +82,7 @@ SECTIONS *(COMMON) . = ALIGN(4); } - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); } ENTRY(_start) diff --git a/arch/powerpc/cpu/mpc5xx/start.S b/arch/powerpc/cpu/mpc5xx/start.S index 3dbd23d0b8..cc11c8fc52 100644 --- a/arch/powerpc/cpu/mpc5xx/start.S +++ b/arch/powerpc/cpu/mpc5xx/start.S @@ -70,7 +70,7 @@ GOT_ENTRY(transfer_to_handler) GOT_ENTRY(__init_end) - GOT_ENTRY(_end) + GOT_ENTRY(__bss_end__) GOT_ENTRY(__bss_start) END_GOT @@ -466,7 +466,7 @@ clear_bss: * Now clear BSS segment */ lwz r3,GOT(__bss_start) - lwz r4,GOT(_end) + lwz r4,GOT(__bss_end__) cmplw 0, r3, r4 beq 6f diff --git a/arch/powerpc/cpu/mpc5xx/u-boot.lds b/arch/powerpc/cpu/mpc5xx/u-boot.lds index 69bd7aa8e6..e02b213d28 100644 --- a/arch/powerpc/cpu/mpc5xx/u-boot.lds +++ b/arch/powerpc/cpu/mpc5xx/u-boot.lds @@ -91,7 +91,7 @@ SECTIONS . = ALIGN(4); } - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); . = env_start; .ppcenv : diff --git a/arch/powerpc/cpu/mpc5xxx/start.S b/arch/powerpc/cpu/mpc5xxx/start.S index 38c0bd7c17..192aa506a8 100644 --- a/arch/powerpc/cpu/mpc5xxx/start.S +++ b/arch/powerpc/cpu/mpc5xxx/start.S @@ -70,7 +70,7 @@ GOT_ENTRY(transfer_to_handler) GOT_ENTRY(__init_end) - GOT_ENTRY(_end) + GOT_ENTRY(__bss_end__) GOT_ENTRY(__bss_start) END_GOT @@ -681,7 +681,7 @@ clear_bss: * Now clear BSS segment */ lwz r3,GOT(__bss_start) - lwz r4,GOT(_end) + lwz r4,GOT(__bss_end__) cmplw 0, r3, r4 beq 6f diff --git a/arch/powerpc/cpu/mpc5xxx/u-boot-customlayout.lds b/arch/powerpc/cpu/mpc5xxx/u-boot-customlayout.lds index bbf0f1625d..0c6c54e10a 100644 --- a/arch/powerpc/cpu/mpc5xxx/u-boot-customlayout.lds +++ b/arch/powerpc/cpu/mpc5xxx/u-boot-customlayout.lds @@ -91,6 +91,6 @@ SECTIONS *(COMMON) . = ALIGN(4); } - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); } diff --git a/arch/powerpc/cpu/mpc5xxx/u-boot.lds b/arch/powerpc/cpu/mpc5xxx/u-boot.lds index 7e3b70aed0..5dcaec1820 100644 --- a/arch/powerpc/cpu/mpc5xxx/u-boot.lds +++ b/arch/powerpc/cpu/mpc5xxx/u-boot.lds @@ -85,6 +85,6 @@ SECTIONS *(.sbss*) . = ALIGN(4); } - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); } diff --git a/arch/powerpc/cpu/mpc8220/start.S b/arch/powerpc/cpu/mpc8220/start.S index ca4267870d..300b35c0c4 100644 --- a/arch/powerpc/cpu/mpc8220/start.S +++ b/arch/powerpc/cpu/mpc8220/start.S @@ -69,7 +69,7 @@ GOT_ENTRY(transfer_to_handler) GOT_ENTRY(__init_end) - GOT_ENTRY(_end) + GOT_ENTRY(__bss_end__) GOT_ENTRY(__bss_start) END_GOT @@ -654,7 +654,7 @@ clear_bss: * Now clear BSS segment */ lwz r3,GOT(__bss_start) - lwz r4,GOT(_end) + lwz r4,GOT(__bss_end__) cmplw 0, r3, r4 beq 6f diff --git a/arch/powerpc/cpu/mpc8220/u-boot.lds b/arch/powerpc/cpu/mpc8220/u-boot.lds index 72ff671a4a..39bb42e1c9 100644 --- a/arch/powerpc/cpu/mpc8220/u-boot.lds +++ b/arch/powerpc/cpu/mpc8220/u-boot.lds @@ -84,6 +84,6 @@ SECTIONS *(COMMON) . = ALIGN(4); } - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); } diff --git a/arch/powerpc/cpu/mpc824x/start.S b/arch/powerpc/cpu/mpc824x/start.S index 0dd1300386..fc4e922d63 100644 --- a/arch/powerpc/cpu/mpc824x/start.S +++ b/arch/powerpc/cpu/mpc824x/start.S @@ -77,7 +77,7 @@ GOT_ENTRY(transfer_to_handler) GOT_ENTRY(__init_end) - GOT_ENTRY(_end) + GOT_ENTRY(__bss_end__) GOT_ENTRY(__bss_start) #if defined(CONFIG_FADS) GOT_ENTRY(environment) @@ -596,7 +596,7 @@ clear_bss: * Now clear BSS segment */ lwz r3,GOT(__bss_start) - lwz r4,GOT(_end) + lwz r4,GOT(__bss_end__) cmplw 0, r3, r4 beq 6f diff --git a/arch/powerpc/cpu/mpc824x/u-boot.lds b/arch/powerpc/cpu/mpc824x/u-boot.lds index 3b9299c0da..b30ce76e02 100644 --- a/arch/powerpc/cpu/mpc824x/u-boot.lds +++ b/arch/powerpc/cpu/mpc824x/u-boot.lds @@ -85,6 +85,6 @@ SECTIONS *(COMMON) . = ALIGN(4); } - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); } diff --git a/arch/powerpc/cpu/mpc8260/start.S b/arch/powerpc/cpu/mpc8260/start.S index 255a15eae4..702546eec5 100644 --- a/arch/powerpc/cpu/mpc8260/start.S +++ b/arch/powerpc/cpu/mpc8260/start.S @@ -70,7 +70,7 @@ GOT_ENTRY(transfer_to_handler) GOT_ENTRY(__init_end) - GOT_ENTRY(_end) + GOT_ENTRY(__bss_end__) GOT_ENTRY(__bss_start) #if defined(CONFIG_HYMOD) GOT_ENTRY(environment) @@ -927,7 +927,7 @@ clear_bss: */ lwz r4,GOT(environment) #else - lwz r4,GOT(_end) + lwz r4,GOT(__bss_end__) #endif cmplw 0, r3, r4 diff --git a/arch/powerpc/cpu/mpc8260/u-boot.lds b/arch/powerpc/cpu/mpc8260/u-boot.lds index c76555ef80..60b71ecd70 100644 --- a/arch/powerpc/cpu/mpc8260/u-boot.lds +++ b/arch/powerpc/cpu/mpc8260/u-boot.lds @@ -84,6 +84,6 @@ SECTIONS *(COMMON) . = ALIGN(4); } - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); } diff --git a/arch/powerpc/cpu/mpc83xx/start.S b/arch/powerpc/cpu/mpc83xx/start.S index 460ac9aabb..7e60315c3f 100644 --- a/arch/powerpc/cpu/mpc83xx/start.S +++ b/arch/powerpc/cpu/mpc83xx/start.S @@ -72,7 +72,7 @@ START_GOT GOT_ENTRY(_GOT2_TABLE_) GOT_ENTRY(__bss_start) - GOT_ENTRY(_end) + GOT_ENTRY(__bss_end__) #ifndef CONFIG_NAND_SPL GOT_ENTRY(_FIXUP_TABLE_) @@ -977,7 +977,7 @@ clear_bss: */ lwz r4,GOT(environment) #else - lwz r4,GOT(_end) + lwz r4,GOT(__bss_end__) #endif cmplw 0, r3, r4 diff --git a/arch/powerpc/cpu/mpc83xx/u-boot.lds b/arch/powerpc/cpu/mpc83xx/u-boot.lds index 752a175b1a..2f4b9ad557 100644 --- a/arch/powerpc/cpu/mpc83xx/u-boot.lds +++ b/arch/powerpc/cpu/mpc83xx/u-boot.lds @@ -83,7 +83,7 @@ SECTIONS *(COMMON) . = ALIGN(4); } - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); } ENTRY(_start) diff --git a/arch/powerpc/cpu/mpc85xx/start.S b/arch/powerpc/cpu/mpc85xx/start.S index fa98af64b5..57774933a3 100644 --- a/arch/powerpc/cpu/mpc85xx/start.S +++ b/arch/powerpc/cpu/mpc85xx/start.S @@ -66,7 +66,7 @@ #endif GOT_ENTRY(__init_end) - GOT_ENTRY(_end) + GOT_ENTRY(__bss_end__) GOT_ENTRY(__bss_start) END_GOT @@ -1050,7 +1050,7 @@ clear_bss: * Now clear BSS segment */ lwz r3,GOT(__bss_start) - lwz r4,GOT(_end) + lwz r4,GOT(__bss_end__) cmplw 0,r3,r4 beq 6f diff --git a/arch/powerpc/cpu/mpc85xx/u-boot-nand.lds b/arch/powerpc/cpu/mpc85xx/u-boot-nand.lds index fa2088bb37..04bc73170a 100644 --- a/arch/powerpc/cpu/mpc85xx/u-boot-nand.lds +++ b/arch/powerpc/cpu/mpc85xx/u-boot-nand.lds @@ -101,6 +101,6 @@ SECTIONS } :bss . = ALIGN(4); - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); } diff --git a/arch/powerpc/cpu/mpc85xx/u-boot-nand_spl.lds b/arch/powerpc/cpu/mpc85xx/u-boot-nand_spl.lds index b10e0f9eee..8410bd7979 100644 --- a/arch/powerpc/cpu/mpc85xx/u-boot-nand_spl.lds +++ b/arch/powerpc/cpu/mpc85xx/u-boot-nand_spl.lds @@ -62,6 +62,6 @@ SECTIONS *(.sbss*) *(.bss*) } - _end = .; + __bss_end__ = .; } ASSERT(__init_end <= 0xfff00ffc, "NAND bootstrap too big"); diff --git a/arch/powerpc/cpu/mpc85xx/u-boot.lds b/arch/powerpc/cpu/mpc85xx/u-boot.lds index 506c7f212b..efe34b774d 100644 --- a/arch/powerpc/cpu/mpc85xx/u-boot.lds +++ b/arch/powerpc/cpu/mpc85xx/u-boot.lds @@ -125,6 +125,6 @@ SECTIONS } :bss . = ALIGN(4); - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); } diff --git a/arch/powerpc/cpu/mpc86xx/start.S b/arch/powerpc/cpu/mpc86xx/start.S index 4c29de61a2..3e3c21eefd 100644 --- a/arch/powerpc/cpu/mpc86xx/start.S +++ b/arch/powerpc/cpu/mpc86xx/start.S @@ -66,7 +66,7 @@ GOT_ENTRY(transfer_to_handler) GOT_ENTRY(__init_end) - GOT_ENTRY(_end) + GOT_ENTRY(__bss_end__) GOT_ENTRY(__bss_start) END_GOT @@ -740,7 +740,7 @@ in_ram: * Now clear BSS segment */ lwz r3,GOT(__bss_start) - lwz r4,GOT(_end) + lwz r4,GOT(__bss_end__) cmplw 0, r3, r4 beq 6f diff --git a/arch/powerpc/cpu/mpc86xx/u-boot.lds b/arch/powerpc/cpu/mpc86xx/u-boot.lds index c550ef5004..121e529876 100644 --- a/arch/powerpc/cpu/mpc86xx/u-boot.lds +++ b/arch/powerpc/cpu/mpc86xx/u-boot.lds @@ -88,6 +88,6 @@ SECTIONS *(COMMON) . = ALIGN(4); } - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); } diff --git a/arch/powerpc/cpu/mpc8xx/start.S b/arch/powerpc/cpu/mpc8xx/start.S index 6a16c26d66..fe3daa2b9f 100644 --- a/arch/powerpc/cpu/mpc8xx/start.S +++ b/arch/powerpc/cpu/mpc8xx/start.S @@ -77,7 +77,7 @@ GOT_ENTRY(transfer_to_handler) GOT_ENTRY(__init_end) - GOT_ENTRY(_end) + GOT_ENTRY(__bss_end__) GOT_ENTRY(__bss_start) END_GOT @@ -597,7 +597,7 @@ clear_bss: * Now clear BSS segment */ lwz r3,GOT(__bss_start) - lwz r4,GOT(_end) + lwz r4,GOT(__bss_end__) cmplw 0, r3, r4 beq 6f diff --git a/arch/powerpc/cpu/ppc4xx/start.S b/arch/powerpc/cpu/ppc4xx/start.S index 2218508388..b43e22c8f0 100644 --- a/arch/powerpc/cpu/ppc4xx/start.S +++ b/arch/powerpc/cpu/ppc4xx/start.S @@ -248,7 +248,7 @@ GOT_ENTRY(transfer_to_handler) GOT_ENTRY(__init_end) - GOT_ENTRY(_end) + GOT_ENTRY(__bss_end__) GOT_ENTRY(__bss_start) END_GOT #endif /* CONFIG_NAND_SPL */ @@ -1624,7 +1624,7 @@ clear_bss: * Now clear BSS segment */ lwz r3,GOT(__bss_start) - lwz r4,GOT(_end) + lwz r4,GOT(__bss_end__) cmplw 0, r3, r4 beq 7f diff --git a/arch/powerpc/cpu/ppc4xx/u-boot.lds b/arch/powerpc/cpu/ppc4xx/u-boot.lds index 656f59a582..2466b79594 100644 --- a/arch/powerpc/cpu/ppc4xx/u-boot.lds +++ b/arch/powerpc/cpu/ppc4xx/u-boot.lds @@ -140,6 +140,6 @@ SECTIONS } :bss . = ALIGN(4); - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); } diff --git a/arch/powerpc/lib/board.c b/arch/powerpc/lib/board.c index b88cf6b67d..4719f8c696 100644 --- a/arch/powerpc/lib/board.c +++ b/arch/powerpc/lib/board.c @@ -123,7 +123,7 @@ DECLARE_GLOBAL_DATA_PTR; #endif extern ulong __init_end; -extern ulong _end; +extern ulong __bss_end__; ulong monitor_flash_len; #if defined(CONFIG_CMD_BEDBUG) @@ -403,7 +403,7 @@ void board_init_f (ulong bootflag) * - monitor code * - board info struct */ - len = (ulong)&_end - CONFIG_SYS_MONITOR_BASE; + len = (ulong)&__bss_end__ - CONFIG_SYS_MONITOR_BASE; /* * Subtract specified amount of memory to hide so that it won't diff --git a/arch/sh/cpu/sh2/u-boot.lds b/arch/sh/cpu/sh2/u-boot.lds index 7c0a18d62c..b86a82297f 100644 --- a/arch/sh/cpu/sh2/u-boot.lds +++ b/arch/sh/cpu/sh2/u-boot.lds @@ -91,5 +91,5 @@ SECTIONS } PROVIDE (bss_end = .); - PROVIDE (_end = .); + PROVIDE (__bss_end__ = .); } diff --git a/arch/sh/cpu/sh3/u-boot.lds b/arch/sh/cpu/sh3/u-boot.lds index 271624636b..9bf8503640 100644 --- a/arch/sh/cpu/sh3/u-boot.lds +++ b/arch/sh/cpu/sh3/u-boot.lds @@ -98,5 +98,5 @@ SECTIONS } PROVIDE (bss_end = .); - PROVIDE (_end = .); + PROVIDE (__bss_end__ = .); } diff --git a/arch/sh/cpu/sh4/u-boot.lds b/arch/sh/cpu/sh4/u-boot.lds index 0f42325aff..d9c70bce09 100644 --- a/arch/sh/cpu/sh4/u-boot.lds +++ b/arch/sh/cpu/sh4/u-boot.lds @@ -95,5 +95,5 @@ SECTIONS } PROVIDE (bss_end = .); - PROVIDE (_end = .); + PROVIDE (__bss_end__ = .); } diff --git a/board/BuS/EB+MCF-EV123/u-boot.lds b/board/BuS/EB+MCF-EV123/u-boot.lds index 0fa633a1fe..e0359e3cb6 100644 --- a/board/BuS/EB+MCF-EV123/u-boot.lds +++ b/board/BuS/EB+MCF-EV123/u-boot.lds @@ -134,6 +134,6 @@ SECTIONS . = ALIGN(4); _ebss = .; } - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); } diff --git a/board/LEOX/elpt860/u-boot.lds b/board/LEOX/elpt860/u-boot.lds index 9077e69717..45206ca3bd 100644 --- a/board/LEOX/elpt860/u-boot.lds +++ b/board/LEOX/elpt860/u-boot.lds @@ -109,6 +109,6 @@ SECTIONS *(COMMON) . = ALIGN(4); } - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); } diff --git a/board/LEOX/elpt860/u-boot.lds.debug b/board/LEOX/elpt860/u-boot.lds.debug index 287fc2015d..92901b1b94 100644 --- a/board/LEOX/elpt860/u-boot.lds.debug +++ b/board/LEOX/elpt860/u-boot.lds.debug @@ -134,6 +134,6 @@ SECTIONS *(.bss) *(COMMON) } - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); } diff --git a/board/RPXClassic/u-boot.lds b/board/RPXClassic/u-boot.lds index fbd901a3c3..05cc2338ab 100644 --- a/board/RPXClassic/u-boot.lds +++ b/board/RPXClassic/u-boot.lds @@ -90,6 +90,6 @@ SECTIONS *(COMMON) . = ALIGN(4); } - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); } diff --git a/board/RPXClassic/u-boot.lds.debug b/board/RPXClassic/u-boot.lds.debug index c21890542f..99c48f28d4 100644 --- a/board/RPXClassic/u-boot.lds.debug +++ b/board/RPXClassic/u-boot.lds.debug @@ -130,6 +130,6 @@ SECTIONS *(.bss) *(COMMON) } - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); } diff --git a/board/RPXlite/u-boot.lds b/board/RPXlite/u-boot.lds index fbd901a3c3..05cc2338ab 100644 --- a/board/RPXlite/u-boot.lds +++ b/board/RPXlite/u-boot.lds @@ -90,6 +90,6 @@ SECTIONS *(COMMON) . = ALIGN(4); } - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); } diff --git a/board/RPXlite/u-boot.lds.debug b/board/RPXlite/u-boot.lds.debug index c21890542f..99c48f28d4 100644 --- a/board/RPXlite/u-boot.lds.debug +++ b/board/RPXlite/u-boot.lds.debug @@ -130,6 +130,6 @@ SECTIONS *(.bss) *(COMMON) } - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); } diff --git a/board/RPXlite_dw/u-boot.lds b/board/RPXlite_dw/u-boot.lds index fbd901a3c3..05cc2338ab 100644 --- a/board/RPXlite_dw/u-boot.lds +++ b/board/RPXlite_dw/u-boot.lds @@ -90,6 +90,6 @@ SECTIONS *(COMMON) . = ALIGN(4); } - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); } diff --git a/board/RPXlite_dw/u-boot.lds.debug b/board/RPXlite_dw/u-boot.lds.debug index a78d0b76be..4491edd944 100644 --- a/board/RPXlite_dw/u-boot.lds.debug +++ b/board/RPXlite_dw/u-boot.lds.debug @@ -130,6 +130,6 @@ SECTIONS *(.bss) *(COMMON) } - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); } diff --git a/board/RRvision/u-boot.lds b/board/RRvision/u-boot.lds index 5232e20680..3e7853a2a0 100644 --- a/board/RRvision/u-boot.lds +++ b/board/RRvision/u-boot.lds @@ -95,6 +95,6 @@ SECTIONS *(COMMON) . = ALIGN(4); } - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); } diff --git a/board/actux1/u-boot.lds b/board/actux1/u-boot.lds index 5c1ece79c8..8be2b20c34 100644 --- a/board/actux1/u-boot.lds +++ b/board/actux1/u-boot.lds @@ -66,5 +66,5 @@ SECTIONS *(.bss) . = ALIGN(4); } - _end =.; + __bss_end__ =.; } diff --git a/board/actux2/u-boot.lds b/board/actux2/u-boot.lds index 707c027ab5..a405f557ed 100644 --- a/board/actux2/u-boot.lds +++ b/board/actux2/u-boot.lds @@ -71,5 +71,5 @@ SECTIONS *(.bss) . = ALIGN(4); } - _end =.; + __bss_end__ =.; } diff --git a/board/actux3/u-boot.lds b/board/actux3/u-boot.lds index 497ab97690..d3463cd8e6 100644 --- a/board/actux3/u-boot.lds +++ b/board/actux3/u-boot.lds @@ -71,5 +71,5 @@ SECTIONS *(.bss) . = ALIGN(4); } - _end =.; + __bss_end__ =.; } diff --git a/board/adder/u-boot.lds b/board/adder/u-boot.lds index 26c9a22358..661a94ab15 100644 --- a/board/adder/u-boot.lds +++ b/board/adder/u-boot.lds @@ -86,7 +86,7 @@ SECTIONS *(COMMON) . = ALIGN(4); } - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); } ENTRY(_start) diff --git a/board/altera/nios2-generic/u-boot.lds b/board/altera/nios2-generic/u-boot.lds index d4be077bbd..88ced629ec 100644 --- a/board/altera/nios2-generic/u-boot.lds +++ b/board/altera/nios2-generic/u-boot.lds @@ -104,7 +104,7 @@ SECTIONS *(.scommon) } . = ALIGN(4); - _end = .; + __bss_end__ = .; PROVIDE (end = .); /* DEBUG -- symbol table, string table, etc. etc. diff --git a/board/amcc/acadia/u-boot-nand.lds b/board/amcc/acadia/u-boot-nand.lds index c2a04c7bfc..ab67de2f76 100644 --- a/board/amcc/acadia/u-boot-nand.lds +++ b/board/amcc/acadia/u-boot-nand.lds @@ -98,6 +98,6 @@ SECTIONS . = ALIGN(4); } - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); } diff --git a/board/amcc/bamboo/u-boot-nand.lds b/board/amcc/bamboo/u-boot-nand.lds index c34bb62cc4..3ad87095a1 100644 --- a/board/amcc/bamboo/u-boot-nand.lds +++ b/board/amcc/bamboo/u-boot-nand.lds @@ -99,6 +99,6 @@ SECTIONS . = ALIGN(4); } - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); } diff --git a/board/amcc/canyonlands/u-boot-nand.lds b/board/amcc/canyonlands/u-boot-nand.lds index 534d6ddf4c..76f89f188d 100644 --- a/board/amcc/canyonlands/u-boot-nand.lds +++ b/board/amcc/canyonlands/u-boot-nand.lds @@ -99,6 +99,6 @@ SECTIONS . = ALIGN(4); } - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); } diff --git a/board/amcc/kilauea/u-boot-nand.lds b/board/amcc/kilauea/u-boot-nand.lds index c2a04c7bfc..ab67de2f76 100644 --- a/board/amcc/kilauea/u-boot-nand.lds +++ b/board/amcc/kilauea/u-boot-nand.lds @@ -98,6 +98,6 @@ SECTIONS . = ALIGN(4); } - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); } diff --git a/board/amcc/sequoia/u-boot-nand.lds b/board/amcc/sequoia/u-boot-nand.lds index f3855c4dd7..07ae8b1291 100644 --- a/board/amcc/sequoia/u-boot-nand.lds +++ b/board/amcc/sequoia/u-boot-nand.lds @@ -99,6 +99,6 @@ SECTIONS . = ALIGN(4); } - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); } diff --git a/board/amcc/sequoia/u-boot-ram.lds b/board/amcc/sequoia/u-boot-ram.lds index ba76a77920..423400ac66 100644 --- a/board/amcc/sequoia/u-boot-ram.lds +++ b/board/amcc/sequoia/u-boot-ram.lds @@ -90,6 +90,6 @@ SECTIONS . = ALIGN(4); } - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); } diff --git a/board/amirix/ap1000/u-boot.lds b/board/amirix/ap1000/u-boot.lds index 356d019976..57fe1d9ce0 100644 --- a/board/amirix/ap1000/u-boot.lds +++ b/board/amirix/ap1000/u-boot.lds @@ -90,6 +90,6 @@ SECTIONS *(COMMON) . = ALIGN(4); } - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); } diff --git a/board/astro/mcf5373l/u-boot.lds b/board/astro/mcf5373l/u-boot.lds index 167a0a3f12..a1d8e0f6dc 100644 --- a/board/astro/mcf5373l/u-boot.lds +++ b/board/astro/mcf5373l/u-boot.lds @@ -137,6 +137,6 @@ SECTIONS . = ALIGN(4); _ebss = .; } - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); } diff --git a/board/atmel/atngw100/u-boot.lds b/board/atmel/atngw100/u-boot.lds index a7243f238f..0a1a8e1653 100644 --- a/board/atmel/atngw100/u-boot.lds +++ b/board/atmel/atngw100/u-boot.lds @@ -68,5 +68,5 @@ SECTIONS *(.bss.*) } . = ALIGN(8); - _end = .; + __bss_end__ = .; } diff --git a/board/atmel/atstk1000/u-boot.lds b/board/atmel/atstk1000/u-boot.lds index 86ef93927b..0e532f234e 100644 --- a/board/atmel/atstk1000/u-boot.lds +++ b/board/atmel/atstk1000/u-boot.lds @@ -68,5 +68,5 @@ SECTIONS *(.bss.*) } . = ALIGN(8); - _end = .; + __bss_end__ = .; } diff --git a/board/c2mon/u-boot.lds b/board/c2mon/u-boot.lds index 7a088c97d8..524c36eb4b 100644 --- a/board/c2mon/u-boot.lds +++ b/board/c2mon/u-boot.lds @@ -98,6 +98,6 @@ SECTIONS *(COMMON) . = ALIGN(4); } - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); } diff --git a/board/c2mon/u-boot.lds.debug b/board/c2mon/u-boot.lds.debug index 99098bffbe..c7711028ad 100644 --- a/board/c2mon/u-boot.lds.debug +++ b/board/c2mon/u-boot.lds.debug @@ -130,6 +130,6 @@ SECTIONS *(.bss) *(COMMON) } - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); } diff --git a/board/cm5200/u-boot.lds b/board/cm5200/u-boot.lds index 2d8492e6ff..cf73b11b35 100644 --- a/board/cm5200/u-boot.lds +++ b/board/cm5200/u-boot.lds @@ -115,6 +115,6 @@ SECTIONS *(COMMON) . = ALIGN(4); } - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); } diff --git a/board/cobra5272/u-boot.lds b/board/cobra5272/u-boot.lds index ec0f5e9faa..da14807a8d 100644 --- a/board/cobra5272/u-boot.lds +++ b/board/cobra5272/u-boot.lds @@ -137,6 +137,6 @@ SECTIONS . = ALIGN(4); _ebss = .; } - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); } diff --git a/board/cogent/u-boot.lds b/board/cogent/u-boot.lds index 42ed142ea2..e324f5c1e6 100644 --- a/board/cogent/u-boot.lds +++ b/board/cogent/u-boot.lds @@ -94,6 +94,6 @@ SECTIONS *(COMMON) . = ALIGN(4); } - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); } diff --git a/board/cogent/u-boot.lds.debug b/board/cogent/u-boot.lds.debug index c21890542f..99c48f28d4 100644 --- a/board/cogent/u-boot.lds.debug +++ b/board/cogent/u-boot.lds.debug @@ -130,6 +130,6 @@ SECTIONS *(.bss) *(COMMON) } - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); } diff --git a/board/cray/L1/u-boot.lds.debug b/board/cray/L1/u-boot.lds.debug index 0e9cdcf81d..fcf8ebbf8e 100644 --- a/board/cray/L1/u-boot.lds.debug +++ b/board/cray/L1/u-boot.lds.debug @@ -130,6 +130,6 @@ SECTIONS *(.bss) *(COMMON) } - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); } diff --git a/board/dave/PPChameleonEVB/u-boot.lds b/board/dave/PPChameleonEVB/u-boot.lds index 17f59193e9..20c32b73e3 100644 --- a/board/dave/PPChameleonEVB/u-boot.lds +++ b/board/dave/PPChameleonEVB/u-boot.lds @@ -123,6 +123,6 @@ SECTIONS } :bss . = ALIGN(4); - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); } diff --git a/board/earthlcd/favr-32-ezkit/u-boot.lds b/board/earthlcd/favr-32-ezkit/u-boot.lds index 0d413a0510..20e363130d 100644 --- a/board/earthlcd/favr-32-ezkit/u-boot.lds +++ b/board/earthlcd/favr-32-ezkit/u-boot.lds @@ -66,5 +66,5 @@ SECTIONS *(.bss.*) } . = ALIGN(8); - _end = .; + __bss_end__ = .; } diff --git a/board/eltec/mhpc/u-boot.lds b/board/eltec/mhpc/u-boot.lds index 4a96388f04..2fac727b84 100644 --- a/board/eltec/mhpc/u-boot.lds +++ b/board/eltec/mhpc/u-boot.lds @@ -90,6 +90,6 @@ SECTIONS *(COMMON) . = ALIGN(4); } - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); } diff --git a/board/eltec/mhpc/u-boot.lds.debug b/board/eltec/mhpc/u-boot.lds.debug index 99098bffbe..c7711028ad 100644 --- a/board/eltec/mhpc/u-boot.lds.debug +++ b/board/eltec/mhpc/u-boot.lds.debug @@ -130,6 +130,6 @@ SECTIONS *(.bss) *(COMMON) } - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); } diff --git a/board/emk/top860/u-boot.lds b/board/emk/top860/u-boot.lds index ae1a791b03..32dcbd3ef5 100644 --- a/board/emk/top860/u-boot.lds +++ b/board/emk/top860/u-boot.lds @@ -91,6 +91,6 @@ SECTIONS *(COMMON) . = ALIGN(4); } - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); } diff --git a/board/emk/top860/u-boot.lds.debug b/board/emk/top860/u-boot.lds.debug index 0f536f3142..39807d43cc 100644 --- a/board/emk/top860/u-boot.lds.debug +++ b/board/emk/top860/u-boot.lds.debug @@ -126,6 +126,6 @@ SECTIONS *(.bss) *(COMMON) } - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); } diff --git a/board/ep88x/u-boot.lds b/board/ep88x/u-boot.lds index 851348e65f..e2dd1c20f2 100644 --- a/board/ep88x/u-boot.lds +++ b/board/ep88x/u-boot.lds @@ -86,7 +86,7 @@ SECTIONS *(COMMON) . = ALIGN(4); } - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); } ENTRY(_start) diff --git a/board/esd/dasa_sim/u-boot.lds b/board/esd/dasa_sim/u-boot.lds index 3349fe8d40..2bf60f5804 100644 --- a/board/esd/dasa_sim/u-boot.lds +++ b/board/esd/dasa_sim/u-boot.lds @@ -97,6 +97,6 @@ SECTIONS *(COMMON) . = ALIGN(4); } - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); } diff --git a/board/esd/pmc440/u-boot-nand.lds b/board/esd/pmc440/u-boot-nand.lds index cf4229a22e..71f0fd2c3e 100644 --- a/board/esd/pmc440/u-boot-nand.lds +++ b/board/esd/pmc440/u-boot-nand.lds @@ -129,6 +129,6 @@ SECTIONS . = ALIGN(4); } - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); } diff --git a/board/esd/tasreg/u-boot.lds b/board/esd/tasreg/u-boot.lds index d4fd705ce1..27a6b93703 100644 --- a/board/esd/tasreg/u-boot.lds +++ b/board/esd/tasreg/u-boot.lds @@ -138,6 +138,6 @@ SECTIONS . = ALIGN(4); _ebss = .; } - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); } diff --git a/board/esteem192e/u-boot.lds b/board/esteem192e/u-boot.lds index 93b756bc8e..8455f0b9f4 100644 --- a/board/esteem192e/u-boot.lds +++ b/board/esteem192e/u-boot.lds @@ -99,6 +99,6 @@ SECTIONS *(COMMON) . = ALIGN(4); } - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); } diff --git a/board/etx094/u-boot.lds b/board/etx094/u-boot.lds index 614880be1f..04233d86a1 100644 --- a/board/etx094/u-boot.lds +++ b/board/etx094/u-boot.lds @@ -99,6 +99,6 @@ SECTIONS *(COMMON) . = ALIGN(4); } - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); } diff --git a/board/etx094/u-boot.lds.debug b/board/etx094/u-boot.lds.debug index be05d8fdcc..8c55de4e84 100644 --- a/board/etx094/u-boot.lds.debug +++ b/board/etx094/u-boot.lds.debug @@ -137,6 +137,6 @@ SECTIONS *(.bss) *(COMMON) } - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); } diff --git a/board/evb64260/u-boot.lds b/board/evb64260/u-boot.lds index bc0bb0636a..0648f62feb 100644 --- a/board/evb64260/u-boot.lds +++ b/board/evb64260/u-boot.lds @@ -94,6 +94,6 @@ SECTIONS *(COMMON) . = ALIGN(4); } - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); } diff --git a/board/fads/u-boot.lds b/board/fads/u-boot.lds index c1ad14120d..63d0ea1121 100644 --- a/board/fads/u-boot.lds +++ b/board/fads/u-boot.lds @@ -92,7 +92,7 @@ SECTIONS *(COMMON) . = ALIGN(4); } - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); } ENTRY(_start) diff --git a/board/flagadm/u-boot.lds b/board/flagadm/u-boot.lds index 4a96388f04..2fac727b84 100644 --- a/board/flagadm/u-boot.lds +++ b/board/flagadm/u-boot.lds @@ -90,6 +90,6 @@ SECTIONS *(COMMON) . = ALIGN(4); } - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); } diff --git a/board/flagadm/u-boot.lds.debug b/board/flagadm/u-boot.lds.debug index 99098bffbe..c7711028ad 100644 --- a/board/flagadm/u-boot.lds.debug +++ b/board/flagadm/u-boot.lds.debug @@ -130,6 +130,6 @@ SECTIONS *(.bss) *(COMMON) } - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); } diff --git a/board/freescale/m5208evbe/u-boot.lds b/board/freescale/m5208evbe/u-boot.lds index 860286930a..e5011a63b6 100644 --- a/board/freescale/m5208evbe/u-boot.lds +++ b/board/freescale/m5208evbe/u-boot.lds @@ -137,6 +137,6 @@ SECTIONS . = ALIGN(4); _ebss = .; } - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); } diff --git a/board/freescale/m52277evb/u-boot.spa b/board/freescale/m52277evb/u-boot.spa index 9458aef5c3..4b710be945 100644 --- a/board/freescale/m52277evb/u-boot.spa +++ b/board/freescale/m52277evb/u-boot.spa @@ -139,6 +139,6 @@ SECTIONS . = ALIGN(4); _ebss = .; } - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); } diff --git a/board/freescale/m52277evb/u-boot.stm b/board/freescale/m52277evb/u-boot.stm index 1ec83e9490..db102223f6 100644 --- a/board/freescale/m52277evb/u-boot.stm +++ b/board/freescale/m52277evb/u-boot.stm @@ -131,6 +131,6 @@ SECTIONS . = ALIGN(4); _ebss = .; } - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); } diff --git a/board/freescale/m5235evb/u-boot.16 b/board/freescale/m5235evb/u-boot.16 index d7bd10fd96..657cd9d3ee 100644 --- a/board/freescale/m5235evb/u-boot.16 +++ b/board/freescale/m5235evb/u-boot.16 @@ -139,6 +139,6 @@ SECTIONS . = ALIGN(4); _ebss = .; } - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); } diff --git a/board/freescale/m5235evb/u-boot.32 b/board/freescale/m5235evb/u-boot.32 index 47ec6dc8b9..1f9199449e 100644 --- a/board/freescale/m5235evb/u-boot.32 +++ b/board/freescale/m5235evb/u-boot.32 @@ -147,6 +147,6 @@ SECTIONS . = ALIGN(4); _ebss = .; } - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); } diff --git a/board/freescale/m5249evb/u-boot.lds b/board/freescale/m5249evb/u-boot.lds index d4fd705ce1..27a6b93703 100644 --- a/board/freescale/m5249evb/u-boot.lds +++ b/board/freescale/m5249evb/u-boot.lds @@ -138,6 +138,6 @@ SECTIONS . = ALIGN(4); _ebss = .; } - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); } diff --git a/board/freescale/m5253demo/u-boot.lds b/board/freescale/m5253demo/u-boot.lds index 4f8bb20d45..3644838ad3 100644 --- a/board/freescale/m5253demo/u-boot.lds +++ b/board/freescale/m5253demo/u-boot.lds @@ -138,6 +138,6 @@ SECTIONS . = ALIGN(4); _ebss = .; } - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); } diff --git a/board/freescale/m5253evbe/u-boot.lds b/board/freescale/m5253evbe/u-boot.lds index 797c83785c..34aa73db19 100644 --- a/board/freescale/m5253evbe/u-boot.lds +++ b/board/freescale/m5253evbe/u-boot.lds @@ -137,6 +137,6 @@ SECTIONS . = ALIGN(4); _ebss = .; } - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); } diff --git a/board/freescale/m5271evb/u-boot.lds b/board/freescale/m5271evb/u-boot.lds index 9878ec18c4..e16a2662b6 100644 --- a/board/freescale/m5271evb/u-boot.lds +++ b/board/freescale/m5271evb/u-boot.lds @@ -138,6 +138,6 @@ SECTIONS . = ALIGN(4); _ebss = .; } - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); } diff --git a/board/freescale/m5272c3/u-boot.lds b/board/freescale/m5272c3/u-boot.lds index 8b011df532..ff5bfe6c15 100644 --- a/board/freescale/m5272c3/u-boot.lds +++ b/board/freescale/m5272c3/u-boot.lds @@ -137,6 +137,6 @@ SECTIONS . = ALIGN(4); _ebss = .; } - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); } diff --git a/board/freescale/m5275evb/u-boot.lds b/board/freescale/m5275evb/u-boot.lds index cd17b0abf2..8e792fea5d 100644 --- a/board/freescale/m5275evb/u-boot.lds +++ b/board/freescale/m5275evb/u-boot.lds @@ -134,6 +134,6 @@ SECTIONS . = ALIGN(4); _ebss = .; } - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); } diff --git a/board/freescale/m5282evb/u-boot.lds b/board/freescale/m5282evb/u-boot.lds index 5ad0fad684..7e6aa6aeef 100644 --- a/board/freescale/m5282evb/u-boot.lds +++ b/board/freescale/m5282evb/u-boot.lds @@ -135,6 +135,6 @@ SECTIONS . = ALIGN(4); _ebss = .; } - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); } diff --git a/board/freescale/m53017evb/u-boot.lds b/board/freescale/m53017evb/u-boot.lds index 2e002ad364..445566b368 100644 --- a/board/freescale/m53017evb/u-boot.lds +++ b/board/freescale/m53017evb/u-boot.lds @@ -137,6 +137,6 @@ SECTIONS . = ALIGN(4); _ebss = .; } - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); } diff --git a/board/freescale/m5329evb/u-boot.lds b/board/freescale/m5329evb/u-boot.lds index ba7ca27733..4375342c8c 100644 --- a/board/freescale/m5329evb/u-boot.lds +++ b/board/freescale/m5329evb/u-boot.lds @@ -137,6 +137,6 @@ SECTIONS . = ALIGN(4); _ebss = .; } - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); } diff --git a/board/freescale/m5373evb/u-boot.lds b/board/freescale/m5373evb/u-boot.lds index a2540bbc74..f3acfc7355 100644 --- a/board/freescale/m5373evb/u-boot.lds +++ b/board/freescale/m5373evb/u-boot.lds @@ -137,6 +137,6 @@ SECTIONS . = ALIGN(4); _ebss = .; } - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); } diff --git a/board/freescale/m54451evb/u-boot.spa b/board/freescale/m54451evb/u-boot.spa index bd86a45bcb..e1bacd3d36 100644 --- a/board/freescale/m54451evb/u-boot.spa +++ b/board/freescale/m54451evb/u-boot.spa @@ -141,6 +141,6 @@ SECTIONS . = ALIGN(4); _ebss = .; } - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); } diff --git a/board/freescale/m54451evb/u-boot.stm b/board/freescale/m54451evb/u-boot.stm index e64a56c59b..1c6979fba1 100644 --- a/board/freescale/m54451evb/u-boot.stm +++ b/board/freescale/m54451evb/u-boot.stm @@ -144,6 +144,6 @@ SECTIONS . = ALIGN(4); _ebss = .; } - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); } diff --git a/board/freescale/m54455evb/u-boot.atm b/board/freescale/m54455evb/u-boot.atm index ebf801ac71..cf4650ee0c 100644 --- a/board/freescale/m54455evb/u-boot.atm +++ b/board/freescale/m54455evb/u-boot.atm @@ -138,6 +138,6 @@ SECTIONS . = ALIGN(4); _ebss = .; } - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); } diff --git a/board/freescale/m54455evb/u-boot.int b/board/freescale/m54455evb/u-boot.int index 153556fe9b..79e64a2f29 100644 --- a/board/freescale/m54455evb/u-boot.int +++ b/board/freescale/m54455evb/u-boot.int @@ -135,6 +135,6 @@ SECTIONS . = ALIGN(4); _ebss = .; } - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); } diff --git a/board/freescale/m54455evb/u-boot.stm b/board/freescale/m54455evb/u-boot.stm index 9cda1029d3..46773d0d97 100644 --- a/board/freescale/m54455evb/u-boot.stm +++ b/board/freescale/m54455evb/u-boot.stm @@ -131,6 +131,6 @@ SECTIONS . = ALIGN(4); _ebss = .; } - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); } diff --git a/board/freescale/m547xevb/u-boot.lds b/board/freescale/m547xevb/u-boot.lds index 54bf2785aa..a4e4d5ac52 100644 --- a/board/freescale/m547xevb/u-boot.lds +++ b/board/freescale/m547xevb/u-boot.lds @@ -136,6 +136,6 @@ SECTIONS . = ALIGN(4); _ebss = .; } - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); } diff --git a/board/freescale/m548xevb/u-boot.lds b/board/freescale/m548xevb/u-boot.lds index 54bf2785aa..a4e4d5ac52 100644 --- a/board/freescale/m548xevb/u-boot.lds +++ b/board/freescale/m548xevb/u-boot.lds @@ -136,6 +136,6 @@ SECTIONS . = ALIGN(4); _ebss = .; } - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); } diff --git a/board/freescale/mx31ads/u-boot.lds b/board/freescale/mx31ads/u-boot.lds index ecd97075b0..b081b21946 100644 --- a/board/freescale/mx31ads/u-boot.lds +++ b/board/freescale/mx31ads/u-boot.lds @@ -66,5 +66,5 @@ SECTIONS . = ALIGN(4); __bss_start = .; .bss : { *(.bss) . = ALIGN(4); } - _end = .; + __bss_end__ = .; } diff --git a/board/gaisler/gr_cpci_ax2000/u-boot.lds b/board/gaisler/gr_cpci_ax2000/u-boot.lds index 22826823cc..87cb8e32ba 100644 --- a/board/gaisler/gr_cpci_ax2000/u-boot.lds +++ b/board/gaisler/gr_cpci_ax2000/u-boot.lds @@ -133,7 +133,7 @@ SECTIONS . = ALIGN(16); /* to speed clearing of bss up */ } __bss_end = . ; - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); /* Relocated into main memory */ diff --git a/board/gaisler/gr_ep2s60/u-boot.lds b/board/gaisler/gr_ep2s60/u-boot.lds index 0ca2651703..2fb44aa832 100644 --- a/board/gaisler/gr_ep2s60/u-boot.lds +++ b/board/gaisler/gr_ep2s60/u-boot.lds @@ -133,7 +133,7 @@ SECTIONS . = ALIGN(16); /* to speed clearing of bss up */ } __bss_end = . ; - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); /* Relocated into main memory */ diff --git a/board/gaisler/gr_xc3s_1500/u-boot.lds b/board/gaisler/gr_xc3s_1500/u-boot.lds index 67222ac8e3..8719e97ee4 100644 --- a/board/gaisler/gr_xc3s_1500/u-boot.lds +++ b/board/gaisler/gr_xc3s_1500/u-boot.lds @@ -134,7 +134,7 @@ SECTIONS . = ALIGN(16); /* to speed clearing of bss up */ } __bss_end = . ; - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); /* Relocated into main memory */ diff --git a/board/gaisler/grsim/u-boot.lds b/board/gaisler/grsim/u-boot.lds index 681fd8d01b..33890b504d 100644 --- a/board/gaisler/grsim/u-boot.lds +++ b/board/gaisler/grsim/u-boot.lds @@ -133,7 +133,7 @@ SECTIONS . = ALIGN(16); /* to speed clearing of bss up */ } __bss_end = . ; - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); /* Relocated into main memory */ diff --git a/board/gaisler/grsim_leon2/u-boot.lds b/board/gaisler/grsim_leon2/u-boot.lds index a12e7fb9ce..cf6e5020ba 100644 --- a/board/gaisler/grsim_leon2/u-boot.lds +++ b/board/gaisler/grsim_leon2/u-boot.lds @@ -132,7 +132,7 @@ SECTIONS . = ALIGN(16); /* to speed clearing of bss up */ } __bss_end = . ; - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); /* Relocated into main memory */ diff --git a/board/gen860t/u-boot-flashenv.lds b/board/gen860t/u-boot-flashenv.lds index cda6c47b33..5bb6c62d71 100644 --- a/board/gen860t/u-boot-flashenv.lds +++ b/board/gen860t/u-boot-flashenv.lds @@ -96,7 +96,7 @@ SECTIONS . = ALIGN(4); } - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); .ppcenv: diff --git a/board/gen860t/u-boot.lds b/board/gen860t/u-boot.lds index 1729c17552..8e854db22d 100644 --- a/board/gen860t/u-boot.lds +++ b/board/gen860t/u-boot.lds @@ -95,6 +95,6 @@ SECTIONS *(COMMON) . = ALIGN(4); } - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); } diff --git a/board/genietv/u-boot.lds b/board/genietv/u-boot.lds index 6b45ea0c26..3e396e4fae 100644 --- a/board/genietv/u-boot.lds +++ b/board/genietv/u-boot.lds @@ -109,6 +109,6 @@ SECTIONS common/env_embedded.o (.ppcenv) } . = ALIGN(4); - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); } diff --git a/board/genietv/u-boot.lds.debug b/board/genietv/u-boot.lds.debug index 60936aaf34..cfa4ef3f87 100644 --- a/board/genietv/u-boot.lds.debug +++ b/board/genietv/u-boot.lds.debug @@ -136,6 +136,6 @@ SECTIONS { common/env_embedded.o (.ppcenv) } - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); } diff --git a/board/hermes/u-boot.lds b/board/hermes/u-boot.lds index 456140df9f..d50c5865b1 100644 --- a/board/hermes/u-boot.lds +++ b/board/hermes/u-boot.lds @@ -96,6 +96,6 @@ SECTIONS *(COMMON) . = ALIGN(4); } - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); } diff --git a/board/hermes/u-boot.lds.debug b/board/hermes/u-boot.lds.debug index 7038ebc1dc..8a197deef7 100644 --- a/board/hermes/u-boot.lds.debug +++ b/board/hermes/u-boot.lds.debug @@ -130,6 +130,6 @@ SECTIONS *(.bss) *(COMMON) } - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); } diff --git a/board/hymod/u-boot.lds b/board/hymod/u-boot.lds index 0897715a94..1592f4f6e8 100644 --- a/board/hymod/u-boot.lds +++ b/board/hymod/u-boot.lds @@ -140,6 +140,6 @@ SECTIONS common/env_embedded.o (.ppcenv) } . = ALIGN(4); - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); } diff --git a/board/hymod/u-boot.lds.debug b/board/hymod/u-boot.lds.debug index c21890542f..99c48f28d4 100644 --- a/board/hymod/u-boot.lds.debug +++ b/board/hymod/u-boot.lds.debug @@ -130,6 +130,6 @@ SECTIONS *(.bss) *(COMMON) } - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); } diff --git a/board/icu862/u-boot.lds b/board/icu862/u-boot.lds index 08dfaeec0a..cb5afc113b 100644 --- a/board/icu862/u-boot.lds +++ b/board/icu862/u-boot.lds @@ -90,6 +90,6 @@ SECTIONS *(COMMON) . = ALIGN(4); } - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); } diff --git a/board/icu862/u-boot.lds.debug b/board/icu862/u-boot.lds.debug index 9c1e3ecd8a..91d3e67e82 100644 --- a/board/icu862/u-boot.lds.debug +++ b/board/icu862/u-boot.lds.debug @@ -131,6 +131,6 @@ SECTIONS *(.bss) *(COMMON) } - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); } diff --git a/board/idmr/u-boot.lds b/board/idmr/u-boot.lds index 9878ec18c4..e16a2662b6 100644 --- a/board/idmr/u-boot.lds +++ b/board/idmr/u-boot.lds @@ -138,6 +138,6 @@ SECTIONS . = ALIGN(4); _ebss = .; } - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); } diff --git a/board/ip860/u-boot.lds b/board/ip860/u-boot.lds index fbd901a3c3..05cc2338ab 100644 --- a/board/ip860/u-boot.lds +++ b/board/ip860/u-boot.lds @@ -90,6 +90,6 @@ SECTIONS *(COMMON) . = ALIGN(4); } - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); } diff --git a/board/ip860/u-boot.lds.debug b/board/ip860/u-boot.lds.debug index 0c0bbb8f5d..2f61b11d81 100644 --- a/board/ip860/u-boot.lds.debug +++ b/board/ip860/u-boot.lds.debug @@ -131,6 +131,6 @@ SECTIONS *(.bss) *(COMMON) } - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); } diff --git a/board/ivm/u-boot.lds b/board/ivm/u-boot.lds index f4c6c981a7..ff7012afbc 100644 --- a/board/ivm/u-boot.lds +++ b/board/ivm/u-boot.lds @@ -90,6 +90,6 @@ SECTIONS *(COMMON) . = ALIGN(4); } - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); } diff --git a/board/ivm/u-boot.lds.debug b/board/ivm/u-boot.lds.debug index 6bcf167a0a..732a46f272 100644 --- a/board/ivm/u-boot.lds.debug +++ b/board/ivm/u-boot.lds.debug @@ -131,6 +131,6 @@ SECTIONS *(.bss) *(COMMON) } - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); } diff --git a/board/jornada/u-boot.lds b/board/jornada/u-boot.lds index de6101e435..c75b21fcec 100644 --- a/board/jornada/u-boot.lds +++ b/board/jornada/u-boot.lds @@ -54,5 +54,5 @@ SECTIONS . = ALIGN(4); __bss_start = .; .bss (NOLOAD) : { *(.bss) . = ALIGN(4); } - _end = .; + __bss_end__ = .; } diff --git a/board/korat/u-boot-F7FC.lds b/board/korat/u-boot-F7FC.lds index 4d73180cd1..6a017e305c 100644 --- a/board/korat/u-boot-F7FC.lds +++ b/board/korat/u-boot-F7FC.lds @@ -135,6 +135,6 @@ SECTIONS . = ALIGN(4); } - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); } diff --git a/board/kup/kup4k/u-boot.lds b/board/kup/kup4k/u-boot.lds index fbd901a3c3..05cc2338ab 100644 --- a/board/kup/kup4k/u-boot.lds +++ b/board/kup/kup4k/u-boot.lds @@ -90,6 +90,6 @@ SECTIONS *(COMMON) . = ALIGN(4); } - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); } diff --git a/board/kup/kup4k/u-boot.lds.debug b/board/kup/kup4k/u-boot.lds.debug index a78d0b76be..4491edd944 100644 --- a/board/kup/kup4k/u-boot.lds.debug +++ b/board/kup/kup4k/u-boot.lds.debug @@ -130,6 +130,6 @@ SECTIONS *(.bss) *(COMMON) } - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); } diff --git a/board/kup/kup4x/u-boot.lds b/board/kup/kup4x/u-boot.lds index fbd901a3c3..05cc2338ab 100644 --- a/board/kup/kup4x/u-boot.lds +++ b/board/kup/kup4x/u-boot.lds @@ -90,6 +90,6 @@ SECTIONS *(COMMON) . = ALIGN(4); } - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); } diff --git a/board/kup/kup4x/u-boot.lds.debug b/board/kup/kup4x/u-boot.lds.debug index a78d0b76be..4491edd944 100644 --- a/board/kup/kup4x/u-boot.lds.debug +++ b/board/kup/kup4x/u-boot.lds.debug @@ -130,6 +130,6 @@ SECTIONS *(.bss) *(COMMON) } - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); } diff --git a/board/lantec/u-boot.lds b/board/lantec/u-boot.lds index 00af66977a..25e7a4def2 100644 --- a/board/lantec/u-boot.lds +++ b/board/lantec/u-boot.lds @@ -99,6 +99,6 @@ SECTIONS *(COMMON) . = ALIGN(4); } - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); } diff --git a/board/lantec/u-boot.lds.debug b/board/lantec/u-boot.lds.debug index deea7e29fc..856a99b6f9 100644 --- a/board/lantec/u-boot.lds.debug +++ b/board/lantec/u-boot.lds.debug @@ -130,6 +130,6 @@ SECTIONS *(.bss) *(COMMON) } - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); } diff --git a/board/lwmon/u-boot.lds b/board/lwmon/u-boot.lds index dd9be60cf0..d02db17ccb 100644 --- a/board/lwmon/u-boot.lds +++ b/board/lwmon/u-boot.lds @@ -90,6 +90,6 @@ SECTIONS *(COMMON) . = ALIGN(4); } - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); } diff --git a/board/lwmon/u-boot.lds.debug b/board/lwmon/u-boot.lds.debug index 131ad23c77..241223481b 100644 --- a/board/lwmon/u-boot.lds.debug +++ b/board/lwmon/u-boot.lds.debug @@ -131,6 +131,6 @@ SECTIONS *(.bss) *(COMMON) } - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); } diff --git a/board/manroland/uc100/u-boot.lds b/board/manroland/uc100/u-boot.lds index dc83071602..344cbde3b0 100644 --- a/board/manroland/uc100/u-boot.lds +++ b/board/manroland/uc100/u-boot.lds @@ -93,6 +93,6 @@ SECTIONS *(COMMON) . = ALIGN(4); } - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); } diff --git a/board/matrix_vision/mvsmr/u-boot.lds b/board/matrix_vision/mvsmr/u-boot.lds index 074a4827e7..f3d01e73f0 100644 --- a/board/matrix_vision/mvsmr/u-boot.lds +++ b/board/matrix_vision/mvsmr/u-boot.lds @@ -97,6 +97,6 @@ SECTIONS *(.sbss*) . = ALIGN(4); } - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); } diff --git a/board/mbx8xx/u-boot.lds b/board/mbx8xx/u-boot.lds index fbd901a3c3..05cc2338ab 100644 --- a/board/mbx8xx/u-boot.lds +++ b/board/mbx8xx/u-boot.lds @@ -90,6 +90,6 @@ SECTIONS *(COMMON) . = ALIGN(4); } - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); } diff --git a/board/mbx8xx/u-boot.lds.debug b/board/mbx8xx/u-boot.lds.debug index a7a67a9276..a95c47feac 100644 --- a/board/mbx8xx/u-boot.lds.debug +++ b/board/mbx8xx/u-boot.lds.debug @@ -131,6 +131,6 @@ SECTIONS *(.bss) *(COMMON) } - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); } diff --git a/board/mercury/mpq101/u-boot.lds b/board/mercury/mpq101/u-boot.lds index 4f4dda57b9..f497a63f11 100644 --- a/board/mercury/mpq101/u-boot.lds +++ b/board/mercury/mpq101/u-boot.lds @@ -127,6 +127,6 @@ SECTIONS } :bss . = ALIGN(4); - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); } diff --git a/board/mimc/mimc200/u-boot.lds b/board/mimc/mimc200/u-boot.lds index a7243f238f..0a1a8e1653 100644 --- a/board/mimc/mimc200/u-boot.lds +++ b/board/mimc/mimc200/u-boot.lds @@ -68,5 +68,5 @@ SECTIONS *(.bss.*) } . = ALIGN(8); - _end = .; + __bss_end__ = .; } diff --git a/board/miromico/hammerhead/u-boot.lds b/board/miromico/hammerhead/u-boot.lds index a7243f238f..0a1a8e1653 100644 --- a/board/miromico/hammerhead/u-boot.lds +++ b/board/miromico/hammerhead/u-boot.lds @@ -68,5 +68,5 @@ SECTIONS *(.bss.*) } . = ALIGN(8); - _end = .; + __bss_end__ = .; } diff --git a/board/ml2/u-boot.lds b/board/ml2/u-boot.lds index b6c0715711..0f2593de89 100644 --- a/board/ml2/u-boot.lds +++ b/board/ml2/u-boot.lds @@ -88,6 +88,6 @@ SECTIONS *(COMMON) . = ALIGN(4); } - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); } diff --git a/board/ml2/u-boot.lds.debug b/board/ml2/u-boot.lds.debug index 0e9cdcf81d..fcf8ebbf8e 100644 --- a/board/ml2/u-boot.lds.debug +++ b/board/ml2/u-boot.lds.debug @@ -130,6 +130,6 @@ SECTIONS *(.bss) *(COMMON) } - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); } diff --git a/board/mousse/u-boot.lds b/board/mousse/u-boot.lds index 4cfb95c496..ef73e2b53a 100644 --- a/board/mousse/u-boot.lds +++ b/board/mousse/u-boot.lds @@ -85,6 +85,6 @@ SECTIONS . = ALIGN(4); } - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); } diff --git a/board/mousse/u-boot.lds.ram b/board/mousse/u-boot.lds.ram index 449d0645e4..b3364be48c 100644 --- a/board/mousse/u-boot.lds.ram +++ b/board/mousse/u-boot.lds.ram @@ -99,6 +99,6 @@ SECTIONS common/env_embedded.o (.ppcenv) } > ram - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); } diff --git a/board/mousse/u-boot.lds.rom b/board/mousse/u-boot.lds.rom index 4f42b329d8..b4b9e02e52 100644 --- a/board/mousse/u-boot.lds.rom +++ b/board/mousse/u-boot.lds.rom @@ -126,6 +126,6 @@ SECTIONS *(COMMON) } - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); } diff --git a/board/mpl/pip405/u-boot.lds.debug b/board/mpl/pip405/u-boot.lds.debug index 0e9cdcf81d..fcf8ebbf8e 100644 --- a/board/mpl/pip405/u-boot.lds.debug +++ b/board/mpl/pip405/u-boot.lds.debug @@ -130,6 +130,6 @@ SECTIONS *(.bss) *(COMMON) } - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); } diff --git a/board/munices/u-boot.lds b/board/munices/u-boot.lds index 4e27bc947d..99576bf3c8 100644 --- a/board/munices/u-boot.lds +++ b/board/munices/u-boot.lds @@ -115,6 +115,6 @@ SECTIONS *(COMMON) . = ALIGN(4); } - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); } diff --git a/board/mvblue/u-boot.lds b/board/mvblue/u-boot.lds index ad06af0b16..03ba15578b 100644 --- a/board/mvblue/u-boot.lds +++ b/board/mvblue/u-boot.lds @@ -94,6 +94,6 @@ SECTIONS *(COMMON) . = ALIGN(4); } - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); } diff --git a/board/netphone/u-boot.lds b/board/netphone/u-boot.lds index 684ab81c4a..b7b6c1aa14 100644 --- a/board/netphone/u-boot.lds +++ b/board/netphone/u-boot.lds @@ -90,6 +90,6 @@ SECTIONS *(COMMON) . = ALIGN(4); } - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); } diff --git a/board/netphone/u-boot.lds.debug b/board/netphone/u-boot.lds.debug index df7b6adba4..a001f3fd87 100644 --- a/board/netphone/u-boot.lds.debug +++ b/board/netphone/u-boot.lds.debug @@ -130,6 +130,6 @@ SECTIONS *(.bss) *(COMMON) } - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); } diff --git a/board/netta/u-boot.lds b/board/netta/u-boot.lds index 684ab81c4a..b7b6c1aa14 100644 --- a/board/netta/u-boot.lds +++ b/board/netta/u-boot.lds @@ -90,6 +90,6 @@ SECTIONS *(COMMON) . = ALIGN(4); } - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); } diff --git a/board/netta/u-boot.lds.debug b/board/netta/u-boot.lds.debug index df7b6adba4..a001f3fd87 100644 --- a/board/netta/u-boot.lds.debug +++ b/board/netta/u-boot.lds.debug @@ -130,6 +130,6 @@ SECTIONS *(.bss) *(COMMON) } - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); } diff --git a/board/netta2/u-boot.lds b/board/netta2/u-boot.lds index 684ab81c4a..b7b6c1aa14 100644 --- a/board/netta2/u-boot.lds +++ b/board/netta2/u-boot.lds @@ -90,6 +90,6 @@ SECTIONS *(COMMON) . = ALIGN(4); } - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); } diff --git a/board/netta2/u-boot.lds.debug b/board/netta2/u-boot.lds.debug index df7b6adba4..a001f3fd87 100644 --- a/board/netta2/u-boot.lds.debug +++ b/board/netta2/u-boot.lds.debug @@ -130,6 +130,6 @@ SECTIONS *(.bss) *(COMMON) } - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); } diff --git a/board/netvia/u-boot.lds b/board/netvia/u-boot.lds index 684ab81c4a..b7b6c1aa14 100644 --- a/board/netvia/u-boot.lds +++ b/board/netvia/u-boot.lds @@ -90,6 +90,6 @@ SECTIONS *(COMMON) . = ALIGN(4); } - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); } diff --git a/board/netvia/u-boot.lds.debug b/board/netvia/u-boot.lds.debug index 58202dc9f5..6c7d698c95 100644 --- a/board/netvia/u-boot.lds.debug +++ b/board/netvia/u-boot.lds.debug @@ -130,6 +130,6 @@ SECTIONS *(.bss) *(COMMON) } - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); } diff --git a/board/nx823/u-boot.lds b/board/nx823/u-boot.lds index 4a96388f04..2fac727b84 100644 --- a/board/nx823/u-boot.lds +++ b/board/nx823/u-boot.lds @@ -90,6 +90,6 @@ SECTIONS *(COMMON) . = ALIGN(4); } - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); } diff --git a/board/nx823/u-boot.lds.debug b/board/nx823/u-boot.lds.debug index 99098bffbe..c7711028ad 100644 --- a/board/nx823/u-boot.lds.debug +++ b/board/nx823/u-boot.lds.debug @@ -130,6 +130,6 @@ SECTIONS *(.bss) *(COMMON) } - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); } diff --git a/board/quantum/u-boot.lds b/board/quantum/u-boot.lds index fbd901a3c3..05cc2338ab 100644 --- a/board/quantum/u-boot.lds +++ b/board/quantum/u-boot.lds @@ -90,6 +90,6 @@ SECTIONS *(COMMON) . = ALIGN(4); } - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); } diff --git a/board/quantum/u-boot.lds.debug b/board/quantum/u-boot.lds.debug index f212fab28a..abc4640eef 100644 --- a/board/quantum/u-boot.lds.debug +++ b/board/quantum/u-boot.lds.debug @@ -125,6 +125,6 @@ SECTIONS *(.bss) *(COMMON) } - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); } diff --git a/board/r360mpi/u-boot.lds b/board/r360mpi/u-boot.lds index a18c515e54..60b3cbfaca 100644 --- a/board/r360mpi/u-boot.lds +++ b/board/r360mpi/u-boot.lds @@ -92,7 +92,7 @@ SECTIONS *(COMMON) . = ALIGN(4); } - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); . = ALIGN(128 * 1024); .ppcenv : diff --git a/board/rbc823/u-boot.lds b/board/rbc823/u-boot.lds index 77f592e0a5..7b790ab9fd 100644 --- a/board/rbc823/u-boot.lds +++ b/board/rbc823/u-boot.lds @@ -100,6 +100,6 @@ SECTIONS *(COMMON) . = ALIGN(4); } - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); } diff --git a/board/renesas/sh7757lcr/u-boot.lds b/board/renesas/sh7757lcr/u-boot.lds index a88d7814a1..790b5b840d 100644 --- a/board/renesas/sh7757lcr/u-boot.lds +++ b/board/renesas/sh7757lcr/u-boot.lds @@ -97,5 +97,5 @@ SECTIONS } PROVIDE (bss_end = .); - PROVIDE (_end = .); + PROVIDE (__bss_end__ = .); } diff --git a/board/rmu/u-boot.lds b/board/rmu/u-boot.lds index fbd901a3c3..05cc2338ab 100644 --- a/board/rmu/u-boot.lds +++ b/board/rmu/u-boot.lds @@ -90,6 +90,6 @@ SECTIONS *(COMMON) . = ALIGN(4); } - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); } diff --git a/board/rmu/u-boot.lds.debug b/board/rmu/u-boot.lds.debug index f212fab28a..abc4640eef 100644 --- a/board/rmu/u-boot.lds.debug +++ b/board/rmu/u-boot.lds.debug @@ -125,6 +125,6 @@ SECTIONS *(.bss) *(COMMON) } - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); } diff --git a/board/rsdproto/u-boot.lds b/board/rsdproto/u-boot.lds index 7763c7fed7..b36047ad5e 100644 --- a/board/rsdproto/u-boot.lds +++ b/board/rsdproto/u-boot.lds @@ -122,6 +122,6 @@ SECTIONS *(COMMON) . = ALIGN(4); } - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); } diff --git a/board/samsung/smdk6400/u-boot-nand.lds b/board/samsung/smdk6400/u-boot-nand.lds index 29a4f61e36..975601b5c2 100644 --- a/board/samsung/smdk6400/u-boot-nand.lds +++ b/board/samsung/smdk6400/u-boot-nand.lds @@ -58,5 +58,5 @@ SECTIONS . = ALIGN(4); __bss_start = .; .bss : { *(.bss) . = ALIGN(4); } - _end = .; + __bss_end__ = .; } diff --git a/board/sandburst/karef/u-boot.lds.debug b/board/sandburst/karef/u-boot.lds.debug index 6b31b1e7ce..31746e3adc 100644 --- a/board/sandburst/karef/u-boot.lds.debug +++ b/board/sandburst/karef/u-boot.lds.debug @@ -139,6 +139,6 @@ SECTIONS *(.bss) *(COMMON) } - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); } diff --git a/board/sandburst/metrobox/u-boot.lds.debug b/board/sandburst/metrobox/u-boot.lds.debug index 2fb3ad97dc..4922bd241e 100644 --- a/board/sandburst/metrobox/u-boot.lds.debug +++ b/board/sandburst/metrobox/u-boot.lds.debug @@ -139,6 +139,6 @@ SECTIONS *(.bss) *(COMMON) } - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); } diff --git a/board/sandpoint/u-boot.lds b/board/sandpoint/u-boot.lds index 59c86278d9..841a29b60c 100644 --- a/board/sandpoint/u-boot.lds +++ b/board/sandpoint/u-boot.lds @@ -92,6 +92,6 @@ SECTIONS *(COMMON) . = ALIGN(4); } - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); } diff --git a/board/sc3/u-boot.lds b/board/sc3/u-boot.lds index 9b1a39bc84..2cbbca50e5 100644 --- a/board/sc3/u-boot.lds +++ b/board/sc3/u-boot.lds @@ -142,6 +142,6 @@ SECTIONS *(COMMON) . = ALIGN(4); } - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); } diff --git a/board/siemens/IAD210/u-boot.lds b/board/siemens/IAD210/u-boot.lds index 0514f5a511..725bef8293 100644 --- a/board/siemens/IAD210/u-boot.lds +++ b/board/siemens/IAD210/u-boot.lds @@ -99,6 +99,6 @@ SECTIONS *(COMMON) . = ALIGN(4); } - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); } diff --git a/board/sixnet/u-boot.lds b/board/sixnet/u-boot.lds index b4c7a0ed6e..2711f2c408 100644 --- a/board/sixnet/u-boot.lds +++ b/board/sixnet/u-boot.lds @@ -90,6 +90,6 @@ SECTIONS *(COMMON) . = ALIGN(4); } - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); } diff --git a/board/snmc/qs850/u-boot.lds b/board/snmc/qs850/u-boot.lds index f8c50cba72..007ae00f46 100644 --- a/board/snmc/qs850/u-boot.lds +++ b/board/snmc/qs850/u-boot.lds @@ -93,6 +93,6 @@ SECTIONS *(COMMON) . = ALIGN(4); } - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); } diff --git a/board/snmc/qs860t/u-boot.lds b/board/snmc/qs860t/u-boot.lds index fbd901a3c3..05cc2338ab 100644 --- a/board/snmc/qs860t/u-boot.lds +++ b/board/snmc/qs860t/u-boot.lds @@ -90,6 +90,6 @@ SECTIONS *(COMMON) . = ALIGN(4); } - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); } diff --git a/board/spc1920/u-boot.lds b/board/spc1920/u-boot.lds index fbd901a3c3..05cc2338ab 100644 --- a/board/spc1920/u-boot.lds +++ b/board/spc1920/u-boot.lds @@ -90,6 +90,6 @@ SECTIONS *(COMMON) . = ALIGN(4); } - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); } diff --git a/board/spd8xx/u-boot.lds b/board/spd8xx/u-boot.lds index b9dd8b719a..796c283b34 100644 --- a/board/spd8xx/u-boot.lds +++ b/board/spd8xx/u-boot.lds @@ -100,6 +100,6 @@ SECTIONS *(COMMON) . = ALIGN(4); } - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); } diff --git a/board/spd8xx/u-boot.lds.debug b/board/spd8xx/u-boot.lds.debug index a7a67a9276..a95c47feac 100644 --- a/board/spd8xx/u-boot.lds.debug +++ b/board/spd8xx/u-boot.lds.debug @@ -131,6 +131,6 @@ SECTIONS *(.bss) *(COMMON) } - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); } diff --git a/board/stx/stxxtc/u-boot.lds b/board/stx/stxxtc/u-boot.lds index 684ab81c4a..b7b6c1aa14 100644 --- a/board/stx/stxxtc/u-boot.lds +++ b/board/stx/stxxtc/u-boot.lds @@ -90,6 +90,6 @@ SECTIONS *(COMMON) . = ALIGN(4); } - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); } diff --git a/board/stx/stxxtc/u-boot.lds.debug b/board/stx/stxxtc/u-boot.lds.debug index df7b6adba4..a001f3fd87 100644 --- a/board/stx/stxxtc/u-boot.lds.debug +++ b/board/stx/stxxtc/u-boot.lds.debug @@ -130,6 +130,6 @@ SECTIONS *(.bss) *(COMMON) } - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); } diff --git a/board/svm_sc8xx/u-boot.lds b/board/svm_sc8xx/u-boot.lds index 6ff4d8c012..c4ce968735 100644 --- a/board/svm_sc8xx/u-boot.lds +++ b/board/svm_sc8xx/u-boot.lds @@ -107,6 +107,6 @@ SECTIONS *(COMMON) . = ALIGN(4); } - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); } diff --git a/board/svm_sc8xx/u-boot.lds.debug b/board/svm_sc8xx/u-boot.lds.debug index f212fab28a..abc4640eef 100644 --- a/board/svm_sc8xx/u-boot.lds.debug +++ b/board/svm_sc8xx/u-boot.lds.debug @@ -125,6 +125,6 @@ SECTIONS *(.bss) *(COMMON) } - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); } diff --git a/board/tqc/tqm8xx/u-boot.lds b/board/tqc/tqm8xx/u-boot.lds index 209d1e0041..83a09b0471 100644 --- a/board/tqc/tqm8xx/u-boot.lds +++ b/board/tqc/tqm8xx/u-boot.lds @@ -106,6 +106,6 @@ SECTIONS *(COMMON) . = ALIGN(4); } - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); } diff --git a/board/tqc/tqm8xx/u-boot.lds.debug b/board/tqc/tqm8xx/u-boot.lds.debug index c21890542f..99c48f28d4 100644 --- a/board/tqc/tqm8xx/u-boot.lds.debug +++ b/board/tqc/tqm8xx/u-boot.lds.debug @@ -130,6 +130,6 @@ SECTIONS *(.bss) *(COMMON) } - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); } diff --git a/board/trab/u-boot.lds b/board/trab/u-boot.lds index cd50e85242..45944016f8 100644 --- a/board/trab/u-boot.lds +++ b/board/trab/u-boot.lds @@ -60,5 +60,5 @@ SECTIONS . = ALIGN(4); __bss_start = .; .bss (NOLOAD) : { *(.bss) . = ALIGN(4); } - _end = .; + __bss_end__ = .; } diff --git a/board/v37/u-boot.lds b/board/v37/u-boot.lds index 9f36f53e65..578a49b04b 100644 --- a/board/v37/u-boot.lds +++ b/board/v37/u-boot.lds @@ -90,6 +90,6 @@ SECTIONS *(COMMON) . = ALIGN(4); } - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); } diff --git a/board/w7o/u-boot.lds.debug b/board/w7o/u-boot.lds.debug index 5ff67d13d4..1c67b301fb 100644 --- a/board/w7o/u-boot.lds.debug +++ b/board/w7o/u-boot.lds.debug @@ -130,6 +130,6 @@ SECTIONS *(.bss) *(COMMON) } - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); } diff --git a/board/westel/amx860/u-boot.lds b/board/westel/amx860/u-boot.lds index 206ec7054a..3514a66d68 100644 --- a/board/westel/amx860/u-boot.lds +++ b/board/westel/amx860/u-boot.lds @@ -99,6 +99,6 @@ SECTIONS *(COMMON) . = ALIGN(4); } - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); } diff --git a/board/westel/amx860/u-boot.lds.debug b/board/westel/amx860/u-boot.lds.debug index 9c1e3ecd8a..91d3e67e82 100644 --- a/board/westel/amx860/u-boot.lds.debug +++ b/board/westel/amx860/u-boot.lds.debug @@ -131,6 +131,6 @@ SECTIONS *(.bss) *(COMMON) } - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); } diff --git a/board/xes/xpedite1000/u-boot.lds.debug b/board/xes/xpedite1000/u-boot.lds.debug index a7475785fa..e2e66aec99 100644 --- a/board/xes/xpedite1000/u-boot.lds.debug +++ b/board/xes/xpedite1000/u-boot.lds.debug @@ -135,6 +135,6 @@ SECTIONS *(.bss) *(COMMON) } - _end = . ; + __bss_end__ = . ; PROVIDE (end = .); } diff --git a/board/zipitz2/u-boot.lds b/board/zipitz2/u-boot.lds index fb4358beea..e1a1ff1f65 100644 --- a/board/zipitz2/u-boot.lds +++ b/board/zipitz2/u-boot.lds @@ -52,5 +52,5 @@ SECTIONS . = ALIGN(4); __bss_start = .; .bss (NOLOAD) : { *(.bss) . = ALIGN(4); } - _end = .; + __bss_end__ = .; } diff --git a/examples/standalone/mips.lds b/examples/standalone/mips.lds index 63a1c92ab6..68ae217b5c 100644 --- a/examples/standalone/mips.lds +++ b/examples/standalone/mips.lds @@ -55,5 +55,5 @@ SECTIONS .sbss (NOLOAD) : { *(.sbss) } .bss (NOLOAD) : { *(.bss) . = ALIGN(4); } - _end = .; + __bss_end__ = .; } diff --git a/examples/standalone/sparc.lds b/examples/standalone/sparc.lds index 9733daa86b..7f060b6d17 100644 --- a/examples/standalone/sparc.lds +++ b/examples/standalone/sparc.lds @@ -57,5 +57,5 @@ SECTIONS } . = ALIGN(4); __bss_end = .; - _end = .; + __bss_end__ = .; } diff --git a/examples/standalone/stubs.c b/examples/standalone/stubs.c index 2d2e7098b7..1379df731e 100644 --- a/examples/standalone/stubs.c +++ b/examples/standalone/stubs.c @@ -187,14 +187,14 @@ void __attribute__((unused)) dummy(void) #include <_exports.h> } -extern unsigned long __bss_start, _end; +extern unsigned long __bss_start, __bss_end__; void app_startup(char * const *argv) { unsigned char * cp = (unsigned char *) &__bss_start; /* Zero out BSS */ - while (cp < (unsigned char *)&_end) { + while (cp < (unsigned char *)&__bss_end__) { *cp++ = 0; } diff --git a/nand_spl/board/amcc/acadia/u-boot.lds b/nand_spl/board/amcc/acadia/u-boot.lds index 56954650af..44a6f816c2 100644 --- a/nand_spl/board/amcc/acadia/u-boot.lds +++ b/nand_spl/board/amcc/acadia/u-boot.lds @@ -60,5 +60,5 @@ SECTIONS . = ALIGN(4); } - _end = . ; + __bss_end__ = . ; } diff --git a/nand_spl/board/amcc/bamboo/u-boot.lds b/nand_spl/board/amcc/bamboo/u-boot.lds index 8a9e6e9475..d4ea67ae8a 100644 --- a/nand_spl/board/amcc/bamboo/u-boot.lds +++ b/nand_spl/board/amcc/bamboo/u-boot.lds @@ -62,5 +62,5 @@ SECTIONS . = ALIGN(4); } - _end = . ; + __bss_end__ = . ; } diff --git a/nand_spl/board/amcc/canyonlands/u-boot.lds b/nand_spl/board/amcc/canyonlands/u-boot.lds index 73190cd390..794f041034 100644 --- a/nand_spl/board/amcc/canyonlands/u-boot.lds +++ b/nand_spl/board/amcc/canyonlands/u-boot.lds @@ -62,5 +62,5 @@ SECTIONS . = ALIGN(4); } - _end = . ; + __bss_end__ = . ; } diff --git a/nand_spl/board/amcc/kilauea/u-boot.lds b/nand_spl/board/amcc/kilauea/u-boot.lds index 9894a10539..4e860ad59e 100644 --- a/nand_spl/board/amcc/kilauea/u-boot.lds +++ b/nand_spl/board/amcc/kilauea/u-boot.lds @@ -60,5 +60,5 @@ SECTIONS . = ALIGN(4); } - _end = . ; + __bss_end__ = . ; } diff --git a/nand_spl/board/amcc/sequoia/u-boot.lds b/nand_spl/board/amcc/sequoia/u-boot.lds index c81ce68c8b..8ff6ac5cc1 100644 --- a/nand_spl/board/amcc/sequoia/u-boot.lds +++ b/nand_spl/board/amcc/sequoia/u-boot.lds @@ -62,5 +62,5 @@ SECTIONS . = ALIGN(4); } - _end = . ; + __bss_end__ = . ; } diff --git a/nand_spl/board/davinci/da8xxevm/u-boot.lds b/nand_spl/board/davinci/da8xxevm/u-boot.lds index f6ccf08103..c86117b9d6 100644 --- a/nand_spl/board/davinci/da8xxevm/u-boot.lds +++ b/nand_spl/board/davinci/da8xxevm/u-boot.lds @@ -71,5 +71,5 @@ SECTIONS . = ALIGN(4); __bss_start = .; .bss : { *(.bss) } - _end = .; + __bss_end__ = .; } diff --git a/nand_spl/board/freescale/mpc8313erdb/u-boot.lds b/nand_spl/board/freescale/mpc8313erdb/u-boot.lds index f1649f84bd..d140453d49 100644 --- a/nand_spl/board/freescale/mpc8313erdb/u-boot.lds +++ b/nand_spl/board/freescale/mpc8313erdb/u-boot.lds @@ -49,7 +49,7 @@ SECTIONS .bss (NOLOAD) : { *(.*bss) } - _end = .; + __bss_end__ = .; } ENTRY(_start) -ASSERT(_end <= 0xfff01000, "NAND bootstrap too big"); +ASSERT(__bss_end__ <= 0xfff01000, "NAND bootstrap too big"); diff --git a/nand_spl/board/freescale/mpc8315erdb/u-boot.lds b/nand_spl/board/freescale/mpc8315erdb/u-boot.lds index f1649f84bd..d140453d49 100644 --- a/nand_spl/board/freescale/mpc8315erdb/u-boot.lds +++ b/nand_spl/board/freescale/mpc8315erdb/u-boot.lds @@ -49,7 +49,7 @@ SECTIONS .bss (NOLOAD) : { *(.*bss) } - _end = .; + __bss_end__ = .; } ENTRY(_start) -ASSERT(_end <= 0xfff01000, "NAND bootstrap too big"); +ASSERT(__bss_end__ <= 0xfff01000, "NAND bootstrap too big"); diff --git a/nand_spl/board/freescale/mx31pdk/u-boot.lds b/nand_spl/board/freescale/mx31pdk/u-boot.lds index ff289fb3c6..324a932fb2 100644 --- a/nand_spl/board/freescale/mx31pdk/u-boot.lds +++ b/nand_spl/board/freescale/mx31pdk/u-boot.lds @@ -67,7 +67,7 @@ SECTIONS __bss_start = .; *(.bss) . = ALIGN(4); - _end = .; + __bss_end__ = .; } /DISCARD/ : { *(.bss*) } diff --git a/nand_spl/board/karo/tx25/u-boot.lds b/nand_spl/board/karo/tx25/u-boot.lds index ff289fb3c6..324a932fb2 100644 --- a/nand_spl/board/karo/tx25/u-boot.lds +++ b/nand_spl/board/karo/tx25/u-boot.lds @@ -67,7 +67,7 @@ SECTIONS __bss_start = .; *(.bss) . = ALIGN(4); - _end = .; + __bss_end__ = .; } /DISCARD/ : { *(.bss*) } diff --git a/nand_spl/board/samsung/smdk6400/u-boot.lds b/nand_spl/board/samsung/smdk6400/u-boot.lds index 3ac6aa1c4c..4cb686c7e5 100644 --- a/nand_spl/board/samsung/smdk6400/u-boot.lds +++ b/nand_spl/board/samsung/smdk6400/u-boot.lds @@ -57,5 +57,5 @@ SECTIONS . = ALIGN(4); __bss_start = .; .bss : { *(.bss) . = ALIGN(4); } - _end = .; + __bss_end__ = .; } diff --git a/nand_spl/board/sheldon/simpc8313/u-boot.lds b/nand_spl/board/sheldon/simpc8313/u-boot.lds index 1da4287673..534a0c8654 100644 --- a/nand_spl/board/sheldon/simpc8313/u-boot.lds +++ b/nand_spl/board/sheldon/simpc8313/u-boot.lds @@ -48,7 +48,7 @@ SECTIONS . = ALIGN(8); __bss_start = .; .bss (NOLOAD) : { *(.*bss) } - _end = .; + __bss_end__ = .; } ENTRY(_start) -ASSERT(_end <= 0xfff01000, "NAND bootstrap too big"); +ASSERT(__bss_end__ <= 0xfff01000, "NAND bootstrap too big"); diff --git a/onenand_ipl/board/apollon/u-boot.onenand.lds b/onenand_ipl/board/apollon/u-boot.onenand.lds index 0960c12ceb..721d2f5949 100644 --- a/onenand_ipl/board/apollon/u-boot.onenand.lds +++ b/onenand_ipl/board/apollon/u-boot.onenand.lds @@ -49,5 +49,5 @@ SECTIONS . = ALIGN(4); __bss_start = .; .bss : { *(.bss) . = ALIGN(4); } - _end = .; + __bss_end__ = .; } diff --git a/onenand_ipl/board/vpac270/u-boot.onenand.lds b/onenand_ipl/board/vpac270/u-boot.onenand.lds index b2e7557f39..b5b26461a4 100644 --- a/onenand_ipl/board/vpac270/u-boot.onenand.lds +++ b/onenand_ipl/board/vpac270/u-boot.onenand.lds @@ -47,5 +47,5 @@ SECTIONS . = ALIGN(4); __bss_start = .; .bss : { *(.bss) . = ALIGN(4); } - _end = .; + __bss_end__ = .; } From f326cbba98bae21d41df8daac0bd78121d557af1 Mon Sep 17 00:00:00 2001 From: Po-Yu Chuang Date: Tue, 1 Mar 2011 23:02:04 +0000 Subject: [PATCH 02/17] arm: fix incorrect monitor protection region in FLASH Monitor protection region in FLASH did not cover .rel.dyn and .dynsym sections, because it uses __bss_start to compute monitor_flash_len. Use _end instead. Add _end to linker scripts for end of u-boot image Add _end_ofs to all the start.S. Signed-off-by: Po-Yu Chuang --- arch/arm/cpu/arm1136/start.S | 4 ++++ arch/arm/cpu/arm1136/u-boot.lds | 2 ++ arch/arm/cpu/arm1176/start.S | 4 ++++ arch/arm/cpu/arm1176/u-boot.lds | 2 ++ arch/arm/cpu/arm720t/start.S | 4 ++++ arch/arm/cpu/arm720t/u-boot.lds | 2 ++ arch/arm/cpu/arm920t/ep93xx/u-boot.lds | 2 ++ arch/arm/cpu/arm920t/start.S | 4 ++++ arch/arm/cpu/arm920t/u-boot.lds | 2 ++ arch/arm/cpu/arm925t/start.S | 4 ++++ arch/arm/cpu/arm925t/u-boot.lds | 2 ++ arch/arm/cpu/arm926ejs/start.S | 4 ++++ arch/arm/cpu/arm926ejs/u-boot.lds | 2 ++ arch/arm/cpu/arm946es/start.S | 4 ++++ arch/arm/cpu/arm946es/u-boot.lds | 2 ++ arch/arm/cpu/arm_intcm/start.S | 4 ++++ arch/arm/cpu/arm_intcm/u-boot.lds | 2 ++ arch/arm/cpu/armv7/start.S | 4 ++++ arch/arm/cpu/armv7/u-boot.lds | 2 ++ arch/arm/cpu/ixp/start.S | 4 ++++ arch/arm/cpu/ixp/u-boot.lds | 2 ++ arch/arm/cpu/lh7a40x/start.S | 4 ++++ arch/arm/cpu/lh7a40x/u-boot.lds | 2 ++ arch/arm/cpu/pxa/start.S | 4 ++++ arch/arm/cpu/pxa/u-boot.lds | 2 ++ arch/arm/cpu/s3c44b0/start.S | 4 ++++ arch/arm/cpu/s3c44b0/u-boot.lds | 2 ++ arch/arm/cpu/sa1100/start.S | 4 ++++ arch/arm/cpu/sa1100/u-boot.lds | 2 ++ arch/arm/include/asm/u-boot-arm.h | 1 + arch/arm/lib/board.c | 2 +- 31 files changed, 88 insertions(+), 1 deletion(-) diff --git a/arch/arm/cpu/arm1136/start.S b/arch/arm/cpu/arm1136/start.S index 64426fa2a8..3c5f3ef5fa 100644 --- a/arch/arm/cpu/arm1136/start.S +++ b/arch/arm/cpu/arm1136/start.S @@ -104,6 +104,10 @@ _bss_start_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 diff --git a/arch/arm/cpu/arm1136/u-boot.lds b/arch/arm/cpu/arm1136/u-boot.lds index 1e0e90b4af..d1e28518ad 100644 --- a/arch/arm/cpu/arm1136/u-boot.lds +++ b/arch/arm/cpu/arm1136/u-boot.lds @@ -72,6 +72,8 @@ SECTIONS *(.dynsym) } + _end = .; + .bss __rel_dyn_start (OVERLAY) : { __bss_start = .; *(.bss) diff --git a/arch/arm/cpu/arm1176/start.S b/arch/arm/cpu/arm1176/start.S index c1302df653..6ae118ac45 100644 --- a/arch/arm/cpu/arm1176/start.S +++ b/arch/arm/cpu/arm1176/start.S @@ -123,6 +123,10 @@ _bss_start_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: diff --git a/arch/arm/cpu/arm1176/u-boot.lds b/arch/arm/cpu/arm1176/u-boot.lds index 170e516550..27d66380bd 100644 --- a/arch/arm/cpu/arm1176/u-boot.lds +++ b/arch/arm/cpu/arm1176/u-boot.lds @@ -61,6 +61,8 @@ SECTIONS *(.dynsym) } + _end = .; + .bss __rel_dyn_start (OVERLAY) : { __bss_start = .; *(.bss) diff --git a/arch/arm/cpu/arm720t/start.S b/arch/arm/cpu/arm720t/start.S index c521753f3b..e774c3ff67 100644 --- a/arch/arm/cpu/arm720t/start.S +++ b/arch/arm/cpu/arm720t/start.S @@ -93,6 +93,10 @@ _bss_start_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 diff --git a/arch/arm/cpu/arm720t/u-boot.lds b/arch/arm/cpu/arm720t/u-boot.lds index deda9fb0db..9370fadcf5 100644 --- a/arch/arm/cpu/arm720t/u-boot.lds +++ b/arch/arm/cpu/arm720t/u-boot.lds @@ -62,6 +62,8 @@ SECTIONS *(.dynsym) } + _end = .; + .bss __rel_dyn_start (OVERLAY) : { __bss_start = .; *(.bss) diff --git a/arch/arm/cpu/arm920t/ep93xx/u-boot.lds b/arch/arm/cpu/arm920t/ep93xx/u-boot.lds index 4cc82a54b1..dc6ba34082 100644 --- a/arch/arm/cpu/arm920t/ep93xx/u-boot.lds +++ b/arch/arm/cpu/arm920t/ep93xx/u-boot.lds @@ -56,4 +56,6 @@ SECTIONS __bss_start = .; .bss : { *(.bss) } __bss_end__ = .; + + _end = .; } diff --git a/arch/arm/cpu/arm920t/start.S b/arch/arm/cpu/arm920t/start.S index 6db61c215c..a7476b0550 100644 --- a/arch/arm/cpu/arm920t/start.S +++ b/arch/arm/cpu/arm920t/start.S @@ -89,6 +89,10 @@ _bss_start_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 diff --git a/arch/arm/cpu/arm920t/u-boot.lds b/arch/arm/cpu/arm920t/u-boot.lds index d6dc21c55d..17ba60423b 100644 --- a/arch/arm/cpu/arm920t/u-boot.lds +++ b/arch/arm/cpu/arm920t/u-boot.lds @@ -71,6 +71,8 @@ SECTIONS *(.dynsym) } + _end = .; + .bss __rel_dyn_start (OVERLAY) : { __bss_start = .; *(.bss) diff --git a/arch/arm/cpu/arm925t/start.S b/arch/arm/cpu/arm925t/start.S index b89cf4ae81..39f2e997d2 100644 --- a/arch/arm/cpu/arm925t/start.S +++ b/arch/arm/cpu/arm925t/start.S @@ -99,6 +99,10 @@ _bss_start_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 diff --git a/arch/arm/cpu/arm925t/u-boot.lds b/arch/arm/cpu/arm925t/u-boot.lds index 4ad1f8ed07..64e76f55e3 100644 --- a/arch/arm/cpu/arm925t/u-boot.lds +++ b/arch/arm/cpu/arm925t/u-boot.lds @@ -66,6 +66,8 @@ SECTIONS *(.dynsym) } + _end = .; + .bss __rel_dyn_start (OVERLAY) : { __bss_start = .; *(.bss) diff --git a/arch/arm/cpu/arm926ejs/start.S b/arch/arm/cpu/arm926ejs/start.S index 7798ef82a9..fefcfa2f88 100644 --- a/arch/arm/cpu/arm926ejs/start.S +++ b/arch/arm/cpu/arm926ejs/start.S @@ -133,6 +133,10 @@ _bss_start_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 diff --git a/arch/arm/cpu/arm926ejs/u-boot.lds b/arch/arm/cpu/arm926ejs/u-boot.lds index b7a5b9e66f..1480e0c960 100644 --- a/arch/arm/cpu/arm926ejs/u-boot.lds +++ b/arch/arm/cpu/arm926ejs/u-boot.lds @@ -63,6 +63,8 @@ SECTIONS *(.dynsym) } + _end = .; + .bss __rel_dyn_start (OVERLAY) : { __bss_start = .; *(.bss) diff --git a/arch/arm/cpu/arm946es/start.S b/arch/arm/cpu/arm946es/start.S index 1b6b188516..00914f42e9 100644 --- a/arch/arm/cpu/arm946es/start.S +++ b/arch/arm/cpu/arm946es/start.S @@ -105,6 +105,10 @@ _bss_start_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 diff --git a/arch/arm/cpu/arm946es/u-boot.lds b/arch/arm/cpu/arm946es/u-boot.lds index fe4a646dfd..ff938e44d8 100644 --- a/arch/arm/cpu/arm946es/u-boot.lds +++ b/arch/arm/cpu/arm946es/u-boot.lds @@ -63,6 +63,8 @@ SECTIONS *(.dynsym) } + _end = .; + .bss __rel_dyn_start (OVERLAY) : { __bss_start = .; *(.bss) diff --git a/arch/arm/cpu/arm_intcm/start.S b/arch/arm/cpu/arm_intcm/start.S index da2c265fcb..2fd3b9a05a 100644 --- a/arch/arm/cpu/arm_intcm/start.S +++ b/arch/arm/cpu/arm_intcm/start.S @@ -101,6 +101,10 @@ _bss_start_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 diff --git a/arch/arm/cpu/arm_intcm/u-boot.lds b/arch/arm/cpu/arm_intcm/u-boot.lds index 899fab06ff..f4a146c9a8 100644 --- a/arch/arm/cpu/arm_intcm/u-boot.lds +++ b/arch/arm/cpu/arm_intcm/u-boot.lds @@ -63,6 +63,8 @@ SECTIONS *(.dynsym) } + _end = .; + .bss __rel_dyn_start (OVERLAY) : { __bss_start = .; *(.bss) diff --git a/arch/arm/cpu/armv7/start.S b/arch/arm/cpu/armv7/start.S index bc7bae85c0..d83d501837 100644 --- a/arch/arm/cpu/armv7/start.S +++ b/arch/arm/cpu/armv7/start.S @@ -81,6 +81,10 @@ _bss_start_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 diff --git a/arch/arm/cpu/armv7/u-boot.lds b/arch/arm/cpu/armv7/u-boot.lds index de8024459d..dbae54d4f8 100644 --- a/arch/arm/cpu/armv7/u-boot.lds +++ b/arch/arm/cpu/armv7/u-boot.lds @@ -66,6 +66,8 @@ SECTIONS *(.dynsym) } + _end = .; + .bss __rel_dyn_start (OVERLAY) : { __bss_start = .; *(.bss) diff --git a/arch/arm/cpu/ixp/start.S b/arch/arm/cpu/ixp/start.S index f8bfed7cc6..561c1f4795 100644 --- a/arch/arm/cpu/ixp/start.S +++ b/arch/arm/cpu/ixp/start.S @@ -112,6 +112,10 @@ _bss_start_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 diff --git a/arch/arm/cpu/ixp/u-boot.lds b/arch/arm/cpu/ixp/u-boot.lds index 7029c6c7d9..3587f8aa6b 100644 --- a/arch/arm/cpu/ixp/u-boot.lds +++ b/arch/arm/cpu/ixp/u-boot.lds @@ -63,6 +63,8 @@ SECTIONS *(.dynsym) } + _end = .; + .bss __rel_dyn_start (OVERLAY) : { __bss_start = .; *(.bss) diff --git a/arch/arm/cpu/lh7a40x/start.S b/arch/arm/cpu/lh7a40x/start.S index bd821a270d..81242b1ed4 100644 --- a/arch/arm/cpu/lh7a40x/start.S +++ b/arch/arm/cpu/lh7a40x/start.S @@ -89,6 +89,10 @@ _bss_start_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 diff --git a/arch/arm/cpu/lh7a40x/u-boot.lds b/arch/arm/cpu/lh7a40x/u-boot.lds index b15ab1e572..30934ff3e3 100644 --- a/arch/arm/cpu/lh7a40x/u-boot.lds +++ b/arch/arm/cpu/lh7a40x/u-boot.lds @@ -63,6 +63,8 @@ SECTIONS *(.dynsym) } + _end = .; + .bss __rel_dyn_start (OVERLAY) : { __bss_start = .; *(.bss) diff --git a/arch/arm/cpu/pxa/start.S b/arch/arm/cpu/pxa/start.S index ca072c4744..f1dbc3b35d 100644 --- a/arch/arm/cpu/pxa/start.S +++ b/arch/arm/cpu/pxa/start.S @@ -106,6 +106,10 @@ _bss_start_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 diff --git a/arch/arm/cpu/pxa/u-boot.lds b/arch/arm/cpu/pxa/u-boot.lds index dfb9b77535..e163369bc3 100644 --- a/arch/arm/cpu/pxa/u-boot.lds +++ b/arch/arm/cpu/pxa/u-boot.lds @@ -63,6 +63,8 @@ SECTIONS *(.dynsym) } + _end = .; + .bss __rel_dyn_start (OVERLAY) : { __bss_start = .; *(.bss) diff --git a/arch/arm/cpu/s3c44b0/start.S b/arch/arm/cpu/s3c44b0/start.S index ac1c4fb58e..10f5284d45 100644 --- a/arch/arm/cpu/s3c44b0/start.S +++ b/arch/arm/cpu/s3c44b0/start.S @@ -80,6 +80,10 @@ _bss_start_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 diff --git a/arch/arm/cpu/s3c44b0/u-boot.lds b/arch/arm/cpu/s3c44b0/u-boot.lds index 797edbc943..74a259c0d5 100644 --- a/arch/arm/cpu/s3c44b0/u-boot.lds +++ b/arch/arm/cpu/s3c44b0/u-boot.lds @@ -63,6 +63,8 @@ SECTIONS *(.dynsym) } + _end = .; + .bss __rel_dyn_start (OVERLAY) : { __bss_start = .; *(.bss) diff --git a/arch/arm/cpu/sa1100/start.S b/arch/arm/cpu/sa1100/start.S index 5cfe19bcc5..b27e970152 100644 --- a/arch/arm/cpu/sa1100/start.S +++ b/arch/arm/cpu/sa1100/start.S @@ -90,6 +90,10 @@ _bss_start_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 diff --git a/arch/arm/cpu/sa1100/u-boot.lds b/arch/arm/cpu/sa1100/u-boot.lds index 0ac13296b9..e6381dacf6 100644 --- a/arch/arm/cpu/sa1100/u-boot.lds +++ b/arch/arm/cpu/sa1100/u-boot.lds @@ -66,6 +66,8 @@ SECTIONS *(.dynsym) } + _end = .; + .bss __rel_dyn_start (OVERLAY) : { __bss_start = .; *(.bss) diff --git a/arch/arm/include/asm/u-boot-arm.h b/arch/arm/include/asm/u-boot-arm.h index 33973a32e0..3904027016 100644 --- a/arch/arm/include/asm/u-boot-arm.h +++ b/arch/arm/include/asm/u-boot-arm.h @@ -32,6 +32,7 @@ /* for the following variables, see start.S */ 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 IRQ_STACK_START; /* top of IRQ stack */ extern ulong FIQ_STACK_START; /* top of FIQ stack */ extern ulong _TEXT_BASE; /* code start */ diff --git a/arch/arm/lib/board.c b/arch/arm/lib/board.c index c620d2c200..dc46e21dba 100644 --- a/arch/arm/lib/board.c +++ b/arch/arm/lib/board.c @@ -459,7 +459,7 @@ void board_init_r (gd_t *id, ulong dest_addr) gd->flags |= GD_FLG_RELOC; /* tell others: relocation done */ - monitor_flash_len = _bss_start_ofs; + monitor_flash_len = _end_ofs; debug ("monitor flash len: %08lX\n", monitor_flash_len); board_init(); /* Setup chipselects */ From 6d56073c60edbade4c2e83a45e631dbd3ea392e0 Mon Sep 17 00:00:00 2001 From: seedshope Date: Sat, 22 Jan 2011 10:06:09 +0000 Subject: [PATCH 03/17] SMDK6400: Fix CONFIG_SYS_INIT_SP_ADDR undefined Fix CONFIG_SYS_INIT_SP_ADDR undefined issue. Signed-off-by: Zhong Hongbo Signed-off-by: Minkyu Kang --- include/configs/smdk6400.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/include/configs/smdk6400.h b/include/configs/smdk6400.h index 671f2c7c8b..c9acf5815f 100644 --- a/include/configs/smdk6400.h +++ b/include/configs/smdk6400.h @@ -44,6 +44,11 @@ #define CONFIG_PERIPORT_BASE 0x70000000 #define CONFIG_PERIPORT_SIZE 0x13 +#define CONFIG_SYS_IRAM_BASE 0x0c000000 /* Internal SRAM base address */ +#define CONFIG_SYS_IRAM_SIZE 0x2000 /* 8 KB of internal SRAM memory */ +#define CONFIG_SYS_IRAM_END (CONFIG_SYS_IRAM_BASE + CONFIG_SYS_IRAM_SIZE) +#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_IRAM_END - GENERATED_GBL_DATA_SIZE) + #define CONFIG_SYS_SDRAM_BASE 0x50000000 /* input clock of PLL: SMDK6400 has 12MHz input clock */ From 6c0db6fb7f72b1b3dde72ccfb3a8bcce0ceee747 Mon Sep 17 00:00:00 2001 From: seedshope Date: Sat, 22 Jan 2011 10:06:10 +0000 Subject: [PATCH 04/17] SMDK6400: Fix some label undefined in build error Modify Makefile for cpu_init.c and Start.s use some label,this defined u-boot.lds of arch/arm/cpu/arm1176. But SMDK6400 use the link script board/samsung/smdk6400/u-boot-nand.lds. So add some label form u-boot.lds to u-boot-nand.lds Signed-off-by: Zhong Hongbo Signed-off-by: Minkyu Kang --- board/samsung/smdk6400/u-boot-nand.lds | 27 +++++++++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) diff --git a/board/samsung/smdk6400/u-boot-nand.lds b/board/samsung/smdk6400/u-boot-nand.lds index 975601b5c2..ef99dc9c29 100644 --- a/board/samsung/smdk6400/u-boot-nand.lds +++ b/board/samsung/smdk6400/u-boot-nand.lds @@ -56,7 +56,28 @@ SECTIONS .mmudata : { *(.mmudata) } . = ALIGN(4); - __bss_start = .; - .bss : { *(.bss) . = ALIGN(4); } - __bss_end__ = .; + + .rel.dyn : { + __rel_dyn_start = .; + *(.rel*) + __rel_dyn_end = .; + } + + .dynsym : { + __dynsym_start = .; + *(.dynsym) + } + + .bss __rel_dyn_start (OVERLAY) : { + __bss_start = .; + *(.bss) + . = ALIGN(4); + __bss_end__ = .; + } + + /DISCARD/ : { *(.dynstr*) } + /DISCARD/ : { *(.dynamic*) } + /DISCARD/ : { *(.plt*) } + /DISCARD/ : { *(.interp*) } + /DISCARD/ : { *(.gnu*) } } From fb3527575dce5ced00bf3c2e92ce13a1fc491747 Mon Sep 17 00:00:00 2001 From: seedshope Date: Sat, 22 Jan 2011 10:06:11 +0000 Subject: [PATCH 05/17] SMDK6400: Fix the mutiple link error The first, the cpu_init.o have already been link for cmd_link_o_target atfer compile, But, The link script re-link the point file. So the link machine will generate multiple definition error information. The second, Since the first 4kB of nand boot featue code move to nand_spl, So It is not necessary to force the cpu_init.o in non-nand boot. Signed-off-by: Zhong Hongbo Signed-off-by: Minkyu Kang --- board/samsung/smdk6400/u-boot-nand.lds | 1 - 1 file changed, 1 deletion(-) diff --git a/board/samsung/smdk6400/u-boot-nand.lds b/board/samsung/smdk6400/u-boot-nand.lds index ef99dc9c29..21e1ed3b7a 100644 --- a/board/samsung/smdk6400/u-boot-nand.lds +++ b/board/samsung/smdk6400/u-boot-nand.lds @@ -35,7 +35,6 @@ SECTIONS .text : { arch/arm/cpu/arm1176/start.o (.text) - arch/arm/cpu/arm1176/s3c64xx/cpu_init.o (.text) *(.text) } From 6dde5074cce290839afdd8e329efb7301cb9fcce Mon Sep 17 00:00:00 2001 From: seedshope Date: Sat, 22 Jan 2011 10:06:12 +0000 Subject: [PATCH 06/17] SMDK6400: Add some labels to u-boot.lds to support nand_spl In the nand_spl feature of SMDK6400. Add some relocation symbols to nand_spl/board/samsung/smdk6400/u-boot.lds to fix the compile error. Signed-off-by: Zhong Hongbo Signed-off-by: Minkyu Kang --- nand_spl/board/samsung/smdk6400/u-boot.lds | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/nand_spl/board/samsung/smdk6400/u-boot.lds b/nand_spl/board/samsung/smdk6400/u-boot.lds index 4cb686c7e5..0153e0e09b 100644 --- a/nand_spl/board/samsung/smdk6400/u-boot.lds +++ b/nand_spl/board/samsung/smdk6400/u-boot.lds @@ -55,7 +55,22 @@ SECTIONS __u_boot_cmd_end = .; . = ALIGN(4); + + .rel.dyn : { + __rel_dyn_start = .; + *(.rel*) + __rel_dyn_end = .; + } + + .dynsym : { + __dynsym_start = .; + *(.dynsym) + } + + .bss __rel_dyn_start (OVERLAY) : { __bss_start = .; - .bss : { *(.bss) . = ALIGN(4); } + *(.bss) + . = ALIGN(4); __bss_end__ = .; + } } From 9a3a49fb00a22324873f1e331379877ec3374962 Mon Sep 17 00:00:00 2001 From: seedshope Date: Sat, 22 Jan 2011 10:06:13 +0000 Subject: [PATCH 07/17] SMDK6400: Disable LED function in start.s on the nand booting Since nand boot have some limit for the first 4KB, We only disable the LED function to reduce the code space. At the same time, Fix the compile error for LED function undefined in the compile time of nand_spl. Signed-off-by: Zhong Hongbo Signed-off-by: Minkyu Kang --- arch/arm/cpu/arm1176/start.S | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm/cpu/arm1176/start.S b/arch/arm/cpu/arm1176/start.S index 6ae118ac45..b095f22f68 100644 --- a/arch/arm/cpu/arm1176/start.S +++ b/arch/arm/cpu/arm1176/start.S @@ -356,9 +356,11 @@ clbss_l:str r2, [r0] /* clear loop... */ cmp r0, r1 bne clbss_l +#ifndef CONFIG_NAND_SPL bl coloured_LED_init bl red_LED_on #endif +#endif /* * We are done. Do not return, instead branch to second part of board From ecc7cedd5ae1d63b50094efeb392a5925ec0f1de Mon Sep 17 00:00:00 2001 From: seedshope Date: Sat, 22 Jan 2011 10:06:14 +0000 Subject: [PATCH 08/17] SMDK6400: Fixup dram_init for relocation support Signed-off-by: Zhong Hongbo Signed-off-by: Minkyu Kang --- board/samsung/smdk6400/smdk6400.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/board/samsung/smdk6400/smdk6400.c b/board/samsung/smdk6400/smdk6400.c index 35aa40b30d..13c7ed5189 100644 --- a/board/samsung/smdk6400/smdk6400.c +++ b/board/samsung/smdk6400/smdk6400.c @@ -78,10 +78,16 @@ int board_init(void) return 0; } -int dram_init(void) +void dram_init_banksize(void) { gd->bd->bi_dram[0].start = PHYS_SDRAM_1; gd->bd->bi_dram[0].size = PHYS_SDRAM_1_SIZE; +} + +int dram_init(void) +{ + gd->ram_size = get_ram_size((long *)CONFIG_SYS_SDRAM_BASE, + PHYS_SDRAM_1_SIZE); return 0; } From 3f129280b3f1df51387447d8366ab6c3b6607547 Mon Sep 17 00:00:00 2001 From: Donghwa Lee Date: Mon, 7 Mar 2011 21:11:42 +0000 Subject: [PATCH 09/17] ARM: S5P: pwm driver support This is common pwm driver of S5P. Signed-off-by: Donghwa Lee Signed-off-by: Kyungmin Park Signed-off-by: Minkyu Kang --- arch/arm/cpu/armv7/s5p-common/Makefile | 1 + arch/arm/cpu/armv7/s5p-common/pwm.c | 189 ++++++++++++++++++++++++ arch/arm/include/asm/arch-s5pc1xx/pwm.h | 19 +++ arch/arm/include/asm/arch-s5pc2xx/pwm.h | 19 +++ include/pwm.h | 31 ++++ 5 files changed, 259 insertions(+) create mode 100644 arch/arm/cpu/armv7/s5p-common/pwm.c create mode 100644 include/pwm.h diff --git a/arch/arm/cpu/armv7/s5p-common/Makefile b/arch/arm/cpu/armv7/s5p-common/Makefile index 922cd95448..ce0a41e2c1 100644 --- a/arch/arm/cpu/armv7/s5p-common/Makefile +++ b/arch/arm/cpu/armv7/s5p-common/Makefile @@ -27,6 +27,7 @@ LIB = $(obj)libs5p-common.o COBJS-y += cpu_info.o COBJS-y += timer.o +COBJS-$(CONFIG_PWM) += pwm.o SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) OBJS := $(addprefix $(obj),$(COBJS-y) $(SOBJS)) diff --git a/arch/arm/cpu/armv7/s5p-common/pwm.c b/arch/arm/cpu/armv7/s5p-common/pwm.c new file mode 100644 index 0000000000..ff95b84f55 --- /dev/null +++ b/arch/arm/cpu/armv7/s5p-common/pwm.c @@ -0,0 +1,189 @@ +/* + * Copyright (C) 2011 Samsung Electronics + * + * Donghwa Lee + * + * See file CREDITS for list of people who contributed to this + * project. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + */ + +#include +#include +#include +#include +#include +#include + +int pwm_enable(int pwm_id) +{ + const struct s5p_timer *pwm = + (struct s5p_timer *)samsung_get_base_timer(); + unsigned long tcon; + + tcon = readl(&pwm->tcon); + tcon |= TCON_START(pwm_id); + + writel(tcon, &pwm->tcon); + + return 0; +} + +void pwm_disable(int pwm_id) +{ + const struct s5p_timer *pwm = + (struct s5p_timer *)samsung_get_base_timer(); + unsigned long tcon; + + tcon = readl(&pwm->tcon); + tcon &= ~TCON_START(pwm_id); + + writel(tcon, &pwm->tcon); +} + +static unsigned long pwm_calc_tin(int pwm_id, unsigned long freq) +{ + unsigned long tin_parent_rate; + unsigned int div; + + tin_parent_rate = get_pwm_clk(); + + for (div = 2; div <= 16; div *= 2) { + if ((tin_parent_rate / (div << 16)) < freq) + return tin_parent_rate / div; + } + + return tin_parent_rate / 16; +} + +#define NS_IN_HZ (1000000000UL) + +int pwm_config(int pwm_id, int duty_ns, int period_ns) +{ + const struct s5p_timer *pwm = + (struct s5p_timer *)samsung_get_base_timer(); + unsigned int offset; + unsigned long tin_rate; + unsigned long tin_ns; + unsigned long period; + unsigned long tcon; + unsigned long tcnt; + unsigned long timer_rate_hz; + unsigned long tcmp; + + /* + * We currently avoid using 64bit arithmetic by using the + * fact that anything faster than 1GHz is easily representable + * by 32bits. + */ + if (period_ns > NS_IN_HZ || duty_ns > NS_IN_HZ) + return -ERANGE; + + if (duty_ns > period_ns) + return -EINVAL; + + period = NS_IN_HZ / period_ns; + + /* Check to see if we are changing the clock rate of the PWM */ + tin_rate = pwm_calc_tin(pwm_id, period); + timer_rate_hz = tin_rate; + + tin_ns = NS_IN_HZ / tin_rate; + tcnt = period_ns / tin_ns; + + /* Note, counters count down */ + tcmp = duty_ns / tin_ns; + tcmp = tcnt - tcmp; + + /* + * the pwm hw only checks the compare register after a decrement, + * so the pin never toggles if tcmp = tcnt + */ + if (tcmp == tcnt) + tcmp--; + + if (tcmp < 0) + tcmp = 0; + + /* Update the PWM register block. */ + offset = pwm_id * 3; + if (pwm_id < 4) { + writel(tcnt, &pwm->tcntb0 + offset); + writel(tcmp, &pwm->tcmpb0 + offset); + } + + tcon = readl(&pwm->tcon); + tcon |= TCON_UPDATE(pwm_id); + if (pwm_id < 4) + tcon |= TCON_AUTO_RELOAD(pwm_id); + else + tcon |= TCON4_AUTO_RELOAD; + writel(tcon, &pwm->tcon); + + tcon &= ~TCON_UPDATE(pwm_id); + writel(tcon, &pwm->tcon); + + return 0; +} + +int pwm_init(int pwm_id, int div, int invert) +{ + u32 val; + const struct s5p_timer *pwm = + (struct s5p_timer *)samsung_get_base_timer(); + unsigned long timer_rate_hz; + unsigned int offset, prescaler; + + /* + * Timer Freq(HZ) = + * PWM_CLK / { (prescaler_value + 1) * (divider_value) } + */ + + val = readl(&pwm->tcfg0); + if (pwm_id < 2) { + prescaler = PRESCALER_0; + val &= ~0xff; + val |= (prescaler & 0xff); + } else { + prescaler = PRESCALER_1; + val &= ~(0xff << 8); + val |= (prescaler & 0xff) << 8; + } + writel(val, &pwm->tcfg0); + val = readl(&pwm->tcfg1); + val &= ~(0xf << MUX_DIV_SHIFT(pwm_id)); + val |= (div & 0xf) << MUX_DIV_SHIFT(pwm_id); + writel(val, &pwm->tcfg1); + + timer_rate_hz = get_pwm_clk() / ((prescaler + 1) * + (div + 1)); + + timer_rate_hz = timer_rate_hz / 100; + + /* set count value */ + offset = pwm_id * 3; + writel(timer_rate_hz, &pwm->tcntb0 + offset); + + val = readl(&pwm->tcon) & ~(0xf << TCON_OFFSET(pwm_id)); + if (invert && (pwm_id < 4)) + val |= TCON_INVERTER(pwm_id); + writel(val, &pwm->tcon); + + pwm_enable(pwm_id); + + return 0; +} diff --git a/arch/arm/include/asm/arch-s5pc1xx/pwm.h b/arch/arm/include/asm/arch-s5pc1xx/pwm.h index 0369968d4a..de4dbce076 100644 --- a/arch/arm/include/asm/arch-s5pc1xx/pwm.h +++ b/arch/arm/include/asm/arch-s5pc1xx/pwm.h @@ -22,6 +22,18 @@ #ifndef __ASM_ARM_ARCH_PWM_H_ #define __ASM_ARM_ARCH_PWM_H_ +#define PRESCALER_0 (8 - 1) /* prescaler of timer 0, 1 */ +#define PRESCALER_1 (16 - 1) /* prescaler of timer 2, 3, 4 */ + +/* Divider MUX */ +#define MUX_DIV_1 0 /* 1/1 period */ +#define MUX_DIV_2 1 /* 1/2 period */ +#define MUX_DIV_4 2 /* 1/4 period */ +#define MUX_DIV_8 3 /* 1/8 period */ +#define MUX_DIV_16 4 /* 1/16 period */ + +#define MUX_DIV_SHIFT(x) (x * 4) + /* Interval mode(Auto Reload) of PWM Timer 4 */ #define TCON4_AUTO_RELOAD (1 << 22) /* Update TCNTB4 */ @@ -29,6 +41,13 @@ /* start bit of PWM Timer 4 */ #define TCON4_START (1 << 20) +#define TCON_OFFSET(x) ((x + 1) * (!!x) << 2) + +#define TCON_START(x) (1 << TCON_OFFSET(x)) +#define TCON_UPDATE(x) (1 << (TCON_OFFSET(x) + 1)) +#define TCON_INVERTER(x) (1 << (TCON_OFFSET(x) + 2)) +#define TCON_AUTO_RELOAD(x) (1 << (TCON_OFFSET(x) + 3)) + #ifndef __ASSEMBLY__ struct s5p_timer { unsigned int tcfg0; diff --git a/arch/arm/include/asm/arch-s5pc2xx/pwm.h b/arch/arm/include/asm/arch-s5pc2xx/pwm.h index 0369968d4a..de4dbce076 100644 --- a/arch/arm/include/asm/arch-s5pc2xx/pwm.h +++ b/arch/arm/include/asm/arch-s5pc2xx/pwm.h @@ -22,6 +22,18 @@ #ifndef __ASM_ARM_ARCH_PWM_H_ #define __ASM_ARM_ARCH_PWM_H_ +#define PRESCALER_0 (8 - 1) /* prescaler of timer 0, 1 */ +#define PRESCALER_1 (16 - 1) /* prescaler of timer 2, 3, 4 */ + +/* Divider MUX */ +#define MUX_DIV_1 0 /* 1/1 period */ +#define MUX_DIV_2 1 /* 1/2 period */ +#define MUX_DIV_4 2 /* 1/4 period */ +#define MUX_DIV_8 3 /* 1/8 period */ +#define MUX_DIV_16 4 /* 1/16 period */ + +#define MUX_DIV_SHIFT(x) (x * 4) + /* Interval mode(Auto Reload) of PWM Timer 4 */ #define TCON4_AUTO_RELOAD (1 << 22) /* Update TCNTB4 */ @@ -29,6 +41,13 @@ /* start bit of PWM Timer 4 */ #define TCON4_START (1 << 20) +#define TCON_OFFSET(x) ((x + 1) * (!!x) << 2) + +#define TCON_START(x) (1 << TCON_OFFSET(x)) +#define TCON_UPDATE(x) (1 << (TCON_OFFSET(x) + 1)) +#define TCON_INVERTER(x) (1 << (TCON_OFFSET(x) + 2)) +#define TCON_AUTO_RELOAD(x) (1 << (TCON_OFFSET(x) + 3)) + #ifndef __ASSEMBLY__ struct s5p_timer { unsigned int tcfg0; diff --git a/include/pwm.h b/include/pwm.h new file mode 100644 index 0000000000..13acf85933 --- /dev/null +++ b/include/pwm.h @@ -0,0 +1,31 @@ +/* + * header file for pwm driver. + * + * Copyright (c) 2011 samsung electronics + * Donghwa Lee + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + */ + +#ifndef _pwm_h_ +#define _pwm_h_ + +int pwm_init (int pwm_id, int div, int invert); +int pwm_config (int pwm_id, int duty_ns, int period_ns); +int pwm_enable (int pwm_id); +void pwm_disable (int pwm_id); + +#endif /* _pwm_h_ */ From 70fc52dfaa04a1ec70188dadec794b45fca48628 Mon Sep 17 00:00:00 2001 From: Minkyu Kang Date: Thu, 10 Mar 2011 20:05:58 +0900 Subject: [PATCH 10/17] S5P: timer: Use pwm functions Use pwm functions for timer that is PWM timer 4. Signed-off-by: Minkyu Kang --- arch/arm/cpu/armv7/s5p-common/timer.c | 49 +++---------------------- arch/arm/include/asm/arch-s5pc1xx/pwm.h | 8 +--- arch/arm/include/asm/arch-s5pc2xx/pwm.h | 8 +--- 3 files changed, 7 insertions(+), 58 deletions(-) diff --git a/arch/arm/cpu/armv7/s5p-common/timer.c b/arch/arm/cpu/armv7/s5p-common/timer.c index 651fd5ddff..cf61ee0d48 100644 --- a/arch/arm/cpu/armv7/s5p-common/timer.c +++ b/arch/arm/cpu/armv7/s5p-common/timer.c @@ -27,15 +27,7 @@ #include #include #include - -#define PRESCALER_1 (16 - 1) /* prescaler of timer 2, 3, 4 */ -#define MUX_DIV_2 1 /* 1/2 period */ -#define MUX_DIV_4 2 /* 1/4 period */ -#define MUX_DIV_8 3 /* 1/8 period */ -#define MUX_DIV_16 4 /* 1/16 period */ -#define MUX4_DIV_SHIFT 16 - -#define TCON_TIMER4_SHIFT 20 +#include static unsigned long count_value; @@ -51,41 +43,10 @@ static inline struct s5p_timer *s5p_get_base_timer(void) int timer_init(void) { - struct s5p_timer *const timer = s5p_get_base_timer(); - u32 val; - - /* - * @ PWM Timer 4 - * Timer Freq(HZ) = - * PWM_CLK / { (prescaler_value + 1) * (divider_value) } - */ - - /* set prescaler : 16 */ - /* set divider : 2 */ - writel((PRESCALER_1 & 0xff) << 8, &timer->tcfg0); - writel((MUX_DIV_2 & 0xf) << MUX4_DIV_SHIFT, &timer->tcfg1); - - /* count_value = 2085937.5(HZ) (per 1 sec)*/ - count_value = get_pwm_clk() / ((PRESCALER_1 + 1) * - (MUX_DIV_2 + 1)); - - /* count_value / 100 = 20859.375(HZ) (per 10 msec) */ - count_value = count_value / 100; - - /* set count value */ - writel(count_value, &timer->tcntb4); - lastdec = count_value; - - val = (readl(&timer->tcon) & ~(0x07 << TCON_TIMER4_SHIFT)) | - TCON4_AUTO_RELOAD; - - /* auto reload & manual update */ - writel(val | TCON4_UPDATE, &timer->tcon); - - /* start PWM timer 4 */ - writel(val | TCON4_START, &timer->tcon); - - timestamp = 0; + /* PWM Timer 4 */ + pwm_init(4, MUX_DIV_2, 0); + pwm_config(4, 0, 0); + pwm_enable(4); return 0; } diff --git a/arch/arm/include/asm/arch-s5pc1xx/pwm.h b/arch/arm/include/asm/arch-s5pc1xx/pwm.h index de4dbce076..d0cf3cb853 100644 --- a/arch/arm/include/asm/arch-s5pc1xx/pwm.h +++ b/arch/arm/include/asm/arch-s5pc1xx/pwm.h @@ -34,19 +34,13 @@ #define MUX_DIV_SHIFT(x) (x * 4) -/* Interval mode(Auto Reload) of PWM Timer 4 */ -#define TCON4_AUTO_RELOAD (1 << 22) -/* Update TCNTB4 */ -#define TCON4_UPDATE (1 << 21) -/* start bit of PWM Timer 4 */ -#define TCON4_START (1 << 20) - #define TCON_OFFSET(x) ((x + 1) * (!!x) << 2) #define TCON_START(x) (1 << TCON_OFFSET(x)) #define TCON_UPDATE(x) (1 << (TCON_OFFSET(x) + 1)) #define TCON_INVERTER(x) (1 << (TCON_OFFSET(x) + 2)) #define TCON_AUTO_RELOAD(x) (1 << (TCON_OFFSET(x) + 3)) +#define TCON4_AUTO_RELOAD (1 << 22) #ifndef __ASSEMBLY__ struct s5p_timer { diff --git a/arch/arm/include/asm/arch-s5pc2xx/pwm.h b/arch/arm/include/asm/arch-s5pc2xx/pwm.h index de4dbce076..d0cf3cb853 100644 --- a/arch/arm/include/asm/arch-s5pc2xx/pwm.h +++ b/arch/arm/include/asm/arch-s5pc2xx/pwm.h @@ -34,19 +34,13 @@ #define MUX_DIV_SHIFT(x) (x * 4) -/* Interval mode(Auto Reload) of PWM Timer 4 */ -#define TCON4_AUTO_RELOAD (1 << 22) -/* Update TCNTB4 */ -#define TCON4_UPDATE (1 << 21) -/* start bit of PWM Timer 4 */ -#define TCON4_START (1 << 20) - #define TCON_OFFSET(x) ((x + 1) * (!!x) << 2) #define TCON_START(x) (1 << TCON_OFFSET(x)) #define TCON_UPDATE(x) (1 << (TCON_OFFSET(x) + 1)) #define TCON_INVERTER(x) (1 << (TCON_OFFSET(x) + 2)) #define TCON_AUTO_RELOAD(x) (1 << (TCON_OFFSET(x) + 3)) +#define TCON4_AUTO_RELOAD (1 << 22) #ifndef __ASSEMBLY__ struct s5p_timer { From dc795a8882a45e1b5b3796454cfebb31feb179fc Mon Sep 17 00:00:00 2001 From: Minkyu Kang Date: Thu, 10 Mar 2011 20:09:43 +0900 Subject: [PATCH 11/17] S5P: smdkc100: Enable the pwm driver Signed-off-by: Minkyu Kang --- include/configs/smdkc100.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/configs/smdkc100.h b/include/configs/smdkc100.h index fb8b43c06d..1ae123445b 100644 --- a/include/configs/smdkc100.h +++ b/include/configs/smdkc100.h @@ -68,6 +68,9 @@ #define CONFIG_SERIAL0 1 /* use SERIAL 0 on SMDKC100 */ #define CONFIG_SERIAL_MULTI 1 +/* PWM */ +#define CONFIG_PWM 1 + /* allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE #define CONFIG_BAUDRATE 115200 From 96caf02f6078194655a8566d8c445d0ac4b52c4c Mon Sep 17 00:00:00 2001 From: Minkyu Kang Date: Thu, 10 Mar 2011 20:10:19 +0900 Subject: [PATCH 12/17] S5P: goni: Enable the pwm driver Signed-off-by: Minkyu Kang --- include/configs/s5p_goni.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/configs/s5p_goni.h b/include/configs/s5p_goni.h index f53e79810b..597cf57ab5 100644 --- a/include/configs/s5p_goni.h +++ b/include/configs/s5p_goni.h @@ -69,6 +69,9 @@ #define CONFIG_MMC 1 #define CONFIG_S5P_MMC 1 +/* PWM */ +#define CONFIG_PWM 1 + /* It should define before config_cmd_default.h */ #define CONFIG_SYS_NO_FLASH 1 From aa44a45f734d06e3536e1a7461733b52aca4869c Mon Sep 17 00:00:00 2001 From: Minkyu Kang Date: Thu, 10 Mar 2011 20:10:38 +0900 Subject: [PATCH 13/17] S5P: universal: Enable the pwm driver Signed-off-by: Minkyu Kang --- include/configs/s5pc210_universal.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/configs/s5pc210_universal.h b/include/configs/s5pc210_universal.h index c033a8d626..5915984977 100644 --- a/include/configs/s5pc210_universal.h +++ b/include/configs/s5pc210_universal.h @@ -70,6 +70,9 @@ #define CONFIG_MMC 1 #define CONFIG_S5P_MMC 1 +/* PWM */ +#define CONFIG_PWM 1 + /* It should define before config_cmd_default.h */ #define CONFIG_SYS_NO_FLASH 1 From 9aca34d6ab4f17033ee65efaa584c591e7df873c Mon Sep 17 00:00:00 2001 From: Minkyu Kang Date: Wed, 16 Mar 2011 20:09:20 +0900 Subject: [PATCH 14/17] S5P: timer: replace bss variable by gd Use the global data instead of bss variable, replace as follow. count_value -> removed timestamp -> tbl lastdec -> lastinc Signed-off-by: Minkyu Kang Signed-off-by: Kyungmin Park Acked-by: Albert ARIBAUD --- arch/arm/cpu/armv7/s5p-common/timer.c | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/arch/arm/cpu/armv7/s5p-common/timer.c b/arch/arm/cpu/armv7/s5p-common/timer.c index cf61ee0d48..b750d16141 100644 --- a/arch/arm/cpu/armv7/s5p-common/timer.c +++ b/arch/arm/cpu/armv7/s5p-common/timer.c @@ -29,11 +29,7 @@ #include #include -static unsigned long count_value; - -/* Internal tick units */ -static unsigned long long timestamp; /* Monotonic incrementing timer */ -static unsigned long lastdec; /* Last decremneter snapshot */ +DECLARE_GLOBAL_DATA_PTR; /* macro to read the 16 bit timer */ static inline struct s5p_timer *s5p_get_base_timer(void) @@ -66,14 +62,14 @@ unsigned long get_timer(unsigned long base) void set_timer(unsigned long t) { - timestamp = t; + gd->tbl = t; } /* delay x useconds */ void __udelay(unsigned long usec) { struct s5p_timer *const timer = s5p_get_base_timer(); - unsigned long tmo, tmp; + unsigned long tmo, tmp, count_value; count_value = readl(&timer->tcntb4); @@ -98,7 +94,7 @@ void __udelay(unsigned long usec) tmp = get_timer(0); /* if setting this fordward will roll time stamp */ - /* reset "advancing" timestamp to 0, set lastdec value */ + /* reset "advancing" timestamp to 0, set lastinc value */ /* else, set advancing stamp wake up time */ if ((tmo + tmp + 1) < tmp) reset_timer_masked(); @@ -115,23 +111,24 @@ void reset_timer_masked(void) struct s5p_timer *const timer = s5p_get_base_timer(); /* reset time */ - lastdec = readl(&timer->tcnto4); - timestamp = 0; + gd->lastinc = readl(&timer->tcnto4); + gd->tbl = 0; } unsigned long get_timer_masked(void) { struct s5p_timer *const timer = s5p_get_base_timer(); unsigned long now = readl(&timer->tcnto4); + unsigned long count_value = readl(&timer->tcntb4); - if (lastdec >= now) - timestamp += lastdec - now; + if (gd->lastinc >= now) + gd->tbl += gd->lastinc - now; else - timestamp += lastdec + count_value - now; + gd->tbl += gd->lastinc + count_value - now; - lastdec = now; + gd->lastinc = now; - return timestamp; + return gd->tbl; } /* From bef5f8565ff87d048df352a891953805db84417c Mon Sep 17 00:00:00 2001 From: Chander Kashyap Date: Tue, 22 Mar 2011 01:29:38 +0000 Subject: [PATCH 15/17] ARMV7: S5P: Fixed register offset in mmc.h The MMC registers are accessed through struct s5p_mmc member variables. MMC controller "control4" register offset is set to 0x8C as per data sheet. The size of struct s5p_mmc is also corrected. Signed-off-by: Chander Kashyap Signed-off-by: Tushar Behera Signed-off-by: Minkyu Kang --- arch/arm/include/asm/arch-s5pc1xx/mmc.h | 5 +++-- arch/arm/include/asm/arch-s5pc2xx/mmc.h | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/arch/arm/include/asm/arch-s5pc1xx/mmc.h b/arch/arm/include/asm/arch-s5pc1xx/mmc.h index 48de64d9c3..d458d3bb8e 100644 --- a/arch/arm/include/asm/arch-s5pc1xx/mmc.h +++ b/arch/arm/include/asm/arch-s5pc1xx/mmc.h @@ -53,10 +53,11 @@ struct s5p_mmc { unsigned char res3[0x34]; unsigned int control2; unsigned int control3; + unsigned char res4[4]; unsigned int control4; - unsigned char res4[0x6e]; + unsigned char res5[0x6e]; unsigned short hcver; - unsigned char res5[0xFFF02]; + unsigned char res6[0xFFF00]; }; struct mmc_host { diff --git a/arch/arm/include/asm/arch-s5pc2xx/mmc.h b/arch/arm/include/asm/arch-s5pc2xx/mmc.h index 528150d755..04827cad75 100644 --- a/arch/arm/include/asm/arch-s5pc2xx/mmc.h +++ b/arch/arm/include/asm/arch-s5pc2xx/mmc.h @@ -53,10 +53,11 @@ struct s5p_mmc { unsigned char res3[0x34]; unsigned int control2; unsigned int control3; + unsigned char res4[4]; unsigned int control4; - unsigned char res4[0x6e]; + unsigned char res5[0x6e]; unsigned short hcver; - unsigned char res5[0xFF02]; + unsigned char res6[0xFF00]; }; struct mmc_host { From f69bb511455513a61c25783414240258f13f3371 Mon Sep 17 00:00:00 2001 From: Chander Kashyap Date: Tue, 22 Mar 2011 01:40:50 +0000 Subject: [PATCH 16/17] S5P: mmc: Resolved interrupt error during mmc_init Blocksize was hardcoded to 512 bytes. But the blocksize varies depeding on various mmc subsystem commands (between 8 and 512). This hardcoding was resulting in interrupt error during data transfer. It is now calculated based upon the request sent by mmc subsystem. Signed-off-by: Chander Kashyap Signed-off-by: Minkyu Kang --- drivers/mmc/s5p_mmc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/mmc/s5p_mmc.c b/drivers/mmc/s5p_mmc.c index 195b5be39e..0323800711 100644 --- a/drivers/mmc/s5p_mmc.c +++ b/drivers/mmc/s5p_mmc.c @@ -51,7 +51,7 @@ static void mmc_prepare_data(struct mmc_host *host, struct mmc_data *data) writeb(ctrl, &host->reg->hostctl); /* We do not handle DMA boundaries, so set it to max (512 KiB) */ - writew((7 << 12) | (512 << 0), &host->reg->blksize); + writew((7 << 12) | (data->blocksize & 0xFFF), &host->reg->blksize); writew(data->blocks, &host->reg->blkcnt); } From 05858736f5f1050d776571451995db81e3f5a5d7 Mon Sep 17 00:00:00 2001 From: Tom Warren Date: Wed, 23 Feb 2011 09:54:31 +0000 Subject: [PATCH 17/17] arm: Tegra2: Change mach-type to MACH_TYPE_SEABOARD due to mach-types.h update Signed-off-by: Tom Warren --- include/configs/seaboard.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/configs/seaboard.h b/include/configs/seaboard.h index fd8756070a..59eef5658f 100644 --- a/include/configs/seaboard.h +++ b/include/configs/seaboard.h @@ -37,7 +37,7 @@ #define CONFIG_TEGRA2_ENABLE_UARTD #define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTD_BASE -#define CONFIG_MACH_TYPE MACH_TYPE_TEGRA_SEABOARD +#define CONFIG_MACH_TYPE MACH_TYPE_SEABOARD #define CONFIG_SYS_BOARD_ODMDATA 0x300d8011 /* lp1, 1GB */ #endif /* __CONFIG_H */