December 2005 - U-Boot

[U-Boot-Users] PATCH for drivers/cfi_flash.c
by Tolunay Orkun 28 Feb '06

28 Feb '06

This patch reworks the patch submitted on May 6, 2005: Ref: http://sourceforge.net/mailarchive/message.php?msg_id=11674386 This patch (cfi_flash.patch.tolunay) is prepared against current CVS version + Peter Pearse Patch dated March 15, 2005. Ref: http://sourceforge.net/mailarchive/message.php?msg_id=11164812 CHANGELOG: * Patch by Tolunay Orkun, 02 July 2005: Fixes for drivers/cfi_flash.c: - Fix wrong timeout value usage in flash_status_check() - Round write_tout up when converting to msec in flash_get_size() - Remove clearing flash status at the end of flash_write_cfibuffer() which sets Intel 28F640J3 flash back to command mode on CSB472 ~~~ In case Peter's Patch is rejected for some reason please apply the alternate patch (cfi_flash.patch.tolunay2) instead. It makes one additional fix that I had submitted in my original patch. CHANGELOG (Alternate) * Patch by Tolunay Orkun, 02 July 2005: Fixes for drivers/cfi_flash.c: - Fix wrong timeout value usage in flash_status_check() - Round write_tout up when converting to msec in flash_get_size() - Remove clearing flash status at the end of flash_write_cfibuffer() which sets Intel 28F640J3 flash back to command mode on CSB472 - Fix incorrect if condition in flash_full_status_check() Best regards, Tolunay Orkun Index: drivers/cfi_flash.c =================================================================== RCS file: /cvsroot/u-boot/u-boot/drivers/cfi_flash.c,v retrieving revision 1.18 diff -p -u -r1.18 cfi_flash.c --- drivers/cfi_flash.c 16 May 2005 15:23:24 -0000 1.18 +++ drivers/cfi_flash.c 2 Jul 2005 23:45:50 -0000 @@ -694,7 +694,7 @@ static int flash_status_check (flash_inf /* Wait for command completion */ start = get_timer (0); while (flash_is_busy (info, sector)) { - if (get_timer (start) > info->erase_blk_tout * CFG_HZ) { + if (get_timer (start) > tout) { printf ("Flash %s timeout at address %lx data %lx\n", prompt, info->start[sector], flash_read_long (info, sector, 0)); @@ -1113,8 +1113,9 @@ static ulong flash_get_size (ulong base, info->erase_blk_tout = (tmp * (1 << flash_read_uchar (info, FLASH_OFFSET_EMAX_TOUT))); tmp = 1 << flash_read_uchar (info, FLASH_OFFSET_WBTOUT); info->buffer_write_tout = (tmp * (1 << flash_read_uchar (info, FLASH_OFFSET_WBMAX_TOUT))); - tmp = 1 << flash_read_uchar (info, FLASH_OFFSET_WTOUT); - info->write_tout = (tmp * (1 << flash_read_uchar (info, FLASH_OFFSET_WMAX_TOUT))) / 1000; + tmp = (1 << flash_read_uchar (info, FLASH_OFFSET_WTOUT)) * + (1 << flash_read_uchar (info, FLASH_OFFSET_WMAX_TOUT)); + info->write_tout = tmp / 1000 + (tmp % 1000 ? 1 : 0); /* round up when converting to ms */ info->flash_id = FLASH_MAN_CFI; if ((info->interface == FLASH_CFI_X8X16) && (info->chipwidth == FLASH_CFI_BY8)) { info->portwidth >>= 1; /* XXX - Need to test on x8/x16 in parallel. */ @@ -1281,7 +1282,6 @@ static int flash_write_cfibuffer (flash_ info->buffer_write_tout, "buffer write"); } - flash_write_cmd (info, sector, 0, FLASH_CMD_CLEAR_STATUS); return retcode; } #endif /* CFG_FLASH_USE_BUFFER_WRITE */ Index: drivers/cfi_flash.c =================================================================== RCS file: /cvsroot/u-boot/u-boot/drivers/cfi_flash.c,v retrieving revision 1.18 diff -p -u -r1.18 cfi_flash.c --- drivers/cfi_flash.c 16 May 2005 15:23:24 -0000 1.18 +++ drivers/cfi_flash.c 2 Jul 2005 23:52:15 -0000 @@ -694,7 +694,7 @@ static int flash_status_check (flash_inf /* Wait for command completion */ start = get_timer (0); while (flash_is_busy (info, sector)) { - if (get_timer (start) > info->erase_blk_tout * CFG_HZ) { + if (get_timer (start) > tout) { printf ("Flash %s timeout at address %lx data %lx\n", prompt, info->start[sector], flash_read_long (info, sector, 0)); @@ -719,7 +719,7 @@ static int flash_full_status_check (flas case CFI_CMDSET_INTEL_EXTENDED: case CFI_CMDSET_INTEL_STANDARD: if ((retcode != ERR_OK) - && !flash_isequal (info, sector, 0, FLASH_STATUS_DONE)) { + || !flash_isequal (info, sector, 0, FLASH_STATUS_DONE)) { retcode = ERR_INVAL; printf ("Flash %s error at address %lx\n", prompt, info->start[sector]); @@ -1113,8 +1113,9 @@ static ulong flash_get_size (ulong base, info->erase_blk_tout = (tmp * (1 << flash_read_uchar (info, FLASH_OFFSET_EMAX_TOUT))); tmp = 1 << flash_read_uchar (info, FLASH_OFFSET_WBTOUT); info->buffer_write_tout = (tmp * (1 << flash_read_uchar (info, FLASH_OFFSET_WBMAX_TOUT))); - tmp = 1 << flash_read_uchar (info, FLASH_OFFSET_WTOUT); - info->write_tout = (tmp * (1 << flash_read_uchar (info, FLASH_OFFSET_WMAX_TOUT))) / 1000; + tmp = (1 << flash_read_uchar (info, FLASH_OFFSET_WTOUT)) * + (1 << flash_read_uchar (info, FLASH_OFFSET_WMAX_TOUT)); + info->write_tout = tmp / 1000 + (tmp % 1000 ? 1 : 0); /* round up when converting to ms */ info->flash_id = FLASH_MAN_CFI; if ((info->interface == FLASH_CFI_X8X16) && (info->chipwidth == FLASH_CFI_BY8)) { info->portwidth >>= 1; /* XXX - Need to test on x8/x16 in parallel. */ @@ -1281,7 +1282,6 @@ static int flash_write_cfibuffer (flash_ info->buffer_write_tout, "buffer write"); } - flash_write_cmd (info, sector, 0, FLASH_CMD_CLEAR_STATUS); return retcode; } #endif /* CFG_FLASH_USE_BUFFER_WRITE */

