summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeLines
* Merge branch 'master' of /home/wd/git/u-boot/master/Wolfgang Denk2008-01-09-31/+45
|\
| * Fix memset bug in ext2fs_read_file()Wolfgang Denk2008-01-09-1/+1
| | | | | | | | | | | | | | | | ext2fs_read_file() had the function arguments swapped. Pointed out by Mike Montour, 19 Dec 2007 22:34:25 -0800 Signed-off-by: Wolfgang Denk <wd@denx.de>
| * Fix problems with usb storage devices on MPC5200 /TQM5200Markus Klotzbücher2008-01-09-0/+1
| | | | | | | | | | | | | | The MPC5200 OHCI controller operates in big endian, so CFG_OHCI_BE_CONTROLLER must be defined for it to work properly. Signed-off-by: Markus Klotzbuecher <mk@denx.de>
| * Fix compile problem with new env code.Wolfgang Denk2008-01-09-0/+1
| | | | | | | | Signed-off-by: Wolfgang Denk <wd@denx.de>
| * tools: fix fw_printenv tool to compile againMarkus Klotzbücher2008-01-09-30/+42
| | | | | | | | | | | | | | | | | | | | This patch updates the fw_printenv/fw_setenv userspace tool to include the correct MTD header in order to compile against current kernel headers. Backward compatibility is preserved by introducing an option MTD_VERSION which can be set to "old" for compilation using the old MTD headers. Along with this a number of warnings are fixed. Signed-off-by: Markus Klotzbuecher <mk@denx.de>
* | Merge branch 'lwmon5-no-ocm'Stefan Roese2008-01-09-13/+80
|\ \
| * | POST: Execute SPR test after relocationStefan Roese2008-01-09-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On LWMON5 we now use d-cache as init-ram and stack. The SPR POST test uses self modifying code and this doesn't work with stack in d-cache, since I can't move the code from d-cache to i-cache. We move the SPR test to be executed a little later, after relocation. Then stack is located in SDRAM and this self-modifying code is no problem anymore. Signed-off-by: Stefan Roese <sr@denx.de>
| * | ppc4xx: Change LWMON5 to not use OCM for init-ram and POST anymoreStefan Roese2008-01-09-11/+14
| | | | | | | | | | | | | | | | | | | | | This patch configures the LWMON5 port to use d-cache as init-ram and the unused GPT0_COMP6 as POST WORD storage. Signed-off-by: Stefan Roese <sr@denx.de>
| * | ppc4xx: Add CFG_POST_ALT_WORD_ADDR to support non OCM POST WORD storageStefan Roese2008-01-09-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The privious 4xx POST implementation only supported storing the POST WORD in OCM. Since we need to reserve the OCM on LWMON5 for the logbuffer we need to store the POST WORD in some other non volatile location. This patch adds CFG_POST_ALT_WORD_ADDR to specify an address for such a location. Signed-off-by: Stefan Roese <sr@denx.de>
| * | ppc4xx: Add 44x cache locking to better support init-ram in d-cacheStefan Roese2008-01-09-0/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds support for locking the init-ram/stack in d-cache, so that other regions may use d-cache as well Note, that this current implementation locks exactly 4k of d-cache, so please make sure that you don't define a bigger init-ram area. Take a look at the lwmon5 440EPx implementation as a reference. Signed-off-by: Stefan Roese <sr@denx.de>
* | | ppc4xx: assign PCI interrupts on seuqoia boardsMatthias Fuchs2008-01-09-0/+14
| | | | | | | | | | | | | | | | | | Some operating systems rely on assigned PCI interrupts. Signed-off-by: Matthias Fuchs <matthias.fuchs@esd-electronics.com>
* | | ppc4xx: Move cpu/ppc4xx/vecnum.h into include pathMatthias Fuchs2008-01-09-5/+5
| | | | | | | | | | | | | | | | | | | | | This patch allows the use of 4xx interrupt vector number defines in board specific code outside cpu/ppc4xx. Signed-off-by: Matthias Fuchs <matthias.fuchs@esd-electronics.com>
* | | ppc4xx: Fix UIC2 vector number baseMatthias Fuchs2008-01-09-16/+16
| | | | | | | | | | | | Signed-off-by: Matthias Fuchs <matthias.fuchs@esd-electronics.com>
* | | ppc4xx: Update PLB/PCI divider for PMC440 boardMatthias Fuchs2008-01-09-2/+2
| | | | | | | | | | | | | | | | | | | | | This patch updates the PLB/PCI divider when running at 400MHz CPU frequency from 4 to 3 which results in 44MHz PCI sync clock. Signed-off-by: Matthias Fuchs <matthias.fuchs@esd-electronics.com>
* | | ppc4xx: Disable error message when no NAND chip is installed on PMC440Matthias Fuchs2008-01-09-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | Add CFG_NAND_QUIET_TEST option to disable error message when no NAND chip is installed on PMC440 boards. Disable a couple of config defines that are only used for NAND_U_BOOT. Signed-off-by: Matthias Fuchs <matthias.fuchs@esd-electronics.com>
* | | ppc4xx: Return 0 on success in 4xx ethernet driverStefan Roese2008-01-08-2/+3
| |/ |/| | | | | Signed-off-by: Stefan Roese <sr@denx.de>
* | Merge branch 'inka4x0-ng' of /home/m8/git/u-boot/Wolfgang Denk2008-01-08-476/+133
|\ \
| * | [INKA4x0] NG hardware: flash supportMarian Balakowicz2007-11-15-443/+10
| | | | | | | | | | | | | | | | | | | | | Disabled and remove inka4x0 custom flash driver, use CFI flash driver instead. Signed-off-by: Marian Balakowicz <m8@semihalf.com>
| * | [INKA4x0] NG hardware: SDRAM supportMarian Balakowicz2007-11-15-27/+116
| | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for three new DDR chips that may be present on a NG INKA4x0 hardware: HYB25D512160BF-5, K4H511638C-7CB3, T46V32M16BN-6IT. Cleanup board/inka4x0/mt48lc16m16a2-75.h file. Signed-off-by: Marian Balakowicz <m8@semihalf.com>
| * | [INKA4x0] NG hardware: platform code updateMarian Balakowicz2007-11-15-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | - Cleanup compile warnings. - Add missing '\0' in default environment. - Increase CFG_MONITOR_LEN to 256 KiB. - Add required CFG_USE_PPCENV. Signed-off-by: Marian Balakowicz <m8@semihalf.com>
* | | Merge branch 'master' of git://www.denx.de/git/u-boot-ppc4xxWolfgang Denk2008-01-08-2780/+394
|\ \ \
| * | | ppc4xx: Remove weak binding from common Denali data-eye search codeLarry Johnson2008-01-05-7/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now that there are no board-specific versions of "denali_core_search_data_eye()", the weak binding on the common version can be removed. Signed-off-by: Larry Johnson <lrj@acm.org>
| * | | Merge branch 'katmai-ddr-gda'Stefan Roese2008-01-05-62/+61
| |\ \ \
| | * | | ppc4xx: Remove unused CONFIG_ECC_ERROR_RESET from 44x_spd_ddr2.cStefan Roese2008-01-05-44/+0
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Stefan Roese <sr@denx.de>
| | * | | ppc4xx: Update Katmai/44x_spd_ddr2.c code for optimal DDR2 setupStefan Roese2008-01-05-18/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On Katmai the complete auto-calibration somehow doesn't seem to produce the best results, meaning optimal values for RQFD/RFFD. This was discovered by GDA using a high bandwidth scope, analyzing the DDR2 signals. GDA provided a fixed value for RQFD, so now on Katmai "only" RFFD is auto-calibrated. This patch also adds RDCC calibration as mentioned on page 7 of the AMCC PowerPC440SP/SPe DDR2 application note: "DDR1/DDR2 Initialization Sequence and Dynamic Tuning" Signed-off-by: Stefan Roese <sr@denx.de>
| * | | | ppc4xx: Remove sdram.h from PMC440 boardMatthias Fuchs2008-01-04-505/+0
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Matthias Fuchs <matthias.fuchs@esd-electronics.com>
| * | | | ppc4xx: use common denali core defines and data eye search code for PMC440Matthias Fuchs2008-01-04-338/+4
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Matthias Fuchs <matthias.fuchs@esd-electronics.com>
| * | | | ppc4xx: More cleanup for esd's LCD codeMatthias Fuchs2008-01-04-20/+18
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Matthias Fuchs <matthias.fuchs@esd-electronics.com>
| * | | | ppc4xx: Fix Sequoia NAND booting targetStefan Roese2008-01-04-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Sequoia NAND booting target now uses the recently extracted cpu/ppc4xx/denali_data_eye.c file too. Signed-off-by: Stefan Roese <sr@denx.de>
| * | | | ppc4xx: Use CFG_4xx_GPIO_TABLE to configure Korat boardLawrence R. Johnson2008-01-04-109/+161
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Larry Johnson <lrj@acm.org>
| * | | | ppc4xx: Use CFG_4xx_GPIO_TABLE to configure Sequoia boardLawrence R. Johnson2008-01-04-30/+78
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Note: this patch changes the configuration of some GPIO registers: Register Old Value New Value --------------- ---------- ---------- DCR GPIO0_TCR 0x0000000F 0x0000F0CF DCR GPIO0_TSRH 0x55005000 0x00000000 DCR GPIO1_TCR 0xC2000000 0xE2000000 DCR GPIO1_TSRL 0x0C000000 0x00200000 DCR GPIO1_ISR2L 0x00050000 0x00110000 Signed-off-by: Larry Johnson <lrj@acm.org>
| * | | | ppc4xx: Add functionality to GPIO supportLawrence R. Johnson2008-01-04-23/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch makes two additions to GPIO support: First, it adds function gpio_read_in_bit() to read the a bit from the GPIO Input Register (GPIOx_IR) in the same way that function gpio_read_out_bit() reads a bit from the GPIO Output Register (GPIOx_OR). Second, it modifies function gpio_set_chip_configuration() to provide an additional option for configuring the GPIO from the "CFG_4xx_GPIO_TABLE". According to the 440EPx User's Manual, when an alternate output is used, the three-state control is configured in one of two ways, depending on the particular output. The first option is to select the corresponding alternate three-state control in the GPIOx_TRSH/L registers. The second option is to select the GPIO Three-State Control Register (GPIOx_TCR) in the GPIOx_TRSH/L registers, and set the corresponding bit in the GPIOx_TCR register to enable the output. For example, the Manual specifies configuring the GPIO00 Alternate 1 Signal (PreAddr07) to use the alternate three-state control (first option), and specifies configuring the GPIO32 Alternate 1 Signal (USB2OM0) with the output enabled in the GPIOx_TCR register (second option). Currently, gpio_set_chip_configuration() configures all alternate signal outputs to use the first option. This patch allow the second option to be selected by setting the "out_val" element in the table entry to "GPIO_OUT_1". The first option is used when the "out_val" element is set to "GPIO_OUT_0". Because "out_val" is not currently used when an alternate signal is selected, and because all current GPIO tables set "out_val" to "GPIO_OUT_0" for all alternate signals, this patch should not change any existing configurations. Signed-off-by: Larry Johnson <lrj@acm.org>
| * | | | PPC4xx: Remove sdram.h from board/lwmon5Larry Johnson2008-01-04-505/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These definitions are now in "include/ppc440.h". Signed-off-by: Larry Johnson <lrj@acm.org>
| * | | | PPC4xx: Use common code for LWMON5 board SDRAM supportLarry Johnson2008-01-04-337/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch also modifies the functionality of the code so that the data-eye search is now done with with the cache disabled. Signed-off-by: Larry Johnson <lrj@acm.org>
| * | | | PPC4xx: Remove sdram.h from board/amcc/sequoiaLarry Johnson2008-01-04-505/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These definitions are now in "include/ppc440.h". Signed-off-by: Larry Johnson <lrj@acm.org>
| * | | | PPC4xx: Use common code for Sequoia board SDRAM supportLarry Johnson2008-01-04-338/+6
| |/ / / | | | | | | | | | | | | Signed-off-by: Larry Johnson <lrj@acm.org>
* | | | net: Add CONFIG_NET_DO_NOT_TRY_ANOTHER optionMatthias Fuchs2008-01-03-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When CONFIG_NET_DO_NOT_TRY_ANOTHER is defined U-Boot's networking stack does not automatically switch to another interface. This patch does not touch the default behavior. Signed-off-by: Matthias Fuchs <matthias.fuchs@esd-electronics.com> Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
* | | | NET: Proper return code handling in eth_init() function in file eth.cUpakul Barkakaty2008-01-03-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch modifies the return code handling in the eth_init() function, to be compatible with the handling of the return codes in the other network stack files. It now returns a 0 on Success and -1 on error. Signed-off-by: Upakul Barkakaty <upakul.barkakaty@conexant.com> Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
* | | | net/eth.c: Fix env_enetaddr signed overflowShinya Kuribayashi2008-01-03-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Assigning the output of simple_strtoul(CB:A9:87:65:43:21) to `char', we are warned as below: U-Boot 1.2.0 (Aug 30 2007 - 08:27:37) DRAM: 256 MB Flash: 32 MB In: serial Out: serial Err: serial Net: NEC-Candy Warning: NEC-Candy MAC addresses don't match: Address in SROM is 00:00:4C:80:92:A2 Address in environment is FFFFFFCB:FFFFFFA9:FFFFFF87:65:43:21 This patch changes env_enetaddr type from `char' to `unsigned char'. Cc: Masaki Ishikawa <ishikawa-masaki@cnt.mxe.nes.nec.co.jp> Signed-off-by: Shinya Kuribayashi <shinya.kuribayashi@necel.com> Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
* | | | Introduce new eth_receive routineRafal Jaworowski2008-01-03-0/+71
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The purpose of this routine is receiving a single network frame, outside of U-Boot's NetLoop(). Exporting it to standalone programs that run on top of U-Boot will let them utilise networking facilities. For sending a raw frame the already existing eth_send() can be used. The direct consumer of this routine is the newly introduced API layer for external applications (enabled with CONFIG_API). Signed-off-by: Rafal Jaworowski <raj@semihalf.com> Signed-off-by: Piotr Kruszynski <ppk@semihalf.com> Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
* | | 8610: Move include of config.h earlier.Jon Loeliger2008-01-03-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Include config.h earlier in the set of #includes so as to avoid a incidental and duplicate definition of CFG_CACHELINE_SIZE. Signed-off-by: Jon Loeliger
* | | Don't slam #undef DEBUG in the 8641HPCN config file.Jon Loeliger2008-01-03-1/+0
| | | | | | | | | | | | | | | | | | | | | Doing so prevents it from being individually set and useful in other files. Signed-off-by: Jon Loeliger <jdl@freescale.com>
* | | Convert MPC8641HPCN to use libfdt.Jon Loeliger2008-01-03-38/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | Assumes the presence of the aliases node in the DTS to locate the ethernet, pci and serial nodes for fixups. Use consistent fdtaddr and fdtfile in environment variables. Signed-off-by: Jon Loeliger <jdl@freescale.com>
* | | Merge commit 'wd/master'Jon Loeliger2008-01-03-6402/+25372
|\ \ \
| * | | cfi_flash: Fix bug in flash_isset() to use correct 32bit functionStefan Roese2008-01-02-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This bug was detected on the LWMON5 target which has 2 Intel 16bit wide flash chips connected to a 32bit wide port. Signed-off-by: Stefan Roese <sr@denx.de>
| * | | Fix compile problem introduced by "cleanup" commit 3dfd708cWolfgang Denk2008-01-02-2/+2
| | | | | | | | | | | | | | | | Signed-off-by: Wolfgang Denk <wd@denx.de>
| * | | Make scripts and Makefiles POSIX compliantWolfgang Denk2008-01-02-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The bash builtin versions of the "test" (resp. "[") command allow using "==" for string comparisons, but POSIX compatible implemen- tations (like /usr/bin/test) insist on using "=" only. On such systems you will see: $ /usr/bin/test a == a && echo OK /usr/bin/test: ==: binary operator expected This patch fixes Makefiles and scripts to use POSIX style. Signed-off-by: Wolfgang Denk <wd@denx.de>
| * | | Merge branch 'master' of /home/wd/git/u-boot/custodiansWolfgang Denk2008-01-02-1/+51
| |\ \ \
| | * \ \ Merge branch 'master' of git://www.denx.de/git/u-boot-cfi-flashWolfgang Denk2008-01-02-1/+51
| | |\ \ \ | | | |_|/ | | |/| |
| | | * | cfi_flash: Add missing check for erased dest to flash_write_cfibuffer()Stefan Roese2007-12-27-1/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The check for an sufficiently erased destination was missing in the buffered write function of the cfi flash driver (when CFG_FLASH_USE_BUFFER_WRITE is defined). This patch adds this check to that writing to such a region will fail with the currect error message. Signed-off-by: Stefan Roese <sr@denx.de>