summaryrefslogtreecommitdiffstats
path: root/include
Commit message (Collapse)AuthorAgeFilesLines
...
| * | arm: at91: Add gardena-gateway-at91sam supportStefan Roese2019-04-091-0/+88
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The GARDENA smart Gateway boards are equipped with an Atmel / Microchip AT91SAM9G25 SoC and with 128 MiB of RAM and 256 MiB of NAND storage. This patch adds support for this board including SPL support. Therefore the AT91Boostrap is not needed on this platform any more. 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> Reviewed-by: Heiko Schocher <hs@denx.de>
| * | arm: at91: siemens: Add support to generate combined SPL+U-Boot imageStefan Roese2019-04-093-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds the necessary defines to the Siemens AT91SAM based boards (smartweb, corvus and taurus) to generate the combined binary image with SPL and main U-Boot image combined (u-boot-with-spl.bin). 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> Reviewed-by: Heiko Schocher <hs@denx.de> Tested on the taurus board: Tested-by: Heiko Schocher <hs@denx.de>
| * | watchdog: Handle SPL build with watchdog disabledStefan Roese2019-04-091-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds some checks, so that the watchdog can be enabled in main U-Boot proper but can be disabled in SPL. This will be used by some AT91SAM based boards, which might enable the watchdog in the main U-Boot proper and not in SPL. It will be enabled in SPL by default there, so no need to configure it there. This approach saves some space in SPL. 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> Reviewed-by: Heiko Schocher <hs@denx.de> Tested on the taurus board: Tested-by: Heiko Schocher <hs@denx.de>
| * | board: pm9g45: Migrate to CONFIG_DMIlko Iliev2019-04-091-82/+91
| |/ | | | | | | | | | | | | | | | | | | | | Migrate the following options to CONFIG_DM: CONFIG_DM_GPIO CONFIG_DM_MMC CONFIG_DM_ETH CONFIG_DM_SERIAL CONFIG_DM_USB Signed-off-by: Ilko Iliev <iliev@ronetix.at>
* | efi_loader: boottime: export efi_[un]load_image()AKASHI Takahiro2019-04-071-0/+9
| | | | | | | | | | | | | | | | Those two functions will be used later to re-implement do_bootefi_exec(). Signed-off-by: AKASHI Takahiro <takahiro.akashi@linaro.org> Reviewed-by: Heinrich Schuchardt <xypron.glpk@gmx.de> Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
* | efi_loader: boottime: add loaded image device path protocol to image handleAKASHI Takahiro2019-04-072-0/+5
| | | | | | | | | | | | | | | | | | To meet UEFI spec v2.7a section 9.2, we should add EFI_LOADED_IMAGE_DEVICE_PATH_PROTOCOL to image handle, instead of EFI_DEVICE_PATH_PROTOCOL. Signed-off-by: AKASHI Takahiro <takahiro.akashi@linaro.org> Reviewed-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
* | efi_loader: set image_base and image_size to correct valuesAKASHI Takahiro2019-04-071-4/+0
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, image's image_base points to an address where the image was temporarily uploaded for further loading. Since efi_loader relocates the image to final destination, image_base and image_size should reflect that. This bug was detected in UEFI SCT, "Loaded Image Protocol Test - test 2," which shows that 'Unload' function doesn't fit into a range suggested by image_base and image_size. TestCase/UEFI/EFI/Protocol/LoadedImage/BlackBoxTest/ LoadedImageBBTestMain.c:1002 Changes in this patch also includes: * reverts a patch, "efi_loader: save image relocation address and size" since newly added fields are no longer needed. * copy PE headers as well since those information will be needed for module loading, in particular, at gurb. (This bug was reported by Heinrich.) Reported-by: Heinrich Schuchardt <xypron.glpk@gmx.de> Signed-off-by: AKASHI Takahiro <takahiro.akashi@linaro.org> Rebase patch. Remove unused fields from struct efi_loaded_image_obj. Reviewed-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
* Merge tag 'u-boot-imx-20190405' of git://git.denx.de/u-boot-imxTom Rini2019-04-055-15/+0
|\ | | | | | | | | | | | | | | Fixes for 2019.04 - fix bashism for MX8 - fix ethernet for MX53 - fix docs for i.MX8
| * cosmetic: Remove not needed string from kp_imx53.h configLukasz Majewski2019-04-021-2/+0
| | | | | | | | Signed-off-by: Lukasz Majewski <lukma@denx.de>
| * cosmetic: config: Remove empty #ifdefsLukasz Majewski2019-04-024-13/+0
| | | | | | | | | | | | | | | | | | After running tools/moveconfig.py it turned out that for various boards there are an empty #ifdef statements. Remove them to clean u-boot source code. Signed-off-by: Lukasz Majewski <lukma@denx.de>
* | Merge branch 'master' of git://git.denx.de/u-boot-shTom Rini2019-04-011-1/+0
|\ \ | |/ |/| | | Minor fixes for the Alt board and PHY use on Gen2.
| * ARM: rmobile: rcar-gen2: Activate bootm_sizeMarek Vasut2019-03-301-1/+0
| | | | | | | | | | | | | | | | | | | | Commit d245059ff797 ("ARM: rmobile: rcar-gen3: Activate bootm_size") only fixed the superfluous CONFIG_SYS_BOOTMAPSZ for R-Car Gen3, even though it listed all affected boards. Apply the same fix to Gen2. Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com> Fixes: d245059ff797 ("ARM: rmobile: rcar-gen3: Activate bootm_size") Cc: Eugeniu Rosca <erosca@de.adit-jv.com>
* | ARM: imx6q_logic: Enable UUID supportAdam Ford2019-03-311-5/+5
| | | | | | | | | | | | | | | | With UUID support, the root can now point to UUID. This makes swiching between mmc 0 and mmc 1 easier by simplying changing mmcdev between 0 and 1. From there, the scripts handle the rest. Signed-off-by: Adam Ford <aford173@gmail.com>
* | Merge branch 'master' of git://git.denx.de/u-bootStefano Babic2019-03-31169-738/+56
|\| | | | | | | Signed-off-by: Stefano Babic <sbabic@denx.de>
| * Merge branch '2019-03-29-master-imports'Tom Rini2019-03-291-1/+1
| |\ | | | | | | | | | | | | | | | | | | | | | - Bugfixes: - mmc: correct the HS400 initialization process - configs: ti: Move FIT image load address to avoid overwrite - lib: time: update module enable MACRO - Add mbrugger as RPi board maintainer, correct agraf's email address.
| | * configs: ti: Move FIT image load address to avoid overwriteAndrew F. Davis2019-03-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The FIT image is loaded to 0x8700_0000 followed by extracting from that several large images also into the 0x8x00_0000 range. Large images can end up overwriting the FIT image as it is being extracted from. Move the FIT load address clear out to 0x9000_0000, this will require a board to have at least 256MB of DRAM, if less then more careful planning will be required for that platform. Signed-off-by: Andrew F. Davis <afd@ti.com>
| * | Merge tag 'efi-2019-04-rc5-2' of git://git.denx.de/u-boot-efiTom Rini2019-03-291-1/+7
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | Pull request for UEFI system for v2019.04-rc5-2 This patch series contains a bug fix for a double free in a UEFI unit test. The other patches are documentation only (except for the definition of two additional constants).
| | * efi_loader: TODO for the EFI file protocolHeinrich Schuchardt2019-03-271-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We currently only support EFI_FILE_PROTOCOL_REVISION while UEFI specs 2.4 - 2.7 prescribe EFI_FILE_PROTOCOL_REVISION2. Add a todo. Add missing constants for the EFI file protocol revision. Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
| * | ARC: AXS10x: drop NAND supportEugeniy Paltsev2019-03-281-6/+0
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | On AXS10x boards we have non-standard NAND controller which was never really used a lot as there're other much more convenient [as they are standard & removable] persistent media like SD-card and USB mass storage. Moreover after recent changes we face with some NAND controller runtime issues. So instead of keeping support of yet another non-standard peripheral we're dropping its support for good. Signed-off-by: Eugeniy Paltsev <Eugeniy.Paltsev@synopsys.com> Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
| * Convert CONFIG_ENV_SPI_* to KconfigPatrick Delaunay2019-03-2598-300/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This converts the following to Kconfig: CONFIG_ENV_SPI_BUS CONFIG_ENV_SPI_CS CONFIG_ENV_SPI_MAX_HZ CONFIG_ENV_SPI_MODE Most of time these value are not needed, CONFIG_SF_DEFAULT with same value is used, so I introduced CONFIG_USE_ENV_SPI_* to force the associated value for the environment. Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com>
| * Convert CONFIG_DEFAULT_SPI_* to KconfigPatrick Delaunay2019-03-255-19/+0
| | | | | | | | | | | | | | | | This converts the following to Kconfig: CONFIG_DEFAULT_SPI_BUS CONFIG_DEFAULT_SPI_MODE Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com>
| * Convert CONFIG_SF_DEFAULT_* to KconfigPatrick Delaunay2019-03-25126-390/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | This converts the following to Kconfig: CONFIG_SF_DEFAULT_BUS CONFIG_SF_DEFAULT_CS CONFIG_SF_DEFAULT_MODE CONFIG_SF_DEFAULT_SPEED I use moveconfig script and then manual check on generated u-boot.cfg to solve the remaining issue. Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com>
| * exynos: replace CONFIG_ENV_SPI_BASE by CONFIG_SYS_SPI_BASEPatrick Delaunay2019-03-251-1/+1
| | | | | | | | | | | | | | | | | | Replace CONFIG_ENV_SPI_BASE by the better CONFIG_SYS_SPI_BASE (it is not the location for environment but the location for U-Boot) and, as it is the only platform with use this define, remove it from whitelist. Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com>
| * controlcenterdc: move some configuration in defconfig filePatrick Delaunay2019-03-251-6/+0
| | | | | | | | | | | | | | | | | | | | Move some configurations in defconfig file - CONFIG_CMD_I2C - CONFIG_CMD_SPI This allow correct dependency handling in Kconfig. Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com>
| * bcm7445: move some configuration in defconfig filePatrick Delaunay2019-03-251-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | Move some configurations in defconfig file - CONFIG_DM_SPI (removed by syncing defconfigs ) - CONFIG_CMD_SF - CONFIG_CMD_SPI - CONFIG_CMD_SF_TEST This allow correct dependency handling in Kconfig. Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com>
| * fs: ext4: do not write on filesystem with metadata_csum featureSébastien Szymanski2019-03-221-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | U-Boot doesn't support metadata_csum feature. Writing to filesystem with metadata_csum feature makes the filesystem corrupted and unbootable by Linux: [ 2.527495] EXT4-fs (mmcblk0p2): ext4_check_descriptors: Checksum for group 0 failed (52188!=0) [ 2.537421] EXT4-fs (mmcblk0p2): ext4_check_descriptors: Checksum for group 1 failed (5262!=0) ... [ 2.653308] EXT4-fs (mmcblk0p2): ext4_check_descriptors: Checksum for group 14 failed (42611!=0) [ 2.662179] EXT4-fs (mmcblk0p2): ext4_check_descriptors: Checksum for group 15 failed (21527!=0) [ 2.687920] JBD2: journal checksum error [ 2.691982] EXT4-fs (mmcblk0p2): error loading journal [ 2.698292] VFS: Cannot open root device "mmcblk0p2" or unknown-block(179,2): error -74 Don't write to filesystem with meatadata_csum feature to not corrupt the filesystem. Signed-off-by: Sébastien Szymanski <sebastien.szymanski@armadeus.com>
| * pci: Add comment to mention difference in DEVFN usage in U-Boot vs LinuxStefan Roese2019-03-221-0/+11
| | | | | | | | | | | | | | | | | | | | This patch adds a comment to the header with the PCI_foo macros related to DEVFN to explain the difference in U-Boot vs Linux. Signed-off-by: Stefan Roese <sr@denx.de> Cc: Simon Glass <sjg@chromium.org> Cc: Bin Meng <bmeng.cn@gmail.com> Reviewed-by: Simon Glass <sjg@chromium.org>
| * cmd: set CONFIG_SYS_HELP_CMD_WIDTH = 10Heinrich Schuchardt2019-03-221-1/+1
| | | | | | | | | | | | | | | | | | CONFIG_SYS_HELP_CMD_WIDTH is used to format the output of help without any arguments. CONFIG_SYS_HELP_CMD_WIDTH = 8 is too narrow to fit all our commands. Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
| * Merge branch 'master' of git://git.denx.de/u-boot-socfpgaTom Rini2019-03-191-0/+2
| |\
| | * arm: socfpga: make SPL_TEXT_BASE overridableSimon Goldschmidt2019-03-161-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To boot from fpga on socfpga gen5, we need to set CONFIG_SPL_TEXT_BASE to 0xC0000000 (hps2fpgaslaves base address). Since converting CONFIG_SPL_TEXT_BASE to Kconfig hasn't been successful so far, let's make this value overridable in socfpga_common.h, so that we can have different board configs override this in socfpga_common.h. Signed-off-by: Simon Goldschmidt <simon.k.r.goldschmidt@gmail.com>
| * | Merge git://git.denx.de/u-boot-fsl-qoriqTom Rini2019-03-155-3/+7
| |\ \ | | |/ | |/| | | | - DPAA2 fixes and DDR errata workaround for LS1021A
| | * armv7: ls102xa: Add workaround for DDR erratum A-008850Alison Wang2019-03-152-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Barrier transactions from CCI400 need to be disabled till the DDR is configured, otherwise it may lead to system hang. The patch adds workaround to fix the erratum. Signed-off-by: Shengzhou Liu <Shengzhou.Liu@nxp.com> Signed-off-by: Alison Wang <alison.wang@nxp.com> Reviewed-by: Prabhakar Kushwaha <prabhakar.kushwaha@nxp.com>
| | * mc : Reduce MC memory size to 128MMeenakshi Aggarwal2019-03-153-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | ls2088, ls1088 : minimum MC Memory size is 128 MB lx2 : minimum MC memory size is 256 MB Signed-off-by: Meenakshi Aggarwal <meenakshi.aggarwal@nxp.com> Acked-by: Joe Hershberger <joe.hershberger@ni.com> Reviewed-by: Prabhakar Kushwaha <prabhakar.kushwaha@nxp.com>
| * | Merge branch 'master' of git://git.denx.de/u-boot-samsungTom Rini2019-03-145-11/+16
| |\ \ | | |/ | |/|
| | * espresso7420: remove duplicated configMinkyu Kang2019-03-111-2/+0
| | | | | | | | | | | | Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
| | * arm: exynos: Remove duplicated "boardname" env settingKrzysztof Kozlowski2019-03-112-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Various places in the code set "boardname" env property. It was used for booting from ITB images and choosing proper DTB file name. Instead of duplicating it, use existing U-Boot wide - "board_name". Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org> Reviewed-by: Lukasz Majewski <lukma@denx.de> Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
| | * configs: odroid_xu3: Unify indentationKrzysztof Kozlowski2019-03-111-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | File mixed space and tab indentation. Unify it. Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org> Reviewed-by: Lukasz Majewski <lukma@denx.de> Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
| | * configs: odroid_xu3: Use consistent syntax for #includeKrzysztof Kozlowski2019-03-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | When including other header from configs, use consistent <> syntax. Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org> Reviewed-by: Lukasz Majewski <lukma@denx.de> Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
| | * regulator: Add support for ramp delayKrzysztof Kozlowski2019-03-111-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changing voltage and enabling regulator might require delays so the regulator stabilizes at expected level. Add support for "regulator-ramp-delay" binding which can introduce required time to both enabling the regulator and to changing the voltage. Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org> Tested-by: Anand Moon <linux.amoon@gmail.com> Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
| | * arm: exynos: Detect revision later, when all resources are readyKrzysztof Kozlowski2019-03-111-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Detection of board revision is done early - before power setup. In case of Odroid XU3/XU4/HC1 family, the detection is done using ADC which is supplied by LDO4/VDD_ADC regulator. This regulator could be turned off (e.g. by kernel before reboot). If ADC is used early, the regulators are not yet available and the detection won't work. Split the revision detection out of set_board_type() into separate function called later - either when displaying board info (in late mode) or during misc_init_r. The idea is that set_board_type() will be called early so its method of detection are limited to flattened device tree (exynos5-dt-types.c for Exynos5) or GPIO (odroid.c for Exynos4412). The newly added set_board_revision() can be called only later, when resources like regulator are available. This is necessary to fix the detection of Odroid HC1 after reboot, if kernel turned off the LDO4 regulator. Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org> Reviewed-by: Lukasz Majewski <lukma@denx.de> Tested-by: Anand Moon <linux.amoon@gmail.com> Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
* | | board: tbs2910: Fix default environmentSoeren Moch2019-03-141-6/+6
|/ / | | | | | | | | | | | | Especially fix usb keyboard support. Other changes are only for beautification. Signed-off-by: Soeren Moch <smoch@web.de>
* | ARM: imx6_logic: Fix typo in FDT addressAdam Ford2019-03-131-4/+4
| | | | | | | | | | | | | | A few scripts reference 'fdt_addr' when they should reference 'fdt_addr_r' so this patch fixes those broken references. Signed-off-by: Adam Ford <aford173@gmail.com>
* | include: configs: imx6-engicam: Add recovery boot optionShyam Saini2019-03-131-0/+11
| | | | | | | | | | | | | | Combined with watchdog board reset mechanism, this can be used as recovery boot option after bootlimit exceeds the configured value. Signed-off-by: Shyam Saini <shyam.saini@amarulasolutions.com>
* | imx8mq_evk: Move CONFIG_ENV_IS_IN_MMC to KconfigFabio Estevam2019-03-131-1/+0
| | | | | | | | | | | | | | | | | | | | Currently the command "saveenv" is not available. The CONFIG_ENV_IS_IN_MMC symbol has been converted to Kconfig, so fix the problem by moving it to the defconfig. Signed-off-by: Fabio Estevam <festevam@gmail.com> Reviewed-by: Peng Fan <peng.fan@nxp.com>
* | pico-imx6ul: Convert to DM_PMICFabio Estevam2019-03-131-8/+0
| | | | | | | | | | | | | | | | | | | | | | Convert to use DM_PMIC for the PFUZE3000. Since this PMIC is under an I2C bus, conver to DM_I2C as well. Also, since I2C is not used in SPL, remove CONFIG_SPL_I2C_SUPPORT to avoid build warnings. Signed-off-by: Fabio Estevam <festevam@gmail.com> Acked-by: Otavio Salvador <otavio@ossystems.com.br>
* | Merge branch 'master' of git://git.denx.de/u-boot-socfpgaTom Rini2019-03-102-3/+8
|\ \ | | | | | | | | | - Arria10 DRAM fixes and Gen5 cache fixes
| * | ARM: socfpga: Fix Arria10 SPI and NAND U-Boot offsetMarek Vasut2019-03-091-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The SPL size on Gen5 is 4*64kiB, but on A10 it is 4*256kiB. Handle the difference. Signed-off-by: Marek Vasut <marex@denx.de> Cc: Chin Liang See <chin.liang.see@intel.com> Cc: Dinh Nguyen <dinguyen@kernel.org> Cc: Simon Goldschmidt <simon.k.r.goldschmidt@gmail.com> Cc: Tien Fong Chee <tien.fong.chee@intel.com>
| * | ARM: socfpga: Drop CONFIG_SYS_NAND_BAD_BLOCK_POSMarek Vasut2019-03-091-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is not used anywhere, so drop it. Signed-off-by: Marek Vasut <marex@denx.de> Cc: Chin Liang See <chin.liang.see@intel.com> Cc: Dinh Nguyen <dinguyen@kernel.org> Cc: Simon Goldschmidt <simon.k.r.goldschmidt@gmail.com> Cc: Tien Fong Chee <tien.fong.chee@intel.com>
| * | ARM: socfpga: Disable D cache in SPLMarek Vasut2019-03-091-2/+0
| |/ | | | | | | | | | | | | | | | | | | | | The bootrom seems to leave the D-cache in messed up state, make sure the SPL disables it so it can not interfere with operation. Signed-off-by: Marek Vasut <marex@denx.de> Cc: Chin Liang See <chin.liang.see@intel.com> Cc: Dinh Nguyen <dinguyen@kernel.org> Cc: Simon Goldschmidt <simon.k.r.goldschmidt@gmail.com> Cc: Tien Fong Chee <tien.fong.chee@intel.com>
* | ARM: rmobile: rcar-gen3: Activate bootm_sizeEugeniu Rosca2019-03-091-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | v2019.01 commit 07a8060a1277 ("ARM: rmobile: Convert to bootm_size") attempted converting to bootm_size of 256 MiB below targets: - include/configs/alt.h - include/configs/gose.h - include/configs/koelsch.h - include/configs/lager.h - include/configs/porter.h - include/configs/rcar-gen3-common.h - include/configs/silk.h - include/configs/stout.h The update didn't fully work on R-Car3 due to the CONFIG_SYS_BOOTMAPSZ=8MiB definition left by v2016.09 commit e525d34b476e ("ARM: rmobile: Add support salvator-x board"), which is explained in below README excerpt: ----8<---- CONFIG_SYS_BOOTMAPSZ: [..] If CONFIG_SYS_BOOTMAPSZ is undefined, then the value in "bootm_size" will be used instead. ----8<---- Allow the original commit to accomplish its purpose on R-Car3 targets by removing the CONFIG_SYS_BOOTMAPSZ definition. Fixes: 07a8060a1277 ("ARM: rmobile: Convert to bootm_size") Signed-off-by: Eugeniu Rosca <erosca@de.adit-jv.com>