summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeLines
* Merge branch 'master' of git://git.denx.de/u-boot-mipsWolfgang Denk2011-08-02-10/+56
|\ | | | | | | | | | | | | | | * 'master' of git://git.denx.de/u-boot-mips: README: update MIPS related informations MIPS: make cache operation mode configurable MIPS: rename INFINEON_EBU_BOOTCFG to CONFIG_SYS_XWAY_EBU_BOOTFG MIPS: INCA-IP: rename inca-swap-bytes host tool
| * README: update MIPS related informationsDaniel Schwierzeck2011-07-31-1/+34
| | | | | | | | | | | | | | | | Amend section 'Directory Hierarchy' for current MIPS directory. Describe config options for MIPS. Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@googlemail.com> Acked-by: Thomas Langer <thomas.langer@lantiq.com> Signed-off-by: Shinya Kuribayashi <skuribay@pobox.com>
| * MIPS: make cache operation mode configurableDaniel Schwierzeck2011-07-31-1/+5
| | | | | | | | | | | | | | | | | | | | | | Currently the cache operation mode is hard-coded to CONF_CM_CACHABLE_NONCOHERENT. This is not appropiate for CPUs or SOCs which operate at a different mode. This patch makes the cache operation mode configurable via board config. Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@googlemail.com> Acked-by: Thomas Langer <thomas.langer@lantiq.com> Signed-off-by: Shinya Kuribayashi <skuribay@pobox.com>
| * MIPS: rename INFINEON_EBU_BOOTCFG to CONFIG_SYS_XWAY_EBU_BOOTFGDaniel Schwierzeck2011-07-31-4/+11
| | | | | | | | | | | | | | | | | | This define is a board-specific config option and should be renamed to follow the U-Boot naming convention. Additionally, add an explaining comment for this option. Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@googlemail.com> Acked-by: Thomas Langer <thomas.langer@lantiq.com> Signed-off-by: Shinya Kuribayashi <skuribay@pobox.com>
| * MIPS: INCA-IP: rename inca-swap-bytes host toolDaniel Schwierzeck2011-07-31-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | The INCA-IP SoC belongs to the Lantiq XWAY SoC product portfolio. For the upcoming support of other Lantiq SoC devices this tool should not solely depend on the INCA-IP board. Rename the tool to xway-swap-bytes and add an config option to enable compilation optionally. Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@googlemail.com> Acked-by: Thomas Langer <thomas.langer@lantiq.com> Signed-off-by: Shinya Kuribayashi <skuribay@pobox.com>
* | tqm834x.c: fix compiler warningWolfgang Denk2011-08-02-3/+3
| | | | | | | | | | | | | | | | | | | | | | Fix: tqm834x.c:299: warning: passing argument 1 of 'get_ram_size' discards qualifiers from pointer target type Signed-off-by: Wolfgang Denk <wd@denx.de> Acked-by: Kumar Gala <galak@kernel.crashing.org> Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
* | environment.h: fix warning: "CONFIG_ENV_IS_EMBEDDED" redefinedWolfgang Denk2011-08-01-1/+3
| | | | | | | | | | Signed-off-by: Wolfgang Denk <wd@denx.de> Cc: Stefan Roese <sr@denx.de>
* | fpga: constify to fix build warningWolfgang Denk2011-08-01-92/+92
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix compiler warning: cmd_fpga.c:318: warning: passing argument 3 of 'fit_image_get_data' from incompatible pointer type Adding the needed 'const' here entails a whole bunch of additonal changes all over the FPGA code. Signed-off-by: Wolfgang Denk <wd@denx.de> Cc: Andre Schwarz <andre.schwarz@matrix-vision.de> Cc: Murray Jensen <Murray.Jensen@csiro.au> Acked-by: Andre Schwarz<andre.schwarz@matrix-vision.de>
* | Unify timer_init() and cpu_init() prototypesWolfgang Denk2011-08-01-35/+3
| | | | | | | | | | | | | | | | | | | | Clean up some duplicated prototype declarations. Get rid of now useless AVR32 initcalls.h file. Signed-off-by: Wolfgang Denk <wd@denx.de> Cc: Albert Aribaud <albert.aribaud@free.fr> Cc: Haavard Skinnemoen <haavard.skinnemoen@atmel.com> Cc: Graeme Russ <graeme.russ@gmail.com>
* | ARM: fix error: conflicting types for 'setenv'seedshope2011-08-01-8/+0
| | | | | | | | | | | | | | | | | | Also remove bogus comment. Signed-off-by: Zhong hongbo <bocui107@gmail.com> Changed commit message Signed-off-by: Wolfgang Denk <wd@denx.de> Cc: Albert Aribaud <albert.aribaud@free.fr>
* | cfb_console.c: checkpatch cleanupWolfgang Denk2011-08-01-6/+10
| | | | | | | | | | | | | | | | | | Fix the following: ERROR: do not initialise statics to 0 or NULL ERROR: do not use assignment in if condition Signed-off-by: Wolfgang Denk <wd@denx.de>
* | cfb_console.c: drop custom PRINTD() and use debug() insteadWolfgang Denk2011-08-01-9/+2
| | | | | | | | Signed-off-by: Wolfgang Denk <wd@denx.de>
* | Cosmetic: reformat drivers/video/cfb_console.cWolfgang Denk2011-08-01-484/+609
|/ | | | | | | | | | | Run cfb_console.c through indent and manually fix some of he deficiencies of the automatic line breaking. Fix multiline comments, excessive line spacing and such. No changes to code done. Signed-off-by: Wolfgang Denk <wd@denx.de>
* Merge branch 'master' of /home/wd/git/u-boot/custodiansWolfgang Denk2011-07-30-55/+246
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of /home/wd/git/u-boot/custodians: powerpc/8xxx: Remove dependency on <usb.h> powerpc/85xx: enable USB2 gadget mode for corenet ds board powerpc/85xx: verify the device tree before booting Linux MPC8xxx: drop redundant boot messages powerpc/85xx: Fix build failure for P1023RDS powerpc/p2041rdb: Enable SATA support powerpc/85xx: Cleanup handling of PVR detection for e500/e500mc/e5500 powerpc/85xx: Fix up clock_freq property in CAN node of dts 85xx: enable FDT support for STX SSA board powerpc/85xx: provide 85xx flush_icache for cmd_cache powerpc/p2041rdb: Enable backside L2 cache support powerpc/85xx: Handle the lack of L2 cache on P2040/P2040E powerpc/85xx: Add support for P2041[e] XAUI in SERDES powerpc/85xx: Rename P2040 id & SERDES to P2041 powerpc/85xx: Adding configuration for DCSRCR to enable 32M access powerpc/85xx: Fix setting of EPAPR_MAGIC value
| * powerpc/8xxx: Remove dependency on <usb.h>Kumar Gala2011-07-29-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We used <usb.h> for USB_MAX_DEVICE. However this requires we actual build in support for USB into u-boot (which should not be required for device tree fixup). At this time no FSL SoC that utilizies this code (83xx/85xx) has more than 2 USB controllers. So we replace USB_MAX_DEVICE with a local define FSL_MAX_NUM_USB_CTRLS. If/when a device shows up with more than 2 controllers we can easily bump this value or refactor into a proper define per SoC. Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
| * powerpc/85xx: enable USB2 gadget mode for corenet ds boardShaohui Xie2011-07-29-2/+2
| | | | | | | | | | | | | | | | | | | | to make USB2 worked in gadget mode, we need to set it's 'dr_mode' to 'peripheral' in hwconfig, but driver starts scan from 'usb1', it'll break out if it cannot find 'usb1', so drop the 'else' clause to make driver scan all the 'usbx'. Signed-off-by: Shaohui Xie <Shaohui.Xie@freescale.com> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
| * powerpc/85xx: verify the device tree before booting LinuxTimur Tabi2011-07-29-0/+93
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduce ft_verify_fdt(), a function that is called after the device tree has been fixed up, that displays warning messages if there is a mismatch between the physical addresses of some devices that U-Boot has configured with what the device tree says the addresses are. This is a particular problem when booting a 36-bit device tree from a 32-bit U-Boot (or vice versa), because the physical address of CCSR is wrong in the device tree. When the operating system boots, no messages are displayed, so the user generally has no idea what's wrong. Signed-off-by: Timur Tabi <timur@freescale.com> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
| * MPC8xxx: drop redundant boot messagesWolfgang Denk2011-07-29-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Current code would print RAM size information like this: DRAM: DDR: 256 MiB (DDR1, 64-bit, CL=2, ECC off) Turn a number of printf()s into debug() to get rid of the redundant "DDR: " string like this: DRAM: 256 MiB (DDR1, 64-bit, CL=2, ECC off) Signed-off-by: Wolfgang Denk <wd@denx.de> Acked-by: York Sun <yorksun@freescale.com> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
| * powerpc/85xx: Fix build failure for P1023RDSKumar Gala2011-07-29-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | When we added the fman fdt fixup we forgot to fixup the P1023RDS platform. So we would get: fdt.c: In function 'fdt_fixup_fman_firmware': fdt.c:465:15: error: 'CONFIG_SYS_FMAN_FW_LENGTH' undeclared (first use in this function) fdt.c:465:15: note: each undeclared identifier is reported only once for each function it appears in Add the needed #defines in P1023RDS.h to fix this. Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
| * powerpc/p2041rdb: Enable SATA supportMingkai Hu2011-07-29-0/+20
| | | | | | | | | | Signed-off-by: Mingkai Hu <Mingkai.hu@freescale.com> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
| * powerpc/85xx: Cleanup handling of PVR detection for e500/e500mc/e5500Kumar Gala2011-07-29-19/+17
| | | | | | | | | | | | | | | | At some point we broke the detection of e500v1 class cores. Fix that and simply the code to just utilize PVR_VER() to have a single case statement. Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
| * powerpc/85xx: Fix up clock_freq property in CAN node of dtsBhaskar Upadhaya2011-07-29-0/+3
| | | | | | | | | | | | | | | | | | Fix up the device tree property associated with the Flexcan clock frequency. This property is used to calculate the bit timing parameters for Flexcan. Signed-off-by: Bhaskar Upadhaya <Bhaskar.Upadhaya@freescale.com> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
| * 85xx: enable FDT support for STX SSA boardWolfgang Denk2011-07-29-1/+14
| | | | | | | | | | | | | | | | We also have to shift TEXT_BASE to accomodate for the additional code size. Signed-off-by: Wolfgang Denk <wd@denx.de> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
| * powerpc/85xx: provide 85xx flush_icache for cmd_cacheMatthew McClintock2011-07-29-0/+2
| | | | | | | | | | | | | | | | This provides a function that will override the weak function flush_icache to let 85xx boards to flush the icache cc: Kumar Gala <kumar.gala@freescale.com> Signed-off-by: Matthew McClintock <msm@freescale.com>
| * powerpc/p2041rdb: Enable backside L2 cache supportMingkai Hu2011-07-29-0/+2
| | | | | | | | | | Signed-off-by: Mingkai Hu <Mingkai.hu@freescale.com> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
| * powerpc/85xx: Handle the lack of L2 cache on P2040/P2040EKumar Gala2011-07-29-9/+37
| | | | | | | | | | | | | | | | | | | | The P2040/P2040E have no L2 cache. So we utilize the SVR to determine if we are one of these devices and skip the L2 init code in cpu_init.c and release. For the device tree we skip the updating of the L2 cache properties but we still update the chain of caches so the CPC/L3 node can be properly updated. Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
| * powerpc/85xx: Add support for P2041[e] XAUI in SERDESKumar Gala2011-07-29-5/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We add XAUI_FM1 into the SERDES tables for P2041[e] devices. However for the P2040[e] devices that dont support XAUI we handle this at runtime via SVR checks. If we are on a P2040[e] device the SERDES functions will behave as follows: is_serdes_prtcl_valid() will always report invalid if prtcl passed in is XAUI_FM1. serdes_get_prtcl() will report NONE if the prtcl in the table is set to XAUI_FM1. Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
| * powerpc/85xx: Rename P2040 id & SERDES to P2041Kumar Gala2011-07-29-3/+3
| | | | | | | | | | | | | | | | P2041 is the superset part that covers both P2040 & P2041. The only difference between the two devices is that P2041 supports 10g/XAUI and has an L2 cache. Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
| * powerpc/85xx: Adding configuration for DCSRCR to enable 32M accessStephen George2011-07-29-2/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Configuring DCSRCR to define the DCSR space to be 1G instead of the default 4M. DCSRCR only allows selection of either 4M or 1G. Most DCSR registers are within 4M but the Nexus trace buffer is located at offset 16M within the DCSR. Configuring the LAW to be 32M to allow access to the Nexus trace buffer. No TLB modification is required since accessing the Nexus trace buffer from within u-boot is not required. Signed-off-by: Stephen George <stephen.george@freescale.com> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
| * powerpc/85xx: Fix setting of EPAPR_MAGIC valueKumar Gala2011-07-29-1/+1
| | | | | | | | | | | | | | | | Had a typo in the ifdef for 85xx, should be CONFIG_MPC85xx for it to get triggered. Was pull in the non-BookE magic number. Reported-by: John Cortell Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
* | Constify getenv(), setenv() and hash code functionsWolfgang Denk2011-07-30-16/+17
| | | | | | | | | | | | | | | | | | | | | | This is needed to get rid of build warnings like main.c:311: warning: passing argument 2 of 'setenv' discards qualifiers from pointer target type which result from commit 09c2e90 "unify version_string". Signed-off-by: Wolfgang Denk <wd@denx.de> Cc: Andreas Bießmann <andreas.devel@googlemail.com>
* | README: udate Coding Style description to current status quoWolfgang Denk2011-07-30-7/+5
|/ | | | Signed-off-by: Wolfgang Denk <wd@denx.de>
* cfb_console: fix build breakageAndreas Bießmann2011-07-29-1/+1
| | | | | | | | | | | | Commit 09c2e90c110ef99f1203685acd1059114a51b167 "unify version_string" introduced a build breakage in cfb_console.c ---8<--- cfb_console.c:1497: warning: format '%s' expects type 'char *', but argument 3 has type 'const char (*)[]' --->8--- Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
* panic: remove warning "'noreturn' function does return"Heiko Schocher2011-07-28-0/+2
| | | | | | | | | | | | | | | | | | | | since commit commit d2e8b911c0a0661d395ccac72156040702ac842d Author: Mike Frysinger <vapier@gentoo.org> Date: Wed Jun 29 11:58:04 2011 +0000 panic: add noreturn attribute I see the following warnings: vsprintf.c: In function 'panic': vsprintf.c:730: warning: 'noreturn' function does return for nearly all boards. This patch fixes this warning. Signed-off-by: Heiko Schocher <hs@denx.de> cc: Mike Frysinger <vapier@gentoo.org>
* post, memory test: add memory_post_test() to include fileHeiko Schocher2011-07-28-0/+1
| | | | | | | | | This include is needed, if this memory test is used "outside" from post code, for example booting with nand_spl, and using this memory test before copying u-boot code to RAM and jumping to it. Signed-off-by: Heiko Schocher <hs@denx.de>
* Fix build error causes by "unify version_string"Wolfgang Denk2011-07-28-1/+2
| | | | | | | | Commit 09c2e90 "unify version_string" introduced a build error, fix it. Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com> Signed-off-by: Wolfgang Denk <wd@denx.de>
* Removed obsolete Netstal boardsNiklaus Giger2011-07-28-3143/+0
| | | | Signed-off-by: Niklaus Giger <niklaus.giger@member.fsf.org>
* cleanup: Fix typos and misspellings in various files.Mike Williams2011-07-28-57/+57
| | | | | | | | | | | Recieve/Receive recieve/receive Interupt/Interrupt interupt/interrupt Addres/Address addres/address Signed-off-by: Mike Williams <mike@mikebwilliams.com>
* rules.mk: replace GNU specific \w with POSIX equivalantJeroen Hofstee2011-07-28-2/+2
| | | | | | | | | | If sed does not support the GNU \w regex extension, build attempts lead to circular dependency warnings and finally build failure (crc32.c not found). Build output before and after the patch on FreeBSD is at: http://lists.denx.de/pipermail/u-boot/2011-June/095235.html Signed-off-by: Jeroen Hofstee <jeroen@myspectrum.nl>
* mkconfig: also create CONFIG defines with BSD sedJeroen Hofstee2011-07-28-1/+1
| | | | | | | | | | | | | | | Parsing of boards.cfg fails on FreeBSD with the error: sed: 1: "/=/ {s/=/\t/;q } ; { s/ ...": extra characters at the end of q command BSD sed expects commands to be on seperate 'lines', hence it expects an additional ; before the closing brackets. BSD sed does not support \t, replaced by literal tab. Signed-off-by: Jeroen Hofstee <jeroen@myspectrum.nl> Cc: Marek Vasut <marek.vasut@gmail.com> Acked-by: Mike Frysinger <vapier@gentoo.org>
* include/compiler.h: typedef ulong for FreeBSDJeroen Hofstee2011-07-28-1/+1
| | | | Signed-off-by: Jeroen Hofstee <jeroen@myspectrum.nl>
* unify version_stringAndreas Bießmann2011-07-28-172/+43
| | | | | | | | | | | | This patch removes the architecture specific implementation of version_string where possible. Some architectures use a special place and therefore we provide U_BOOT_VERSION_STRING definition and a common weak symbol version_string. Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com> CC: Mike Frysinger <vapier@gentoo.org> CC: Peter Pan <pppeterpppan@gmail.com> Acked-by: Mike Frysinger <vapier@gentoo.org>
* Correct ih_os for u-boot.imganeeshv2011-07-28-1/+1
| | | | | | | Provide appropriate '-O u-boot' while doing mkimage for u-boot.img Signed-off-by: Aneesh V <aneesh@ti.com>
* mkimage: add UBL header support for booting davinci cpusHeiko Schocher2011-07-28-0/+532
| | | | | | | | creating an u-boot.ubl file, which contains the UBL Header needed for booting from NAND with the RBL from TI. For more information read doc/README.ublimage. Signed-off-by: Heiko Schocher <hs@denx.de>
* MAINTAINERS: integrator+versatile boardsLinus Walleij2011-07-28-5/+6
| | | | | | | | | - Take maintainership of the unlisted integratorap board - Orphan the boards maintained by Peter Pearse, as he has retired from ARM Cc: Philippe Robin <philippe.robin@arm.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
* mv_common.c: don't compile reset_environment if ENV_IS_NOWHEREMichael Jones2011-07-28-0/+2
| | | | | | | | | Doesn't make sense to provide this function to boards which defined CONFIG_ENV_IS_NOWHERE. Such a board gets a linking error because common/env_nowhere.c doesn't define saveenv(). Signed-off-by: Michael Jones <michael.jones@matrix-vision.de> Acked-by: Mike Frysinger <vapier@gentoo.org>
* fpga: support FPP Cyclone configurationMichael Jones2011-07-28-0/+10
| | | | | | Support FPGAs which use Fast Passive Parallel configuration Signed-off-by: Michael Jones <michael.jones@matrix-vision.de>
* fpga: add #define for Altera Cyclone EP3C5Michael Jones2011-07-28-0/+1
| | | | Signed-off-by: Michael Jones <michael.jones@matrix-vision.de>
* cmd_mac: fix help for 'mac read'Michael Jones2011-07-28-1/+1
| | | | | | | | | | | In the only implementation of 'mac read', it doesn't display the contents of the eeprom as the help indicated unless compiled with DEBUG. It only re-reads the contents of the EEPROM into memory. Displaying the contents of the EEPROM is done by passing no arguments to 'mac'. Signed-off-by: Michael Jones <michael.jones@matrix-vision.de> Acked-by: Detlev Zundel <dzu@denx.de>
* cmd_mac: cleanup helpMichael Jones2011-07-28-1/+1
| | | | | Signed-off-by: Michael Jones <michael.jones@matrix-vision.de> Acked-by: Detlev Zundel <dzu@denx.de>
generated by cgit v1.1 at 2024-11-19 14:01:12 +0000