March 2012 - U-Boot

Re: [U-Boot] [PATCH 2/3] ventana: define CONFIG_MACH_VENTANA
by Stephen Warren 02 Mar '12

02 Mar '12

On 03/01/2012 03:55 PM, Troy Kisky wrote: > On 3/1/2012 2:30 PM, Stephen Warren wrote: >> On 03/01/2012 02:13 PM, Troy Kisky wrote: >>> ventana uses board/nvidia/seaboard/seaboard.c >>> which uses machine_is_ventana. >>> diff --git a/include/configs/ventana.h b/include/configs/ventana.h >>> +#define CONFIG_MACH_VENTANA >> It'd be nice not to have to do this; that header already does: >> >> #define CONFIG_MACH_TYPE MACH_TYPE_VENTANA >> >> Can't the code key off that? Otherwise, any use of machine_is_xxx() will >> be very error-prone, since CONFIG_MACH_XXX has to be manually defined, >> and people will forget. >> > > Before patch 3/3 mach-types.h has > > #ifdef CONFIG_MACH_VENTANA > # ifdef machine_arch_type > # undef machine_arch_type > # define machine_arch_type __machine_arch_type > # else > # define machine_arch_type MACH_TYPE_VENTANA > # endif > # define machine_is_ventana() (machine_arch_type == MACH_TYPE_VENTANA) > #else > # define machine_is_ventana() (0) > #endif > > So, it wants CONFIG_MACH_VENTANA defined. Yes, there's certainly a pre-existing bug that needs to be fixed. My point is that every board already needs to set CONFIG_MACH_TYPE to the relevant type. It's quite unexpected that boards will /also/ need to set e.g. CONFIG_MACH_VENTANA on top of that if they need to call machine_is_xxx(). That is exactly why this bug exists for Ventana and needs to be fixed. So, rather than forcing this unusual requirement on boards, isn't it possible to fix mach-types.h to use CONFIG_MACH_TYPE rather than CONFIG_MACH_${machine_name}? It's probably not too hard to run some kind of script over mach-types.h when importing it from the kernel, or instead of importing the generated mach-types.h, import the source data file and write a U-Boot-specific script that generates mach-types.h in a format more suitable for U-Boot. -- nvpublic

1 0

[U-Boot] [PATCH 0/4] OMAP3+: Fix voltage bringup sequence
by Nishanth Menon 02 Mar '12

02 Mar '12

Current configuration results in the following voltage waveform (example 4460 Panda ES): |---------------| (SET1 default 1.4V) | --------(programmed voltage) | <- (This switch happens on mux7,pullup) vdd_mpu(TPS) -----/ (OPP boot voltage) --------- (programmed voltage) vdd_IVA(TWL6030) -------------------------/ (OPP boot voltage) --------- (programmed voltage) vdd_core(TWL6030) -----------------------/ (OPP boot voltage) Problem 1) |<----- Tx ------>| timing violation for a duration Tx close to few milliseconds. Problem 2) voltage of MPU goes beyond spec for even the highest of MPU OPP. Problem 3) All SoCs are doing MPU, CORE, IVA - which is a timing violation Oscilloscope picture: http://goo.gl/SykHb By using GPIO as recommended as standard procedure by TI and fixing the sequence in this series changes this to: --------- (programmed voltage) vdd_IVA(TWL6030) ------------------/ (OPP boot voltage) -------- (programmed voltage) vdd_mpu(TPS) ----------------/ (Opp boot voltage) --------- (programmed voltage) vdd_core(TWL6030) -------------/ (OPP boot voltage) Oscilloscope Picture: http://goo.gl/PgyKt Why is this critical: without the voltage sequence fixes, certain intermediate circuitry inside OMAP behaves in often unpredictable manner as they are operating out of spec. This in production line(extreme example of OMAP4460) translates close to ~5% devices failing to boot up and shows all kind of random untraceable crashes in production kernel. NOTE: 1. Clock sequences need to be fixed as well 2. kernel.org support for PandaBoard ES(OMAP4460) depends on the current wrong setup of u-boot to allow kernel boot to take place. This can and must be fixed. Merging this series breaks k.org, as a temporary WA: run: mw.w 0x4A31E05A 0x1f on u-boot prompt prior to booting the kernel to replicate old broken logic. Tested on: Pandaboard vanilla - OMAP4430 Pandaboard ES - OMAP4460 OMAP5 EVM Nishanth Menon (4): OMAP3+: Introduce generic logic for OMAP voltage controller OMAP4460: TPS Ensure SET1 is selected after voltage configuration OMAP4: scale voltage of core before MPU scales OMAP5: scale voltage of core before MPU scales arch/arm/cpu/armv7/omap-common/Makefile | 1 + arch/arm/cpu/armv7/omap-common/clocks-common.c | 67 ++++-------- arch/arm/cpu/armv7/omap-common/vc.c | 138 ++++++++++++++++++++++++ arch/arm/cpu/armv7/omap4/clocks.c | 64 ++++++----- arch/arm/cpu/armv7/omap5/clocks.c | 10 +- arch/arm/include/asm/arch-omap4/clocks.h | 17 +--- arch/arm/include/asm/arch-omap4/sys_proto.h | 2 + arch/arm/include/asm/arch-omap5/clocks.h | 17 +--- arch/arm/include/asm/arch-omap5/sys_proto.h | 2 + board/ti/panda/panda_mux_data.h | 2 +- board/ti/sdp4430/sdp4430_mux_data.h | 2 +- 11 files changed, 211 insertions(+), 111 deletions(-) create mode 100644 arch/arm/cpu/armv7/omap-common/vc.c Regards, Nishanth Menon -- 1.7.5.4

1 4

[U-Boot] u-boot.lds question
by Will Khan 02 Mar '12

02 Mar '12

