summaryrefslogtreecommitdiff
path: root/tools/Makefile
AgeCommit message (Collapse)Author
2009-12-02makefiles: fixes for building build toolsScott Wood
Currently, some of the tools instead set CC to be HOSTCC in order to re-use some pattern rules -- but this fails when the user overrides CC on the make command line. Also, the HOSTCFLAGS in tools/Makefile are currently not being used because config.mk overwrites them. This patch adds static pattern rules for files that have been requested to be built with the native compiler using $(HOSTSRCS) and $(HOSTOBJS), and converts the tools to use them. It restores easylogo to using the host compiler, which was broken by commit 38d299c2db81bd889c601b5dfc12c4e83ef83333 (if this was an intentional change, please let me know -- but it seems to be a build tool). It restores -pedantic and the special flags for darwin and cygwin that were requested in tools/makefile (but keeps the flags added by config.mk) -- hopefully someone can test this on those platforms. It no longer conditionalizes -pedantic on not being darwin; it wasn't clear that that was intentional, and unless there's a real problem it's just inviting people to contribute non-pedantic patches to those files (I'm not a fan of -pedantic personally, but if it's on for one platform it should be on for all). HOST_LDFLAGS is renamed HOSTLDFLAGS for consistency with the previous HOST_CFLAGS to HOSTCFLAGS rename. A new HOSTCFLAGS_NOPED is made available for those files which currently cannot be built with -pedantic, and replaces the old FIT_CFLAGS. imls now uses the cross compiler properly, rather than by trying to reconstruct CC using the typoed $(CROSS_COMPILER). envcrc.c is now dependency-processed unconditionally -- previously it would be built without being on (HOST)SRCS if CONFIG_ENV_IS_EMBEDDED was not selected. Signed-off-by: Scott Wood <scottwood@freescale.com>
2009-10-27Revert "env: only build env_embedded and envcrc when needed"Wolfgang Denk
Breaks building on many boards, and no really clean fix available yet. This reverts commit 6dab6add2d8ee80905234b326abc3de11be1d178.
2009-10-18env: only build env_embedded and envcrc when neededMike Frysinger
The env code is protected by the ENV_IS_EMBEDDED define, so attempting to compile the code when this isn't defined is pointless. Now that the env headers have unified around CONFIG_ENV_IS_EMBEDDED, convert the build system to only build the env objects when this is enabled. And now that the env code is conditionally compiled, we can drop the source code checks. For people who want to extract the environment manually, add a new option CONFIG_BUILD_ENVCRC that only enables the envcrc utility. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
2009-09-10mkimage: Add Kirkwood Boot Image support (kwbimage)Prafulla Wadaskar
This patch adds support for "kwbimage" (Kirkwood Boot Image) image types to the mkimage code. For details refer to docs/README.kwbimage This patch is tested with Sheevaplug board Signed-off-by: Prafulla Wadaskar <prafulla@marvell.com> Acked-by: Ron Lee <ron@debian.org> Signed-off-by: Prafulla Wadaskar <prafulla@marvell.com>
2009-09-10mkimage: Include missing files in build dependency calculationsPrafulla Wadaskar
Include default_image.o and fit_image.o into the build dependency calculations. This makes sure they get rebuilt if any of the headers they include are modified Signed-off-by: Prafulla Wadaskar <prafulla@marvell.com> Acked-by: Ron Lee <ron@debian.org> Edited commit message. Signed-off-by: Wolfgang Denk <wd@denx.de>
2009-09-10tools: mkimage: split code into core, default and FIT image specificPrafulla Wadaskar
This is a first step towards reorganizing the mkimage code to make it easier to add support for additional images types. Current mkimage code is specific to generating uImage and FIT image files, but the same framework can be used to generate other image types like Kirkwood boot images (kwbimage-TBD). For this, the mkimage code gets reworked: Here is the brief plan for the same:- a) Split mkimage code into core and image specific support b) Implement callback functions for image specific code c) Move image type specific code to respective C files Currently there are two types of file generation/list supported (i.e uImage, FIT), the code is abstracted from mkimage.c/.h and put in default_image.c and fit_image.c; all code in these file is static except init function call d) mkimage_register API is added to add new image type support All above is addressed in this patch e) Add kwbimage type support to this new framework (TBD) This will be implemented in a following commit. Signed-off-by: Prafulla Wadaskar <prafulla@marvell.com> Edit commit message, fix coding style and typos. Signed-off-by: Wolfgang Denk <wd@denx.de>
2009-09-10tools: mkimage: Makefile sortedPrafulla Wadaskar
The tools/Makefile is sorted for all entries, Signed-off-by: Prafulla Wadaskar <prafulla@marvell.com>
2009-07-23unify HOST_CFLAGS and HOSTCFLAGSMike Frysinger
The top build system sets up HOSTCFLAGS a bit and exports it, but other places use HOST_CFLAGS instead. Unify the two as HOSTCFLAGS so that the values stay in sync. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
2009-07-17envcrc: add missing dependencies on env storageMike Frysinger
When the envcrc building was made conditional, it missed a bunch of env storage types, so add all currently supported types. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
2009-04-16at91: add support for the PM9263 board of Ronetix GmbHIlko Iliev
The PM9263 board is based on the AT91SAM9263-EK board. Here is the page on Ronetix website: http://www.ronetix.at/starter_kit_9263.html Signed-off-by: Ilko Iliev <iliev@ronetix.at> Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
2009-04-05One more fix for building env_embedded.oWolfgang Denk
In addition to the changes for CONFIG_ENV_IS_IN_FLASH as done in commit afcbce07, we also need to do the same for CONFIG_ENV_IS_IN_EEPROM and CONFIG_ENV_IS_IN_NVRAM. Signed-off-by: Wolfgang Denk <wd@denx.de>
2009-04-04Fix building of env_embedded.oWolfgang Denk
Since commit a706bfc7 common/env_embedded.o and tools/envcrc were only built when CONFIG_ENV_IS_EMBEDDED was set, but this breaks building for many boards. We always have to build these files when CONFIG_ENV_IS_IN_FLASH is set. Signed-off-by: Wolfgang Denk <wd@denx.de>
2009-04-04tools/Makefile: fix image.c dependancy locationJean-Christophe PLAGNIOL-VILLARD
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
2009-04-04Add support for building native win32 toolsPeter Tyser
Add support for compiling the host tools in the tools directory using the MinGW toolchain. This produces executables which can be used on standard Windows computers without requiring cygwin. One must specify the MinGW compiler and strip utilities as if they were the host toolchain in order to build win32 executables, eg: make HOSTCC=i586-mingw32msvc-gcc HOSTSTRIP=i586-mingw32msvc-strip tools Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
2009-04-04tools/Makefile: Simplify HOST_CFLAGS/HOST_LDFLAGS generationPeter Tyser
Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
2009-04-04tools/Makefile: Create generic build rulesPeter Tyser
Create a few generic build rules to replace the current method which has 1 build target for each file Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
2009-04-04tools/Makefile: Use auto-generated object file dependenciesPeter Tyser
Files in the SRCS variable have their dependencies automatically generated so remove duplicate explicit dependencies Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
2009-04-04tools/Makefile: Remove symlinks for remaining source filesPeter Tyser
Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
2009-04-04tools/Makefile: Dynamically generate libfdt object dependenciesPeter Tyser
Add the libfdt files to the SRCS variable so that they have their dependencies automatically generated Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
2009-04-04tools/Makefile: Remove symlinks for fdt targetsPeter Tyser
Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
2009-04-04tools/Makefile: Add libfdt/ to the include search pathPeter Tyser
This change makes the process of symlinking libfdt_internal.h unnecessary Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
2009-04-04tools: Remove unecessary symlinking of zlib.hPeter Tyser
crc32.c uses the zlib.h header in include/u-boot/zlib.h. The symlink was previously necessary to give U-Boot's version of zlib.h precedence over the host computer's version of zlib.h. Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
2009-04-04tools/Makefile: Add tools/ to the include search pathPeter Tyser
This change makes the process of symlinking mkimage.h and fdt_host.h unnecessary Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
2009-04-04tools/Makefile: Compile ncb when CONFIG_NETCONSOLEPeter Tyser
Also conditionally add ncb.o to OBJ_FILES list Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
2009-04-04tools/Makefile: Make gen_eth_addr dependent upon CONFIG_CMD_NETPeter Tyser
Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
2009-04-04tools/Makefile: Make envcrc dependent upon CONFIG_ENV_IS_EMBEDDEDPeter Tyser
Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
2009-04-04tools/Makefile: Make inca-swap-bytes dependent on CONFIG_INCA_IPPeter Tyser
Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
2009-04-04tools/Makefile: Make ubsha1 dependent upon CONFIG_SHA1_CHECK_UB_IMGPeter Tyser
Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
2009-04-04tools/Makefile: Make img2srec dependent upon CONFIG_CMD_LOADSPeter Tyser
Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
2009-04-04tools/Makefile: Build bmp_logo only when LCD or VIDEO logos are enabledPeter Tyser
Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
2009-04-04tools/Makefile: Split variable declarations into multiple linesPeter Tyser
Split variable declarations into multiple lines and use the standard VAR-y convention. Also move object and binary variable declarations to after config.mk has been included to allow for these lists to utilize the CONFIG_XXX variables. These changes lay the groundwork for conditional compilation of files in the tools directory. Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
2009-04-04tools/Makefile: Remove inappropriate double-tabsPeter Tyser
Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
2009-04-04tools/Makefile: Remove HOSTARCH HOSTOS definesPeter Tyser
The values of HOSTARCH and HOSTOS which are exported from the top-level Makefile should be used Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
2008-09-10rename environment.c in env_embedded.c to reflect is functionalityJean-Christophe PLAGNIOL-VILLARD
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
2008-08-18Add 'license' command to U-Boot command lineHarald Welte
The 'license' command includes the U-Boot license (GPLv2) into the actual bootloader binary. The license text can be shown interactively at the U-Boot commandline. For products where the commandline can actually be accessed by the end user, this helps to prevent inadvertent GPL violations, since the GPLv2 license text can no longer be 'forgotten' to be included into the product. The 'license' command can be enabled by CONFIG_CMD_LICENSE. Signed-off-by: Harald Welte <laforge@openmoko.org>
2008-05-24Merging Stelian Pop AT91 patchesJean-Christophe PLAGNIOL-VILLARD
Merge branch 'testing-V2' Conflicts: board/atmel/at91cap9adk/Makefile Fixing copyright board/atmel/at91sam9260ek/Makefile Fixing copyright board/atmel/at91sam9260ek/u-boot.lds Delete no more needed ld script Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
2008-05-21Big white-space cleanup.Wolfgang Denk
This commit gets rid of a huge amount of silly white-space issues. Especially, all sequences of SPACEs followed by TAB characters get removed (unless they appear in print statements). Also remove all embedded "vim:" and "vi:" statements which hide indentation problems. Signed-off-by: Wolfgang Denk <wd@denx.de>
2008-05-10Use custom logo for Atmel boardsStelian Pop
This patch adds a custom vendor logo for the Atmel AT91 boards. Signed-off-by: Stelian Pop <stelian@popies.net> Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
2008-04-24crc32: use uint32_t rather than unsigned longMike Frysinger
The envcrc.c does sizeof(unsigned long) when calculating the crc, but this is done with the build toolchain instead of the target tool chain, so if the build is a 64bit system but the target is 32bits, the size will obviously be wrong. This converts all unsigned long stuff related to crc32 to uint32_t types. Compile tested only: output of ./tools/envcrc when run on a 32bit build system matches that of a 64bit build system. Signed-off-by: Mike Frysinger <vapier@gentoo.org> Acked-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
2008-03-27Fix out of tree building issueAnatolij Gustschin
Currently U-Boot building in some external directory doesn't work. This patch tries to fix the problem. Signed-off-by: Anatolij Gustschin <agust@denx.de>
2008-03-14Add MD5 support to the new uImage formatBartlomiej Sieka
Signed-off-by: Bartlomiej Sieka <tur@semihalf.com>
2008-02-29[new uImage] Add libfdt support to mkimageBartlomiej Sieka
Signed-off-by: Bartlomiej Sieka <tur@semihalf.com>
2008-02-29[new uImage] Add sha1.o object to mkimage binary buildBartlomiej Sieka
Signed-off-by: Bartlomiej Sieka <tur@semihalf.com>
2008-02-07[new uImage] Define a API for image handling operationsMarian Balakowicz
- Add inline helper macros for basic header processing - Move common non inline code common/image.c - Replace direct header access with the API routines - Rename IH_CPU_* to IH_ARCH_* Signed-off-by: Marian Balakowicz <m8@semihalf.com>
2008-01-09Do not reference sha1.c when building mkimage.Mike Frysinger
remove sha1.o from mkimage linking since it isn't actually used. Signed-Off-By: Mike Frysinger <vapier@gentoo.org>
2008-01-09Fix build problems under Cygwinraptorbrino@aim.com
This patch allows u-boot to build without error in a cygwin environment. Cygwin does not define __u64 in it's include/asm/types.h file. The -idirafter flag in the u-boot build causes the inclusion of the cygwin types.h file as opposed to u-bot/include/asm/types.h file which does define __u64. Subsequently, sha1.c compile fails due to unknown symbol. Signed-off-by: Brian Miller <raptorbrino@netscape.net>
2007-07-09Merge with /home/hs/Atronic/u-bootWolfgang Denk
2007-06-22[PCS440EP] upgrade the PCS440EP board:Heiko Schocher
- Show on the Status LEDs, some States of the board. - Get the MAC addresses from the EEProm - use PREBOOT - use the CF on the board. - check the U-Boot image in the Flash with a SHA1 checksum. - use dynamic TLB entries generation for the SDRAM Signed-off-by: Heiko Schocher <hs@denx.de>
2007-05-15Fix compilation issues on MACOSXAubrey.Li
Singed-off-by: Marc Hoffman <Marc.Hoffman@analog.com> Signed-off-by: Aubrey Li <aubrey.adi@gmail.com>
2006-10-09Coding style cleanupWolfgang Denk