January 2007 - U-Boot

[U-Boot-Users] [PATCH] Fix: Bug in MIPS linker scripts
by Robert Deliën 11 Apr '07

11 Apr '07

Hi, This patch fixes the possible alignment error between _gp and __got_start in the linker scripts of all MIPS targets. This problem has been previously reported under the title '_gp and __got_start alignment problem in u-boot.lds. Thanks for your comment Andrew! With kind regards, Robert.

2 1

[U-Boot-Users] PPC 83xx + QE support
by David Saada 07 Apr '07

07 Apr '07

Hello, Are there plans for U-boot to support any PPC 83xx+QE (Quick Engine) based boards? Relevant boards can be Freescale's 8360 or 8323 based ones. Thanks. David.

3 3

[U-Boot-Users] [DNX#2007012542000021] [PATCH] Abort booting if the DTB version is incomp [...]
by OTRS Notification Master 15 Mar '07

15 Mar '07

Hello list, inside the automatic U-Boot patch tracking system a new ticket [DNX#2007012542000021] was created: <snip> > U-Boot only supports version 16 of the device tree file format, although > some > versions of the device tree compiler generate version 3 by default. > With > this patch, U-Boot now checks the version number and aborts the boot > process > if the version of the device tree passed on the bootm command line is > not > compatible. > > Signed-off-by: Timur Tabi <timur(a)freescale.com> > --- > common/cmd_bootm.c | 10 ++++++++++ > 1 files changed, 10 insertions(+), 0 deletions(-) > > diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c > index 0c092c7..9111cbd 100644 > --- a/common/cmd_bootm.c > +++ b/common/cmd_bootm.c > @@ -741,6 +741,16 @@ do_bootm_linux (cmd_tbl_t *cmdtp, int fl > hdr = (image_header_t *)of_flat_tree; > > if (*(ulong *)of_flat_tree == OF_DT_HEADER) { > + struct boot_param_header *bph = > + (struct boot_param_header *) of_flat_tree; > + > + if ((OF_DT_VERSION < be32_to_cpu(bph->last_comp_version)) || > + (OF_DT_VERSION > be32_to_cpu(bph->version))) { > + printf("ERROR: DTB version %u is not compatible with version %u " \ > + "(last_comp_version=%u)\n", be32_to_cpu(bph->version), > + OF_DT_VERSION, be32_to_cpu(bph->last_comp_version)); > + return; > + } > #ifndef CFG_NO_FLASH > if (addr2info((ulong)of_flat_tree) != NULL) > of_data = (ulong)of_flat_tree; > -- > 1.4.4 </snip> Your U-Boot support team

6 9

[U-Boot-Users] [patch] drop special case for ppc hosts
by Mike Frysinger 06 Mar '07

06 Mar '07

for some reason there's a special case for ppc HOSTARCH's when setting up the default CROSS_COMPILE value ... this messes up my default env builds when going between my x86/amd64/ppc dev hosts ;) attached patch simply drops this special case handling -mike

2 6

[U-Boot-Users] [GIT PULL] AVR32 relocation
by Haavard Skinnemoen 02 Mar '07

02 Mar '07

Hi Wolfgang, Please pull from the 'for-upstream' branch of git://www.atmel.no/~hskinnemoen/u-boot/avr32 for-upstream to receive the following updates: Haavard Skinnemoen (6): AVR32: Split start_u_boot into board_init_f and board_init_r AVR32: Use avr32-linux- cross-compilation prefix by default AVR32: Build position-independent u-boot AVR32: Clean up memory-map.h for at32ap7000 AVR32: Resource management rewrite AVR32: Relocate u-boot to SDRAM Makefile | 2 +- avr32_config.mk | 2 +- board/atmel/atstk1000/atstk1000.c | 13 + board/atmel/atstk1000/flash.c | 2 +- board/atmel/atstk1000/u-boot.lds | 21 +- cpu/at32ap/Makefile | 2 +- cpu/at32ap/at32ap7000/Makefile | 2 +- cpu/at32ap/at32ap7000/devices.c | 448 ------------------------ cpu/at32ap/at32ap7000/gpio.c | 77 ++++ cpu/at32ap/at32ap7000/hebi.c | 38 -- cpu/at32ap/cpu.c | 64 +++- cpu/at32ap/device.c | 126 ------- cpu/at32ap/entry.S | 3 +- cpu/at32ap/exception.c | 7 +- cpu/at32ap/hsdramc.c | 43 +-- cpu/at32ap/hsdramc1.h | 8 +- cpu/at32ap/hsmc3.h | 8 +- cpu/at32ap/interrupts.c | 14 +- cpu/at32ap/pio.c | 90 ++---- cpu/at32ap/pio2.h | 8 +- cpu/at32ap/pm.c | 127 +------- cpu/at32ap/sm.h | 8 +- cpu/at32ap/start.S | 113 +++++-- drivers/atmel_usart.c | 48 ++- drivers/atmel_usart.h | 8 +- include/asm-avr32/arch-at32ap7000/clk.h | 58 +++ include/asm-avr32/arch-at32ap7000/gpio.h | 210 +++++++++++ include/asm-avr32/arch-at32ap7000/hmatrix2.h | 8 +- include/asm-avr32/arch-at32ap7000/memory-map.h | 81 +++-- include/asm-avr32/arch-at32ap7000/platform.h | 146 -------- include/asm-avr32/global_data.h | 3 +- include/configs/atstk1002.h | 17 +- lib_avr32/avr32_linux.c | 4 +- lib_avr32/board.c | 139 +++++++- 34 files changed, 796 insertions(+), 1152 deletions(-) delete mode 100644 cpu/at32ap/at32ap7000/devices.c create mode 100644 cpu/at32ap/at32ap7000/gpio.c delete mode 100644 cpu/at32ap/at32ap7000/hebi.c delete mode 100644 cpu/at32ap/device.c create mode 100644 include/asm-avr32/arch-at32ap7000/clk.h create mode 100644 include/asm-avr32/arch-at32ap7000/gpio.h delete mode 100644 include/asm-avr32/arch-at32ap7000/platform.h After this, the avr32 port will relocate itself to the end of DRAM like the ppc port does. Attached is a combined diff with all the changes, for your reference (too big to include inline.) Quite a large number of files were touched. This is mostly early init code which assumed the .data and .bss sections were available. Now, I would like to use the cfi driver with the AT49BV6416 chip on atstk1000 instead of the custom driver, but unfortunately, it doesn't work. I'll have a closer look at it later (I think it's a combination of the geometry reversal issue and a special non-intel unlocking algorithm.) Thanks, Haavard

4 4

[U-Boot-Users] MCF5271 Port.
by adarsh babu 13 Feb '07

13 Feb '07

I am new to U-Boot. I downloaded u-boot-1.1.6 and plan to use the same on the MCF5271 EVB. My host system has Red Hat 6. I followed the instructions provided in the readme and I got the following result [root@em u-boot-1.1.6]# make M5271EVB_config Configuring for M5271EVB board... [root@em u-boot-1.1.6]# make all for dir in tools examples post post/cpu ; do make -C $dir _depend ; done make[1]: Entering directory `/U-Boot/u-boot-1.1.6/tools' ln -s ../common/environment.c environment.c ln -s ../lib_generic/crc32.c crc32.c make[1]: Leaving directory `/U-Boot/u-boot-1.1.6/tools' make[1]: Entering directory `/U-Boot/u-boot-1.1.6/tools' make[1]: Nothing to be done for `_depend'. make[1]: Leaving directory `/U-Boot/u-boot-1.1.6/tools' make[1]: Entering directory `/U-Boot/u-boot-1.1.6/examples' m68k-elf-gcc: hello_world.o: No such file or directory m68k-elf-gcc: unrecognized option `-MQ' m68k-elf-gcc: stubs.o: No such file or directory m68k-elf-gcc: unrecognized option `-MQ' make[1]: *** [.depend] Error 1 make[1]: Leaving directory `/U-Boot/u-boot-1.1.6/examples' make[1]: Entering directory `/U-Boot/u-boot-1.1.6/post' m68k-elf-gcc: cache_8xx.o: No such file or directory m68k-elf-gcc: unrecognized option `-MQ' m68k-elf-gcc: cache.o: No such file or directory m68k-elf-gcc: unrecognized option `-MQ' m68k-elf-gcc: codec.o: No such file or directory m68k-elf-gcc: unrecognized option `-MQ' m68k-elf-gcc: cpu.o: No such file or directory m68k-elf-gcc: unrecognized option `-MQ' m68k-elf-gcc: dsp.o: No such file or directory m68k-elf-gcc: unrecognized option `-MQ' m68k-elf-gcc: ether.o: No such file or directory m68k-elf-gcc: unrecognized option `-MQ' m68k-elf-gcc: i2c.o: No such file or directory m68k-elf-gcc: unrecognized option `-MQ' m68k-elf-gcc: memory.o: No such file or directory m68k-elf-gcc: unrecognized option `-MQ' m68k-elf-gcc: post.o: No such file or directory m68k-elf-gcc: unrecognized option `-MQ' m68k-elf-gcc: rtc.o: No such file or directory m68k-elf-gcc: unrecognized option `-MQ' m68k-elf-gcc: spr.o: No such file or directory m68k-elf-gcc: unrecognized option `-MQ' m68k-elf-gcc: sysmon.o: No such file or directory m68k-elf-gcc: unrecognized option `-MQ' m68k-elf-gcc: tests.o: No such file or directory m68k-elf-gcc: unrecognized option `-MQ' m68k-elf-gcc: uart.o: No such file or directory m68k-elf-gcc: unrecognized option `-MQ' m68k-elf-gcc: usb.o: No such file or directory m68k-elf-gcc: unrecognized option `-MQ' m68k-elf-gcc: watchdog.o: No such file or directory m68k-elf-gcc: unrecognized option `-MQ' make[1]: *** [.depend] Error 1 make[1]: Leaving directory `/U-Boot/u-boot-1.1.6/post' make[1]: Entering directory `/U-Boot/u-boot-1.1.6/post/cpu' m68k-elf-gcc: asm.o: No such file or directory m68k-elf-gcc: unrecognized option `-MQ' m68k-elf-gcc: cmp.o: No such file or directory m68k-elf-gcc: unrecognized option `-MQ' m68k-elf-gcc: cmpi.o: No such file or directory m68k-elf-gcc: unrecognized option `-MQ' m68k-elf-gcc: two.o: No such file or directory m68k-elf-gcc: unrecognized option `-MQ' m68k-elf-gcc: twox.o: No such file or directory m68k-elf-gcc: unrecognized option `-MQ' m68k-elf-gcc: three.o: No such file or directory m68k-elf-gcc: unrecognized option `-MQ' m68k-elf-gcc: threex.o: No such file or directory m68k-elf-gcc: unrecognized option `-MQ' m68k-elf-gcc: threei.o: No such file or directory m68k-elf-gcc: unrecognized option `-MQ' m68k-elf-gcc: andi.o: No such file or directory m68k-elf-gcc: unrecognized option `-MQ' m68k-elf-gcc: srawi.o: No such file or directory m68k-elf-gcc: unrecognized option `-MQ' m68k-elf-gcc: rlwnm.o: No such file or directory m68k-elf-gcc: unrecognized option `-MQ' m68k-elf-gcc: rlwinm.o: No such file or directory m68k-elf-gcc: unrecognized option `-MQ' m68k-elf-gcc: rlwimi.o: No such file or directory m68k-elf-gcc: unrecognized option `-MQ' m68k-elf-gcc: store.o: No such file or directory m68k-elf-gcc: unrecognized option `-MQ' m68k-elf-gcc: load.o: No such file or directory m68k-elf-gcc: unrecognized option `-MQ' m68k-elf-gcc: cr.o: No such file or directory m68k-elf-gcc: unrecognized option `-MQ' m68k-elf-gcc: b.o: No such file or directory m68k-elf-gcc: unrecognized option `-MQ' m68k-elf-gcc: multi.o: No such file or directory m68k-elf-gcc: unrecognized option `-MQ' m68k-elf-gcc: string.o: No such file or directory m68k-elf-gcc: unrecognized option `-MQ' m68k-elf-gcc: complex.o: No such file or directory m68k-elf-gcc: unrecognized option `-MQ' make[1]: *** [.depend] Error 1 make[1]: Leaving directory `/U-Boot/u-boot-1.1.6/post/cpu' make: *** [depend] Error 2 Can you please help me out. Regards, Adarsh. __________________________________________________________ Yahoo! India Answers: Share what you know. Learn something new http://in.answers.yahoo.com/

5 10

[U-Boot-Users] fixup section problem.
by Txema Lopez 12 Feb '07

12 Feb '07

Hi, We are working in a MPC5200B based custom board and we are developping a tool to relocate a U-Boot (1.1.4 version) binary file to a different address in flash that it was linked. So, we have to change the GOT and FIXUP entries in the original file to point at the new address. Doing this work, we have found that, surprisingly, the FIXUP section in U-Boot is empty. When U-Boot is relocated from flash to sdram these lines in the file start.S have no effect: /* * Now adjust the fixups and the pointers to the fixups * in case we need to move ourselves again. */ 2: li r0,__fixup_entries@sectoff@l lwz r3,GOT(_FIXUP_TABLE_) cmpwi r0,0 mtctr r0 addi r3,r3,-4 beq 4f 3: lwzu r4,4(r3) lwzux r0,r4,r11 add r0,r0,r11 stw r10,0(r3) stw r0,0(r4) bdnz 3b 4: Looking into the sources we have found some places where the fixup elements seem to be relocated manually, i.e.: void malloc_bin_reloc (void) { DECLARE_GLOBAL_DATA_PTR; unsigned long *p = (unsigned long *)(&av_[2]); int i; for (i=2; i<(sizeof(av_)/sizeof(mbinptr)); ++i) { *p++ += gd->reloc_off; } } Is there any reason to leave the FIXUP section empty in U-Boot? Is it a bug?. Checking the u-boot.lds file for the IceCube board we have found that fhe fixup section is included in the TEXT section and in the RELOC section, but the linker generate code only for the TEXT section. If we put it only in the RELOC section the FIXUP is not empty, the pointers adjustement in the start.S seems to work properly and the malloc_bin_reloc() function would be not necessary. Does anynone know if I'am missing something? Any clue will be welcomed. Best regards,

3 5

[U-Boot-Users] [PATCH] Fixed cfi flash read uchar bug.
by wei.zhang＠freescale.com 11 Feb '07

11 Feb '07

From: Zhang Wei <wei.zhang(a)freescale.com> For the flash of port width more than 8bit, a completetly read must be performed. For example, 16bit port width flash must perform a ushort read. Otherwise, some flashes will get error data. Signed-off-by: Zhang Wei <wei.zhang(a)freescale.com> --- drivers/cfi_flash.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/cfi_flash.c b/drivers/cfi_flash.c index 9b10220..f02b047 100644 --- a/drivers/cfi_flash.c +++ b/drivers/cfi_flash.c @@ -250,9 +250,9 @@ #endif */ inline uchar flash_read_uchar (flash_info_t * info, uint offset) { - uchar *cp; + uchar cp[FLASH_CFI_64BIT]; - cp = flash_make_addr (info, 0, offset); + memcpy(cp, flash_make_addr (info, 0, offset), info->portwidth); #if defined(__LITTLE_ENDIAN) return (cp[0]); #else -- 1.4.0

12 54

[U-Boot-Users] Please pull from 'mpc83xx' branch
by Kumar Gala 01 Feb '07

01 Feb '07

Please pull from 'mpc83xx' branch of git://git.kernel.org/pub/scm/boot/u-boot/galak/u-boot.git to receive the following updates: >From bec770f7708fde81e96eec3230851c04f8b822db Mon Sep 17 00:00:00 2001 From: Kumar Gala <galak(a)kernel.crashing.org> Date: Tue, 30 Jan 2007 14:08:30 -0600 Subject: [PATCH] Replace CONFIG_MPC8349 and use CONFIG_MPC834X instead The code that is ifdef'd with CONFIG_MPC8349 is actually applicable to all MPC834X class processors. Change the protections from CONFIG_MPC8349 to CONFIG_MPC834X so they are more generic. Signed-off-by: Kumar Gala <galak(a)kernel.crashing.org> --- cpu/mpc83xx/cpu.c | 2 +- cpu/mpc83xx/speed.c | 8 ++++---- include/asm-ppc/global_data.h | 4 ++-- include/asm-ppc/immap_83xx.h | 2 +- include/mpc83xx.h | 14 +++++++------- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/cpu/mpc83xx/cpu.c b/cpu/mpc83xx/cpu.c index bc61219..15e04ba 100644 --- a/cpu/mpc83xx/cpu.c +++ b/cpu/mpc83xx/cpu.c @@ -113,7 +113,7 @@ int checkcpu(void) return -1; /* Not sure what this is */ } -#if defined(CONFIG_MPC8349) +#if defined(CONFIG_MPC834X) printf("Rev: %02x at %s MHz\n", (spridr & 0x0000FFFF)>>4 |(spridr & 0x0000000F), strmhz(buf, clock)); #else printf("Rev: %02x at %s MHz\n", spridr & 0x0000FFFF, strmhz(buf, clock)); diff --git a/cpu/mpc83xx/speed.c b/cpu/mpc83xx/speed.c index 9fd1bf1..c759930 100644 --- a/cpu/mpc83xx/speed.c +++ b/cpu/mpc83xx/speed.c @@ -99,7 +99,7 @@ int get_clocks(void) u32 lcrr; u32 csb_clk; -#if defined(CONFIG_MPC8349) +#if defined(CONFIG_MPC834X) u32 tsec1_clk; u32 tsec2_clk; u32 usbmph_clk; @@ -148,7 +148,7 @@ int get_clocks(void) sccr = im->clk.sccr; -#if defined(CONFIG_MPC8349) +#if defined(CONFIG_MPC834X) switch ((sccr & SCCR_TSEC1CM) >> SCCR_TSEC1CM_SHIFT) { case 0: tsec1_clk = 0; @@ -314,7 +314,7 @@ int get_clocks(void) #endif gd->csb_clk = csb_clk; -#if defined(CONFIG_MPC8349) +#if defined(CONFIG_MPC834X) gd->tsec1_clk = tsec1_clk; gd->tsec2_clk = tsec2_clk; gd->usbmph_clk = usbmph_clk; @@ -371,7 +371,7 @@ int print_clock_conf(void) #if !defined(CONFIG_MPC832X) printf(" I2C2: %4d MHz\n", gd->i2c2_clk / 1000000); #endif -#if defined(CONFIG_MPC8349) +#if defined(CONFIG_MPC834X) printf(" TSEC1: %4d MHz\n", gd->tsec1_clk / 1000000); printf(" TSEC2: %4d MHz\n", gd->tsec2_clk / 1000000); printf(" USB MPH: %4d MHz\n", gd->usbmph_clk / 1000000); diff --git a/include/asm-ppc/global_data.h b/include/asm-ppc/global_data.h index 8bc61b6..c113b7e 100644 --- a/include/asm-ppc/global_data.h +++ b/include/asm-ppc/global_data.h @@ -52,12 +52,12 @@ typedef struct global_data { #if defined(CONFIG_MPC83XX) /* There are other clocks in the MPC83XX */ u32 csb_clk; -#if defined (CONFIG_MPC8349) +#if defined (CONFIG_MPC834X) u32 tsec1_clk; u32 tsec2_clk; u32 usbmph_clk; u32 usbdr_clk; -#endif /* CONFIG_MPC8349 */ +#endif /* CONFIG_MPC834X */ u32 core_clk; u32 i2c1_clk; u32 i2c2_clk; diff --git a/include/asm-ppc/immap_83xx.h b/include/asm-ppc/immap_83xx.h index 77a079f..5e088d6 100644 --- a/include/asm-ppc/immap_83xx.h +++ b/include/asm-ppc/immap_83xx.h @@ -544,7 +544,7 @@ typedef struct security83xx { u8 fixme[0x10000]; } security83xx_t; -#if defined(CONFIG_MPC8349) +#if defined(CONFIG_MPC834X) typedef struct immap { sysconf83xx_t sysconf; /* System configuration */ wdt83xx_t wdt; /* Watch Dog Timer (WDT) Registers */ diff --git a/include/mpc83xx.h b/include/mpc83xx.h index 52e4369..c1c6ad1 100644 --- a/include/mpc83xx.h +++ b/include/mpc83xx.h @@ -96,7 +96,7 @@ #define SPCR_COREPR 0x00300000 /* E300 PowerPC Core system bus request priority */ #define SPCR_COREPR_SHIFT (31-11) -#if defined(CONFIG_MPC8349) +#if defined(CONFIG_MPC834X) /* SPCR bits - MPC8349 specific */ #define SPCR_TSEC1DP 0x00003000 /* TSEC1 data priority */ #define SPCR_TSEC1DP_SHIFT (31-19) @@ -114,7 +114,7 @@ /* SICRL/H - System I/O Configuration Register Low/High */ -#if defined(CONFIG_MPC8349) +#if defined(CONFIG_MPC834X) /* SICRL bits - MPC8349 specific */ #define SICRL_LDP_A 0x80000000 #define SICRL_USB1 0x40000000 @@ -340,7 +340,7 @@ #define HRCWH_PCI_HOST_SHIFT 31 #define HRCWH_PCI_AGENT 0x00000000 -#if defined(CONFIG_MPC8349) +#if defined(CONFIG_MPC834X) #define HRCWH_32_BIT_PCI 0x00000000 #define HRCWH_64_BIT_PCI 0x40000000 #endif @@ -351,7 +351,7 @@ #define HRCWH_PCI_ARBITER_DISABLE 0x00000000 #define HRCWH_PCI_ARBITER_ENABLE 0x20000000 -#if defined(CONFIG_MPC8349) +#if defined(CONFIG_MPC834X) #define HRCWH_PCI2_ARBITER_DISABLE 0x00000000 #define HRCWH_PCI2_ARBITER_ENABLE 0x10000000 @@ -375,14 +375,14 @@ #define HRCWH_ROM_LOC_DDR_SDRAM 0x00000000 #define HRCWH_ROM_LOC_PCI1 0x00100000 -#if defined(CONFIG_MPC8349) +#if defined(CONFIG_MPC834X) #define HRCWH_ROM_LOC_PCI2 0x00200000 #endif #define HRCWH_ROM_LOC_LOCAL_8BIT 0x00500000 #define HRCWH_ROM_LOC_LOCAL_16BIT 0x00600000 #define HRCWH_ROM_LOC_LOCAL_32BIT 0x00700000 -#if defined(CONFIG_MPC8349) +#if defined(CONFIG_MPC834X) #define HRCWH_TSEC1M_IN_RGMII 0x00000000 #define HRCWH_TSEC1M_IN_RTBI 0x00004000 #define HRCWH_TSEC1M_IN_GMII 0x00008000 @@ -742,7 +742,7 @@ #define BR_V 0x00000001 #define BR_V_SHIFT 0 -#if defined(CONFIG_MPC8349) +#if defined(CONFIG_MPC834X) #define BR_RES ~(BR_BA | BR_PS | BR_DECC | BR_WP | BR_MSEL | BR_V) #elif defined(CONFIG_MPC8360) #define BR_RES ~(BR_BA | BR_PS | BR_DECC | BR_WP | BR_MSEL | BR_ATOM | BR_V) -- 1.4.4.2 >From 8fa0c664107f4dbce5f688c1c5c0f4f5f54a061c Mon Sep 17 00:00:00 2001 From: Kumar Gala <galak(a)kernel.crashing.org> Date: Tue, 30 Jan 2007 15:23:48 -0600 Subject: [PATCH] Fix config of Arbiter, System Priority, and Clock Mode on MPC83xx The config value for: * CFG_ACR_PIPE_DEP * CFG_ACR_RPTCNT * CFG_SPCR_TSEC1EP * CFG_SPCR_TSEC2EP * CFG_SCCR_TSEC1CM * CFG_SCCR_TSEC2CM Were not being used when setting the appropriate register Added: * CFG_SCCR_USBMPHCM * CFG_SCCR_USBDRCM * CFG_SCCR_PCICM * CFG_SCCR_ENCCM To allow full config of the SCCR. Also removed random CFG_SCCR settings in MPC8349EMDS, TQM834x, and sbc8349 that were just bogus. Signed-off-by: Kumar Gala <galak(a)kernel.crashing.org> --- cpu/mpc83xx/cpu_init.c | 33 +++++++++++++++++++++++++++------ include/configs/MPC8349EMDS.h | 11 ----------- include/configs/TQM834x.h | 11 ----------- include/configs/sbc8349.h | 11 ----------- include/mpc83xx.h | 9 ++------- 5 files changed, 29 insertions(+), 46 deletions(-) diff --git a/cpu/mpc83xx/cpu_init.c b/cpu/mpc83xx/cpu_init.c index eb256e5..d01311d 100644 --- a/cpu/mpc83xx/cpu_init.c +++ b/cpu/mpc83xx/cpu_init.c @@ -69,31 +69,52 @@ void cpu_init_f (volatile immap_t * im) #ifdef CFG_ACR_PIPE_DEP /* Arbiter pipeline depth */ - im->arbiter.acr = (im->arbiter.acr & ~ACR_PIPE_DEP) | (3 << ACR_PIPE_DEP_SHIFT); + im->arbiter.acr = (im->arbiter.acr & ~ACR_PIPE_DEP) | (CFG_ACR_PIPE_DEP << ACR_PIPE_DEP_SHIFT); #endif #ifdef CFG_SPCR_TSEC1EP /* TSEC1 Emergency priority */ - im->sysconf.spcr = (im->sysconf.spcr & ~SPCR_TSEC1EP) | (3 << SPCR_TSEC1EP_SHIFT); + im->sysconf.spcr = (im->sysconf.spcr & ~SPCR_TSEC1EP) | (CFG_SPCR_TSEC1EP << SPCR_TSEC1EP_SHIFT); #endif #ifdef CFG_SPCR_TSEC2EP /* TSEC2 Emergency priority */ - im->sysconf.spcr = (im->sysconf.spcr & ~SPCR_TSEC2EP) | (3 << SPCR_TSEC2EP_SHIFT); + im->sysconf.spcr = (im->sysconf.spcr & ~SPCR_TSEC2EP) | (CFG_SPCR_TSEC2EP << SPCR_TSEC2EP_SHIFT); #endif +#ifdef CONFIG_MPC834X #ifdef CFG_SCCR_TSEC1CM /* TSEC1 clock mode */ - im->clk.sccr = (im->clk.sccr & ~SCCR_TSEC1CM) | (1 << SCCR_TSEC1CM_SHIFT); + im->clk.sccr = (im->clk.sccr & ~SCCR_TSEC1CM) | (CFG_SCCR_TSEC1CM << SCCR_TSEC1CM_SHIFT); #endif #ifdef CFG_SCCR_TSEC2CM /* TSEC2 & I2C1 clock mode */ - im->clk.sccr = (im->clk.sccr & ~SCCR_TSEC2CM) | (1 << SCCR_TSEC2CM_SHIFT); + im->clk.sccr = (im->clk.sccr & ~SCCR_TSEC2CM) | (CFG_SCCR_TSEC2CM << SCCR_TSEC2CM_SHIFT); +#endif +#ifdef CFG_SCCR_USBMPHCM + /* USB MPH clock mode */ + im->clk.sccr = (im->clk.sccr & ~SCCR_USBMPHCM) | (CFG_SCCR_USBMPHCM << SCCR_USBMPHCM_SHIFT); +#endif +#endif /* CONFIG_MPC834X */ + +#ifdef CFG_SCCR_PCICM + /* PCI & DMA clock mode */ + im->clk.sccr = (im->clk.sccr & ~SCCR_PCICM) | (CFG_SCCR_PCICM << SCCR_PCICM_SHIFT); +#endif + +#ifdef CFG_SCCR_USBDRCM + /* USB DR clock mode */ + im->clk.sccr = (im->clk.sccr & ~SCCR_USBDRCM) | (CFG_SCCR_USBDRCM << SCCR_USBDRCM_SHIFT); +#endif + +#ifdef CFG_SCCR_ENCCM + /* Encryption clock mode */ + im->clk.sccr = (im->clk.sccr & ~SCCR_ENCCM) | (CFG_SCCR_ENCCM << SCCR_PCICM_SHIFT); #endif #ifdef CFG_ACR_RPTCNT /* Arbiter repeat count */ - im->arbiter.acr = ((im->arbiter.acr & ~(ACR_RPTCNT)) | (3 << ACR_RPTCNT_SHIFT)); + im->arbiter.acr = ((im->arbiter.acr & ~(ACR_RPTCNT)) | (CFG_ACR_RPTCNT << ACR_RPTCNT_SHIFT)); #endif /* RSR - Reset Status Register - clear all status (4.6.1.3) */ diff --git a/include/configs/MPC8349EMDS.h b/include/configs/MPC8349EMDS.h index 5bed2d0..d06b51d 100644 --- a/include/configs/MPC8349EMDS.h +++ b/include/configs/MPC8349EMDS.h @@ -60,17 +60,6 @@ #endif #endif -#define CFG_SCCR_INIT (SCCR_DEFAULT & (~SCCR_CLK_MASK)) -#define CFG_SCCR_TSEC1CM SCCR_TSEC1CM_1 /* TSEC1 clock setting */ -#define CFG_SCCR_TSEC2CM SCCR_TSEC2CM_1 /* TSEC2 clock setting */ -#define CFG_SCCR_ENCCM SCCR_ENCCM_3 /* ENC clock setting */ -#define CFG_SCCR_USBCM SCCR_USBCM_3 /* USB clock setting */ -#define CFG_SCCR_VAL ( CFG_SCCR_INIT \ - | CFG_SCCR_TSEC1CM \ - | CFG_SCCR_TSEC2CM \ - | CFG_SCCR_ENCCM \ - | CFG_SCCR_USBCM ) - #define CONFIG_BOARD_EARLY_INIT_F /* call board_pre_init */ #define CFG_IMMR 0xE0000000 diff --git a/include/configs/TQM834x.h b/include/configs/TQM834x.h index 728083b..ed03577 100644 --- a/include/configs/TQM834x.h +++ b/include/configs/TQM834x.h @@ -57,17 +57,6 @@ */ #define CFG_LCRR (LCRR_DBYP | LCRR_CLKDIV_8) -#define CFG_SCCR_INIT (SCCR_DEFAULT & (~SCCR_CLK_MASK)) -#define CFG_SCCR_TSEC1CM SCCR_TSEC1CM_1 /* TSEC1 clock setting */ -#define CFG_SCCR_TSEC2CM SCCR_TSEC2CM_1 /* TSEC2 clock setting */ -#define CFG_SCCR_ENCCM SCCR_ENCCM_3 /* ENC clock setting */ -#define CFG_SCCR_USBCM SCCR_USBCM_3 /* USB clock setting */ -#define CFG_SCCR_VAL ( CFG_SCCR_INIT \ - | CFG_SCCR_TSEC1CM \ - | CFG_SCCR_TSEC2CM \ - | CFG_SCCR_ENCCM \ - | CFG_SCCR_USBCM ) - /* board pre init: do not call, nothing to do */ #undef CONFIG_BOARD_EARLY_INIT_F diff --git a/include/configs/sbc8349.h b/include/configs/sbc8349.h index 1876c61..321d3ce 100644 --- a/include/configs/sbc8349.h +++ b/include/configs/sbc8349.h @@ -63,17 +63,6 @@ #endif #endif -#define CFG_SCCR_INIT (SCCR_DEFAULT & (~SCCR_CLK_MASK)) -#define CFG_SCCR_TSEC1CM SCCR_TSEC1CM_1 /* TSEC1 clock setting */ -#define CFG_SCCR_TSEC2CM SCCR_TSEC2CM_1 /* TSEC2 clock setting */ -#define CFG_SCCR_ENCCM SCCR_ENCCM_3 /* ENC clock setting */ -#define CFG_SCCR_USBCM SCCR_USBCM_3 /* USB clock setting */ -#define CFG_SCCR_VAL ( CFG_SCCR_INIT \ - | CFG_SCCR_TSEC1CM \ - | CFG_SCCR_TSEC2CM \ - | CFG_SCCR_ENCCM \ - | CFG_SCCR_USBCM ) - #undef CONFIG_BOARD_EARLY_INIT_F /* call board_pre_init */ #define CFG_IMMR 0xE0000000 diff --git a/include/mpc83xx.h b/include/mpc83xx.h index c1c6ad1..f1df5cf 100644 --- a/include/mpc83xx.h +++ b/include/mpc83xx.h @@ -498,6 +498,7 @@ #define SCCR_PCICM_SHIFT 16 /* SCCR bits - MPC8349 specific */ +#ifdef CONFIG_MPC834X #define SCCR_TSEC1CM 0xc0000000 #define SCCR_TSEC1CM_SHIFT 30 #define SCCR_TSEC1CM_0 0x00000000 @@ -511,6 +512,7 @@ #define SCCR_TSEC2CM_1 0x10000000 #define SCCR_TSEC2CM_2 0x20000000 #define SCCR_TSEC2CM_3 0x30000000 +#endif #define SCCR_USBMPHCM 0x00c00000 #define SCCR_USBMPHCM_SHIFT 22 @@ -522,13 +524,6 @@ #define SCCR_USBCM_2 0x00A00000 #define SCCR_USBCM_3 0x00F00000 -#define SCCR_CLK_MASK ( SCCR_TSEC1CM_3 \ - | SCCR_TSEC2CM_3 \ - | SCCR_ENCCM_3 \ - | SCCR_USBCM_3 ) - -#define SCCR_DEFAULT 0xFFFFFFFF - /* CSn_BDNS - Chip Select memory Bounds Register */ #define CSBNDS_SA 0x00FF0000 -- 1.4.4.2

3 9

[U-Boot-Users] jffs2 fsload - SOLVED.
by Dan Merillat 01 Feb '07

01 Feb '07

Booting off jffs2 is now a valid configuration. The failure was that for each node, jffs2_1pass.c was doing an insertion sort. That's an O(N^2) operation, and that's not current filecount, that's every filename version that has ever existed on your flash. I made a pathological test case on my linux desktop (loop, block2mtd, jffs2mount) by running bonnie on it. I rapidly generated 72000 dentries and 61000 inodes to go through. On a 2.4ghz athlon X2, it took over 13 minutes to load the filesystem with stock jffs2_1pass.c I changed it from a insertion sort to a list-based mergesort (no extra heap requirements) and it read the filesystem in 650ms. Back on the flash chip, ARM with 32meg jffs2 filesystem takes ~15 seconds JUST to read the flash with while(offset<max) junk=*offset; Other hits: the spinner: all those compares added 15 seconds to the boot time. Removed. get_node_mem() calls - huge overhead (45 seconds, or roughly 66% of the total time) jffs2_scan_empty() - any erased sectors were bog slow, to do the EXACT same thing the main loop was doing. Removed. Added ignore cases for erase and summary blocks (from another patch) that gets rid of those warnings with new kernels. It still does the right thing, by checking magic, CRC and length then skipping it. The main problem is that there's no dcache on ARM, so we pay a massive penalty for function calls or even memory->register loads. Simple addition became quite expensive, hence changing offset+part->offset into offset. This does add the assumption that a partition will be contiguous in memory. I'm not sure if that is valid on all platforms, but it is on every one I'm working on. The mergesort license seems to be GPL compatable, (no restrictions or advertising clause). If it's a problem I can rewrite it myself under GPL.

2 3