summaryrefslogtreecommitdiff
path: root/Makefile
Commit message (Collapse)AuthorAgeFilesLines
* HSD #1508690657-2: tools: socfpgaimage: update padding flowLey Foon Tan2022-10-061-2/+8
| | | | | | | | | | | | | | | | | The existing socfpgaimage always pads the image to the maximum size of OCRAM size. This will break in the encryption flow where it expects the image to be un-padded. The encryption tool will do the encryption for the whole image and append the signature key at end of the image. The signature key will append to beyond the size of OCRAM if the image is padded with the maximum size before encryption. Move the padding step from socfpgaimage to Makefile and pads with objcopy command. socfpgaimage will pad the image with 16 bytes aligned (including CRC word), this is a requirement in encryption flow. Signed-off-by: Ley Foon Tan <ley.foon.tan@intel.com>
* Prepare v2022.10Tom Rini2022-10-031-1/+1
| | | | Signed-off-by: Tom Rini <trini@konsulko.com>
* Prepare v2022.10-rc5Tom Rini2022-09-191-1/+1
| | | | Signed-off-by: Tom Rini <trini@konsulko.com>
* Makefile: Unify condition for mpc85xx reset vectorPali Rohár2022-09-161-1/+1
| | | | | | | | | | Use 'CONFIG_MPC85XX_HAVE_RESET_VECTOR && CONFIG_OF_SEPARATE' pattern instead of 'CONFIG_MPC85XX_HAVE_RESET_VECTOR && !CONFIG_OF_EMBED' also in OBJCOPYFLAGS_u-boot-nodtb.bin as this pattern is used in rest of Makefile. Signed-off-by: Pali Rohár <pali@kernel.org> Reviewed-by: Simon Glass <sjg@chromium.org> Signed-off-by: Marek Behún <kabel@kernel.org>
* Makefile: Reduce usage of custom mpc85xx u-boot.bin targetPali Rohár2022-09-161-7/+4
| | | | | | | | | | | | | | | | Building of final u-boot.bin binary for mpc85xx via binman is needed only when inserting DTB binary in the middle of the u-boot ELF binary (before .bootpg and .resetvec ELF sections). These requirements are met when CONFIG_MPC85XX_HAVE_RESET_VECTOR is enabled (= generating .bootpg/.resetvec sections) and CONFIG_OF_SEPARATE is enabled (= inserting DTB binary). So in all other cases use standard build procedure instead of custom mpc85xx u-boot.bin Makefile target via binman. Signed-off-by: Pali Rohár <pali@kernel.org> Signed-off-by: Marek Behún <kabel@kernel.org>
* Makefile: Build final mpc85xx non-SPL image in standard file u-boot.binPali Rohár2022-09-161-14/+5
| | | | | | | | | | | | | | | | | | | | | Currently Makefile produces final mpc85xx image when SPL is not used in custom file u-boot-with-dtb.bin. It is quite confusing name as build process produce also intermediate file standard file u-boot-dtb.bin (which is just intermediate and not bootable). Other platforms use u-boot.bin (UBOOT_BIN) as standard name for final bootable raw image. So change Makefile rules and binman to produce final bootable file for mpc85xx also into file u-boot.bin. There is just need for mpc85xx to not define default rule for u-boot.bin then instruct binman (via DTS file) to store final image into u-boot.bin (instead of u-boot-with-dtb.bin) and finally rename target u-boot-with-dtb.bin to u-boot.bin. With this change are also removed custom Makefile hacks for mpc85xx that it produced non-standard output file. And also updated documentation. Signed-off-by: Pali Rohár <pali@kernel.org> Reviewed-by: Tom Rini <trini@konsulko.com> Signed-off-by: Marek Behún <kabel@kernel.org>
* Makefile: Fix dependency for u-boot-with-dtb.binPali Rohár2022-09-161-1/+1
| | | | | | | | | | | Makefile uses binman to produce u-boot-with-dtb.bin target. As its input it takes DTB file and u-boot binary without DTB, which is stored in file u-boot-nodtb.bin. So fix target dependency. Signed-off-by: Pali Rohár <pali@kernel.org> Reviewed-by: Tom Rini <trini@konsulko.com> Reviewed-by: Simon Glass <sjg@chromium.org> Signed-off-by: Marek Behún <kabel@kernel.org>
* Prepare v2022.10-rc4Tom Rini2022-09-051-1/+1
| | | | Signed-off-by: Tom Rini <trini@konsulko.com>
* rockchip: add u-boot-rockchip-spi.bin image for booting from SPI-NOR flashQuentin Schulz2022-09-041-1/+2
| | | | | | | | | | This new image is similar to u-boot-rockchip.bin except that it's destined to be flashed on SPI-NOR flashes. Cc: Quentin Schulz <foss+uboot@0leil.net> Signed-off-by: Quentin Schulz <quentin.schulz@theobroma-systems.com> Reviewed-by: Kever Yang <kever.yang@rock-chips.com> Reviewed-by: Simon Glass <sjg@chromium.org>
* rockchip: simplify binman image dependencies addition to INPUTSQuentin Schulz2022-09-041-7/+2
| | | | | | | | | | By factoring SPL check in the first condition, this makes the checks a bit less convoluted and more readable. Cc: Quentin Schulz <foss+uboot@0leil.net> Signed-off-by: Quentin Schulz <quentin.schulz@theobroma-systems.com> Reviewed-by: Kever Yang <kever.yang@rock-chips.com> Reviewed-by: Simon Glass <sjg@chromium.org>
* rockchip: generate u-boot-rockchip.bin with binman for ARM64 boardsQuentin Schulz2022-09-041-25/+1
| | | | | | | | | This allows to build u-boot-rockchip.bin binary with binman for Rockchip ARM64 boards instead of the legacy Makefile way. Cc: Quentin Schulz <foss+uboot@0leil.net> Signed-off-by: Quentin Schulz <quentin.schulz@theobroma-systems.com> Reviewed-by: Simon Glass <sjg@chromium.org>
* rockchip: generate idbloader.img content for u-boot-rockchip.bin with binman ↵Quentin Schulz2022-09-041-1/+1
| | | | | | | | | | | | | | for ARM idbloader.img content - currently created by way of Makefile - can be created by binman directly. So let's do that for Rockchip ARM platforms. Cc: Quentin Schulz <foss+uboot@0leil.net> Signed-off-by: Quentin Schulz <quentin.schulz@theobroma-systems.com> Reviewed-by: Simon Glass <sjg@chromium.org> Reviewed-by: Kever Yang <kever.yang@rock-chips.com>
* rockchip: remove binman temporary files when cleaningQuentin Schulz2022-09-041-1/+2
| | | | | | | | | | | | Binman mkimage entry generates temporary files so let's remove them when calling `make clean`. Fixes: 9b312e26fc77 ("rockchip: Enable building a SPI ROM image on jerry") Cc: Quentin Schulz <foss+uboot@0leil.net> Reported-by: Johan Jonker <jbx6244@gmail.com> Signed-off-by: Quentin Schulz <quentin.schulz@theobroma-systems.com> Reviewed-by: Simon Glass <sjg@chromium.org> Reviewed-by: Kever Yang <kever.yang@rock-chips.com>
* Prepare v2022.10-rc3Tom Rini2022-08-221-1/+1
| | | | Signed-off-by: Tom Rini <trini@konsulko.com>
* net: Make DM_ETH be selected by NETDEVICETom Rini2022-08-201-1/+0
| | | | | | | | | | | | | | | | The deadline for DM_ETH migration passed 2 years ago. Now that platforms which cannot be migrated have been either removed or had drivers disabled, and platforms that needed minor help to migrate have been forcefully migrated, we can complete the migration. This entails select'ing DM_ETH under NETDEVICES, and then removing now extraneous depends on lines. In a few places, we can now either remove options or just simplify later dependencies. Cc: Ramon Fried <rfried.dev@gmail.com> Cc: Simon Glass <sjg@chromium.org> Signed-off-by: Tom Rini <trini@konsulko.com> Acked-by: Ramon Fried <rfried.dev@gmail.com>
* Makefile: avoid false positive -Wmaybe-uninitializedHeinrich Schuchardt2022-08-101-1/+7
| | | | | | | | | | When compiling with -Og gcc reports false positive -Wmaybe-uninitialized as reported in https://gcc.gnu.org/bugzilla/show_bug.cgi?id=78394. Silence these warnings when building with CONFIG_CC_OPTIMIZE_FOR_DEBUG. Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com> Reviewed-by: Simon Glass <sjg@chromium.org>
* Prepare v2022.10-rc2Tom Rini2022-08-081-1/+1
| | | | Signed-off-by: Tom Rini <trini@konsulko.com>
* Prepare v2022.10-rc1Tom Rini2022-07-251-2/+2
| | | | Signed-off-by: Tom Rini <trini@konsulko.com>
* usb: add isp1760 family driverRui Miguel Silva2022-07-121-0/+1
| | | | | | | | | ISP1760/61/63 are a family of usb controllers, here the main goal is to support the ISP1763 hcd part found in the MPS3 FPGA board form Arm. This is based on the kernel driver and ported to u-boot. Signed-off-by: Rui Miguel Silva <rui.silva@linaro.org>
* Merge branch 'next'Tom Rini2022-07-111-5/+9
|\
| * Makefile: respect CONFIG_CC_OPTIMIZE_FOR_DEBUG for host toolsHeinrich Schuchardt2022-07-081-0/+6
| | | | | | | | | | | | | | If CONFIG_CC_OPTIMIZE_FOR_DEBUG=y, the host tools should be built with debug symbols and with reduced optimization. Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
| * env: Remove include/generated/env.* under "make clean"Tom Rini2022-06-281-1/+1
| | | | | | | | | | | | | | When running "make clean" we want to remove env.in and well as env.txt. Cc: Simon Glass <sjg@chromium.org> Signed-off-by: Tom Rini <trini@konsulko.com>
| * Merge tag 'xilinx-for-v2022.10' of ↵Tom Rini2022-06-271-4/+2
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://source.denx.de/u-boot/custodians/u-boot-microblaze into next Xilinx changes for v2022.10 cpu: - Add driver for microblaze cpu net: - Add support for DM_ETH_PHY to AXI emac and emaclite xilinx: - Switch platforms to DM_ETH_PHY - DT chagnes in ZynqMP and Zynq - Enable support for SquashFS zynqmp: - Add support for KR260 boards - Move BSS from address 0 - Move platform identification from board code to soc driver - Improve zynqmp_psu_init_minimize versal: - Enable loading app at EL1 serial: - Setup default address and clock rates for DEBUG uarts pinctrl: - Add support for tri state and output enable properties relocate-rela: - Clean relocate-rela implementation for ARM64 - Add support for Microblaze microblaze: - Add support for runtime relocation - Rework cache handling (wiring, Kconfig) based on cpuinfo - Remove interrupt support timer: - Extract axi timer driver from Microblaze to generic location
| | * tools: relocate-rela: Read rela start/end directly from ELFMichal Simek2022-06-241-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is no need to pass section information via parameters. Let's read text base and rela start/end directly from elf. It will help with reading other information from ELF for others architecture. Input to relocate-rela is u-boot binary and u-boot ELF. Signed-off-by: Michal Simek <michal.simek@amd.com> Link: https://lore.kernel.org/r/ab7ae14a6e058722e8c608089729e98edf20a08d.1655299267.git.michal.simek@amd.com
| | * Makefile: Fix description for relocate-rela parametersMichal Simek2022-06-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Numbers in comment are shifter which is visible from command which calls them. Also relocate-rela usage is describing them. "Usage: %s <bin file> <text base> <rela start> <rela end>" Signed-off-by: Michal Simek <michal.simek@amd.com> Link: https://lore.kernel.org/r/bb0287b9071eb33eea0cf914a7128c2603684377.1655299267.git.michal.simek@amd.com
* | | Prepare v2022.07Tom Rini2022-07-111-1/+1
| | | | | | | | | | | | Signed-off-by: Tom Rini <trini@konsulko.com>
* | | Prepare v2022.07-rc6Tom Rini2022-07-041-1/+1
|/ / | | | | | | Signed-off-by: Tom Rini <trini@konsulko.com>
* | Prepare v2022.07-rc5Tom Rini2022-06-201-1/+1
|/ | | | Signed-off-by: Tom Rini <trini@konsulko.com>
* Prepare v2022.07-rc4Tom Rini2022-06-061-1/+1
| | | | Signed-off-by: Tom Rini <trini@konsulko.com>
* Prepare v2022.07-rc3Tom Rini2022-05-231-1/+1
| | | | Signed-off-by: Tom Rini <trini@konsulko.com>
* powerpc: mpc85xx: Fix CONFIG_OF_EMBED support for NOR bootingPali Rohár2022-05-231-1/+1
| | | | | | | | | | | | | | | | mpc85xx NOR binary contains also reset vector and therefore option CONFIG_MPC85XX_HAVE_RESET_VECTOR must be defined. When build system uses binman, it takes care of constructing final image which consist of u-boot-without-reset-vector, DTB and reset-vector. CONFIG_OF_EMBED does not use binman, there is no external DTB and Makefile produce directly final u-boot.bin binary. So in this case mpc85xx reset vector must not be stripped from the final u-boot.bin binary. Fix it. Signed-off-by: Pali Rohár <pali@kernel.org>
* Makefile: update warning about CONFIG_OF_EMBEDRalph Siemsen2022-05-111-1/+1
| | | | | | | Update the diagnostic message with revised location of document, which changed in 3e9fddfc4f1 ("doc: Move devicetree control doc to rST") Signed-off-by: Ralph Siemsen <ralph.siemsen@linaro.org>
* Prepare v2022.07-rc2Tom Rini2022-05-091-1/+1
| | | | Signed-off-by: Tom Rini <trini@konsulko.com>
* Makefile: support CROSS_COMPILE=armv7a-*Heinrich Schuchardt2022-05-071-1/+1
| | | | | | Gentoo uses armv7a-hardfloat-linux-gnueabi- as cross compiler prefix. Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
* Makefile: Avoid non-portable GNU sed extensionMark Kettenis2022-05-071-1/+1
| | | | | | | | | | | Use [:space:] instead of \s and \S in regular expression that determines the sandbox target architecture. Fixes the build failure on OpenBSD introduced with commit 4e65ca00f3a3 ("efi_loader: bootmgr: add booting from removable media"). Fixes: f7691a6d736b ("sandbox: allow cross-compiling sandbox") Signed-off-by: Mark Kettenis <kettenis@openbsd.org> Reviewed-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
* Introduce Verifying Program Loader (VPL)Simon Glass2022-05-021-0/+14
| | | | | | | | Add support for VPL, a new phase of U-Boot. This runs after TPL. It is responsible for selecting which SPL binary to run, based on a verified-boot process. Signed-off-by: Simon Glass <sjg@chromium.org>
* Makefile: Tidy up the TPL build rulesSimon Glass2022-05-021-2/+5
| | | | | | These should follow the same pattern as SPL, for consistency. Fix them. Signed-off-by: Simon Glass <sjg@chromium.org>
* Makefile: Simplify devicetree rules for SPL/TPLSimon Glass2022-05-021-5/+2
| | | | | | | | The current logic checks several options to decide whether SPL/TPL need the U-Boot devicetree to be built. In fact we can check OF_CONTROL, which is enabled in all cases that matter. Signed-off-by: Simon Glass <sjg@chromium.org>
* test: Tidy up test building with SPLSimon Glass2022-05-021-1/+1
| | | | | | | We can in principle add tests to any SPL build, e.g. TPL or VPL. Update the build rules to handle this. Signed-off-by: Simon Glass <sjg@chromium.org>
* Prepare v2022.07-rc1Tom Rini2022-04-251-2/+2
| | | | Signed-off-by: Tom Rini <trini@konsulko.com>
* Makefile: Drop a stale comment about linkingSimon Glass2022-04-181-4/+0
| | | | | | The bug mentioned here is fixed, so drop the comment. Signed-off-by: Simon Glass <sjg@chromium.org>
* Makefile: Sort u-boot-initial-env outputChristoph Niedermaier2022-04-071-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will sort the default environment file generated by "make u-boot-initial-env", but won't sort the default environment in the compiled u-boot binary. The file u-boot-initial-env is considered to use for the userpace environment access tools [1] in case of that the environments is written the first time into its location. This is done on the one hand for a better overview and comparison of the generated environment file. On the other hand it is to synchronize the output with the script get_default_env.sh, which generated a sorted default environment file. The sorting preserves the order of equal variable names by sorting only the variable name, and disable the last-resort comparison. After sorting, unnoticed blank lines at the end move to the top. Avoid that by removing it before sorting. [1] https://github.com/sbabic/libubootenv Signed-off-by: Christoph Niedermaier <cniedermaier@dh-electronics.com> Reviewed-by: Stefano Babic <sbabic@denx.de> Tested-by: Stefano Babic <sbabic@denx.de> Cc: Stefano Babic <sbabic@denx.de> Cc: Simon Glass <sjg@chromium.org> Cc: Marek Behún <marek.behun@nic.cz> To: u-boot@lists.denx.de Reviewed-by: Simon Glass <sjg@chromium.org>
* Makefile: add endian link flag to u-boot-elf.oDu Huanpeng2022-04-061-0/+1
| | | | | | | | | | | | | | fix compile error when using a little-endian to build with configs: sfr_nb4-ser_ram_defconfig comtrend_wap5813n_ram_defconfig comtrend_ar5387un_ram_defconfig comtrend_ct5361_ram_defconfig comtrend_vr3032u_ram_defconfig comtrend_ar5315u_ram_defconfig huawei_hg556a_ram_defconfig netgear_dgnd3700v2_ram_defconfig Signed-off-by: Du Huanpeng <dhu@hodcarrier.org>
* Merge branch 'next'Tom Rini2022-04-041-3/+16
|\ | | | | | | Signed-off-by: Tom Rini <trini@konsulko.com>
| * Makefile: provide sah-key to binmanPhilippe Reynes2022-03-311-0/+1
| | | | | | | | | | | | | | | | | | Set the variable pre-load-key-path with the shell variable PRE_LOAD_KEY_PATH that contain the keys path (used for signature). This variable pre-load-key-path is provided to binman. Reviewed-by: Simon Glass <sjg@chromium.org> Signed-off-by: Philippe Reynes <philippe.reynes@softathome.com>
| * Merge tag 'v2022.04-rc5' into nextTom Rini2022-03-281-4/+5
| |\ | | | | | | | | | Prepare v2022.04-rc5
| * | Add option to use -OgSean Anderson2022-03-251-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds support for using -Og when building U-Boot. According to the gcc man page: > -Og should be the optimization level of choice for the standard > edit-compile-debug cycle, offering a reasonable level of optimization > while maintaining fast compilation and a good debugging experience. This optimization level is roughly -O1 minus a few additional optimizations. It provides a noticably better debugging experience, with many fewer variables <optimized out>. Signed-off-by: Sean Anderson <sean.anderson@seco.com> Reviewed-by: Simon Glass <sjg@chromium.org>
| * | Split CONFIG_CC_OPTIMIZE_FOR_SIZE into two configsSean Anderson2022-03-251-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | This adds a separate CONFIG_CC_OPTIMIZE_FOR_SPEED option in a choice, in preparation for adding another optimization option. Also convert SH's makefile to use this new option. Signed-off-by: Sean Anderson <sean.anderson@seco.com> Reviewed-by: Simon Glass <sjg@chromium.org>
| * | Merge tag 'v2022.04-rc4' into nextTom Rini2022-03-141-2/+2
| |\ \ | | | | | | | | | | | | Prepare v2022.04-rc4
| * | | Makefile: Add a way to check for pylint errorsSimon Glass2022-03-021-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | Add a new 'pylint_err' target which only reports errors, not warnings. Signed-off-by: Simon Glass <sjg@chromium.org>