summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeLines
* tools: make it possible to build tools unconfiguredMike Frysinger2011-06-22-10/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On Sunday, June 19, 2011 13:55:13 Ilya Yanok wrote: > On 18.06.2011 23:03, Mike Frysinger wrote: > >> - tools/Makefile put common/env_embedded.o and envcrc.o to object list > >> > >> conditionally. This fixes errors during dependency generation. > > > > pretty sure this breaks board builds. if the only thing this fixes is a > > I'm sorry but I can't see how this can break the builds. Could you > please be more specific? I've tried to build some boards, it actually > works... i might be thinking of a different env_embedded situation. a different problem with your patch to tools/Makefile: you copied the same logic multiple times which means more bitrot. why dont you do something like: > > harmless warning when generating dependency files, then i say ignore it. > > after all, this is how it has always worked in the past and no one really > > cared. > > Yep, they are harmless but they are not warnings but rather scary errors > actually. ;) I think it's better to fix them. i guess my threshold for being scared is a bit higher :p -mike
* Makefile: move $(VERSION_FILE) rule out of ifeq configuredIlya Yanok2011-06-22-18/+18
| | | | | | | | | mkimage relies on autogenerated version so we need to move $(VERSION_FILE) rule out of ifeq and make tools rule depend on it to be able to run 'make tools' from the unconfigured tree. Signed-off-by: Ilya Yanok <yanok@emcraft.com> Acked-by: Mike Frysinger <vapier@gentoo.org>
* config.mk: move LDSCRIPT processing to the top-level MakefileIlya Yanok2011-06-22-30/+30
| | | | | | | | | | LDSCRIPT is used only from the top-level Makefile and only when the system is configured so we can move LDSCRIPT and CONFIG_SYS_LDSCRIPT related logic into the top level Makefile and under configured condition to avoid errors when building tools from unconfigured tree. Signed-off-by: Ilya Yanok <yanok@emcraft.com> Acked-by: Mike Frysinger <vapier@gentoo.org>
* ARM: drop unsupported 'trab' boardWolfgang Denk2011-06-22-7892/+6
| | | | | | | | | | The 'trab' board configuration is broken, and there is nobody who is interested and willing to fix it. Drop it. This includes support for VFD displays which have always been used by this board only. Signed-off-by: Wolfgang Denk <wd@denx.de>
* Prepare v2011.06-rc3v2011.06-rc3Wolfgang Denk2011-06-22-1/+1
| | | | Signed-off-by: Wolfgang Denk <wd@denx.de>
* Build fix/update of AFEB9260Sergey Lapin2011-06-21-82/+97
| | | | | | | Make AFEB9260 build again. Based on fix for AT91SAM9260EK. Signed-off-by: Sergey Lapin <slapin@ossfans.org>
* macb: fix compile warningandreas.devel@googlemail.com2011-06-21-2/+3
| | | | | | | | | | | This patch fixes following compile warning: ---8<--- macb.c: In function 'macb_write_hwaddr': macb.c:525:2: warning: dereferencing type-punned pointer will break strict-aliasing rules --->8--- Signed-off-by: Andreas Bießmann <andreas.devel@gmail.com>
* at91_emac: fix compile warningandreas.devel@googlemail.com2011-06-21-5/+7
| | | | | | | | | | | This patch removes the warning ---8<--- at91_emac.c: In function 'at91emac_write_hwaddr': at91_emac.c:487:2: warning: dereferencing type-punned pointer will break strict-aliasing rules --->8--- Signed-off-by: Andreas Bießmann <andreas.devel@gmail.com>
* include/asm/arch-at91: update several .h files to ATMEL_xxx name schemeEric Benard2011-06-21-28/+28
| | | | Signed-off-by: Eric Bénard <eric@eukrea.com>
* cpuat91: fix board supportEric Benard2011-06-21-4/+3
| | | | Signed-off-by: Eric Bénard <eric@eukrea.com>
* cpu9260/9G20: fix board supportEric Benard2011-06-21-36/+24
| | | | Signed-off-by: Eric Bénard <eric@eukrea.com>
* arm926ejs/at91/lowlevel_init.S: fix definesEric Benard2011-06-21-19/+22
| | | | | | atmel rework changed define names which broke this file Signed-off-by: Eric Bénard <eric@eukrea.com>
* ATMEL spi_dataflash driver - fix to build againReinhard Meyer2011-06-21-2/+1
| | | | | | | | The rework effort for ATMEL (AT91/AVR32) accidentially broke build of this driver. Fix this to make it build again. However this driver should be reworked as soon as possible! Signed-off-by: Reinhard Meyer <u-boot@emk-elektronik.de>
* AT91 rework: fix TOP9000 files to build againReinhard Meyer2011-06-21-44/+50
| | | | | | | Fix EMK TOP9000 board to build again: - changes required due to ATMEL rework Signed-off-by: Reinhard Meyer <u-boot@emk-elektronik.de>
* AT91 rework: fix at91sam(9260/9g20/9xe)ek board port to build again:Reinhard Meyer2011-06-21-142/+147
| | | | | | Make ATMEL's at91sam9260/9g20/9xe-ek boards build again Signed-off-by: Reinhard Meyer <u-boot@emk-elektronik.de>
* Add support for Bluewater Systems Snapper 9260/9G20 modulesRyan Mallon2011-06-21-0/+418
| | | | | | | | Add support for Bluewater Systems AT91 based Snapper 9260 and 9G20 single board computer modules. Includes NAND flash and Ethernet support. Signed-off-by: Ryan Mallon <ryan@bluewatersys.com>
* update arm/at91rm9200 work with rework rework110202Jens Scharsig2011-06-21-187/+196
| | | | | | | | | | | * convert at91rm9200ek and eb_cpux9k2 board to ATMEL_xxx name scheme * Fix: timer.c compile error io.h not found with arm/at91rm9200 * update arm920t/at91 to ATMEL_xxx name scheme * update arm920t/at91 soc lib * update at91_emac driver Signed-off-by: Jens Scharsig <js_at_ng@scharsoft.de> Tested-by: Andreas Bießmann <andreas.devel@gmail.com>
* mx31pdk: Add DHCP commandFabio Estevam2011-06-21-0/+1
| | | | Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
* mxc_spi.c: typo fixedHelmut Raiger2011-06-21-1/+1
| | | | Signed-off-by: Helmut Raiger <helmut.raiger@hale.at>
* imx31_phycore: Fix build by using new relocation schemeFabio Estevam2011-06-21-8/+25
| | | | Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
* mx1ads: Fix build by using new relocation schemeFabio Estevam2011-06-21-33/+29
| | | | Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
* MX31: QONG: drop config.mkStefano Babic2011-06-21-4/+3
| | | | | | Remove obsolete config.mk from QONG board. Signed-off-by: Stefano Babic <sbabic@denx.de>
* omap730p2: fix build breaksAneesh V2011-06-21-0/+5
| | | | | | | Provide SDRAM base address and use SRAM for initial stack Signed-off-by: Aneesh V <aneesh@ti.com> Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
* omap2420h4: fix build breaksAneesh V2011-06-21-0/+4
| | | | | | | DRAM base address and use SRAM for initial stack Signed-off-by: Aneesh V <aneesh@ti.com> Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
* omap1610inn: fix build breaksAneesh V2011-06-21-0/+5
| | | | | | | Provide SDRAM base address and use SRAM for initial stack Signed-off-by: Aneesh V <aneesh@ti.com> Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
* omap1510inn: fix build breaksAneesh V2011-06-21-0/+5
| | | | | | | Provide SDRAM base address and use SRAM for initial stack Signed-off-by: Aneesh V <aneesh@ti.com> Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
* omap5912osk: fix build breaksAneesh V2011-06-21-0/+5
| | | | | | | Provide SDRAM base address and use SRAM for initial stack Signed-off-by: Aneesh V <aneesh@ti.com> Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
* omap1610h2: fix build breaksAneesh V2011-06-21-0/+5
| | | | | | | Provide SDRAM base address and use SRAM for initial stack Signed-off-by: Aneesh V <aneesh@ti.com> Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
* powerpc/p1022ds: set the clock-frequency prop only if the clock is enabledTimur Tabi2011-06-09-6/+10
| | | | | | | | | | | The clock-frequency property in an audio codec's device tree node is set to the input clock frequency for that codec. On the Freescale P1022DS board, the input clock is enabled only if the hwconfig 'audclk' option is set. Therefore, the property should only be set in the device tree if the clock is actually enabled. Signed-off-by: Timur Tabi <timur@freescale.com> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
* Merge branch 'master' of git://git.denx.de/u-boot-armWolfgang Denk2011-06-08-33/+80
|\ | | | | | | | | | | | | | | | | | | * 'master' of git://git.denx.de/u-boot-arm: SMDK6400: fix the compiler error imx27lite: Remove local config.mk mx31ads: Fix environment location on flash imx31_litekit: Remove local config.mk mx31litekit: Fix boot with the new relocation scheme. mx31ads: Use the new relocation scheme
| * SMDK6400: fix the compiler errorMinkyu Kang2011-06-08-0/+2
| | | | | | | | | | | | | | | | | | This patch adds _end for fix following compiler error arch/arm/cpu/arm1176/start.o: In function `_end_ofs': arch/arm/cpu/arm1176/start.S:61: undefined reference to `_end' Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
| * imx27lite: Remove local config.mkFabio Estevam2011-06-07-5/+2
| | | | | | | | | | | | | | | | Local board config.mk should be avoided. Place CONFIG_SYS_TEXT_BASE definition into the board config file instead. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
| * mx31ads: Fix environment location on flashFelix Radensky2011-06-07-7/+3
| | | | | | | | | | | | | | | | | | | | At the moment u-boot and u-boot environment on flash have overlapping addresses, so each u-boot update erases the environment. Fix this by placing evironment right after u-boot. Also, remove confusing comment about environment location. Signed-off-by: Felix Radensky <felix@embedded-sol.com>
| * imx31_litekit: Remove local config.mkFabio Estevam2011-06-07-1/+2
| | | | | | | | | | | | | | | | | | Local board config.mk should be avoided. Place CONFIG_SYS_TEXT_BASE definition into the board config file instead. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Acked-by: Stefano Babic <sbabic@denx.de>
| * mx31litekit: Fix boot with the new relocation scheme.Fabio Estevam2011-06-06-6/+12
| | | | | | | | | | | | | | | | | | imx31_litekit has been converted to the new relocation scheme, but it does not boot. Make the boot functional by using board_early_init_f . Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Tested-by: Magnus Lilja <lilja.magnus@gmail.com>
| * mx31ads: Use the new relocation schemeFabio Estevam2011-06-06-14/+59
| | | | | | | | | | | | | | This fixes the MX31ADS build by using the new relocation scheme. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Tested-by: Felix Radensky <felix@embedded-sol.com>
* | Blackfin: cm-bf537e/cm-bf537u/tcm-bf537: update embedded env settingsHarald Krapfenbauer2011-06-03-18/+15
| | | | | | | | | | | | | | | | The recent commit ea882baf9c1 broke embedding environments in the middle of a sector, so relocate it to the start of the 2nd sector. Signed-off-by: Harald Krapfenbauer <harald.krapfenbauer@bluetechnix.com> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* | Blackfin: boards: build zlib dir with -O2Mike Frysinger2011-06-03-0/+22
| | | | | | | | | | | | | | Now that the zlib code has been relocated to a dedicated subdir, make sure we still build it with -O2 for boards that want speed over size. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* | Blackfin: bf548-ezkit/bf561-ezkit: update env locationMike Frysinger2011-06-03-25/+8
| | | | | | | | | | | | | | | | Relocate the env to one of the small end sectors to avoid issues with embedding it, such as support being broken (by recent commit ea882baf9c1), and for taking a while to save updates. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* | Blackfin: use on-chip reset func with newer partsMike Frysinger2011-06-03-36/+34
| | | | | | | | | | | | | | | | Turns out the documentation is wrong and doing "RAISE 1" does not result in a software reset, only a core reset. So when the on-chip rom has a functioning reset helper, use it. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* | Blackfin: use common LDSCRIPT logicMike Frysinger2011-06-03-4/+0
|/ | | | | | | | Now that common code is a bit smarter when it comes to default LDSCRIPT values, rename the default Blackfin file and drop the Blackfin-specific config.mk logic. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* Prepare v2011.06-rc2v2011.06-rc2Wolfgang Denk2011-06-02-1/+1
| | | | Signed-off-by: Wolfgang Denk <wd@denx.de>
* Minor coding style cleanupWolfgang Denk2011-06-02-22/+22
| | | | Signed-off-by: Wolfgang Denk <wd@denx.de>
* common/cmd_fdt.c: fix wrong data displayed in fdt printHaojian Zhuang2011-06-01-1/+1
| | | | | | | | | All data in dtb is big endian. Some ARM devices are little-endian. In print_data(), it displays data with big-endian format. For ARM device, data should be converted to little-endian first. Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com> Cc: Gerald Van Baren <vanbaren@cideas.com>
* sntp: avoid use of uninitialized variableLuuk Paulussen2011-06-01-1/+2
| | | | | | | | | | | When we use the ntpserverip environment variable argv[1] may not be set. Printing the error message using the NetNtpServerIP variable ensures the correct output in both cases. Signed-off-by: Luuk Paulussen <luuk.paulussen@alliedtelesis.co.nz> Acked-by: Chris Packham <chris.packham@alliedtelesis.co.nz> Cc: Ben Warren <biggerbadderben@gmail.com> Acked-by: Detlev Zundel <dzu@denx.de>
* sf: kick watchdog when pollingPatrick Sestier2011-06-01-0/+3
| | | | | | | | The status polling can take a while, so make sure we kick the watchdog after each successful poll. Signed-off-by: Patrick Sestier <psestier@mircom.com> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* net/net.c: Update ipaddr if the environment has changedEnric Balletbo i Serra2011-06-01-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | At least on ARM the ipaddr is only set in board_init_r function. The problem is if ipaddr is not defined in environment importing another environment defined don't update the ipaddr value. For example, suppose we've a default environment without net variables defined and we want to import an uEnv.txt environment from SD-card like this: ipaddr=192.168.2.240 netmask=255.255.255.0 gatewayip=192.168.2.1 serverip=192.168.2.114 Then if you try boot from NFS results in: Importing environment from mmc ... Running uenvcmd ... smc911x: detected LAN9221 controller smc911x: phy initialized smc911x: MAC ac:de:48:00:00:00 *** ERROR: `ipaddr' not set The ipaddr at this point is NULL beacause is only set at board_init_r function. This patch updates the ipaddr value if the environment has changed. Signed-off-by: Enric Balletbo i Serra <eballetbo@iseebcn.com> Acked-by: Mike Frysinger <vapier@gentoo.org>
* Merge branch 'master' of /home/wd/git/u-boot/custodiansWolfgang Denk2011-06-01-1/+1
|\ | | | | | | | | * 'master' of /home/wd/git/u-boot/custodians: sh: sh7785lcr: Update BSC of USB area
| * Merge branch 'master' of git://git.denx.de/u-boot-shWolfgang Denk2011-06-01-1/+1
| |\ | | | | | | | | | | | | * 'master' of git://git.denx.de/u-boot-sh: sh: sh7785lcr: Update BSC of USB area
| | * sh: sh7785lcr: Update BSC of USB areaNobuhiro Iwamatsu2011-06-01-1/+1
| | | | | | | | | | | | | | | | | | | | | A value of BSC of the USB was wrong. This updates this. Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>