> On Thursday 01 March 2012 01:06:58 Will Khan wrote: > > When I look at u-boot.lds (in the main directory), it shows the > > incorrect path to start.o. u-boot.lds is generated through the make > all process. > > When I manually fix the start.o pathname in u-boot.lds, everything > > builds fine. My question is where and how is u-boot.lds generated? > I > > see where there is also a u-boot.lds in arch/powerpc/cpu/mpc83xx/, > > with an explicit path to start.o, but this file seems to not do > > anything (I can modify the file or delete this specific u-boot.lds, > > and nothing happens -a new one is not created). > > the top level u-boot.lds lacks a depend on the files that create it > (known bug). so you manually have to `rm` it in order for a new one > to be generated. > most likely the cpu subdir u-boot.lds is what is broken & needs fixing. > -mike One of my issues is that when I remove it and a new one is created, it is always created with the wrong path for start.o. As well, when I make changes to the cpu subdir one, it doesn't affect anything. In fact, I can delete it and a new one is not created, nor is there any complaint. If anything else comes to your mind in terms of where to look, please let me know... Will

2 1

[U-Boot] u-boot.lds question
by Will Khan 01 Mar '12

01 Mar '12

Hi all, I'm trying to upgrade my u-boot from 16 May 2009 release (out of tree customized version) to the release version December 2011. I'm a novice with u-boot, but after some hacking, I've had some success, but there are a few questions: When I build (for powerpc MPC8349), I get the following error at the very end of the build, when it tries to link everything together: powerpc-linux-ld: cannot find cpu/mpc83xx/start.o This error make sense because start.o is actually located at arch/powerpc/cpu/mpc83xx/start.o. When I look at u-boot.lds (in the main directory), it shows the incorrect path to start.o. u-boot.lds is generated through the make all process. When I manually fix the start.o pathname in u-boot.lds, everything builds fine. My question is where and how is u-boot.lds generated? I see where there is also a u-boot.lds in arch/powerpc/cpu/mpc83xx/, with an explicit path to start.o, but this file seems to not do anything (I can modify the file or delete this specific u-boot.lds, and nothing happens -a new one is not created). I've also looked through the main Makefile, but perhaps I missed something. CPUDIR is set appropriately, and I see references to u-boot.lds, but I don't see the information that goes into u-boot.lds. Please help! Thanks in advance! Will Khan Phone : +61 3 9538-3368 <http://www.optiscan.com<http://www.optiscan.com/>> This email may contain confidential information. If you have received this email in error, please delete it immediately, and inform us of the mistake by return email. Any form of reproduction, or further dissemination of this email is strictly prohibited. Also, please note that opinions expressed in this email are those of the author, and are not necessarily those of Optiscan Pty Ltd.

2 1

[U-Boot] [PATCH] ARM: Add .data/.rodata/.bss section starts to gd_t
by Peter Barada 01 Mar '12

01 Mar '12