2 1

[U-Boot-Users] cfi_flash.c patch
by richard＠uclinux.net 28 Feb '06

28 Feb '06

Afternoon... Adding 2 spaces in cfi_flash.c makes the output of "flinfo" much more readable if there are protected and unprotected sectors: rick ---------------------------------------------------------------------------- CHANGELOG: * Patch by Richard Klingler, 09 Apr 2005: correct column layout of flinfo output. --- u-boot.orig/drivers/cfi_flash.c 2005-01-09 19:12:33.000000000 +0200 +++ u-boot/drivers/cfi_flash.c 2005-04-09 16:35:04.000000000 +0300 @@ -483,7 +483,7 @@ void flash_print_info (flash_info_t * in if ((i % 5) == 0) printf ("\n "); printf (" %08lX%s", - info->start[i], info->protect[i] ? " (RO) " : " "); + info->start[i], info->protect[i] ? " (RO) " : " "); #endif } putc ('\n');

3 3

[U-Boot-Users] PATCH: minor bugs fix in cfi_driver.c
by Pierre AUBERT 28 Feb '06

28 Feb '06

Please find attached a little patch against current CVS. CHANGELOG: * Patch by Pierre Aubert 09 Dec 2004 - Fix flash information strings alignement in cfi_driver.c - Fix monitor size for flash protection in cfi_driver.c Best regards diff -pur u-boot/drivers/cfi_flash.c u-boot-paub/drivers/cfi_flash.c --- u-boot/drivers/cfi_flash.c 2004-10-11 01:27:35.000000000 +0200 +++ u-boot-paub/drivers/cfi_flash.c 2004-12-09 10:11:31.000000000 +0100 @@ -334,7 +334,7 @@ unsigned long flash_init (void) #if (CFG_MONITOR_BASE >= CFG_FLASH_BASE) flash_protect (FLAG_PROTECT_SET, CFG_MONITOR_BASE, - CFG_MONITOR_BASE + CFG_MONITOR_LEN - 1, + CFG_MONITOR_BASE + monitor_flash_len - 1, &flash_info[0]); #endif @@ -477,7 +477,7 @@ void flash_print_info (flash_info_t * in if ((i % 5) == 0) printf ("\n "); printf (" %08lX%s", - info->start[i], info->protect[i] ? " (RO) " : " "); + info->start[i], info->protect[i] ? " (RO)" : " "); #endif } putc ('\n');

