summaryrefslogtreecommitdiff
path: root/Makefile
Commit message (Collapse)AuthorAgeFilesLines
* Revert "Makefile: Prioritize external dtb if defined"Tom Rini2019-05-191-1/+1
| | | | | | | | | This is causing unexpected size growth in the normal case and is likely to have been mis-applied by myself. This reverts commit 3eaf6dcd9362b56e3217559401287dd8fa35b5b2. Signed-off-by: Tom Rini <trini@konsulko.com>
* Makefile: Prioritize external dtb if definedMichal Simek2019-05-181-1/+1
| | | | | | | | | | | Prioritize external dtb if its passed via EXT_DTB than the dtb that was built in the tree. With this patch it appends the specified external dtb to the u-boot image. Signed-off-by: Michal Simek <michal.simek@xilinx.com> Signed-off-by: Siva Durga Prasad Paladugu <siva.durga.paladugu@xilinx.com> Reviewed-by: Simon Glass <sjg@chromium.org>
* Prepare v2019.07-rc2v2019.07-rc2Tom Rini2019-05-151-1/+1
| | | | Signed-off-by: Tom Rini <trini@konsulko.com>
* Set time and umask on fit-dtb.blob to ensure reproducibile builds.Vagrant Cascadian2019-05-091-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | Support for compressed fit-dtb.blob was added in: commit 95f4bbd581cf ("lib: fdt: Allow LZO and GZIP DT compression in U-Boot") When building compressed (lzop, gzip) fit-dtb.blob images, the compression tool may embed the time or umask in the image. Work around this by manually setting the time of the source file using SOURCE_DATE_EPOCH and a hard-coded 0600 umask. With gzip, this could be accomplished by using -n/--no-name, but lzop has no current workaround: https://bugs.debian.org/896520 This is essentially the same fix applied to multi-dtb fit SPL images in: commit 8664ab7debab ("Set time and umask on multi-dtb fit images to ensure reproducibile builds.") Signed-off-by: Vagrant Cascadian <vagrant@reproducible-builds.org>
* Remove fit-dtb.blob* in clean target.Vagrant Cascadian2019-05-091-1/+1
| | | | | | | | | | | Support for compressed fit-dtb.blob was added in: commit 95f4bbd581cf ("lib: fdt: Allow LZO and GZIP DT compression in U-Boot") Adjust Makefile to also clean compressed blobs. Signed-off-by: Vagrant Cascadian <vagrant@reproducible-builds.org>
* dm: MIGRATION: Add migration plan for WDT (DM watchdog support)Stefan Roese2019-05-091-0/+11
| | | | | | | | | | | | | As much of the watchdog system has been migrated to DM now, formalize a deadline for migration. Please note that the old CONFIG_HW_WATCHDOG macro should be removed completely at some point. Signed-off-by: Stefan Roese <sr@denx.de> Cc: Michal Simek <michal.simek@xilinx.com> Cc: Simon Glass <sjg@chromium.org> Cc: Tom Rini <trini@konsulko.com>
* x86: Allow 16-bit init to be in TPLSimon Glass2019-05-081-0/+1
| | | | | | | | At present we support having 16-bit init be in SPL or U-Boot proper, but not TPL. Add support for this so that TPL can boot. Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
* ddr: altera: Compile ALTERA SDRAM in SPL onlyLey Foon Tan2019-05-061-1/+1
| | | | | | | Compile ALTERA_SDRAM driver in SPL only. Rename ALTERA_SDRAM to SPL_ALTERA_SDRAM. Signed-off-by: Ley Foon Tan <ley.foon.tan@intel.com>
* Prepare v2019.07-rc1v2019.07-rc1Tom Rini2019-04-291-2/+2
| | | | Signed-off-by: Tom Rini <trini@konsulko.com>
* Add target to generate initial environmentStefano Babic2019-04-221-0/+7
| | | | | | | | | | | | | | | | | | The initial environment is linked to the u-boot binary. Modifying the environment from User Space with the env tools requires that the tools are always built together with the bootloader to be sure that they contain the initial environment in case no environment is stored into persistent storage or when a board boots with just the default environment. This makes difficult for distros to provide a general package to access the environment. A simpler way is if the tools are generic for all boards and a configuration file is given to provide the initial environment. The patch just generates the initial environment by extracting it from the compiled object. This file can then be used for tools in user space to initialize the environment. Signed-off-by: Stefano Babic <sbabic@denx.de>
* Makefile: Prioritize external dtb if definedMichal Simek2019-04-161-0/+5
| | | | | | | | | | | Prioritize external dtb if its passed via EXT_DTB than the dtb that was built in the tree. With this patch it appends the specified external dtb to the u-boot image. Signed-off-by: Michal Simek <michal.simek@xilinx.com> Signed-off-by: Siva Durga Prasad Paladugu <siva.durga.paladugu@xilinx.com> Reviewed-by: Simon Glass <sjg@chromium.org>
* Makefile: Correct logic for DM_SCSI + unconverted drivers checkStefan Roese2019-04-121-4/+15
| | | | | | | | | | | | | | | When checking for boards that are enabling a SATA driver that isn't converted to DM yet we need to be sure to not also trip over boards that do set CONFIG_AHCI & CONFIG_BLK by itself, as that is not a bug. This was detected when converting the Armada XP SATA driver sata_mv.c to DM with AHCI & BLK support. This warning is still printed without this patch applied here. Signed-off-by: Stefan Roese <sr@denx.de> Cc: Simon Glass <sjg@chromium.org> Cc: Tom Rini <trini@konsulko.com> Reviewed-by: Tom Rini <trini@konsulko.com>
* Merge branch 'master' of git://git.denx.de/u-boot-shTom Rini2019-04-111-1/+15
|\ | | | | | | - Various rmobile fixes
| * lib: fdt: Allow LZO and GZIP DT compression in U-BootMarek Vasut2019-04-091-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | Add required Kconfig symbols, Makefile bits and macro fixes in a few places to support LZO and DT compression in U-Boot. This can save a lot of space with multi-DTB fitImages. Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com> Cc: Nobuhiro Iwamatsu <iwamatsu@nigauri.org> Cc: Simon Glass <sjg@chromium.org> Cc: Tom Rini <trini@konsulko.com> Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
* | Makefile: Add Kconfig option CONFIG_SPL_IMAGE to select the SPL binaryStefan Roese2019-04-091-1/+3
|/ | | | | | | | | | | | | | | | | This patch adds the CONFIG_SPL_IMAGE option to select the SPL image that shall be used to generate the combined SPL + U-Boot image. The default value is the current value "spl/u-boot-spl.bin". This patch also sets CONFIG_SPL_IMAGE to "spl/boot.bin" for AT91 targets which use SPL NAND support (boot from NAND). For these build targets the combined image "u-boot-with-spl.bin" is now automatically generated and can be programmed into NAND as one single image (vs. SPL image and U-Boot as 2 separate images). Signed-off-by: Stefan Roese <sr@denx.de> Cc: Heiko Schocher <hs@denx.de> Cc: Andreas Bießmann <andreas@biessmann.org> Cc: Eugen Hristev <eugen.hristev@microchip.com>
* Prepare v2019.04v2019.04Tom Rini2019-04-081-1/+1
| | | | Signed-off-by: Tom Rini <trini@konsulko.com>
* fix compile error on macOS Mojave默默2019-04-031-0/+7
|
* Makefile: Do not pass -E to mkimage when SPL has full fitImage supportMarek Vasut2019-03-221-1/+7
| | | | | | | | | | When the SPL has full fitImage support, do not generate fitImage with external data. The full fitImage code assumes the entire fitImage is loaded in RAM, and the SPL uses fdt_totalsize() to determine the size of the whole fitImage, which can not work with external data. Signed-off-by: Marek Vasut <marex@denx.de> Cc: Tom Rini <trini@konsulko.com>
* Prepare v2019.04-rc4v2019.04-rc4Tom Rini2019-03-181-1/+1
| | | | Signed-off-by: Tom Rini <trini@konsulko.com>
* Prepare v2019.04-rc4v2019.04-rc3Tom Rini2019-03-041-1/+1
| | | | Signed-off-by: Tom Rini <trini@konsulko.com>
* Prepare v2019.04-rc2v2019.04-rc2Tom Rini2019-02-181-1/+1
| | | | Signed-off-by: Tom Rini <trini@konsulko.com>
* Prepare v2019.04-rc1v2019.04-rc1Tom Rini2019-02-071-2/+2
| | | | Signed-off-by: Tom Rini <trini@konsulko.com>
* Makefile: remove generated font filesHeinrich Schuchardt2019-01-301-1/+2
| | | | | | | | | If `make mrproper` does not delete the generated drivers/video/fonts/*.S files a following `make tests` fails. Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de> Reviewed-by: Anatolij Gustschin <agust@denx.de> Reviewed-by: Simon Glass <sjg@chromium.org>
* Merge tag 'u-boot-imx-20190129' of git://git.denx.de/u-boot-imxTom Rini2019-01-301-1/+1
|\ | | | | | | For 2019.04
| * imx: build flash.bin for i.MX8Peng Fan2019-01-281-1/+1
| | | | | | | | | | | | Build flash.bin for i.MX8 when SPL enabled. Signed-off-by: Peng Fan <peng.fan@nxp.com>
* | Makefile: have "make distclean" remove CHANGELOGRobert P. J. Day2019-01-261-1/+1
|/ | | | | | Ensure that "make distclean" deletes an existing CHANGELOG file. Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
* mkimage: fixup CONFIG_FIT_EXTERNAL_OFFSETPatrick Wildt2019-01-181-1/+1
| | | | | | | | The last parameter is expected to be the imagefile. Since -E is a flag having the output name before -p will make mkimage ignore the external offset option. Signed-off-by: Patrick Wildt <patrick@blueri.se>
* Makefile: run CONFIG_BOARD_SIZE_LIMIT against .imgSimon Goldschmidt2019-01-151-0/+1
| | | | | | | | | | | | With the current Makefile, CONFIG_BOARD_SIZE_LIMIT is used to check the U-Boot binary without devicetree only. This produces wrong results when OF_SEPARATE is used. To fix this, run the CONFIG_BOARD_SIZE_LIMIT check on all .img binaries as well. Signed-off-by: Simon Goldschmidt <simon.k.r.goldschmidt@gmail.com> Reviewed-by: Simon Glass <sjg@chromium.org>
* kbuild: fix parallel build race caused by u-boot.cfg regenerationMasahiro Yamada2019-01-151-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Multiple people have reported intermittent build failure in parallel building. Kever Yang reported this issue some time ago [1], but I could not get enough clue at that time. This time, Richard Purdie provided a full build log [2], which was very helpful for me to root-cause it. The cause of the problem is commit 0d982c585330 ("Makefile: add dependencies to regenerate u-boot.cfg when lost"). That commit added the 'cfg' as the prerequisite of the 'all' target, so the parallel build tries to run it simultaneously, then regenerates a symlink while building objects. When u-boot.cfg is accidentally lost, let's rebuild it before descending into any subdirectories. Also, what is annoying is u-boot.cfg is currently regenerated every time since it depends on FORCE. We can get rid of all the prerequisites of u-boot.cfg because u-boot.cfg is rebuilt anyway as the byproduct of auto.conf when a user updates the .config file. [1] https://lists.denx.de/pipermail/u-boot/2018-June/330341.html [2] https://autobuilder.yoctoproject.org/typhoon/#/builders/65/builds/160/steps/7/logs/step1b Fixes: 0d982c585330 ("Makefile: add dependencies to regenerate u-boot.cfg when lost") Reported-by: Kever Yang <kever.yang@rock-chips.com> Reported-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Reviewed-by: Simon Glass <sjg@chromium.org>
* Prepare v2019.01v2019.01Tom Rini2019-01-141-1/+1
| | | | Signed-off-by: Tom Rini <trini@konsulko.com>
* Merge branch 'master' of git://git.denx.de/u-boot-usbTom Rini2019-01-111-2/+2
|\
| * usb: Make compiling gadget support optionalJean-Jacques Hiblot2019-01-101-2/+2
| | | | | | | | | | | | | | There is no need to compile and include this code if it is not used. CONFIG_USB_GADGET can be used for the purpose. Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
* | Merge tag 'u-boot-imx-20190110' of git://git.denx.de/u-boot-imxTom Rini2019-01-101-0/+3
|\ \ | | | | | | | | | Fixes for 2019.01
| * | imx: Add Makefile dependency for mkimage_fit_atf.shChris Spencer2019-01-091-0/+3
| |/ | | | | | | | | | | | | | | | | | | The mkimage_fit_atf.sh SPL FIT generator script requires u-boot-nodtb.bin, but this was not enforced by the Makefile. This could cause the generator script to be executed before u-boot-nodtb.bin has been created. Signed-off-by: Chris Spencer <christopher.spencer@sea.co.uk> Cc: NXP i.MX U-Boot Team <uboot-imx@nxp.com>
* | dm: video: lcd: MIGRATION: Add migration plan for videoSimon Glass2019-01-091-0/+10
| | | | | | | | | | | | Add a migration plan for video which is an important subsystem in U-Boot. Signed-off-by: Simon Glass <sjg@chromium.org>
* | dm: pci: MIGRATION: Add migration plan for PCISimon Glass2019-01-091-0/+10
| | | | | | | | | | | | Add a migration plan for PCI which is an important subsystem in U-Boot. Signed-off-by: Simon Glass <sjg@chromium.org>
* | Makefile: Correct logic for DM_SCSI + unconverted drivers checkTom Rini2019-01-081-1/+3
|/ | | | | | | | | | When checking for boards that are enabling a SATA driver that isn't converted to DM yet we need to be sure to not also trip over boards that do set CONFIG_DM_SCSI by itself, as that is not a bug. Reported-by: Andy Shevchenko <andy.shevchenko@gmail.com> Fixes: ea9d7c17fc4c ("dm: MIGRATION: Add migration plan for CONFIG_SATA") Signed-off-by: Tom Rini <trini@konsulko.com>
* Prepare v2019.01-rc3v2019.01-rc3Tom Rini2019-01-071-1/+1
| | | | Signed-off-by: Tom Rini <trini@konsulko.com>
* Merge branch 'master' of git://git.denx.de/u-boot-spiTom Rini2019-01-021-0/+21
|\
| * dm: MIGRATION: Update migration plan for DM_SPI_FLASHJagan Teki2019-01-021-0/+10
| | | | | | | | | | | | | | Migration plan for DM_SPI_FLASH is v2019.07 since it depends on DM_SPI migration. Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
| * dm: MIGRATION: Update migration plan for SPIJagan Teki2019-01-021-0/+11
| | | | | | | | | | | | | | | | | | | | - v2019.04 for no dm conversion drivers - v2019.07 for partially converted drivers. Note: there were many updates on this deadline, so better not update this again. Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
* | Merge tag 'u-boot-imx-20190101' of git://www.denx.de/git/u-boot-imxTom Rini2019-01-011-1/+6
|\ \ | |/ |/| | | | | | | | | | | | | imx for 2019.01 - introduce support for i.MX8M - fix size limit for Vhybrid / pico boards - several board fixes - w1 driver for MX2x / MX5x
| * imx: imx8mq: build flash.binPeng Fan2019-01-011-0/+5
| | | | | | | | | | | | | | | | Build flash.bin for i.MX8MQ, it will include signed hdmi firmware, spl, ddr firmware, fit image(bl31.bin, u-boot-nodtb.bin, dtb). Burn it to 33KB offset of SD card. Signed-off-by: Peng Fan <peng.fan@nxp.com>
| * Introduce CONFIG_FIT_EXTERNAL_OFFSETPeng Fan2019-01-011-1/+1
| | | | | | | | | | | | | | Introduce CONFIG_FIT_EXTERNAL_OFFSET to give user a choice to choose where to put the external data. Signed-off-by: Peng Fan <peng.fan@nxp.com>
* | Prepare v2019.01-rc2v2019.01-rc2Tom Rini2018-12-171-1/+1
| | | | | | | | Signed-off-by: Tom Rini <trini@konsulko.com>
* | Makefile: output migration warnings to stderrChris Packham2018-12-171-29/+29
| | | | | | | | | | | | | | | | Output the device model migration warnings to stderr. This allows tools like buildman to pick them up rather than suppressing them along with the normal build output on stdout. Signed-off-by: Chris Packham <judge.packham@gmail.com>
* | test: Only descend into test/ when CONFIG_UNIT_TEST is enabledTom Rini2018-12-151-2/+1
|/ | | | | | | | | The contents of the test subdirectories only make sense when we have CONFIG_UNIT_TEST set. We will otherwise attempt to build code on for example sandbox that needs CONFIG_UNIT_TEST otherwise and rather than complicate the Makefiles simply leave them out when we can. Signed-off-by: Tom Rini <trini@konsulko.com>
* spl: fix build failure with !CONFIG_SPL_PCI_SUPPORTSekhar Nori2018-12-121-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Building U-Boot with CONFIG_PCI and CONFIG_DM_PCI enabled, but CONFIG_SPL_PCI_SUPPORT disabled, results in following linker error: lib/built-in.o: In function `fdtdec_get_pci_bar32': lib/fdtdec.c:305: undefined reference to `dm_pci_read_bar32' fdtdec.c:305:(.text.fdtdec_get_pci_bar32+0x24): relocation truncated to fit: R_AARCH64_CALL26 against undefined symbol `dm_pci_read_bar32' This is because reference to dm_pci_read_bar32() remains in lib/fdtdec.c while SPL build does not descend into drivers/pci directory in drivers/Makefile if CONFIG_SPL_PCI_SUPPORT is not enabled. Fix this by applying appropriate #define guards in lib/fdtdec.c. It looks like ns16550.c has the same problem, so fixed that too. To simplify this, CONFIG_SPL_PCI_SUPPORT is renamed to CONFIG_SPL_PCI (enables use of CONFIG_IS_ENABLED() macro). Suggested-by: Vignesh R <vigneshr@ti.com> Signed-off-by: Sekhar Nori <nsekhar@ti.com> Reviewed-by: Lokesh Vutla <lokeshvutla@ti.com> Reviewed-by: Tom Rini <trini@konsulko.com>
* fdt: Add warning about CONFIG_OF_EMBEDSimon Glass2018-12-121-0/+8
| | | | | | | | | | | This option has crept into use with some boards. Add a warning to try to prevent this. As an example: https://lists.denx.de/pipermail/u-boot/2017-September/304966.html Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Tom Rini <trini@konsulko.com>
* Prepare v2019.01-rc1v2019.01-rc1Tom Rini2018-12-031-3/+3
| | | | Signed-off-by: Tom Rini <trini@konsulko.com>
View Lorry Controller Status