When debugging u-boot, after relocation its tedious to calculate positions of the various sections (.data, .rodata, .bss). To make it easier, add the structure "sections" to gd_t that contains the relocated start of those sections. Then the gdb command "add-symbol-file" can by used with "-s <section> <address>" that corresponds to the values in gd_t->sections. Signed-off-by: Peter Barada <peter.barada(a)logicpd.com> --- README | 6 ++++++ arch/arm/cpu/arm1136/start.S | 10 ++++++++++ arch/arm/cpu/arm1136/u-boot.lds | 6 +++++- arch/arm/cpu/arm1176/start.S | 10 ++++++++++ arch/arm/cpu/arm1176/u-boot.lds | 6 +++++- arch/arm/cpu/arm720t/start.S | 10 ++++++++++ arch/arm/cpu/arm720t/u-boot.lds | 6 +++++- arch/arm/cpu/arm920t/ep93xx/u-boot.lds | 10 ++++++++-- arch/arm/cpu/arm920t/start.S | 10 ++++++++++ arch/arm/cpu/arm920t/u-boot.lds | 6 +++++- arch/arm/cpu/arm925t/start.S | 10 ++++++++++ arch/arm/cpu/arm925t/u-boot.lds | 6 +++++- arch/arm/cpu/arm926ejs/mx28/start.S | 10 ++++++++++ arch/arm/cpu/arm926ejs/mx28/u-boot-spl.lds | 6 +++++- arch/arm/cpu/arm926ejs/start.S | 10 ++++++++++ arch/arm/cpu/arm926ejs/u-boot.lds | 6 +++++- arch/arm/cpu/arm946es/start.S | 10 ++++++++++ arch/arm/cpu/arm946es/u-boot.lds | 6 +++++- arch/arm/cpu/arm_intcm/start.S | 10 ++++++++++ arch/arm/cpu/arm_intcm/u-boot.lds | 6 +++++- arch/arm/cpu/armv7/omap-common/u-boot-spl.lds | 11 +++++++++-- arch/arm/cpu/armv7/start.S | 10 ++++++++++ arch/arm/cpu/armv7/u-boot.lds | 6 +++++- arch/arm/cpu/ixp/start.S | 10 ++++++++++ arch/arm/cpu/ixp/u-boot.lds | 6 +++++- arch/arm/cpu/lh7a40x/start.S | 10 ++++++++++ arch/arm/cpu/lh7a40x/u-boot.lds | 6 +++++- arch/arm/cpu/pxa/start.S | 10 ++++++++++ arch/arm/cpu/pxa/u-boot.lds | 6 +++++- arch/arm/cpu/s3c44b0/start.S | 10 ++++++++++ arch/arm/cpu/s3c44b0/u-boot.lds | 6 +++++- arch/arm/cpu/sa1100/start.S | 10 ++++++++++ arch/arm/cpu/sa1100/u-boot.lds | 6 +++++- arch/arm/include/asm/config.h | 3 +++ arch/arm/include/asm/global_data.h | 13 +++++++++++++ arch/arm/include/asm/u-boot-arm.h | 4 ++++ arch/arm/lib/board.c | 7 +++++++ board/ait/cam_enc_4xx/u-boot-spl.lds | 11 +++++++++-- board/davinci/da8xxevm/u-boot-spl-da850evm.lds | 10 ++++++++-- board/davinci/da8xxevm/u-boot-spl-hawk.lds | 6 +++++- board/vpac270/u-boot-spl.lds | 6 +++++- common/cmd_bdinfo.c | 5 +++++ nand_spl/board/freescale/mx31pdk/u-boot.lds | 6 +++++- nand_spl/board/karo/tx25/u-boot.lds | 6 +++++- 44 files changed, 317 insertions(+), 27 deletions(-) diff --git a/README b/README index eba6378..0d7a7a0 100644 --- a/README +++ b/README @@ -426,6 +426,12 @@ The following options need to be configured: Select high exception vectors of the ARM core, e.g., do not clear the V bit of the c1 register of CP15. + CONFIG_GDB_SECTIONS_START + + Add to gd_t "sections" structure containing starting addresses + of .bss, .data, and .rodata sections to allow + "gdb add-symbol-file" to work once u-boot is relocated. + - Linux Kernel Interface: CONFIG_CLOCKS_IN_MHZ diff --git a/arch/arm/cpu/arm1136/start.S b/arch/arm/cpu/arm1136/start.S index c0db96c..9ab4351 100644 --- a/arch/arm/cpu/arm1136/start.S +++ b/arch/arm/cpu/arm1136/start.S @@ -108,6 +108,16 @@ _bss_end_ofs: _end_ofs: .word _end - _start +#ifdef CONFIG_GDB_SECTIONS_START +.globl _data_start_ofs +_data_start_ofs: + .word __data_start - _start + +.globl _rodata_start_ofs +_rodata_start_ofs: + .word __rodata_start - _start +#endif + #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 d1e2851..751fa21 100644 --- a/arch/arm/cpu/arm1136/u-boot.lds +++ b/arch/arm/cpu/arm1136/u-boot.lds @@ -45,10 +45,14 @@ SECTIONS } . = ALIGN(4); - .rodata : { *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*))) } + .rodata : { + __rodata_start = .; + *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*))) + } . = ALIGN(4); .data : { + __data_start = .; *(.data) } diff --git a/arch/arm/cpu/arm1176/start.S b/arch/arm/cpu/arm1176/start.S index 848144a..0f8f368 100644 --- a/arch/arm/cpu/arm1176/start.S +++ b/arch/arm/cpu/arm1176/start.S @@ -127,6 +127,16 @@ _bss_end_ofs: _end_ofs: .word _end - _start +#ifdef CONFIG_GDB_SECTIONS_START +.globl _data_start_ofs +_data_start_ofs: + .word __data_start - _start + +.globl _rodata_start_ofs +_rodata_start_ofs: + .word __rodata_start - _start +#endif + /* 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 27d6638..91bea89 100644 --- a/arch/arm/cpu/arm1176/u-boot.lds +++ b/arch/arm/cpu/arm1176/u-boot.lds @@ -36,10 +36,14 @@ SECTIONS } . = ALIGN(4); - .rodata : { *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*))) } + .rodata : { + __rodata_start = .; + *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*))) + } . = ALIGN(4); .data : { + __data_start = .; *(.data) } diff --git a/arch/arm/cpu/arm720t/start.S b/arch/arm/cpu/arm720t/start.S index 540e3c2..947deb8 100644 --- a/arch/arm/cpu/arm720t/start.S +++ b/arch/arm/cpu/arm720t/start.S @@ -97,6 +97,16 @@ _bss_end_ofs: _end_ofs: .word _end - _start +#ifdef CONFIG_GDB_SECTIONS_START +.globl _data_start_ofs +_data_start_ofs: + .word __data_start - _start + +.globl _rodata_start_ofs +_rodata_start_ofs: + .word __rodata_start - _start +#endif + #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 9370fad..308862b 100644 --- a/arch/arm/cpu/arm720t/u-boot.lds +++ b/arch/arm/cpu/arm720t/u-boot.lds @@ -36,10 +36,14 @@ SECTIONS } . = ALIGN(4); - .rodata : { *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*))) } + .rodata : { + __rodata_start = .; + *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*))) + } . = ALIGN(4); .data : { + __data_start = .; } . = ALIGN(4); diff --git a/arch/arm/cpu/arm920t/ep93xx/u-boot.lds b/arch/arm/cpu/arm920t/ep93xx/u-boot.lds index dc6ba34..29a8c9e 100644 --- a/arch/arm/cpu/arm920t/ep93xx/u-boot.lds +++ b/arch/arm/cpu/arm920t/ep93xx/u-boot.lds @@ -39,10 +39,16 @@ SECTIONS } . = ALIGN(4); - .rodata : { *(.rodata) } + .rodata : { + __rodata_start = .; + *(.rodata) + } . = ALIGN(4); - .data : { *(.data) } + .data : { + __data_start = .; + *(.data) + } . = ALIGN(4); .got : { *(.got) } diff --git a/arch/arm/cpu/arm920t/start.S b/arch/arm/cpu/arm920t/start.S index 8c5612c..be364f1 100644 --- a/arch/arm/cpu/arm920t/start.S +++ b/arch/arm/cpu/arm920t/start.S @@ -93,6 +93,16 @@ _bss_end_ofs: _end_ofs: .word _end - _start +#ifdef CONFIG_GDB_SECTIONS_START +.globl _data_start_ofs +_data_start_ofs: + .word __data_start - _start + +.globl _rodata_start_ofs +_rodata_start_ofs: + .word __rodata_start - _start +#endif + #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 17ba604..3999a3b 100644 --- a/arch/arm/cpu/arm920t/u-boot.lds +++ b/arch/arm/cpu/arm920t/u-boot.lds @@ -44,10 +44,14 @@ SECTIONS } . = ALIGN(4); - .rodata : { *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*))) } + .rodata : { + __rodata_start = .; + *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*))) + } . = ALIGN(4); .data : { + __data_start = .; *(.data) } diff --git a/arch/arm/cpu/arm925t/start.S b/arch/arm/cpu/arm925t/start.S index dbb93ef..9d01f19 100644 --- a/arch/arm/cpu/arm925t/start.S +++ b/arch/arm/cpu/arm925t/start.S @@ -103,6 +103,16 @@ _bss_end_ofs: _end_ofs: .word _end - _start +#ifdef CONFIG_GDB_SECTIONS_START +.globl _data_start_ofs +_data_start_ofs: + .word __data_start - _start + +.globl _rodata_start_ofs +_rodata_start_ofs: + .word __rodata_start - _start +#endif + #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 64e76f5..dac4e97 100644 --- a/arch/arm/cpu/arm925t/u-boot.lds +++ b/arch/arm/cpu/arm925t/u-boot.lds @@ -39,10 +39,14 @@ SECTIONS } . = ALIGN(4); - .rodata : { *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*))) } + .rodata : { + __rodata_start = .; + *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*))) + } . = ALIGN(4); .data : { + __data_start = .; *(.data) } diff --git a/arch/arm/cpu/arm926ejs/mx28/start.S b/arch/arm/cpu/arm926ejs/mx28/start.S index 2cd4d73..645987d 100644 --- a/arch/arm/cpu/arm926ejs/mx28/start.S +++ b/arch/arm/cpu/arm926ejs/mx28/start.S @@ -139,6 +139,16 @@ _bss_end_ofs: _end_ofs: .word _end - _start +#ifdef CONFIG_GDB_SECTIONS_START +.globl _data_start_ofs +_data_start_ofs: + .word __data_start - _start + +.globl _rodata_start_ofs +_rodata_start_ofs: + .word __rodata_start - _start +#endif + #ifdef CONFIG_USE_IRQ /* IRQ stack memory (calculated at run-time) */ .globl IRQ_STACK_START diff --git a/arch/arm/cpu/arm926ejs/mx28/u-boot-spl.lds b/arch/arm/cpu/arm926ejs/mx28/u-boot-spl.lds index 0fccd52..4ed5014 100644 --- a/arch/arm/cpu/arm926ejs/mx28/u-boot-spl.lds +++ b/arch/arm/cpu/arm926ejs/mx28/u-boot-spl.lds @@ -42,10 +42,14 @@ SECTIONS } . = ALIGN(4); - .rodata : { *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*))) } + .rodata : { + __rodata_start = .; + *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*))) + } . = ALIGN(4); .data : { + __data_start = .; *(.data) } diff --git a/arch/arm/cpu/arm926ejs/start.S b/arch/arm/cpu/arm926ejs/start.S index 6f05f1a..c87a99b 100644 --- a/arch/arm/cpu/arm926ejs/start.S +++ b/arch/arm/cpu/arm926ejs/start.S @@ -160,6 +160,16 @@ _end: .word __bss_end__ #endif +#ifdef CONFIG_GDB_SECTIONS_START +.globl _data_start_ofs +_data_start_ofs: + .word __data_start - _start + +.globl _rodata_start_ofs +_rodata_start_ofs: + .word __rodata_start - _start +#endif + #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 1480e0c..9edaaab 100644 --- a/arch/arm/cpu/arm926ejs/u-boot.lds +++ b/arch/arm/cpu/arm926ejs/u-boot.lds @@ -36,10 +36,14 @@ SECTIONS } . = ALIGN(4); - .rodata : { *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*))) } + .rodata : { + __rodata_start = .; + *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*))) + } . = ALIGN(4); .data : { + __data_start = .; *(.data) } diff --git a/arch/arm/cpu/arm946es/start.S b/arch/arm/cpu/arm946es/start.S index 89ba558..af1f9c4 100644 --- a/arch/arm/cpu/arm946es/start.S +++ b/arch/arm/cpu/arm946es/start.S @@ -109,6 +109,16 @@ _bss_end_ofs: _end_ofs: .word _end - _start +#ifdef CONFIG_GDB_SECTIONS_START +.globl _data_start_ofs +_data_start_ofs: + .word __data_start - _start + +.globl _rodata_start_ofs +_rodata_start_ofs: + .word __rodata_start - _start +#endif + #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 ff938e4..a3608ba 100644 --- a/arch/arm/cpu/arm946es/u-boot.lds +++ b/arch/arm/cpu/arm946es/u-boot.lds @@ -36,10 +36,14 @@ SECTIONS } . = ALIGN(4); - .rodata : { *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*))) } + .rodata : { + __rodata_start = .; + *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*))) + } . = ALIGN(4); .data : { + __data_start = .; *(.data) } diff --git a/arch/arm/cpu/arm_intcm/start.S b/arch/arm/cpu/arm_intcm/start.S index 2033b36..27b2c3c 100644 --- a/arch/arm/cpu/arm_intcm/start.S +++ b/arch/arm/cpu/arm_intcm/start.S @@ -105,6 +105,16 @@ _bss_end_ofs: _end_ofs: .word _end - _start +#ifdef CONFIG_GDB_SECTIONS_START +.globl _data_start_ofs +_data_start_ofs: + .word __data_start - _start + +.globl _rodata_start_ofs +_rodata_start_ofs: + .word __rodata_start - _start +#endif + #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 f4a146c..0fbe17c 100644 --- a/arch/arm/cpu/arm_intcm/u-boot.lds +++ b/arch/arm/cpu/arm_intcm/u-boot.lds @@ -36,10 +36,14 @@ SECTIONS } . = ALIGN(4); - .rodata : { *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*))) } + .rodata : { + __rodata_start = .; + *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*))) + } . = ALIGN(4); .data : { + __rodata_start = .; *(.data) } diff --git a/arch/arm/cpu/armv7/omap-common/u-boot-spl.lds b/arch/arm/cpu/armv7/omap-common/u-boot-spl.lds index 8867e06..fccd824 100644 --- a/arch/arm/cpu/armv7/omap-common/u-boot-spl.lds +++ b/arch/arm/cpu/armv7/omap-common/u-boot-spl.lds @@ -43,10 +43,17 @@ SECTIONS } >.sram . = ALIGN(4); - .rodata : { *(SORT_BY_ALIGNMENT(.rodata*)) } >.sram + .rodata : { + __rodata_start = .; + *(SORT_BY_ALIGNMENT(.rodata*)) + } >.sram . = ALIGN(4); - .data : { *(SORT_BY_ALIGNMENT(.data*)) } >.sram + .data : { + __data_start = .; + *(SORT_BY_ALIGNMENT(.data*)) + } >.sram + . = ALIGN(4); __image_copy_end = .; _end = .; diff --git a/arch/arm/cpu/armv7/start.S b/arch/arm/cpu/armv7/start.S index ef08a55..c29a1d3 100644 --- a/arch/arm/cpu/armv7/start.S +++ b/arch/arm/cpu/armv7/start.S @@ -101,6 +101,16 @@ _bss_end_ofs: _end_ofs: .word _end - _start +#ifdef CONFIG_GDB_SECTIONS_START +.globl _data_start_ofs +_data_start_ofs: + .word __data_start - _start + +.globl _rodata_start_ofs +_rodata_start_ofs: + .word __rodata_start - _start +#endif + #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 40ecf78..45011f6 100644 --- a/arch/arm/cpu/armv7/u-boot.lds +++ b/arch/arm/cpu/armv7/u-boot.lds @@ -39,10 +39,14 @@ SECTIONS } . = ALIGN(4); - .rodata : { *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*))) } + .rodata : { + __rodata_start = .; + *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*))) + } . = ALIGN(4); .data : { + __data_start = .; *(.data) } diff --git a/arch/arm/cpu/ixp/start.S b/arch/arm/cpu/ixp/start.S index cb32121..452f093 100644 --- a/arch/arm/cpu/ixp/start.S +++ b/arch/arm/cpu/ixp/start.S @@ -118,6 +118,16 @@ _bss_end_ofs: _end_ofs: .word _end - _start +#ifdef CONFIG_GDB_SECTIONS_START +.globl _data_start_ofs +_data_start_ofs: + .word __data_start - _start + +.globl _rodata_start_ofs +_rodata_start_ofs: + .word __rodata_start - _start +#endif + #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 7199de4..3f875f6 100644 --- a/arch/arm/cpu/ixp/u-boot.lds +++ b/arch/arm/cpu/ixp/u-boot.lds @@ -36,10 +36,14 @@ SECTIONS } . = ALIGN(4); - .rodata : { *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*))) } + .rodata : { + __rodata_start = .; + *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*))) + } . = ALIGN(4); .data : { + __data_start = .; *(.data*) } diff --git a/arch/arm/cpu/lh7a40x/start.S b/arch/arm/cpu/lh7a40x/start.S index 62de8b8..a66a089 100644 --- a/arch/arm/cpu/lh7a40x/start.S +++ b/arch/arm/cpu/lh7a40x/start.S @@ -93,6 +93,16 @@ _bss_end_ofs: _end_ofs: .word _end - _start +#ifdef CONFIG_GDB_SECTIONS_START +.globl _data_start_ofs +_data_start_ofs: + .word __data_start - _start + +.globl _rodata_start_ofs +_rodata_start_ofs: + .word __rodata_start - _start +#endif + #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 30934ff..f73a6e0 100644 --- a/arch/arm/cpu/lh7a40x/u-boot.lds +++ b/arch/arm/cpu/lh7a40x/u-boot.lds @@ -36,10 +36,14 @@ SECTIONS } . = ALIGN(4); - .rodata : { *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*))) } + .rodata : { + __rodata_start = .; + *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*))) + } . = ALIGN(4); .data : { + __data_start = .; *(.data) } diff --git a/arch/arm/cpu/pxa/start.S b/arch/arm/cpu/pxa/start.S index ba0de8f..f7aa19e 100644 --- a/arch/arm/cpu/pxa/start.S +++ b/arch/arm/cpu/pxa/start.S @@ -126,6 +126,16 @@ _bss_end_ofs: _end_ofs: .word _end - _start +#ifdef CONFIG_GDB_SECTIONS_START +.globl _data_start_ofs +_data_start_ofs: + .word __data_start - _start + +.globl _rodata_start_ofs +_rodata_start_ofs: + .word __rodata_start - _start +#endif + #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 e86e781..f250876 100644 --- a/arch/arm/cpu/pxa/u-boot.lds +++ b/arch/arm/cpu/pxa/u-boot.lds @@ -36,10 +36,14 @@ SECTIONS } . = ALIGN(4); - .rodata : { *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*))) } + .rodata : { + __rodata_start = .; + *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*))) + } . = ALIGN(4); .data : { + __data_start = .; *(.data) } diff --git a/arch/arm/cpu/s3c44b0/start.S b/arch/arm/cpu/s3c44b0/start.S index a29d5b4..11879d7 100644 --- a/arch/arm/cpu/s3c44b0/start.S +++ b/arch/arm/cpu/s3c44b0/start.S @@ -84,6 +84,16 @@ _bss_end_ofs: _end_ofs: .word _end - _start +#ifdef CONFIG_GDB_SECTIONS_START +.globl _data_start_ofs +_data_start_ofs: + .word __data_start - _start + +.globl _rodata_start_ofs +_rodata_start_ofs: + .word __rodata_start - _start +#endif + #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 74a259c..0facaaf 100644 --- a/arch/arm/cpu/s3c44b0/u-boot.lds +++ b/arch/arm/cpu/s3c44b0/u-boot.lds @@ -36,10 +36,14 @@ SECTIONS } . = ALIGN(4); - .rodata : { *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*))) } + .rodata : { + __rodata_start = .; + *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*))) + } . = ALIGN(4); .data : { + __data_start = .; *(.data) } diff --git a/arch/arm/cpu/sa1100/start.S b/arch/arm/cpu/sa1100/start.S index 92546d8..4b1f2fb 100644 --- a/arch/arm/cpu/sa1100/start.S +++ b/arch/arm/cpu/sa1100/start.S @@ -94,6 +94,16 @@ _bss_end_ofs: _end_ofs: .word _end - _start +#ifdef CONFIG_GDB_SECTIONS_START +.globl _data_start_ofs +_data_start_ofs: + .word __data_start - _start + +.globl _rodata_start_ofs +_rodata_start_ofs: + .word __rodata_start - _start +#endif + #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 e6381da..3cbae0d 100644 --- a/arch/arm/cpu/sa1100/u-boot.lds +++ b/arch/arm/cpu/sa1100/u-boot.lds @@ -39,10 +39,14 @@ SECTIONS } . = ALIGN(4); - .rodata : { *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*))) } + .rodata : { + __rodata_start = .; + *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*))) + } . = ALIGN(4); .data : { + __data_start = .; *(.data) } diff --git a/arch/arm/include/asm/config.h b/arch/arm/include/asm/config.h index c60dba2..6297be9 100644 --- a/arch/arm/include/asm/config.h +++ b/arch/arm/include/asm/config.h @@ -21,6 +21,9 @@ #ifndef _ASM_CONFIG_H_ #define _ASM_CONFIG_H_ +/* Include section starts for .bss, .data, .rodata for "gdb add-symbol-file" */ +#define CONFIG_GDB_SECTIONS_START + #define CONFIG_LMB #define CONFIG_SYS_BOOT_RAMDISK_HIGH #endif diff --git a/arch/arm/include/asm/global_data.h b/arch/arm/include/asm/global_data.h index c3ff789..5f28bbf 100644 --- a/arch/arm/include/asm/global_data.h +++ b/arch/arm/include/asm/global_data.h @@ -68,6 +68,19 @@ typedef struct global_data { unsigned long timestamp; #endif unsigned long relocaddr; /* Start address of U-Boot in RAM */ +#ifdef CONFIG_GDB_SECTIONS_START + /* Section start information. Used with GDB command: + * add-symbol-file u-boot $gd->relocaddr \ + * -s .data $gd->sections.data \ + * -s .rodata $gd->sections.rodata \ + * -s .bss $gd->sections.bss + */ + struct { + unsigned long data; + unsigned long rodata; + unsigned long bss; + } sections; +#endif phys_size_t ram_size; /* RAM size */ unsigned long mon_len; /* monitor len */ unsigned long irq_sp; /* irq stack pointer */ diff --git a/arch/arm/include/asm/u-boot-arm.h b/arch/arm/include/asm/u-boot-arm.h index 4ca75f9..99f05bd 100644 --- a/arch/arm/include/asm/u-boot-arm.h +++ b/arch/arm/include/asm/u-boot-arm.h @@ -33,6 +33,10 @@ 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 */ +#ifdef CONFIG_GDB_SECTIONS_START +extern ulong _data_start_ofs; /* .data start relative to _start */ +extern ulong _rodata_start_ofs; /* .rodata start relative to _start */ +#endif 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 500e216..3fdc33e 100644 --- a/arch/arm/lib/board.c +++ b/arch/arm/lib/board.c @@ -422,6 +422,13 @@ void board_init_f(ulong bootflag) gd->relocaddr = addr; gd->start_addr_sp = addr_sp; gd->reloc_off = addr - _TEXT_BASE; +#ifdef CONFIG_GDB_SECTIONS_START + /* Save secitons starts of bss, data, rodata for + * gdb "add-symbol-file" command */ + gd->sections.bss = addr + _bss_start_ofs; + gd->sections.data = addr + _data_start_ofs; + gd->sections.rodata = addr + _rodata_start_ofs; +#endif debug("relocation Offset is: %08lx\n", gd->reloc_off); memcpy(id, (void *)gd, sizeof(gd_t)); diff --git a/board/ait/cam_enc_4xx/u-boot-spl.lds b/board/ait/cam_enc_4xx/u-boot-spl.lds index 6f6e065..25b583b 100644 --- a/board/ait/cam_enc_4xx/u-boot-spl.lds +++ b/board/ait/cam_enc_4xx/u-boot-spl.lds @@ -43,10 +43,17 @@ SECTIONS } >.sram . = ALIGN(4); - .rodata : { *(SORT_BY_ALIGNMENT(.rodata*)) } >.sram + .rodata : { + __rodata_start = .; + *(SORT_BY_ALIGNMENT(.rodata*)) + } >.sram . = ALIGN(4); - .data : { *(SORT_BY_ALIGNMENT(.data*)) } >.sram + .data : { + __rodata_start = .; + *(SORT_BY_ALIGNMENT(.data*)) + } >.sram + . = ALIGN(4); .rel.dyn : { __rel_dyn_start = .; diff --git a/board/davinci/da8xxevm/u-boot-spl-da850evm.lds b/board/davinci/da8xxevm/u-boot-spl-da850evm.lds index 6f6e065..a48eaf6 100644 --- a/board/davinci/da8xxevm/u-boot-spl-da850evm.lds +++ b/board/davinci/da8xxevm/u-boot-spl-da850evm.lds @@ -43,10 +43,16 @@ SECTIONS } >.sram . = ALIGN(4); - .rodata : { *(SORT_BY_ALIGNMENT(.rodata*)) } >.sram + .rodata : { + __rodata_start = .; + *(SORT_BY_ALIGNMENT(.rodata*)) + } >.sram . = ALIGN(4); - .data : { *(SORT_BY_ALIGNMENT(.data*)) } >.sram + .data : { + __data_start = .; + *(SORT_BY_ALIGNMENT(.data*)) + } >.sram . = ALIGN(4); .rel.dyn : { __rel_dyn_start = .; diff --git a/board/davinci/da8xxevm/u-boot-spl-hawk.lds b/board/davinci/da8xxevm/u-boot-spl-hawk.lds index b3a41af..bf29859 100644 --- a/board/davinci/da8xxevm/u-boot-spl-hawk.lds +++ b/board/davinci/da8xxevm/u-boot-spl-hawk.lds @@ -42,10 +42,14 @@ SECTIONS } . = ALIGN(4); - .rodata : { *(.rodata) } + .rodata : { + __rodata_start = .; + *(.rodata) + } . = ALIGN(4); .data : { + __data_start = .; *(.data) __datarel_start = .; *(.data.rel) diff --git a/board/vpac270/u-boot-spl.lds b/board/vpac270/u-boot-spl.lds index 1958c2f..2363fbd 100644 --- a/board/vpac270/u-boot-spl.lds +++ b/board/vpac270/u-boot-spl.lds @@ -50,10 +50,14 @@ SECTIONS } . = ALIGN(4); - .rodata : { *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*))) } + .rodata : { + __rodata_start = .; + *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*))) + } . = ALIGN(4); .data : { + __data_start = .; *(.data) } diff --git a/common/cmd_bdinfo.c b/common/cmd_bdinfo.c index 5359a47..8993a33 100644 --- a/common/cmd_bdinfo.c +++ b/common/cmd_bdinfo.c @@ -367,6 +367,11 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) #endif print_num("relocaddr", gd->relocaddr); print_num("reloc off", gd->reloc_off); +#ifdef CONFIG_GDB_SECTIONS_START + print_num("data_start", gd->sections.data); + print_num("rodata_start", gd->sections.rodata); + print_num("bss_start", gd->sections.bss); +#endif print_num("irq_sp", gd->irq_sp); /* irq stack pointer */ print_num("sp start ", gd->start_addr_sp); print_num("FB base ", gd->fb_base); diff --git a/nand_spl/board/freescale/mx31pdk/u-boot.lds b/nand_spl/board/freescale/mx31pdk/u-boot.lds index d2b08f6..b743b07 100644 --- a/nand_spl/board/freescale/mx31pdk/u-boot.lds +++ b/nand_spl/board/freescale/mx31pdk/u-boot.lds @@ -38,10 +38,14 @@ SECTIONS } . = ALIGN(4); - .rodata : { *(.rodata) } + .rodata : { + __rodata_start = .; + *(.rodata) + } . = ALIGN(4); .data : { + __data_start = .; *(.data) } diff --git a/nand_spl/board/karo/tx25/u-boot.lds b/nand_spl/board/karo/tx25/u-boot.lds index d2b08f6..b743b07 100644 --- a/nand_spl/board/karo/tx25/u-boot.lds +++ b/nand_spl/board/karo/tx25/u-boot.lds @@ -38,10 +38,14 @@ SECTIONS } . = ALIGN(4); - .rodata : { *(.rodata) } + .rodata : { + __rodata_start = .; + *(.rodata) + } . = ALIGN(4); .data : { + __data_start = .; *(.data) } -- 1.7.1