2 1

[U-Boot-Users] [PATCH] Two System ACE CF fixes
by Peter Ryser 25 Jan '06

25 Jan '06

Attached a patch that adds support for the 16-bit wide bus of System ACE CF besides the existing support for the 8-bit wide bus. The patch also sets the FORCECFGMODE bit in the control register when the System ACE CF configuration controller is reset before reading a sector. Without this bit set System ACE CF reconfigures an FPGA if the CFGMODE pin is active whenever a sector is read. The third hunk fixes a typo. - Peter --- u-boot.orig/common/cmd_ace.c 2005-09-22 23:53:00.000000000 -0700 +++ u-boot/common/cmd_ace.c 2005-09-26 07:40:41.000000000 -0700 @@ -22,8 +22,9 @@ /* * The Xilinx SystemACE chip support is activated by defining * CONFIG_SYSTEMACE to turn on support, and CFG_SYSTEMACE_BASE - * to set the base address of the device. This code currently - * assumes that the chip is connected via a byte-wide bus. + * to set the base address of the device. CFG_SYSTEMACE_WIDTH + * selects the bus width the chip is connected with. Valid + * settings are 8 or 16. * * The CONFIG_SYSTEMACE also adds to fat support the device class * "ace" that allows the user to execute "fatls ace 0" and the @@ -137,6 +138,11 @@ block_dev_desc_t * systemace_get_dev(in systemace_dev.removable = 1; systemace_dev.block_read = systemace_read; + if(CFG_SYSTEMACE_WIDTH == 8) + ace_writew(0, 0); + else + ace_writew(1, 0); + init_part(&systemace_dev); } @@ -227,7 +233,7 @@ static unsigned long systemace_read(int /* Reset the configruation controller */ val = ace_readw(0x18); - val|=0x0080; + val|=0x0088; ace_writew(val, 0x18); retry = trans * 16; @@ -249,7 +255,7 @@ static unsigned long systemace_read(int retry -= 1; } - /* Clear the configruation controller reset */ + /* Clear the configuration controller reset */ val = ace_readw(0x18); val&=~0x0080; ace_writew(val, 0x18); * Add System ACE CF support for 16-bit bus width Add fix to ignore CFGMODE pin when resetting the System ACE CF configuration controller to avoid reconfiguration of FPGAs when reading sectors. Patch by Peter Ryser, 26 Sep 2005

2 2

[U-Boot-Users] EP852 : Kernel not booting ( Hangs after uncompressing)
by gautam borad 20 Jan '06

20 Jan '06

