summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeLines
* Fix warning: "assert" redefinedWolfgang Denk2011-09-10-2/+0
| | | | | | | | | | | | | | | | | | Commit 21726a7 "Add assert() for debug assertions" caused build warnings for many systems: In file included from bedbug.c:6: /home/wd/git/u-boot/work/include/bedbug/bedbug.h:24:1: warning: "assert" redefined In file included from bedbug.c:3: /home/wd/git/u-boot/work/include/common.h:144:1: warning: this is the location of the previous definition In file included from cmd_bedbug.c:10: /home/wd/git/u-boot/work/include/bedbug/bedbug.h:24:1: warning: "assert" redefined In file included from cmd_bedbug.c:5: /home/wd/git/u-boot/work/include/common.h:144:1: warning: this is the location of the previous definition Signed-off-by: Wolfgang Denk <wd@denx.de> Cc: Simon Glass <sjg@chromium.org> Acked-by: Simon Glass <sjg@chromium.org>
* Merge branch 'master' of git://git.denx.de/u-boot-mpc85xxWolfgang Denk2011-09-10-15/+13
|\ | | | | | | | | | | | | * 'master' of git://git.denx.de/u-boot-mpc85xx: powerpc/mpc8610hpcd: set pci1_hose.config_table after fsl_setup_hose powerpc/mpc8548cds: set pci1_hose.config_table after fsl_setup_hose powerpc/mpc8568mds: set pci1_hose.config_table after fsl_setup_hose
| * powerpc/mpc8610hpcd: set pci1_hose.config_table after fsl_setup_hoseZhao Chenhui2011-09-09-6/+5
| | | | | | | | | | | | | | | | The function fsl_setup_hose clears the variable pci1_hose. Set pci1_hose.config_table after it. Signed-off-by: Zhao Chenhui <chenhui.zhao@freescale.com> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
| * powerpc/mpc8548cds: set pci1_hose.config_table after fsl_setup_hoseZhao Chenhui2011-09-09-3/+3
| | | | | | | | | | | | | | | | The function fsl_setup_hose clears the variable pci1_hose. Set pci1_hose.config_table after it. Signed-off-by: Zhao Chenhui <chenhui.zhao@freescale.com> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
| * powerpc/mpc8568mds: set pci1_hose.config_table after fsl_setup_hoseZhao Chenhui2011-09-09-6/+5
| | | | | | | | | | | | | | | | The function fsl_setup_hose clears the variable pci1_hose. Set pci1_hose.config_table after it. Signed-off-by: Zhao Chenhui <chenhui.zhao@freescale.com> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
* | CM4000: fix broken flash base for OpenGear boardsGreg Ungerer2011-09-10-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use _bss_start_ofs as the size of the boot loader code+data that we want to protect in the flash. This replaces use of the no longer defined _armboot_start. Fixes: flash.c: In function ‘flash_init’: flash.c:75: error: ‘_bss_start’ undeclared (first use in this function) flash.c:75: error: (Each undeclared identifier is reported only once flash.c:75: error: for each function it appears in.) flash.c:75: error: ‘_armboot_start’ undeclared (first use in this function) Signed-off-by: <greg.ungerer@opengear.com>
* | CM4000: fix missing RAM definitions for OpenGear boardsGreg Ungerer2011-09-10-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The OpenGear boards CM4008, CM4116 and CM4148 need their DRAM base and RAM stack base addresses defined. Fixes: board.c: In function ‘__dram_init_banksize’: board.c:227: error: ‘CONFIG_SYS_SDRAM_BASE’ undeclared (first use in this function) board.c:227: error: (Each undeclared identifier is reported only once board.c:227: error: for each function it appears in.) board.c: In function ‘board_init_f’: board.c:270: error: ‘CONFIG_SYS_INIT_SP_ADDR’ undeclared (first use in this function) board.c:303: error: ‘CONFIG_SYS_SDRAM_BASE’ undeclared (first use in this function) Signed-off-by: Greg Ungerer <greg.ungerer@opengear.com>
* | KS8695: move TIMER_ definitions before code useGreg Ungerer2011-09-10-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | Move the TIMER_ definitions before they are used in KS8695 timer.c code. Fixes: timer.c: In function ‘timer_init’: timer.c:37: error: ‘TIMER_COUNT’ undeclared (first use in this function) timer.c:37: error: (Each undeclared identifier is reported only once timer.c:37: error: for each function it appears in.) timer.c:38: error: ‘TIMER_PULSE’ undeclared (first use in this function) Signed-off-by: Greg Ungerer <greg.ungerer@opengear.com>
* | phylib: remove a couple of redundant code linesVladimir Zapolskiy2011-09-10-5/+2
| | | | | | | | | | | | | | | | This change slightly improves readability of the phydev speed/duplex assignment logic. Signed-off-by: Vladimir Zapolskiy <vz@mleia.com> Acked-by: Detlev Zundel <dzu@denx.de>
* | phylib: reset mii bus only if reset handler is registeredVladimir Zapolskiy2011-09-10-1/+2
| | | | | | | | | | | | | | | | This change allows to cope with a mii bus device registered using miiphy_register(), which doesn't assign a default reset handler. Signed-off-by: Vladimir Zapolskiy <vz@mleia.com> Acked-by: Detlev Zundel <dzu@denx.de>
* | UBIFS: Change ubifsload to set the filesize variableBastian Ruppert2011-09-10-1/+5
| | | | | | | | | | | | | | | | This is the same behaviour like tftp or fatload command. Signed-off-by: Bastian Ruppert <Bastian.Ruppert@Sewerin.de> CC: kmpark@infradead.org Acked-by: Detlev Zundel <dzu@denx.de>
* | Add assert() for debug assertionsSimon Glass2011-09-10-20/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | assert() is like BUG_ON() but compiles to nothing unless DEBUG is defined. This is useful when a condition is an error but a board reset is unlikely to fix it, so it is better to soldier on in hope. Assertion failures should be caught during development/test. It turns out that assert() is defined separately in a few places in U-Boot with various meanings. This patch cleans up some of these. Build errors exposed by this change (and defining DEBUG) are also fixed in this patch. Signed-off-by: Simon Glass <sjg@chromium.org>
* | MAKEALL: drop boards listed in boards.cfgWolfgang Denk2011-09-10-46/+4
| | | | | | | | | | | | Pick them up automatically using $(boards_by_arch ...) Signed-off-by: Wolfgang Denk <wd@denx.de>
* | MAKEALL: drop non-existent "versatile" configurationWolfgang Denk2011-09-10-1/+0
| | | | | | | | | | Signed-off-by: Wolfgang Denk <wd@denx.de> Cc: Albert ARIBAUD <albert.u.boot@aribaud.net>
* | YAFFS2: fs/yaffs2/yaffs_guts.c - fix build warningsWolfgang Denk2011-09-10-9/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix these: yaffs_guts.c: In function 'yaffs_ReadDataFromFile': yaffs_guts.c:4622: warning: pointer targets in passing argument 3 of 'yaffs_AddrToChunk' differ in signedness yaffs_guts.c:4622: warning: pointer targets in passing argument 4 of 'yaffs_AddrToChunk' differ in signedness yaffs_guts.c: In function 'yaffs_WriteDataToFile': yaffs_guts.c:4745: warning: pointer targets in passing argument 3 of 'yaffs_AddrToChunk' differ in signedness yaffs_guts.c:4745: warning: pointer targets in passing argument 4 of 'yaffs_AddrToChunk' differ in signedness yaffs_guts.c: In function 'yaffs_ResizeFile': yaffs_guts.c:4968: warning: pointer targets in passing argument 3 of 'yaffs_AddrToChunk' differ in signedness yaffs_guts.c:4968: warning: pointer targets in passing argument 4 of 'yaffs_AddrToChunk' differ in signedness yaffs_guts.c: In function 'yaffs_GutsInitialise': yaffs_guts.c:7235: warning: assignment from incompatible pointer type yaffs_guts.c: In function 'yaffs_CreateNewObject': yaffs_guts.c:2143: warning: 'tn' may be used uninitialized in this function yaffs_guts.c: In function 'yaffs_MknodObject': yaffs_guts.c:2258: warning: 'str' may be used uninitialized in this function Signed-off-by: Wolfgang Denk <wd@denx.de>
* | YAFFS2: fs/yaffs2/yaffs_guts.c - fix build warningsWolfgang Denk2011-09-10-3/+3
| | | | | | | | | | | | | | | | | | | | Fix these: yaffs_guts.c: At top level: yaffs_guts.c:400: warning: 'yaffs_SkipFullVerification' defined but not used Testing shows no changes of the image sizes. Signed-off-by: Wolfgang Denk <wd@denx.de>
* | YAFFS2: fs/yaffs2/yaffs_nand.[hc] - fix build warningsWolfgang Denk2011-09-10-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | Fix these: yaffs_guts.c: In function 'yaffs_Scan': yaffs_guts.c:5436: warning: pointer targets in passing argument 4 of 'yaffs_QueryInitialBlockState' differ in signedness yaffs_guts.c: In function 'yaffs_ScanBackwards': yaffs_guts.c:6017: warning: pointer targets in passing argument 4 of 'yaffs_QueryInitialBlockState' differ in signedness yaffs_nand.c: In function 'yaffs_QueryInitialBlockState': yaffs_nand.c:109: warning: pointer targets in passing argument 4 of 'dev->queryNANDBlock' differ in signedness yaffs_nand.c:113: warning: pointer targets in passing argument 4 of 'yaffs_TagsCompatabilityQueryNANDBlock' differ in signedness Signed-off-by: Wolfgang Denk <wd@denx.de>
* | YAFFS2: fs/yaffs2/Makefile - fix build warningsWolfgang Denk2011-09-10-1/+1
| | | | | | | | | | | | | | | | | | | | | | Drop the "-DNO_Y_INLINE" setting to fix these: yaffs_guts.h:806: warning: 'yaffs_GetBlockInfo' defined but not used Impact on image size is negligible - for the VCMA9 board the text segment size grew from 496353 to 496357 bytes (i. e. 0.0008%); total image size even remained constant. Signed-off-by: Wolfgang Denk <wd@denx.de>
* | YAFFS2: fs/yaffs2/yaffscfg.c - fix build warningsWolfgang Denk2011-09-10-2/+2
| | | | | | | | | | | | | | | | | | Fix these: yaffscfg.c: In function 'cmd_yaffs_mread_file': yaffscfg.c:316: warning: format '%08x' expects type 'unsigned int', but argument 3 has type 'char *' yaffscfg.c: In function 'cmd_yaffs_ls': yaffscfg.c:371: warning: format '%7d' expects type 'int', but argument 3 has type 'off_t' Signed-off-by: Wolfgang Denk <wd@denx.de>
* | YAFFS2: cmd_yaffs2.c - fix build warningsWolfgang Denk2011-09-10-1/+1
| | | | | | | | | | | | | | | | | | Fix these: cmd_yaffs2.c: In function 'do_ywr': cmd_yaffs2.c:69: warning: format '%x' expects type 'unsigned int', but argument 2 has type 'ulong' cmd_yaffs2.c:69: warning: format '%x' expects type 'unsigned int', but argument 3 has type 'ulong' Signed-off-by: Wolfgang Denk <wd@denx.de>
* | net/eth.c: throw BUG for eth_get_dev_by_name(NULL)Helmut Raiger2011-09-09-0/+2
| | | | | | | | | | | | | | | | eth_get_dev_by_name() is not safe to use for devname being NULL as it uses strcmp. This patch makes it fail with a BUG(). Signed-off-by: Helmut Raiger <helmut.raiger@hale.at> Acked-by: Mike Frysinger <vapier@gentoo.org>
* | smc911x: Fix build warningsWolfgang Denk2011-09-09-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Commit 6af1d41 "smc911x MII made available" was missing a few "const" qualifiers. Fix the resulting in build warnings: smc911x.c: In function 'smc911x_initialize': smc911x.c:297: warning: passing argument 2 of 'miiphy_register' from incompatible pointer type smc911x.c:297: warning: passing argument 3 of 'miiphy_register' from incompatible pointer type Signed-off-by: Wolfgang Denk <wd@denx.de> Cc: Helmut Raiger <helmut.raiger@hale.at>
* | MX31: mx31pdk: make use of GPIO frameworkStefano Babic2011-09-07-0/+1
| | | | | | | | Signed-off-by: Stefano Babic <sbabic@denx.de>
* | PXA: FIX: Deep-sleep return address in stored in PSPRMarek Vasut2011-09-07-1/+1
| | | | | | | | | | | | FIX for a typo-bug: The address is stored in PSPR, not PSSR. Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
* | smc911x MII made availableHelmut Raiger2011-09-07-6/+30
| | | | | | | | | | | | | | The driver already had the MII functions, but they have not been registered using miiphy_register(). Signed-off-by: Helmut Raiger <helmut.raiger@hale.at>
* | common: fix behavior of ROUND macro when input is already roundedAnton Staaf2011-09-07-2/+2
|/ | | | | | | | | | | | | | | | | | | Currently when you call ROUND with a value that is already a multiple of the second parameter it will return a value that is one multiple larger, instead of returning the value passed in. There are only two types of usage of ROUND currently, one in various config files to round CONFIG_SYS_MALLOC_LEN to a multiple of 4096 bytes. The other in cmd_sf.c where the incorrect behavior of ROUND is worked around be subtracting one from the length argument before passing it to ROUND. This patch fixes ROUND and removes the workaround from cmd_sf. It also results in all of the malloc pools that use ROUND to compute their size shrinking by 4KB. Cc: Lukasz Majewski <l.majewski@samsung.com> Cc: Mike Frysinger <vapier@gentoo.org>
* Merge branch 'master' of git://git.denx.de/u-boot-mmcWolfgang Denk2011-09-07-1/+915
|\ | | | | | | | | | | * 'master' of git://git.denx.de/u-boot-mmc: ftsdc010: add support of ftsdc010 mmc controller mmc: Fix mmc_send_status()
| * ftsdc010: add support of ftsdc010 mmc controllerMacpaul Lin2011-09-04-0/+913
| | | | | | | | | | | | Faraday FTSDC010 controller is a SD/MMC controller for SoC chip. Signed-off-by: Macpaul Lin <macpaul@andestech.com>
| * mmc: Fix mmc_send_status()Marek Vasut2011-09-04-1/+2
| | | | | | | | | | | | | | | | The mmc_send_status() function sets cmd.arg = 0. That's incorrect, so fix it. Signed-off-by: Marek Vasut <marek.vasut@gmail.com> Acked-by: Andy Fleming <afleming@freescale.com> Tested-by: Lei Wen <adrian.wenl@gmail.com>
* | Merge branch 'master' of git://git.denx.de/u-boot-videoWolfgang Denk2011-09-07-1/+0
|\ \ | | | | | | | | | | | | * 'master' of git://git.denx.de/u-boot-video: VIDEO: mb86r0xgdc.c: fix warning: unused variable 'i'
| * | VIDEO: mb86r0xgdc.c: fix warning: unused variable 'i'Wolfgang Denk2011-09-06-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix build warning: Configuring for jadecpu board... mb86r0xgdc.c: In function 'dsp_init': mb86r0xgdc.c:60: warning: unused variable 'i' Signed-off-by: Wolfgang Denk <wd@denx.de> Cc: Anatolij Gustschin <agust@denx.de>
* | | I2C: mxc: fix compilation for MX31Stefano Babic2011-09-07-4/+1
| | | | | | | | | | | | | | | | | | Signed-off-by: Stefano Babic <sbabic@denx.de> CC: Heiko Schocher <hs@denx.de> Acked-by: Heiko Schocher <hs@denx.de>
* | | MX31: fix missing mxc_get_clk() callStefano Babic2011-09-07-0/+2
| | | | | | | | | | | | | | | | | | Add missing case to be used in common MXC code. Signed-off-by: Stefano Babic <sbabic@denx.de>
* | | arm: tegra2: fix out-of-tree buildChe-liang Chiou2011-09-07-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The out-of-tree build fails because the Makefiles in question depend on source files of another directory but do not explicitly mkdir that directory. As a matter of fact, other Makefiles under board/*/ directory that refer to source files under another directory explicitly call mkdir. This patch adds explicit mkdir's to the Makefiles in question, and verifies that out-of-tree build is working. Signed-off-by: Che-Liang Chiou <clchiou@chromium.org> Cc: Albert Aribaud <albert.u.boot@aribaud.net>
* | | omap24xx: fix 'reset_timer_masked' declaration errorWolfgang Denk2011-09-07-11/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 17659d7 "Timer: Remove reset_timer_masked()" introduced a static declaration for reset_timer_masked() which causes build errors: timer.c:45: error: static declaration of 'reset_timer_masked' follows non-static declaration include/asm/u-boot-arm.h:70: error: previous declaration of 'reset_timer_masked' was here Signed-off-by: Wolfgang Denk <wd@denx.de> Cc: Graeme Russ <graeme.russ@gmail.com> Cc: Cc: Albert ARIBAUD <albert.u.boot@aribaud.net> Cc: Sandeep Paulraj <s-paulraj@ti.com>
* | | da8xxevm: Fix warning: unused variable 'val'Wolfgang Denk2011-09-07-1/+3
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Wolfgang Denk <wd@denx.de> Cc: Albert ARIBAUD <albert.u.boot@aribaud.net> Cc: Sandeep Paulraj <s-paulraj@ti.com> Cc: Sudhakar Rajashekhara <sudhakar.raj@ti.com>
* | | ARM: PXA: remove broken "zylonite" board.Wolfgang Denk2011-09-07-1743/+1
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Wolfgang Denk <wd@denx.de> Cc: Albert ARIBAUD <albert.u.boot@aribaud.net> Cc: Marek Vasut <marek.vasut@gmail.com> Acked-by: Marek Vasut <marek.vasut@gmail.com>
* | | ARM: remove broken "shannon" board.Wolfgang Denk2011-09-07-968/+1
| | | | | | | | | | | | | | | | | | Signed-off-by: Wolfgang Denk <wd@denx.de> Cc: Albert ARIBAUD <albert.u.boot@aribaud.net> Cc: Rolf Offermanns <rof@sysgo.de>
* | | ARM: remove broken "modnet50" board.Wolfgang Denk2011-09-07-1148/+1
| | | | | | | | | | | | | | | | | | Signed-off-by: Wolfgang Denk <wd@denx.de> Cc: Albert ARIBAUD <albert.u.boot@aribaud.net> Cc: Thomas Elste <info@elste.org>
* | | ARM: remove broken "lpc2292sodimm" board.Wolfgang Denk2011-09-07-638/+1
| | | | | | | | | | | | | | | Signed-off-by: Wolfgang Denk <wd@denx.de> Cc: Albert ARIBAUD <albert.u.boot@aribaud.net>
* | | ARM: remove broken "lart" board.Wolfgang Denk2011-09-07-1062/+1
| | | | | | | | | | | | | | | | | | Signed-off-by: Wolfgang Denk <wd@denx.de> Cc: Albert ARIBAUD <albert.u.boot@aribaud.net> Cc: Alex Züpke <azu@sysgo.de>
* | | ARM: remove broken "impa7" board.Wolfgang Denk2011-09-07-878/+6
| | | | | | | | | | | | | | | | | | Signed-off-by: Wolfgang Denk <wd@denx.de> Cc: Albert ARIBAUD <albert.u.boot@aribaud.net> Cc: Marius Gröger <mag@sysgo.de>
* | | ARM: remove broken "gcplus" board.Wolfgang Denk2011-09-07-853/+1
| | | | | | | | | | | | | | | | | | Signed-off-by: Wolfgang Denk <wd@denx.de> Cc: Albert ARIBAUD <albert.u.boot@aribaud.net> Cc: George G. Davis <gdavis@mvista.com>
* | | ARM: remove broken "evb4510" board.Wolfgang Denk2011-09-07-1032/+1
| | | | | | | | | | | | | | | | | | Signed-off-by: Wolfgang Denk <wd@denx.de> Cc: Albert ARIBAUD <albert.u.boot@aribaud.net> Cc: Curt Brune <curt@cucy.com>
* | | ARM: remove broken "ep7312" board.Wolfgang Denk2011-09-07-775/+9
| | | | | | | | | | | | | | | | | | Signed-off-by: Wolfgang Denk <wd@denx.de> Cc: Albert ARIBAUD <albert.u.boot@aribaud.net> Cc: Marius Gröger <mag@sysgo.de>
* | | ARM: remove broken "dnp1110" board.Wolfgang Denk2011-09-07-856/+1
| | | | | | | | | | | | | | | | | | Signed-off-by: Wolfgang Denk <wd@denx.de> Cc: Albert ARIBAUD <albert.u.boot@aribaud.net> Cc: Alex Züpke <azu@sysgo.de>
* | | ARM: remove broken "SMN42" board.Wolfgang Denk2011-09-07-939/+1
| | | | | | | | | | | | | | | Signed-off-by: Wolfgang Denk <wd@denx.de> Cc: Albert ARIBAUD <albert.u.boot@aribaud.net>
* | | doc/README.scrapyard: Update commit IDs or board removalsWolfgang Denk2011-09-07-25/+25
| | | | | | | | | | | | Signed-off-by: Wolfgang Denk <wd@denx.de>
* | | Makefile : fix generation of cpu related asm-offsets.hStefano Babic2011-09-07-27/+25
|/ / | | | | | | | | | | | | | | | | | | | | commit 0edf8b5b2fa0d210ebc4d6da0fd1aceeb7e44e47 breaks building on a different directory with the O= parameter. The patch wil fix this issue, generating always asm-offsets.h before the other targets. Signed-off-by: Stefano Babic <sbabic@denx.de> CC: Matthias Weisser <weisserm@arcor.de> CC: Wolfgang Denk <wd@denx.de>
* | Flush cache after the OS image is loaded into the memory.Diana CRACIUN2011-09-05-14/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since we are loading an executable image into memory we need flush it out of the cache to possible maintain coherence on CPUs with split instruction and data caches. We do this for other executable image loading command. On PowerPC once we do this we no longer need to explicitly flush the dcache on multi-core systems in the BOOTM_STATE_OS_PREP phase. We now treat the BOOTM_STATE_OS_PREP as a no-op to maintain backwards compatibility with the bootm subcommand. Signed-off-by: James Yang <James.Yang@freescale.com> Signed-off-by: Diana CRACIUN <Diana.Craciun@freescale.com> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
generated by cgit v1.1 at 2024-11-17 20:52:12 +0000