2 4

[U-Boot] Yaffs2 Patches for u-boot-2009.01
by VISWANADHULA BALAJI 01 Mar '12

01 Mar '12

> Hi, > I am using u-boot-2009.01 for loading yaffs2 image on to the nand flash.But uboot is not supporting nand write.yaffs.How can i get the yaffs2 supported patch for u-boot-2009.01.Please help me. Regards V.Balaji

1 0

[U-Boot] Yaffs2 Patches for u-boot-2009.01
by VISWANADHULA BALAJI 01 Mar '12

01 Mar '12

I am using u-boot-2009.01 for loading yaffs2 image on to the nand flash.But uboot is not supporting nand write.yaffs.How can i get the yaffs2 supported patch for u-boot-2009.01.Please help me. Please post this question on the mailing list Thanks, Graeme

3 3

[U-Boot] [PATCH] sh: timer: Remove unnecessary variable 'ticks'
by Nobuhiro Iwamatsu 01 Mar '12

01 Mar '12

Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj(a)renesas.com> Reported-by: Mike Frysinger <vapier(a)gentoo.org> --- arch/sh/lib/time.c | 7 +------ 1 files changed, 1 insertions(+), 6 deletions(-) diff --git a/arch/sh/lib/time.c b/arch/sh/lib/time.c index c70baed..a01596c 100644 --- a/arch/sh/lib/time.c +++ b/arch/sh/lib/time.c @@ -108,14 +108,9 @@ int timer_init (void) unsigned long long get_ticks (void) { unsigned long tcnt = 0 - readl(TCNT0); - unsigned long ticks; - if (last_tcnt > tcnt) { /* overflow */ + if (last_tcnt > tcnt) /* overflow */ overflow_ticks++; - ticks = (0xffffffff - last_tcnt) + tcnt; - } else { - ticks = tcnt; - } last_tcnt = tcnt; return (overflow_ticks << 32) | tcnt; -- 1.7.9.1

1 0

[U-Boot] [PATCH] powerpc/85xx:Fix lds for nand boot debug info
by Prabhakar Kushwaha 01 Mar '12

01 Mar '12

Currently "u-boot", the elf file generated via u-boot-nand.lds does not contain required debug information i.e. .debug_{line, info, abbrev, aranges, ranges} into their respective _global_ sections. The original ld script line arch/powerpc/cpu/mpc85xx/start.o KEEP(*(.bootpg)) is not entirely correct because the start.o file is already processed by the linker,therefore the file wildcard in "KEEP(*(.bootpg))" will not process start.o again for bootpg. So Fix u-boot-nand.lds to generate these debug information. Signed-off-by: Anmol Paralkar <b07584(a)freescale.com> Signed-off-by: John Russo <John.Russo(a)freescale.com> Signed-off-by: Prabhakar Kushwaha <prabhakar(a)freescale.com> --- Developed against git://git.denx.de/u-boot.git branch master arch/powerpc/cpu/mpc85xx/u-boot-nand.lds | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/powerpc/cpu/mpc85xx/u-boot-nand.lds b/arch/powerpc/cpu/mpc85xx/u-boot-nand.lds index 04bc731..b1a1dac 100644 --- a/arch/powerpc/cpu/mpc85xx/u-boot-nand.lds +++ b/arch/powerpc/cpu/mpc85xx/u-boot-nand.lds @@ -1,5 +1,5 @@ /* - * Copyright 2009 Freescale Semiconductor, Inc. + * Copyright 2009-2012 Freescale Semiconductor, Inc. * * See file CREDITS for list of people who contributed to this * project. @@ -87,7 +87,7 @@ SECTIONS .bootpg ADDR(.text) - 0x1000 : { - arch/powerpc/cpu/mpc85xx/start.o KEEP(*(.bootpg)) + KEEP(arch/powerpc/cpu/mpc85xx/start.o (.bootpg)) } :text = 0xffff . = ADDR(.text) + 0x80000; -- 1.7.5.4

1 0

[U-Boot] [PATCH] Blackfin: move gd/bd to bss by default
by Mike Frysinger 01 Mar '12

01 Mar '12

We don't need these setup manually, so let the bss do the rest. On Blackfin systems, we clear the bss before executing any C code that would use these, so this should be fine. Signed-off-by: Mike Frysinger <vapier(a)gentoo.org> --- arch/blackfin/include/asm/config.h | 8 +---- arch/blackfin/lib/board.c | 58 ++++++++++++++++++++++++++---------- 2 files changed, 43 insertions(+), 23 deletions(-) diff --git a/arch/blackfin/include/asm/config.h b/arch/blackfin/include/asm/config.h index 1a8de49..25cd833 100644 --- a/arch/blackfin/include/asm/config.h +++ b/arch/blackfin/include/asm/config.h @@ -109,14 +109,8 @@ #ifndef CONFIG_SYS_MALLOC_BASE # define CONFIG_SYS_MALLOC_BASE (CONFIG_SYS_MONITOR_BASE - CONFIG_SYS_MALLOC_LEN) #endif -#ifndef CONFIG_SYS_GBL_DATA_ADDR -# define CONFIG_SYS_GBL_DATA_ADDR (CONFIG_SYS_MALLOC_BASE - GENERATED_GBL_DATA_SIZE) -#endif -#ifndef CONFIG_SYS_BD_INFO_ADDR -# define CONFIG_SYS_BD_INFO_ADDR (CONFIG_SYS_GBL_DATA_ADDR - GENERATED_BD_INFO_SIZE) -#endif #ifndef CONFIG_STACKBASE -# define CONFIG_STACKBASE (CONFIG_SYS_BD_INFO_ADDR - 4) +# define CONFIG_STACKBASE (CONFIG_SYS_MALLOC_BASE - 4) #endif #ifndef CONFIG_SYS_MEMTEST_START # define CONFIG_SYS_MEMTEST_START 0 diff --git a/arch/blackfin/lib/board.c b/arch/blackfin/lib/board.c index e3ee4cd..2d424a2 100644 --- a/arch/blackfin/lib/board.c +++ b/arch/blackfin/lib/board.c @@ -181,6 +181,46 @@ void init_cplbtables(void) } } +static int global_board_data_init(void) +{ +#ifndef CONFIG_SYS_GBL_DATA_ADDR +# define CONFIG_SYS_GBL_DATA_ADDR 0 +#endif +#ifndef CONFIG_SYS_BD_INFO_ADDR +# define CONFIG_SYS_BD_INFO_ADDR 0 +#endif + + bd_t *bd; + + if (CONFIG_SYS_GBL_DATA_ADDR) { + gd = (gd_t *) (CONFIG_SYS_GBL_DATA_ADDR); + memset((void *)gd, 0, GENERATED_GBL_DATA_SIZE); + } else { + static gd_t _bfin_gd; + gd = &_bfin_gd; + } + + if (CONFIG_SYS_BD_INFO_ADDR) { + bd = (bd_t *) (CONFIG_SYS_BD_INFO_ADDR); + memset(bd, 0, GENERATED_BD_INFO_SIZE); + } else { + static bd_t _bfin_bd; + bd = &_bfin_bd; + } + gd->bd = bd; + + bd->bi_r_version = version_string; + bd->bi_cpu = MK_STR(CONFIG_BFIN_CPU); + bd->bi_board_name = BFIN_BOARD_NAME; + bd->bi_vco = get_vco(); + bd->bi_cclk = get_cclk(); + bd->bi_sclk = get_sclk(); + bd->bi_memstart = CONFIG_SYS_SDRAM_BASE; + bd->bi_memsize = CONFIG_SYS_MAX_RAM_SIZE; + + return 0; +} + /* * All attempts to come up with a "common" initialization sequence * that works for all boards and architectures failed: some of the @@ -201,7 +241,6 @@ extern int timer_init(void); void board_init_f(ulong bootflag) { - bd_t *bd; char buf[32]; #ifdef CONFIG_BOARD_EARLY_INIT_F @@ -234,21 +273,8 @@ void board_init_f(ulong bootflag) hang(); #endif serial_early_puts("Init global data\n"); - gd = (gd_t *) (CONFIG_SYS_GBL_DATA_ADDR); - memset((void *)gd, 0, GENERATED_GBL_DATA_SIZE); - - bd = (bd_t *) (CONFIG_SYS_BD_INFO_ADDR); - gd->bd = bd; - memset((void *)bd, 0, GENERATED_BD_INFO_SIZE); - bd->bi_r_version = version_string; - bd->bi_cpu = MK_STR(CONFIG_BFIN_CPU); - bd->bi_board_name = BFIN_BOARD_NAME; - bd->bi_vco = get_vco(); - bd->bi_cclk = get_cclk(); - bd->bi_sclk = get_sclk(); - bd->bi_memstart = CONFIG_SYS_SDRAM_BASE; - bd->bi_memsize = CONFIG_SYS_MAX_RAM_SIZE; + global_board_data_init(); /* Initialize */ serial_early_puts("IRQ init\n"); @@ -276,7 +302,7 @@ void board_init_f(ulong bootflag) if (CONFIG_MEM_SIZE) { printf("RAM: "); - print_size(bd->bi_memsize, "\n"); + print_size(gd->bd->bi_memsize, "\n"); } #if defined(CONFIG_POST) -- 1.7.8.4

1 0