Hi, I'm trying to port u-boot-1.1.3 to EP852 board with mpc852T processor.The kernel im using is linuxppc 2.4.21. The board is working fine with u-boot , the problem is that kernel is not starting. I've made sure that the bd_info structure is same in kernel and u-boot. The clocks_in_mhz variable is not set and the IMMR value in kernel and u-boot matches. I run the test_burst program in u-boot and it worked fine.( so no prob with RAM) What else am i doing wrong?? The dump is : U-Boot 1.1.3 (Oct 28 2005 - 12:54:07) EP852 CPU: MPC852TxxZPnn at 50 MHz [25.0...125.0 MHz] 4 kB I-Cache 4 kB D-Cache FEC present Board: EP852 (Rev. e4). CPLD Rev: 00 DIP Switch: 1111 DRAM: 16 MB Top of RAM usable for U-Boot at: 01000000 Reserving 354k for U-Boot at: 00fa7000 Reserving 128k for malloc() at: 00f87000 Reserving 60 Bytes for Board Info at: 00f86fc4 Reserving 56 Bytes for Global Data at: 00f86f8c Stack Pointer at: 00f86f68 New Stack Pointer is: 00f86f68 Now running in RAM - U-Boot at: 00fa7000 FLASH: Flash addr:ff800000 AMD_ID_LV320B selected. before print_size 8 MB In: serial Out: serial Err: serial U-Boot relocated to 00fa7000 Net: FEC ETHERNET ### main_loop entered: bootdelay=8 ### main_loop: bootcmd="<UNDEFINED>" => printenv bootargs bootargs=console=ttyS0,9600 root=/dev/ram => tftp 0x00200000 pImage Using FEC ETHERNET device TFTP from server 10.129.87.5; our IP address is 10.129.87.250 Filename 'pImage'. Load address: 0x200000 Loading: ################################################################# ########################################################### done Bytes transferred = 631143 (9a167 hex) => bootm 0x00200000 ## Booting image at 00200000 ... Image Name: Linux-2.4.21 Created: 2005-10-27 13:15:01 UTC Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 631079 Bytes = 616.3 kB Load Address: 00100000 Entry Point: 00100000 Verifying Checksum ... OK Uncompressing Kernel Image ... OK before do_bootm_linux() argv = 16722772 addr = 16282928 ## Current stack ends at 0x00F86CA8 => set upper limit to 0x00800000 ## cmdline at 0x007FFF00 ... 0x007FFF20 No initrd ## Transferring control to Linux (at address 00100000) ... bi_memstart = 0 bi_memsize = 16777216 bi_flashstart = 4286578688 bi_flashsize = 8388608 bi_flashoffset = 343040 bi_sramstart = 0 bi_sramsize = 0 bi_immr_base = 4196401152 bi_bootflags = 1 bi_ip_addr = 176248826 bi_enetaddr[6] = bi_ethspeed = 114 bi_intfreq = 50000000 bi_busfreq = 50000000 bi_baudrate = 38400 // see the problem below The image was created with the following in arc/ppc/boot/Makefile : $(MKIMAGE) -A ppc -O linux -T kernel -C gzip -a 0x00100000 -e 0x00100000 \ -n 'Linux-$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)' \ -d $< images/vmlinux.PPCBoot ln -sf vmlinux.PPCBoot images/pImage The same kernel was working fine before with the epbootloader. the partitions i made in kernel MTD are: ff80_0000 ------- ff82_0000 -> boot ff82_0000 ------- ff8c_0000 -> zImage ff8c_0000 ------- ff2c_0000 -> ramdisk ff2c_0000 ------- ffff_ffff -> UserFS (JFFS2) Some of the #defines in EP852 configs are : #define CFG_SDRAM_SIZE (16 * MB) #define CFG_FLASH_BASE 0xFF800000 #define CFG_FLASH_SIZE (8 * MB) #define CFG_BSCR_BASE 0xFA400000 #define CFG_IMMR 0xFA200000 #define CFG_JFFS2_FIRST_SECTOR 56 what should i give here? #define CFG_PRELIM_OR_AM 0xFF800000 #define CFG_OR0_PRELIM (CFG_PRELIM_OR_AM | CFG_OR_TIMING_FLASH) #define CFG_BR0_PRELIM 0xFF800001 #define CFG_OR1_PRELIM 0xFF000600 #define CFG_BR1_PRELIM ((CFG_SDRAM_BASE & BR_BA_MSK) | BR_MS_UPMA | BR_V ) #define CFG_BR3_PRELIM 0xFA400001 /* BCSR */ #define CFG_OR3_PRELIM 0xFF7F8970 #define CFG_BR4_PRELIM 0xFA000401 /* NVRAM&SRAM */ #define CFG_OR4_PRELIM 0xFFF80970 There is other minor(??) problem. When i set the value of CFG_SCCR to SCCR_COM00 | SCCR_DFSYNC00 | SCCR_DFBRG00 | SCCR_DFNL000 | SCCR_DFNH000 | SCCR_DFLCD000 | SCCR_DFALCD00 u-boot works at CONFIG_BAUDRATE / 4 speed i.e if CONFIG_BAUDRATE = 9600 i've to set minicom/kermit to 2400 . Now when i set CFG_SCCR to 0x03020800 ( the value given by embedded planet config file) the baud rate works fine but the FEC doesnt work properly. It works __VERY__ slowly, i get errors in fec_recv() ( enabling ET_DEBUG) How do I make both ( FEC and baudrate ) work fine and also is this related to kernel not booting? Thanks in advance. ----------- We would change the world..... But GOD wont give the source code.

4 6

[U-Boot-Users] Suggestion on flash init
by Wang Jian 05 Jan '06

05 Jan '06

