summaryrefslogtreecommitdiff
path: root/Makefile
Commit message (Collapse)AuthorAgeLines
* Merge branch 'master' of git://git.denx.de/u-boot-armTom Rini2013-12-10-1/+1
|\ | | | | | | | | | | | | | | Conflicts: board/samsung/trats2/trats2.c include/configs/exynos5250-dt.h Signed-off-by: Tom Rini <trini@ti.com>
| * Merge branch 'u-boot/master' into 'u-boot-arm/master'Albert ARIBAUD2013-12-10-101/+64
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: arch/arm/cpu/armv7/rmobile/Makefile doc/README.scrapyard Needed manual fix: arch/arm/cpu/armv7/omap-common/Makefile board/compulab/cm_t335/u-boot.lds
| * | arm: keep all sections in ELF fileAlbert ARIBAUD2013-12-07-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Current LDS files /DISCARD/ a lot of sections when linking ELF files, causing diagnostic tools such as readelf or objdump to produce partial output. Keep all section at link stage, filter only at objcopy time so that .bin remains minimal. Signed-off-by: Albert ARIBAUD <albert.u.boot@aribaud.net> Reviewed-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com>
* | | blackfin: Do not generate unused header bootrom-asm-offsets.hMasahiro Yamada2013-12-06-1/+0
| |/ |/| | | | | | | Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com> Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>
* | Merge branch 'master' of git://git.denx.de/u-boot-mpc85xxTom Rini2013-12-02-0/+1
|\ \
| * | Driver/DDR: Moving Freescale DDR driver to a common driverYork Sun2013-11-25-0/+1
| | | | | | | | | | | | | | | | | | | | | Freescale DDR driver has been used for mpc83xx, mpc85xx, mpc86xx SoCs. The similar DDR controllers will be used for ARM-based SoCs. Signed-off-by: York Sun <yorksun@freescale.com>
* | | Prepare v2014.01-rc1Tom Rini2013-11-25-3/+3
| | | | | | | | | | | | Signed-off-by: Tom Rini <trini@ti.com>
* | | Makefile: move some libraries to lib/MakefileMasahiro Yamada2013-11-25-5/+0
| | | | | | | | | | | | Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
* | | Makefile: descend into subdirectories only when CONFIG_API is definedMasahiro Yamada2013-11-25-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All objects under api/ and examples/api/ directories are selected by CONFIG_API. So we can move CONFIG_API switch to the top Makefile. In order to use CONFIG_API, the definition of SUBDIR_EXAMPLES-y must be moved after "sinlude $(obj)include/autoconf.mk". Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
* | | tools: updater: Remove remainders of dead boardMasahiro Yamada2013-11-25-4/+1
|/ / | | | | | | | | | | | | | | | | tools/updater needs board/MAI/AmigaOneG3SE board for compiling. But AmigaOneG3SE board was already deleted by Commit 953b7e6. Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
* | Makefile: move fs/fat/ entry to drivers/MakefileMasahiro Yamada2013-11-17-2/+1
| | | | | | | | | | | | Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com> Cc: Simon Glass <sjg@chromium.org> Acked-by: Simon Glass <sjg@chromium.org>
* | powerpc: mpc824x: Do not create a symbolic link to bedbug_603e.cMasahiro Yamada2013-11-17-1/+0
| | | | | | | | Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
* | powerpc: mpc83xx: Do not create a symbolic link to ddr-gen2.cMasahiro Yamada2013-11-17-1/+0
| | | | | | | | Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
* | Makefile: delete unused linesMasahiro Yamada2013-11-17-6/+0
| | | | | | | | Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
* | Makefile: refactor a littleMasahiro Yamada2013-11-17-3/+1
| | | | | | | | Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
* | Makefile: rename all libraries to built-in.oMasahiro Yamada2013-11-17-56/+56
| | | | | | | | Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
* | drivers/net/npe: descend only when CONFIG_IXP4XX_NPE=yMasahiro Yamada2013-11-17-3/+1
| | | | | | | | | | | | | | CONFIG_IXP4XX_NPE is defined only for CPU ixp. It is not necessary to filter by CPU ixp. Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
* | drivers/net/fm: descend only when CONFIG_FMAN_ENET=yMasahiro Yamada2013-11-17-3/+1
| | | | | | | | | | | | | | CONFIG_FMAN_ENET is defined only for CPU mpc85xx. We do not need to filter by CPU mpc85xx. Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
* | drivers/qe: move the entry to drivers/MakefileMasahiro Yamada2013-11-17-4/+0
| | | | | | | | Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
* | powerpc: move mpc8xxx entry under arch/powerpc/cpu/Masahiro Yamada2013-11-17-8/+1
| | | | | | | | Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
* | Makefile: merge $(LIBBOARD) into $(LIBS)Masahiro Yamada2013-11-17-9/+4
| | | | | | | | | | | | We do not need to handle $(LIBBOARD) and $(LIBS) separately. Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
* | lib: descend into sub directories only when it is necessaryMasahiro Yamada2013-11-17-4/+4
|/ | | | Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
* Makfile: fix a rule to build u-boot.sbMasahiro Yamada2013-11-06-1/+1
| | | | Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
* Makefile: convert makefiles to Kbuild style and delete grep switchMasahiro Yamada2013-11-01-32/+6
| | | | | | | | | | | | | We have converted all makefiles needed to build $(LIBS). Until this commit we used to grep switch so that U-Boot style and Kbuild style makefiles coexist. But we do not need any more. Goint forward, use always Kbuild style Makefile when adding a new Makefile Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
* dts, api, test: convert makefiles to Kbuild styleMasahiro Yamada2013-11-01-1/+1
| | | | Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
* ARM: s5pc, exynos: move Samsung ARM SoC specific code under arch/arm/Masahiro Yamada2013-10-31-6/+0
| | | | | | | | | This patch moves S5PC, EXYNOS specific directory entries from the toplevel Makefile to arch/arm/cpu/armv7/Makefile using Kbuild descending feature. Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com> Cc: Minkyu Kang <mk7.kang@samsung.com>
* ARM: omap: move OMAP specific code under arch/arm/Masahiro Yamada2013-10-31-4/+0
| | | | | | | | | This patch moves OMAP specific directory entries from the toplevel Makefile and spl/Makefile to arch/arm/cpu/armv7/Makefile using Kbuild descending feature. Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com> Cc: Tom Rini <trini@ti.com>
* ARM: tegra: move Tegra specific code under arch/arm/Masahiro Yamada2013-10-31-5/+1
| | | | | | | | | This patch moves Tegra specific directory entries from the toplevel Makefile and spl/Makefile to arch/arm/cpu/*/Makefile using Kbuild descending feature. Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com> Cc: Tom Warren <TWarren@nvidia.com>
* fs: move some file system to fs/MakefileMasahiro Yamada2013-10-31-11/+1
| | | | | | | | | This commit moves some subdirectories of fs from the toplevel Makefile to fs/Makefile using Kbuild descending feature. Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com> Acked-by: Simon Glass <sjg@chromium.org>
* drivers: move some drivers to drivers/MakefileMasahiro Yamada2013-10-31-15/+1
| | | | | | | | This commit moves some drivers subdirectory entry from the toplevel Makefile to drivers/Makefile using Kbuild descending feature. Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
* ARM: imx-common: convert makefiles to Kbuild styleMasahiro Yamada2013-10-31-3/+5
| | | | | | | | Multiple targets are included in arch/arm/imx-common/Makefile In order to refactor it, we need to tweak Makefile and spl/Makefile. Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
* Makefile: prepare for using Kbuild-style MakefileMasahiro Yamada2013-10-31-5/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Every makefile in sub directories has common lines at the top and the bottom. This commit pushes the common parts into script/Makefile.build. Going forward sub-makefiles only need to describe this part: COBJS := ... COBJS += ... SOBJS := ... But using obj-y is preferable to prepare for switching to Kbuild. The conventional (non-Kbuild) Makefile style is still supported. This is achieved by greping the Makefile before entering into it. U-Boot conventional sub makefiles always include some other makefiles. So the build system searches a line beginning with "include" keyword in the makefile in order to distinguish which style it is. If the Makefile include a "include" line, we assume it is a conventional U-Boot style. Otherwise, it is treated as a Kbuild-style makefile. With this tweak, we can switch sub-makefiles from U-Boot style to Kbuild style little by little. obj-y := foo/ syntax (descending into the sub directory) is not supportd yet. It will be implemented in the upcomming commit. Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com> Cc: Simon Glass <sjg@chromium.org> Cc: Tom Rini <trini@ti.com>
* powerpc/tool/pbl: fix pbl image compiling processShaohui Xie2013-10-16-0/+1
| | | | | | | | | | | | | | | | | | | | Previous process of compiling a PBL boot image is: 1: make <board_name_config> 2: make u-boot.pbl for example: make T4240QDS_SDCARD_config make u-boot.pbl Now the process is: 1: make <board_name> for example: make T4240QDS_SDCARD Also, updated README.pblimage. Signed-off-by: Shaohui Xie <Shaohui.Xie@freescale.com>
* Prepare v2013.10Tom Rini2013-10-16-1/+1
| | | | Signed-off-by: Tom Rini <trini@ti.com>
* Merge branch 'master' of git://git.denx.de/u-boot-armTom Rini2013-10-14-0/+1
|\
| * drivers:power:max77693: add support for new multi function pmic max77693Piotr Wilczek2013-09-25-0/+1
| | | | | | | | | | | | | | | | | | This patch add support for new multi function pmic max77693. The driver is split into three modules: pmic, muic and fuelgage. Signed-off-by: Piotr Wilczek <p.wilczek@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
* | Prepare v2013.04-rc4Tom Rini2013-10-02-1/+1
| | | | | | | | Signed-off-by: Tom Rini <trini@ti.com>
* | Makefile: Do not show make debug messagesMasahiro Yamada2013-09-20-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit 27af930, the top Makefile was adjusted to the new boards.cfg format. But at the same time, -d option was added. If you configure and make separately, for example like follows: make omap4_panda_config make CROSS_COMPILE=<your_compiler_prefix> it works fine as it did before. But if you do them in one time like follows: make omap4_panda CROSS_COMPILE=<your_compiler_prefix> The log is sprinkled with annoying make debug messages. This commit deletes -d option again. Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com> Tested-by: Nishanth Menon <nm@ti.com>
* | Cosmetic: Fix a number of typos, no functional changes.Robert P. J. Day2013-09-20-3/+3
| | | | | | | | | | | | | | Fix various misspellings of things like "environment", "kernel", "default" and "volatile", and throw in a couple grammar fixes. Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
* | Prepare v2013.10-rc3Tom Rini2013-09-16-1/+1
|/ | | | Signed-off-by: Tom Rini <trini@ti.com>
* Merge and reformat boards.cfg and MAINTAINERSAlbert ARIBAUD2013-09-12-1/+1
| | | | | | | | Put all informations about targets, including state (active or orphan) and maintainers, in boards.cfg; remove MAINTAINERS; adjust the build system accordingly. Signed-off-by: Albert ARIBAUD <albert.u.boot@aribaud.net>
* Merge branch 'master' of git://git.denx.de/u-boot-armTom Rini2013-09-12-1/+1
|\
| * Merge branch 'u-boot-samsung/master' into 'u-boot-arm/master'Albert ARIBAUD2013-09-11-1/+1
| |\ | | | | | | | | | | | | Conflicts: tools/Makefile
| | * CONFIG: EXYNOS5: Replace misnomer SMDK5250 with EXYNOS5250 and update MakefilesChander Kashyap2013-08-27-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Update the Makefiles so that all boards can use the same spl generation tool Signed-off-by: Inderpal Singh <inderpal.singh@linaro.org> Acked-by: Simon Glass <sjg@chromium.org> Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
* | | Always build u-boot.img when using CONFIG_SPL_FRAMEWORKHenrik Nordström2013-09-06-0/+1
|/ / | | | | | | | | | | | | Use of uImage formatted u-boot have long been preferred, and recent changes to better support Falcon mode on MMC now enforces it on MMC. Signed-off-by: Henrik Nordstrom <henrik@henriknordstrom.net>
* | Prepare v2013.10-rc2Tom Rini2013-09-02-1/+1
| | | | | | | | Signed-off-by: Tom Rini <trini@ti.com>
* | Makefile: Fix build in a separated directory treeYork Sun2013-08-21-2/+2
| | | | | | | | | | | | | | Fix a bug introduced by commit 3aa29dee TPL : introduce the TPL based on the SPL Signed-off-by: York Sun <yorksun@freescale.com>
* | TPL : introduce the TPL based on the SPLYing Zhang2013-08-20-8/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to the nand SPL on some board(e.g. P1022DS)has a size limit, it can not be more than 4K. So, the SPL cannot initialize the DDR with the SPD code. This patch introduces TPL to enable a loader stub that is loaded by the code from the SPL. It initializes the DDR with the SPD or other operations. The TPL's size is sizeable, the maximum size is decided by the memory's size that TPL runs. It initializes the DDR through SPD code, and copys final uboot image to DDR. So there are three stage uboot images: * spl_boot, * tpl_boot, * final uboot image Signed-off-by: Ying Zhang <b40530@freescale.com> Acked-by: York Sun <yorksun@freescale.com>
* | SPL: Makefile: Build a separate autoconf.mk for SPLJoel Fernandes2013-08-19-2/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SPL defines CONFIG_SPL_BUILD but this does not percolate to the autoconf.mk Makefile. As a result the build breaks when CONFIG_SPL_BUILD is used in the board-specific include header file. With this, there is a possibility of having a CONFIG option defined in the header file but not defined in the Makefile causing all kinds of build failure and problems. It also messes things for up, for example, when one might want to undefine options to keep the SPL small and doesn't want to be stuck with the CONFIG options used for U-boot. Lastly, this also avoids defining special CONFIG_SPL_ variables for cases where some options are required in U-boot but not in SPL. We add a spl-autoconf.mk rule that is generated for SPL with the CONFIG_SPL_BUILD flag and conditionally include it for SPL builds. Signed-off-by: Joel Fernandes <joelf@ti.com> Signed-off-by: Ying Zhang <b40530@freescale.com>
* | Prepare v2013.10-rc1Tom Rini2013-08-19-2/+2
| | | | | | | | Signed-off-by: Tom Rini <trini@ti.com>