summaryrefslogtreecommitdiffstats
path: root/Makefile
Commit message (Collapse)AuthorAgeFilesLines
* Prepare v2019.10-rc1Tom Rini2019-07-291-2/+2
| | | | Signed-off-by: Tom Rini <trini@konsulko.com>
* Merge tag 'dm-pull-29jul19' of ↵Tom Rini2019-07-291-2/+3
|\ | | | | | | | | | | https://gitlab.denx.de/u-boot/custodians/u-boot-dm binman support for replacing files
| * Makefile: fix implementation of BINMAN_DEBUGStephen Warren2019-07-291-2/+3
| | | | | | | | | | | | | | | | | | binman only accepts the -D argument early on the command-line, yet the Makefile currently passes it near the end. This causes the build to fail if this feature is used. Re-order the command-line to fix this. Signed-off-by: Stephen Warren <swarren@nvidia.com> Reviewed-by: Simon Glass <sjg@chromium.org>
* | i2c: remove i2c driver-model compatibility layerBartosz Golaszewski2019-07-291-7/+0
| | | | | | | | | | | | | | | | There are no more users of the compatibility layer for i2c. Remove the driver and all references to it. Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com> Acked-by: Heiko Schocher <hs@denx.de>
* | sandbox: remove CONFIG_DM_I2C_COMPAT from defconfigsBartosz Golaszewski2019-07-291-1/+1
|/ | | | | | | | There are no more "real" users of CONFIG_DM_I2C_COMPAT and we'll soon remove it altogether. Stop building it in sandbox mode. Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com> Acked-by: Heiko Schocher <hs@denx.de>
* binman: Convert to use ArgumentParserSimon Glass2019-07-241-2/+2
| | | | | | | | This class is the new way to handle arguments in Python. Convert binman over to use it. At the same time, introduce commands so that we can separate out the different parts of binman functionality. Signed-off-by: Simon Glass <sjg@chromium.org>
* arm64: add an option to switch visibility of CONFIG_SYS_INIT_SP_BSS_OFFSETMasahiro Yamada2019-07-101-2/+2
| | | | | | | | | | | | | | | | | | | | | | By default, CONFIG_SYS_INIT_SP_BSS_OFFSET was made invisible by not giving a prompt to it. The only way to define it is to hard-code an extra entry in SoC/board Kconfig, like arch/arm/mach-tegra/tegra{186,210}/Kconfig. Add a prompt to it in order to allow defconfig files to specify the value of CONFIG_SYS_INIT_SP_BSS_OFFSET. With this, CONFIG_SYS_INIT_SP_BSS_OFFSET would become always visible. So, we need a new bool option to turn it off by default. I move the 'default 524288' to the common place. This value is not too big, but is big enough to avoid the overwrap of DT in most platforms. If 512KB is not a suitable choice for your platform, you can change it from your defconfig or menuconfig etc. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Acked-by: Stephen Warren <swarren@nvidia.com>
* Prepare v2019.07Tom Rini2019-07-081-1/+1
| | | | Signed-off-by: Tom Rini <trini@konsulko.com>
* rockchip: rk3399: Get bl31.elf via BL31Jagan Teki2019-06-261-1/+1
| | | | | | | | | | | | | | | | | | | | Right now rockchip platform need to copy bl31.elf into u-boot source directory to make use of building u-boot.itb. So, add environment variable BL31 like Allwinner SoC so-that the bl31.elf would available via BL31. If the builds are not exporting BL31 env, the make_fit_atf.py explicitly create dummy bl31.elf in u-boot root directory to satisfy travis builds and it will show the warning on console as WARNING: BL31 file bl31.elf NOT found, resulting binary is non-functional WARNING: Please read Building section in doc/README.rockchip Note, that the dummy bl31 files were created during not exporting BL31 case would be removed via clean target in Makefile. Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
* Makefile: clean bl31_*.binJagan Teki2019-06-261-1/+1
| | | | | | | | | | | | Rockchip platform has its python script that would generate various bl31_*bin for creating u-boot.itb file by taking bl31.elf as input. These bl31_*.bin files are generated in u-boot root directory and have no rule to clean it up. so add support for it by adding in command entry of clean target in Makefile. Signed-off-by: Jagan Teki <jagan@amarulasolutions.com> Reviewed-by: Kever Yang <kever.yang@rock-chips.com>
* Makefile: clean image.mapJagan Teki2019-06-261-1/+2
| | | | | | | | | | | binman tools for creating single image build will create image.map at the end, which has information about binman image node details. current u-boot, is unable to clean this image.map so add a command entry in clean target in Makefile. Signed-off-by: Jagan Teki <jagan@amarulasolutions.com> Reviewed-by: Kever Yang <kever.yang@rock-chips.com>
* doc: Remove duplicated documentation directoryBreno Matheus Lima2019-06-201-3/+3
| | | | | | | | | | | | | | | | Commit ad7061ed742e ("doc: Move device tree bindings documentation to doc/device-tree-bindings") moved all device tree binding documentation to doc/device-tree-bindings directory. The current U-Boot project still have two documentation directories: - doc/ - Documentation/ Move all documentation and sphinx files to doc directory so all content can be in a common place. Signed-off-by: Breno Lima <breno.lima@nxp.com>
* Merge branch 'master' of git://git.denx.de/u-boot-spiTom Rini2019-06-171-11/+8
|\ | | | | | | | | | | - Drop zipitz2 board (Tom) - Add DEPRECATED option (Tom) - Mark legacy or non-dm drivers as DEPRECATED (Jagan)
| * Makefile: Trigger a warning for legcay spi driversJagan Teki2019-06-131-11/+5
| | | | | | | | | | | | | | | | | | | | | | We have a warning text for non dm converted spi drivers, but the plan is to mark all these respective drivers with CONFIG_DEPRECATED. So, trigger a warning saying that these driver configurations and associated code will remove in v2019.07 (earlier plan is to remove it from v2019.04) Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
| * Makefile: Trigger a Warning if DEPRECATED is definedJagan Teki2019-06-131-0/+3
| | | | | | | | | | | | | | | | | | | | If configured target has deprecated configs enabled, trigger a warning about this. Cc: Heinrich Schuchardt <xypron.glpk@gmx.de> Signed-off-by: Jagan Teki <jagan@amarulasolutions.com> [trini: Change from BROKEN to DEPRECATED] Signed-off-by: Tom Rini <trini@konsulko.com>
* | Merge tag 'u-boot-imx-20190612' of git://git.denx.de/u-boot-imxTom Rini2019-06-111-0/+4
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | u-boot-imx-20190612 -------------------- - Board fixes: - imx6logic - wandboard - mx6sabre boots again - imx8qm_mek - pico-* boards - Toradex apalis / colibri - engicam imx6 (environment) - KP MX53 - opos6ul - Switch to DM: - vining2000 - dh MX6 - Toradex colibri i.MX7 - Novena - Security : fix CSF size for HAB - Other: - imx: fix building for i.mx8 without spl - pcie and switch to DM mx6sabreauto: Enable SPL SDP support
| * arm, imx, Makefile: fix u-boot-dtb.imx build in CONFIG_MULTI_DTB_FIT caseHeiko Schocher2019-06-111-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | in case CONFIG_MULTI_DTB_FIT is set and u-boot-dtb.imx image is build, currently u-boot-dtb.bin is used for generating the u-boot-dtb.imx binary, which is wrong, as it contains only a dtb blob not the fit.blob Use instead the u-boot-fit-dtb.bin for generating u-boot-dtb.imx which contains the fit.blob. Signed-off-by: Heiko Schocher <hs@denx.de>
* | Prepare v2019.07-rc4Tom Rini2019-06-101-1/+1
|/ | | | Signed-off-by: Tom Rini <trini@konsulko.com>
* spl: add overall SPL size checkSimon Goldschmidt2019-06-071-1/+2
| | | | | | | | | | | | | This adds a size check for SPL that can dynamically check generated SPL binaries (including devicetree) for a size limit that ensures this image plus global data, heap and stack fit in initial SRAM. Since some of these sizes are not available to make, a new host tool 'spl_size_limit' is added that dumps the resulting maximum size for an SPL binary to stdout. This tool is used in toplevel Makefile to implement the size check on SPL binaries. Signed-off-by: Simon Goldschmidt <simon.k.r.goldschmidt@gmail.com>
* configs: define CONFIG_SPL_SIZE_LIMITHeinrich Schuchardt2019-06-071-0/+8
| | | | | | | | | | | | | | | | | | A new configuration variable CONFIG_SPL_SIZE_LIMIT is introduced to define the board specific maximum size for the SPL file. Use Makefile function size_check() to implement the test. Depending on the size of CONFIG_SPL_SIZE_LIMIT an error like the following is thrown: spl/u-boot-spl.bin exceeds file size limit: limit: 30720 bytes actual: 33426 bytes excess: 2706 bytes make: *** [Makefile:1663: spl/u-boot-spl.bin] Error 1 Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
* imx: move BOARD_SIZE_CHECK to main MakefileHeinrich Schuchardt2019-06-071-0/+1
| | | | | | | | | | | | | | | | | | | We currently have duplicate definitions for BOARD_SIZE_CHECK in Makefile and arch/arm/mach-imx/Makefile. Move the board size check from arch/arm/mach-imx/Makefile to Makefile. Depending on the value of CONFIG_BOARD_SIZE_LIMIT an error like an error like the following is thrown: u-boot-dtb.imx exceeds file size limit: limit: 503696 bytes actual: 509720 bytes excess: 6024 bytes make: *** [Makefile:1051: u-boot-dtb.imx] Error 1 Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de> Reviewed-by: Fabio Estevam <festevam@gmail.com>
* Makefile: reusable function for BOARD_SIZE_CHECKHeinrich Schuchardt2019-06-071-10/+14
| | | | | | | | | | | | | | | | Carve out function size_check from macro BOARD_SIZE_CHECK. This will allow us to reuse the function for other file size checks. Depending on the value of CONFIG_BOARD_SIZE_LIMIT an error like the following is thrown: u-boot-dtb.img exceeds file size limit: limit: 409516 bytes actual: 444346 bytes excess: 34830 bytes make: *** [Makefile:1212: u-boot-dtb.img] Error 1 Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
* Prepare v2019.07-rc3Tom Rini2019-05-271-1/+1
| | | | Signed-off-by: Tom Rini <trini@konsulko.com>
* ARM: rmobile: Add recovery SPL for R-Car Gen3Marek Vasut2019-05-211-0/+3
| | | | | | | | | | | | | | | | | | | | | Build an SPL which can be started via SCIF download mode on R-Car Gen3 and allows loading and executing U-Boot uImage with the next stage code. This is also useful for starting e.g. ATF BL2, which inits the hardware and returns to the U-Boot SPL, which can then load e.g. U-Boot proper. The H3, M3-W, M3-N SoCs have plenty of SRAM for storing the U-Boot SPL while the payload, e.g. ATF BL2, executes, so there is no problem here. However, E3 and D3 have much less SRAM, hence the loader uses a trick where it copies itself beyond the area used by BL2 and executes from there. That area is 32kiB large and not enough to hold U-Boot SPL, BSS, stack and malloc area, so the later two are placed at +0x4000 offset from start of SRAM, another area not used by ATF BL2. To make things even more complicated, the SCIF loader cannot load to the upper 32kiB of the SRAM directly, hence the copying approach. Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com> Cc: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
* 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-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-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.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-rc4Tom Rini2019-03-181-1/+1
| | | | Signed-off-by: Tom Rini <trini@konsulko.com>
* Prepare v2019.04-rc4Tom Rini2019-03-041-1/+1
| | | | Signed-off-by: Tom Rini <trini@konsulko.com>
* Prepare v2019.04-rc2Tom Rini2019-02-181-1/+1
| | | | Signed-off-by: Tom Rini <trini@konsulko.com>
* Prepare v2019.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>