Hi, After reading many board/*/flash.c and writing customer board driver for one of my customer, I think the current flash interface can be improved. I suggest adding a subdir $(TOPDIR)/include/flash/ and putting flash chip information here. When you use some kinds of flash chips, just include relevant header files. If we go further, many information in $(TOPDIR)/include/flash.h can be put into these header files. And, even flash operation (non-CFI) sample code can be put into $(TOPDIR)/contrib/flash/. The following is an example of AMD Spansion S29AL016M chip. --snip-- #ifndef _FLASH_S29AL016M_H_ #define _FLASH_S29AL016M_H_ #define FLASH_S29AL016M_T_SECTORS 35 #define FLASH_S29AL016M_B_SECTORS 35 #define FLASH_S29AL016M_T_SIZE 0x00200000 #define FLASH_S29AL016M_B_SIZE 0x00200000 int FLASH_S29AL016M_T_BYTE_SA[] = { 0x000000, 0x010000, 0x020000, 0x030000, 0x040000, 0x050000, 0x060000, 0x070000, 0x080000, 0x090000, 0x0A0000, 0x0B0000, 0x0C0000, 0x0D0000, 0x0E0000, 0x0F0000, 0x100000, 0x110000, 0x120000, 0x130000, 0x140000, 0x150000, 0x160000, 0x170000, 0x180000, 0x190000, 0x1A0000, 0x1B0000, 0x1C0000, 0x1D0000, 0x1E0000, 0x1F0000, 0x1F8000, 0x1FA000, 0x1C0000 }; int FLASH_S29AL016M_T_WORD_SA[] = { 0x000000, 0x008000, 0x010000, 0x018000, 0x020000, 0x028000, 0x030000, 0x038000, 0x040000, 0x048000, 0x050000, 0x058000, 0x060000, 0x068000, 0x070000, 0x078000, 0x080000, 0x088000, 0x090000, 0x098000, 0x0A0000, 0x0A8000, 0x0B0000, 0x0B8000, 0x0C0000, 0x0C8000, 0x0D0000, 0x0D8000, 0x0E0000, 0x0E8000, 0x0F0000, 0x0F8000, 0x0FC000, 0x0FD000, 0x0FE000 }; int FLASH_S29AL016M_B_BYTE_SA[] = { 0x000000, 0x004000, 0x006000, 0x008000, 0x010000, 0x020000, 0x030000, 0x040000, 0x050000, 0x060000, 0x070000, 0x080000, 0x090000, 0x0A0000, 0x0B0000, 0x0C0000, 0x0D0000, 0x0E0000, 0x0F0000, 0x100000, 0x110000, 0x120000, 0x130000, 0x140000, 0x150000, 0x160000, 0x170000, 0x180000, 0x190000, 0x1A0000, 0x1B0000, 0x1C0000, 0x1D0000, 0x1E0000, 0x1F0000 }; int FLASH_S29AL016M_B_WORD_SA[] = { 0x000000, 0x002000, 0x003000, 0x004000, 0x008000, 0x010000, 0x018000, 0x020000, 0x028000, 0x030000, 0x038000, 0x040000, 0x048000, 0x050000, 0x058000, 0x060000, 0x068000, 0x070000, 0x078000, 0x080000, 0x088000, 0x090000, 0x098000, 0x0A0000, 0x0A8000, 0x0B0000, 0x0B8000, 0x0C0000, 0x0C8000, 0x0D0000, 0x0D8000, 0x0E0000, 0x0E8000, 0x0F0000, 0x0F8000 }; #endif --snip-- In flash_get_size() --snip-- switch (device) { case BYTEME(AMD_ID_S29AL016M_T): info->flash_id += FLASH_S29AL016M_T; info->sector_count = FLASH_S29AL016M_T_SECTORS; info->size = FLASH_S29AL016M_T_SIZE; break; case BYTEME(AMD_ID_S29AL016M_B): info->flash_id += FLASH_S29AL016M_B; info->sector_count = FLASH_S29AL016M_B_SECTORS; info->size = FLASH_S29AL016M_B_SIZE; break; --snip-- In flash_get_offset() --snip-- switch (info->flash_id & FLASH_TYPEMASK) { case FLASH_S29AL016M_T: for (i = 0; i < info->sector_count; i++) { info->start[i] = base + FLASH_S29AL016M_T_BYTE_SA[i]; } break; case FLASH_S29AL016M_B: for (i = 0; i < info->sector_count; i++) { info->start[i] = base + FLASH_S29AL016M_B_BYTE_SA[i]; } break; --snip-- -- lark

3 10

[U-Boot-Users] [PATCH] add support for DS1339 RTC
by Wang Jian 03 Jan '06

03 Jan '06

Hi, The attached patch add support for DS1339, which directly uses rtc/ds1337.c. CHANGELOG: * Add support for DS1339 RTC which uses rtc/ds1337.c -- lark

2 2

[U-Boot-Users] Re: stokehold councilman
by Nova Garett 31 Dec '05

31 Dec '05

VA CI VI XA LIU ALI AG NA M S RA X from $1.21 from $3.75 from $3.33 http://www.maanvare.com

1 0

[U-Boot-Users] about DS1339
by Wang Jian 30 Dec '05

30 Dec '05

Hi Wolfgang Denk, Since only difference between ds1339 and ds1337 is Trickle Charge register from software view, and currently u-boot doesn't use this register, can I send a doc & code patch which adds support for CONFIG_RTC_DS1339, or send a doc patch which states that CONFIG_RTC_DS1337 is for DS1337/1339? Regards -- lark

2 1

[U-Boot-Users] Error when updating local git repo
by llandre 30 Dec '05

30 Dec '05

Hi Wolfgang, I'm working with a local U-Boot repository that periodically is updated with your public one. I encountered the following error when trying to update it: [llandre@linuxserver u-boot-denx-dave]$ cg-update Recovering from a previously interrupted fetch... WARNING: The rsync access method is DEPRECATED and will be REMOVED in the future! Fetching head... receiving file list ... done .git/refs/heads/.origin-fetching sent 94 bytes received 144 bytes 158.67 bytes/sec total size is 41 speedup is 0.17 Fetching objects... receiving file list ... done sent 79 bytes received 47423 bytes 13572.00 bytes/sec total size is 23238354 speedup is 489.21 Fetching tags... receiving file list ... done sent 81 bytes received 1797 bytes 1252.00 bytes/sec total size is 5002 speedup is 2.66 Applying changes... Merging 0a69b26ed6fe3184cab86872589c27b076e6cb8e -> e6b6d16de73de6a76e2ec4338291e828b860f040 to 50ecf0766fb61883a94c4e703990cb3b5bc1bec1... ... Auto-merging CHANGELOG merge: warning: conflicts during merge ... Auto-merging MAINTAINERS ... Auto-merging MAKEALL ... Auto-merging Makefile ... Auto-merging board/amcc/bamboo/bamboo.c MERGE ERROR: File board/amcc/luan/u-boot.lds added in both branches, but different in each! MERGE ERROR: Conflicting versions saved as 'board/amcc/luan/u-boot.lds~master' and 'board/amcc/luan/u-boot.lds~origin'. ... Auto-merging board/amcc/yellowstone/yellowstone.c ... Auto-merging board/amcc/yosemite/yosemite.c MERGE ERROR: File board/esd/cms700/u-boot.lds removed in one branch but modified in the other! MERGE ERROR: The original version saved as 'board/esd/cms700/u-boot.lds~merge~base', the modified one as 'board/esd/cms700/u-boot.lds~origin'. MERGE ERROR: File board/prodrive/p3p440/u-boot.lds removed in one branch but modified in the other! MERGE ERROR: The original version saved as 'board/prodrive/p3p440/u-boot.lds~merge~base', the modified one as 'board/prodrive/p3p440/u-boot.lds~origin'. ... Auto-merging board/tqm834x/pci.c MERGE ERROR: File board/tqm85xx/u-boot.lds added in both branches, but different in each! MERGE ERROR: Conflicting versions saved as 'board/tqm85xx/u-boot.lds~master' and 'board/tqm85xx/u-boot.lds~origin'. ... Auto-merging cpu/ppc4xx/405gp_pci.c merge: warning: conflicts during merge ... Auto-merging cpu/ppc4xx/cpu.c merge: warning: conflicts during merge ... Auto-merging cpu/ppc4xx/spd_sdram.c ... Auto-merging cpu/ppc4xx/start.S ... Auto-merging include/configs/TQM5200.h ... Auto-merging include/configs/TQM834x.h ... Auto-merging include/configs/bamboo.h ... Auto-merging include/configs/o2dnt.h ... Auto-merging include/ppc440.h Conflicts during merge. Do cg-commit after resolving them. cg-reset will cancel the merge. What the following error messages mean? MERGE ERROR: File board/amcc/luan/u-boot.lds added in both branches, but different in each! MERGE ERROR: Conflicting versions saved as 'board/amcc/luan/u-boot.lds~master' and 'board/amcc/luan/u-boot.lds~origin'. MERGE ERROR: File board/esd/cms700/u-boot.lds removed in one branch but modified in the other! MERGE ERROR: The original version saved as 'board/esd/cms700/u-boot.lds~merge~base', the modified one as 'board/esd/cms700/u-boot.lds~origin'. Best regards, llandre DAVE Electronics System House - R&D Department web: http://www.dave-tech.it email: r&d2(a)dave-tech.it

2 4