summaryrefslogtreecommitdiff
path: root/Makefile
Commit message (Collapse)AuthorAgeLines
* Prepare v2012.10Tom Rini2012-10-15-1/+1
| | | | Signed-off-by: Tom Rini <trini@ti.com>
* Prepare v2012.10-rc3Tom Rini2012-10-08-1/+1
| | | | Signed-off-by: Tom Rini <trini@ti.com>
* Prepare v2012.10-rc2Tom Rini2012-10-01-1/+1
| | | | Signed-off-by: Tom Rini <trini@ti.com>
* Merge branch 'master' of git://git.denx.de/u-boot-netTom Rini2012-09-27-1/+1
|\
| * dm: net: Move IXP NPE to drivers/net/Marek Vasut2012-09-24-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Marek Vasut <marex@denx.de> Cc: Bryan Hundven <bryanhundven@gmail.com> Cc: Michael Schwingen <rincewind@discworld.dascon.de> Cc: Wolfgang Denk <wd@denx.de> Cc: Albert Aribaud <albert.u.boot@aribaud.net> Cc: U-Boot DM <u-boot-dm@lists.denx.de> Cc: Joe Hershberger <joe.hershberger@ni.com>
* | ARM: SPL: Convert davinci to CONFIG_SPL_FRAMEWORKTom Rini2012-09-27-2/+2
| | | | | | | | | | | | | | | | - Convert the non-relocation part of board_init_f to spl_board_init, turn on CONFIG_SPL_BOARD_INIT in the configs. - Remove duplicated code. - Add spl_boot_device() that returns the statically chosen boot device. Signed-off-by: Tom Rini <trini@ti.com>
* | Makefile: Move SPL files to clobber, remove from cleanTom Rini2012-09-27-4/+3
| | | | | | | | | | | | | | | | The 'clean' target has been removing all of spl but not u-boot itself. For consistency and ease of testing, only remove SPL binaries / maps in the clobber target, just like for full U-Boot Signed-off-by: Tom Rini <trini@ti.com>
* | Merge branch 'master' of git://git.denx.de/u-boot-mpc85xxTom Rini2012-09-25-0/+6
|\ \ | |/ |/|
| * powerpc/CoreNet: add tool to support pbl image build.Shaohui Xie2012-08-23-0/+6
| | | | | | | | | | | | | | | | | | | | Provides a tool to build boot Image for PBL(Pre boot loader) which is used on Freescale CoreNet SoCs, PBL can be used to load some instructions and/or data for pre-initialization. The default output image is u-boot.pbl, for more details please refer to doc/README.pblimage. Signed-off-by: Shaohui Xie <Shaohui.Xie@freescale.com> Signed-off-by: Andy Fleming <afleming@freescale.com>
* | Prepare v2012.10-rc1Tom Rini2012-09-21-2/+2
| | | | | | | | Signed-off-by: Tom Rini <trini@ti.com>
* | Merge branch 'master' of git://git.denx.de/u-boot-armTom Rini2012-09-21-5/+3
|\ \
| * | MX: set a common place to share code for Freescale i.MXStefano Babic2012-09-10-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Up now only MX5 and MX6 can share code, because they have a common source directory in cpu/armv7. Other not armv7 i.MX can profit of the same shared code. Move these files into a directory accessible for all, similar to plat-mxc in linux. Signed-off-by: Stefano Babic <sbabic@denx.de>
| * | MX28: Cleanup mxsboot within make mrproperMarek Vasut2012-09-04-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Delete the "mxsboot" binary if make mrproper is called. Signed-off-by: Marek Vasut <marex@denx.de> Cc: Wolfgang Denk <wd@denx.de> Cc: Stefano Babic <sbabic@denx.de> Cc: Fabio Estevam <festevam@gmail.com> CC: Albert Aribaud <albert.u.boot@aribaud.net> Acked-by: Stefano Babic <sbabic@denx.de>
* | | Merge branch 'ext4'Tom Rini2012-09-20-3/+9
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update Makefile change for LIBS -> LIBS-y change. Conflicts: Makefile Signed-off-by: Tom Rini <trini@ti.com>
| * | | ext4fs ls load supportUma Shankar2012-08-09-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Uma Shankar <uma.shankar@samsung.com> Signed-off-by: Manjunatha C Achar <a.manjunatha@samsung.com> Signed-off-by: Iqbal Shareef <iqbal.ams@samsung.com> Signed-off-by: Hakgoo Lee <goodguy.lee@samsung.com>
* | | | IPL: Remove remains of OneNAND IPLMarek Vasut2012-09-18-10/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After removing the Apollon board, remove the OneNAND IPL too. There are no users for it any more. Signed-off-by: Marek Vasut <marex@denx.de> Cc: Albert Aribaud <albert.u.boot@aribaud.net> Cc: Minkyu Kang <promsoft@gmail.com> Cc: Tom Rini <trini@ti.com> Acked-by: Minkyu Kang <mk7.kang@samsung.com>
* | | | fix out of tree building with kallsymsMike Frysinger2012-09-02-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The call to SYSTEM_MAP assumes that the u-boot output is in $PWD when it really should be in $(obj). This fixes building out of tree. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* | | | Merge branch 'master' of git://git.denx.de/u-boot-usbWolfgang Denk2012-09-02-0/+1
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://git.denx.de/u-boot-usb: MUSB driver: Timeout is never detected as the while loop does not end usb: fix ulpi_set_vbus prototype pxa25x: Add UDC registers definitions USB: Fix strict aliasing in ohci-hcd usb: Optimize USB storage read/write ehci: Optimize qTD allocations usb_stor_BBB_transport: Do not delay when not required usb_storage: Remove EHCI constraints usb_storage: Restore non-EHCI support ehci-hcd: Boost transfer speed ehci: cosmetic: Define used constants ehci: Fail for multi-transaction interrupt transfers arm:trats: Enable g_dnl composite USB gadget with embedded DFU function on TRATS arm:trats: Support for USB UDC driver at TRATS board. dfu:cmd: Support for DFU u-boot command dfu: MMC specific routines for DFU operation dfu: DFU backend implementation dfu:usb: DFU USB function (f_dfu) support for g_dnl composite gadget dfu:usb: Support for g_dnl composite download gadget. ehci: cosmetic: Define the number of qt_buffers Signed-off-by: Wolfgang Denk <wd@denx.de>
| * | | dfu: DFU backend implementationLukasz Majewski2012-09-01-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New, separate driver at ./drivers/dfu has been added. It allows platform and storage independent operation of DFU. It has been extended to use new MMC level of command abstraction. Signed-off-by: Lukasz Majewski <l.majewski@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Cc: Marek Vasut <marex@denx.de>
* | | | MX28: config: Allow different target generation in elftosb callOtavio Salvador2012-09-01-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The elftosb call needs to use a target param specific for i.MX28. This patch allow for later addition of i.MX233. Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Acked-by: Marek Vasut <marex@denx.de>
* | | | tegra20: enable SPL for tegra20 boardsAllen Martin2012-09-01-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add SPL options to tegra20 config files and enable SPL build for tegra20 boards. Also remove redundant code from u-boot that is not contained in SPL. Signed-off-by: Allen Martin <amartin@nvidia.com> Acked-by: Stephen Warren <swarren@wwwdotorg.org> Tested-by: Thierry Reding <thierry.reding@avionic-design.de> Signed-off-by: Tom Warren <twarren@nvidia.com>
* | | | tegra20: add u-boot-*-tegra.bin targetsAllen Martin2012-09-01-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add target for tegra20 u-boot image. This is a concatenation of tegra spl and normal u-boot binaries. For non-devicetree builds this is named "u-boot-nodtb-tegra.bin" for devicetree builds is named "u-boot-dtb-tegra.bin". Signed-off-by: Allen Martin <amartin@nvidia.com> Acked-by: Stephen Warren <swarren@wwwdotorg.org> Tested-by: Thierry Reding <thierry.reding@avionic-design.de> Signed-off-by: Tom Warren <twarren@nvidia.com>
* | | | tegra20: move tegra20 SoC code to arch/arm/cpu/tegra20-commonAllen Martin2012-09-01-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In preparation for splitting out the armv4t code from tegra20, move the tegra20 SoC code to arch/arm/cpu/tegra20-common. This code will be compiled armv4t for the arm7tdmi and armv7 for the cortex A9. Signed-off-by: Allen Martin <amartin@nvidia.com> Acked-by: Stephen Warren <swarren@wwwdotorg.org> Tested-by: Thierry Reding <thierry.reding@avionic-design.de> Signed-off-by: Tom Warren <twarren@nvidia.com>
* | | | MX28: Move the u-boot.bd info CPUDIR/SOCDIRMarek Vasut2012-09-01-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This gets us rid of duplication of the same file. Signed-off-by: Marek Vasut <marex@denx.de> Cc: Stefano Babic <sbabic@denx.de> Acked-by: Stefano Babic <sbabic@denx.de>
* | | | hawkboard/omapl-138: Add support for generating ais image for hawkboardSughosh Ganu2012-09-01-2/+3
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | Parameters used for configuring certain SoC peripherals are parsed from the cfg file and appended as part of the ais image's header. The u-boot-spl.ais generated is flashed separately to the nand, so do not delete the file after generation of u-boot.ais. Signed-off-by: Sughosh Ganu <urwithsughosh@gmail.com>
* | | Consolidate bootcount code into drivers/bootcountStefan Roese2012-09-01-0/+1
| |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch moves all bootcount implementations into a common directory: drivers/bootcount. The generic bootcount driver is now usable not only by powerpc platforms, but others as well. Signed-off-by: Stefan Roese <sr@denx.de> Cc: Heiko Schocher <hs@denx.de> Cc: Valentin Longchamp <valentin.longchamp@keymile.com> Cc: Christian Riesch <christian.riesch@omicron.at> Cc: Manfred Rudigier <manfred.rudigier@omicron.at> Cc: Mike Frysinger <vapier@gentoo.org> Cc: Rob Herring <rob.herring@calxeda.com> Cc: Reinhard Meyer <reinhard.meyer@emk-elektronik.de> Tested-by: Valentin Longchamp <valentin.longchamp@keymile.com> Tested-by: Christian Riesch <christian.riesch@omicron.at> Acked-by: Rob Herring <rob.herring@calxeda.com> Acked-by: Mike Frysinger <vapier@gentoo.org>
* | Makefile: fix HAVE_VENDOR_COMMON_LIBScott Wood2012-08-17-1/+1
| | | | | | | | | | | | | | | | | | | | | | Commit 8b5a02640adf77301f943e8754992c50df004e8a ("Makefile: cosmetic: optimize usage of LIBS-y") broke the build of boards that have a board vendor "common" directory, by introducing a space between "LIBS-" and "y". Signed-off-by: Scott Wood <scottwood@freescale.com> Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com> Acked-by: Kim Phillips <kim.phillips@freescale.com>
* | Makefile: cosmetic: optimize usage of LIBS-yDaniel Schwierzeck2012-08-10-11/+6
| | | | | | | | Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
* | Makefile: replace LIBS by LIBS-yDaniel Schwierzeck2012-08-10-68/+68
| | | | | | | | | | | | | | Synchronize with ALL-y handling and code in spl/Makefile. Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com> Acked-by: Mike Frysinger <vapier@gentoo.org>
* | Makefile: allow appending to LIB in sub-makefilesDaniel Schwierzeck2012-08-10-1/+1
|/ | | | | | | | | | | | | | | | | | | | The top Makefile and the SPL Makefile have lines like those: ifneq ($(CONFIG_AM33XX)$(CONFIG_OMAP34XX)$(CONFIG_OMAP44XX)$(CONFIG_OMAP54XX),) LIBS += $(CPUDIR)/omap-common/libomap-common.o endif ifeq ($(SOC),mx5) LIBS += $(CPUDIR)/imx-common/libimx-common.o endif This should be done in the arch/CPU/SoC specific sub-makefiles to keep the top Makefiles clean. This patch also allows adding of new arch/CPU/SoC specific libraries in the future without touching the top Makefiles. Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com> Acked-by: Mike Frysinger <vapier@gentoo.org>
* zfs: Add ZFS filesystem supportJorgen Lundman2012-08-09-1/+1
| | | | | | | | | | | | | | | | | | | | | U-Boot port is based on sources forked from GRUB-0.97 by Sun in 2004, which can be found here: http://src.opensolaris.org/source/xref/onnv/onnv-gate/usr/src/grub/grub-0.97/stage2/zfs-include/zfs.h Released by Sun for GRUB under the license: * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. GRUB official releases include ZFS in version: ftp://alpha.gnu.org/gnu/grub/grub-1.99~rc1.tar.gz And patched against GRUB Bazaar repository for ashift fixes (4KB HDDs) more conveniently found at github: https://github.com/pendor/grub-zfs/commit/e7b6ef3ac3b9685ac4c394c897b1d4221b7381f1 Signed-off-by: Jorgen Lundman <lundman@lundman.net>
* sandbox: Add basic test for command executionSimon Glass2012-08-09-0/+1
| | | | | | | | | | | | | | | | | | | Since run_command() and run_command_list() are important and a little confusing, add some basic tests to check that the behaviour is correct. Note: I am not sure that this should be committed, nor where it should go in the source tree. Comments welcome. To run the unit tests use the ut_cmd command available in sandbox: make sandbox_config make ./u-boot -c ut_cmd (To test both hush and built-in parsers, you need to manually change CONFIG_SYS_HUSH_PARSER in include/configs/sandbox.h and build/run again) Signed-off-by: Simon Glass <sjg@chromium.org>
* Prepare v2012.07Wolfgang Denk2012-07-30-1/+1
| | | | Signed-off-by: Wolfgang Denk <wd@denx.de>
* Merge branch 'master' of git://git.denx.de/u-boot-mipsWolfgang Denk2012-07-30-1/+1
|\ | | | | | | | | | | | | * 'master' of git://git.denx.de/u-boot-mips: MIPS: fix renaming of inca-swap-bytes to xway-swap-bytes Signed-off-by: Wolfgang Denk <wd@denx.de>
| * MIPS: fix renaming of inca-swap-bytes to xway-swap-bytesDaniel Schwierzeck2012-07-27-1/+1
| | | | | | | | | | | | | | | | | | | | Fix some remains of the renaming of inca-swap-bytes introduced in commit 60b74bde9280e85f4423c05a50ecc41de56ad980 MIPS: INCA-IP: rename inca-swap-bytes host tool Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
* | Makefile: avoid "Generating asm-offsets.h" message with "-s"Wolfgang Denk2012-07-29-1/+1
|/ | | | | | | | | | make would spit out a message like Generating /tmp/build/include/generated/asm-offsets.h even when running with option "-s". Fix this. Signed-off-by: Wolfgang Denk <wd@denx.de>
* Prepare v2012.07-rc3Wolfgang Denk2012-07-27-1/+1
| | | | Signed-off-by: Wolfgang Denk <wd@denx.de>
* Prepare v2012.07-rc2Wolfgang Denk2012-07-22-1/+1
| | | | Signed-off-by: Wolfgang Denk <wd@denx.de>
* Prepare v2012.07-rc1Wolfgang Denk2012-07-10-3/+3
| | | | Signed-off-by: Wolfgang Denk <wd@denx.de>
* Makefile: Add u-boot.spr build target (SPEAr)Stefan Roese2012-07-07-0/+17
| | | | | | | | | | | | | On x600 (SPEAr600) U-Boot is appended to U-Boot SPL. Both images are created using mkimage (crc etc), so that the ROM bootloader can check its integrity. Padding needs to be done to the SPL image (with mkimage header) and not the binary. Otherwise the resulting image which is loaded/copied by the ROM bootloader to SRAM doesn't fit. The resulting image containing both U-Boot images is called u-boot.spr. Signed-off-by: Stefan Roese <sr@denx.de> Cc: Amit Virdi <amit.virdi@st.com> Cc: Vipin Kumar <vipin.kumar@st.com>
* create lib/tizen directoryDonghwa Lee2012-05-25-0/+3
| | | | | | | | | | | This directory includes tizen logo data, common tizen library and so on. Signed-off-by: Donghwa Lee <dh09.lee@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Acked-by: Minkyu Kang <mk7.kang@samsung.com> [ agust: change to conditionally build lib/tizen directory ] Signed-off-by: Anatolij Gustschin <agust@denx.de>
* Makefile: Add a 'checkthumb' ruleTom Rini2012-05-15-0/+7
| | | | | | | | | | | | This rule confirms that if we're on ARM and we have enabled THUMB builds that we have a new enough toolchain to produce a working binary. Changes in v2: - Switch to ALL-$(CONFIG_SYS_THUMB_BUILD) in arch/arm/config.mk (Mike F) - Simplfy checkthumb test after doing the above Signed-off-by: Tom Rini <trini@ti.com> Acked-by: Mike Frysinger <vapier@gentoo.org>
* Prepare v2012.04.01Wolfgang Denk2012-04-25-1/+1
| | | | Signed-off-by: Wolfgang Denk <wd@denx.de>
* Prepare v2012.04Wolfgang Denk2012-04-21-1/+1
| | | | | | Also tiny style cleanup to tools/patman/README Signed-off-by: Wolfgang Denk <wd@denx.de>
* Prepare v2012.04-rc3Wolfgang Denk2012-04-18-1/+1
| | | | Signed-off-by: Wolfgang Denk <wd@denx.de>
* Prepare v2012.04-rc2; minor Coding Style cleanupWolfgang Denk2012-04-16-1/+1
| | | | Signed-off-by: Wolfgang Denk <wd@denx.de>
* Prepare v2012.04-rc1Wolfgang Denk2012-03-31-3/+3
| | | | Signed-off-by: Wolfgang Denk <wd@denx.de>
* Define CPUDIR for the .lds link scriptSimon Glass2012-03-30-0/+1
| | | | | | | | | | Most link scripts differ only in the directory containing the start.o file. Make this a #define to remove this last difference. (Note that if start.o were disallowed outside the CPU start directory then we wouldn't even need this. But that is a separate discussion.) Signed-off-by: Simon Glass <sjg@chromium.org>
* Allow arch directory to contain .lds without requiring MakefileSimon Glass2012-03-30-1/+9
| | | | | | | | | The Makefile for a CPU is in arch/($ARCH)/cpu/$(CPU). We want to support having an .lds file in arch/$(ARCH)/cpu without requiring an additional Makefile there. This change makes it clear that we expect a Makefile in the same directory as the link script except in this case. Signed-off-by: Simon Glass <sjg@chromium.org>
* IXP: Move PDNB3 and SCPU from Makefile to boards.cfgMarek Vasut2012-03-26-12/+0
| | | | | | Signed-off-by: Marek Vasut <marex@denx.de> Cc: Bryan Hundven <bryanhundven@gmail.com> Cc: Michael Schwingen <rincewind@discworld.dascon.de>