summaryrefslogtreecommitdiffstats
path: root/include/configs/rcar-gen3-common.h
Commit message (Collapse)AuthorAgeFilesLines
* env: Finish migration of common ENV optionsTom Rini2019-11-201-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | - In ARMv8 NXP Layerscape platforms we also need to make use of CONFIG_SYS_RELOC_GD_ENV_ADDR now, do so. - On ENV_IS_IN_REMOTE, CONFIG_ENV_OFFSET is never used, drop the define to 0. - Add Kconfig entry for ENV_ADDR. - Make ENV_ADDR / ENV_OFFSET depend on the env locations that use it. - Add ENV_xxx_REDUND options that depend on their primary option and SYS_REDUNDAND_ENVIRONMENT - On a number of PowerPC platforms, use SPL_ENV_ADDR not CONFIG_ENV_ADDR for the pre-main-U-Boot environment location. - On ENV_IS_IN_SPI_FLASH, check not for CONFIG_ENV_ADDR being set but rather it being non-zero, as it will now be zero by default. - Rework the env_offset absolute in env/embedded.o to not use CONFIG_ENV_OFFSET as it was the only use of ENV_OFFSET within ENV_IS_IN_FLASH. - Migrate all platforms. Cc: Wolfgang Denk <wd@denx.de> Cc: Joe Hershberger <joe.hershberger@ni.com> Cc: Patrick Delaunay <patrick.delaunay@st.com> Cc: uboot-stm32@st-md-mailman.stormreply.com Signed-off-by: Tom Rini <trini@konsulko.com> Acked-by: Joe Hershberger <joe.hershberger@ni.com> Reviewed-by: Simon Goldschmidt <simon.k.r.goldschmidt@gmail.com>
* env: Remove useless CONFIG_ENV_SIZE_REDUND and fix ENV_IS_REDUND checkTom Rini2019-11-201-1/+0
| | | | | | | | | | | | | | | We have CONFIG_ENV_SIZE_IS_REDUND but don't really use it. We have one board where we can simply multiple CONFIG_ENV_SIZE by two for the same result. The other place where we could but were not previously using this is for where env_internal.h checks for if we should set ENV_IS_EMBEDDED. This seems like the most likely use, historically, of the variable, but it was not used. Add logic to check for this now. Cc: Wolfgang Denk <wd@denx.de> Cc: Joe Hershberger <joe.hershberger@ni.com> Signed-off-by: Tom Rini <trini@konsulko.com> Reviewed-by: Simon Glass <sjg@chromium.org> Acked-by: Joe Hershberger <joe.hershberger@ni.com>
* Convert CONFIG_ARCH_CPU_INIT to KconfigAdam Ford2019-08-251-2/+0
| | | | | | | | | This converts the following to Kconfig: CONFIG_ARCH_CPU_INIT Signed-off-by: Adam Ford <aford173@gmail.com> Acked-by: Chris Packham <chris.packham@alliedtelesis.co.nz> Tested-by: Felix Brack <fb@ltec.ch>
* Convert CONFIG_SHOW_BOOT_PROGRESS to KconfigSimon Glass2019-08-021-2/+0
| | | | | | | This converts the following to Kconfig: CONFIG_SHOW_BOOT_PROGRESS Signed-off-by: Simon Glass <sjg@chromium.org>
* ARM: rmobile: Add recovery SPL for R-Car Gen3Marek Vasut2019-05-211-0/+19
| | | | | | | | | | | | | | | | | | | | | 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>
* 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>
* Kconfig: Migrate CONFIG_BUILD_TARGETJagan Teki2019-02-021-1/+0
| | | | | | Migrate CONFIG_BUILD_TARGET into Kconfig. Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
* ARM: rmobile: Convert to bootm_sizeMarek Vasut2018-12-041-2/+1
| | | | | | | | | | | | | | | | | | | | | | | Convert all Renesas R-Car boards to bootm_size of 256 MiB and drop both fdt_high and initrd_high. This change implies that the FDT and initrd will always be copied into the first 256 MiB of RAM instead of being used in place, which can cause various kinds of inobvious problems. The simpler problems include FDT or initrd being overwritten or being used from unaligned addresses, especially on ARM64. The overhead of copying the FDT to aligned location is negligible and these problems go away, so the benefit is significant. Regarding alignment problems with fitImage. The alignment of DT properties is always 32 bits, which implies that the alignment of the "data" property in fitImage is also 32 bits. The /incbin/ syntax plays no role here. The kernel expects all elements, including DT and initrd, to be aligned to 64 bits on ARM64, thus using them in place may not be possible. Using the bootm_size assures correct alignment, again with negligible overhead. Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com> Cc: Nobuhiro Iwamatsu <iwamatsu@nigauri.org> Cc: Tom Rini <trini@konsulko.com>
* configs: Migrate CONFIG_NR_DRAM_BANKSTom Rini2018-08-161-1/+0
| | | | | | | | | | | We have the following cases: - CONFIG_NR_DRAM_BANKS was defined, migrate normally - CONFIG_NR_DRAM_BANKS_MAX was defined and then used for CONFIG_NR_DRAM_BANKS after a check, just migrate it over now. - CONFIG_NR_DRAM_BANKS was very oddly defined on p2771-0000-* (to 1024 + 2), set this to 8. Signed-off-by: Tom Rini <trini@konsulko.com>
* ARM: rmobile: Point load address to more sane area on Gen3Marek Vasut2018-06-141-1/+2
| | | | | | | | | | | | Point the $loadaddr variable and default load address to a more sane area, 384 MiB from the start of RAM. This is to avoid all the reserved memory at the beginning of RAM. The old behavior could still be easily retained by "setenv loadaddr 0x48080000" . The new setup allows us to use for example modern fitImage with kernel_noload, so use this as a new preferred default. Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com> Cc: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
* SPDX: Convert all of our single license tags to Linux Kernel styleTom Rini2018-05-071-2/+1
| | | | | | | | | | | | | | | | | | | | When U-Boot started using SPDX tags we were among the early adopters and there weren't a lot of other examples to borrow from. So we picked the area of the file that usually had a full license text and replaced it with an appropriate SPDX-License-Identifier: entry. Since then, the Linux Kernel has adopted SPDX tags and they place it as the very first line in a file (except where shebangs are used, then it's second line) and with slightly different comment styles than us. In part due to community overlap, in part due to better tag visibility and in part for other minor reasons, switch over to that style. This commit changes all instances where we have a single declared license in the tag as both the before and after are identical in tag contents. There's also a few places where I found we did not have a tag and have introduced one. Signed-off-by: Tom Rini <trini@konsulko.com>
* ARM: rmobile: Set maximum kernel size to 64 MiB on Gen3Marek Vasut2018-04-111-0/+1
| | | | | | | | | The Gen3 kernel images are often above 8 MiB, increase the maximum kernel size to 64 MiB to future-proof it, just like many other ARM64 boards do. Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com> Cc: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
* ARM: rmobile: Build u-boot-elf.srec on Gen3Masaru Nagai2018-02-271-0/+1
| | | | | | | | The u-boot-elf.srec is needed for the minimon update on Gen3 SoCs, conveniently generate this file. Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com> Cc: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
* Convert CONFIG_BOOTP_BOOTPATH et al to KconfigAdam Ford2018-02-231-4/+0
| | | | | | | | | | | | | | | | | | | This converts the following to Kconfig: CONFIG_BOOTP_BOOTPATH CONFIG_BOOTP_DNS CONFIG_BOOTP_GATEWAY CONFIG_BOOTP_HOSTNAME CONFIG_BOOTP_PXE CONFIG_BOOTP_SUBNETMASK CONFIG_CMDLINE_EDITING CONFIG_AUTO_COMPLETE CONFIG_SYS_LONGHELP CONFIG_SUPPORT_RAW_INITRD CONFIG_ENV_VARS_UBOOT_CONFIG Signed-off-by: Adam Ford <aford173@gmail.com> [trini: Re-run the migration] Signed-off-by: Tom Rini <trini@konsulko.com>
* ARM: rmobile: Enable autocompletion on Gen3Marek Vasut2018-02-161-0/+1
| | | | | | | This makes the shell so much more pleasant to use, so enable it. Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com> Cc: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
* configs: Migrate CONFIG_SYS_TEXT_BASETom Rini2018-02-111-5/+0
| | | | | | | | | | | On the NIOS2 and Xtensa architectures, we do not have CONFIG_SYS_TEXT_BASE set. This is a strict migration of the current values into the defconfig and removing them from the headers. I did not attempt to add more default values in and for now will leave that to maintainers. Signed-off-by: Tom Rini <trini@konsulko.com>
* fs: fat: Drop CONFIG_SUPPORT_VFATTuomas Tynkkynen2018-01-221-3/+0
| | | | | | | | fat.h unconditionally defines CONFIG_SUPPORT_VFAT (and has done since 2003), so as a result VFAT support is always enabled regardless of whether a board config defines it or not. Drop this unnecessary option. Signed-off-by: Tuomas Tynkkynen <tuomas@tuxera.com>
* fs: Migrate ext4 to KconfigTuomas Tynkkynen2018-01-221-2/+0
| | | | | | | | | | | Migrate the following symbols to Kconfig: CONFIG_FS_EXT4 CONFIG_EXT4_WRITE The definitions in config_fallbacks.h can now be expressed in Kconfig. Signed-off-by: Tuomas Tynkkynen <tuomas@tuxera.com>
* ARM: rmobile: Add R8A77970 SoCMarek Vasut2017-12-091-0/+4
| | | | | | | Add bits to support yet another SoC, the R8A77970 V3M . Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com> Cc: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
* ARM: rmobile: Zap ad-hoc DRAM configuration macrosMarek Vasut2017-11-301-21/+3
| | | | | | | | These macros are no longer needed since the DRAM configuration is parsed from the DT. Drop them all. Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com> Cc: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
* ARM: rmobile: Clean up GIC macrosMarek Vasut2017-11-301-0/+5
| | | | | | | | | Pull out the GIC macros from the board configuration files into the common Gen3 configuration file since these macros are the same for all Gen3 systems. Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com> Cc: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
* ARM: rmobile: Switch to DM PFC pinmux and GPIO driverMarek Vasut2017-09-281-2/+0
| | | | | | | | | | Enable the PFC pinmux and GPIO drivers and disable the SH GPIO combo driver. This allows the drivers to obtain pinmux and GPIO configuration from DT rather than hard-coding it in board files. Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com> Cc: Nobuhiro Iwamatsu <iwamatsu@nigauri.org> Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
* ARM: rmobile: Place initial stack right below U-BootMarek Vasut2017-09-241-1/+1
| | | | | | | | | Place the stack right below U-Boot so it's not in the way in case U-Boot grows too much. Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com> Cc: Nobuhiro Iwamatsu <iwamatsu@nigauri.org> Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
* ARM: rmobile: Move CONFIG_CMD_ from rcar-gen3-common to configsMarek Vasut2017-09-241-4/+0
| | | | | | | | Just move those config options from macros to configs. Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com> Cc: Nobuhiro Iwamatsu <iwamatsu@nigauri.org> Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
* include/configs: drop default definitions of CONFIG_SYS_PBSIZEThomas Petazzoni2017-09-031-2/+0
| | | | | | | | | Now that the fallback value of CONFIG_SYS_PBSIZE in include/config_fallbacks.h has been adjusted, remove its definition from a large number of board configuration files. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Reviewed-by: Tom Rini <trini@konsulko.com>
* common: Move CONFIG_BOOTARGS to KconfigSam Protsenko2017-08-141-4/+0
| | | | | | | | | Also introduce CONFIG_USE_BOOTARGS option so we can control if CONFIG_BOOTARGS defined at all. Signed-off-by: Sam Protsenko <semen.protsenko@linaro.org> [trini: Resync r8a779[56]_ulcb, various ls10xx targets] Signed-off-by: Tom Rini <trini@konsulko.com>
* Convert CONFIG_CMD_SDRAM to KconfigSimon Glass2017-08-111-1/+0
| | | | | | | | | This converts the following to Kconfig: CONFIG_CMD_SDRAM Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Bin Meng <bmeng.cn@gmail.com> Reviewed-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
* ARM: rmobile: Increase console buffer sizesMarek Vasut2017-08-031-5/+5
| | | | | | | | | Allow pasting extra long lines into the U-Boot console on RCar Gen3. This is OK since we have plenty of resources and it's convenient. Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com> Cc: Nobuhiro Iwamatsu <iwamatsu@nigauri.org> Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
* Kconfig: Migrate FS_FAT / FAT_WRITETom Rini2017-06-031-2/+0
| | | | | | | | Now that these symbols are in Kconfig, migrate all users. Use imply on a number of platforms that default to having this enabled. As part of this we must migrate some straglers for CMD_FAT and DOS_PARTITION. Signed-off-by: Tom Rini <trini@konsulko.com>
* ARM: rmobile: salvator-x: Set default device treeMarek Vasut2017-05-221-1/+1
| | | | | | | | | Set default device tree file in the salvator-x_defconfig and use it in the environment. Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com> Cc: Hiroyuki Yokoyama <hiroyuki.yokoyama.vx@renesas.com> Cc: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
* ARM: rmobile: salvator-x: Move OF_LIBFDT and CMD_FDT to board configMarek Vasut2017-05-221-2/+0
| | | | | | | | Move these two Kconfig symbols to the salvator-x_defconfig. Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com> Cc: Hiroyuki Yokoyama <hiroyuki.yokoyama.vx@renesas.com> Cc: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
* ARM: rmobile: Add R8A7796 supportMarek Vasut2017-05-221-5/+26
| | | | | | | | Add Kconfig entry for the R8A7796 RCar M3 SoC. Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com> Cc: Hiroyuki Yokoyama <hiroyuki.yokoyama.vx@renesas.com> Cc: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
* ARM: rmobile: Update link address to match latest BL2Marek Vasut2017-05-221-1/+1
| | | | | | | | | Update the CONFIG_SYS_TEXT_BASE to match BL2 Rev.1.0.9 and newer, which loads the U-Boot to 0x50000000 . Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com> Cc: Hiroyuki Yokoyama <hiroyuki.yokoyama.vx@renesas.com> Cc: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
* Kconfig: Drop CONFIG_CMD_DFLSimon Glass2017-04-301-1/+0
| | | | | | This option is not used in U-Boot. Drop it. Signed-off-by: Simon Glass <sjg@chromium.org>
* Kconfig: Migrate CONFIG_BAUDRATEPhilipp Tomsich2017-03-191-2/+0
| | | | | | | | Move this in to Kconfig with a default of 115200. Signed-off-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com> [trini: Run moveconfig.py, reword commit slightly] Signed-off-by: Tom Rini <trini@konsulko.com>
* disk: convert CONFIG_DOS_PARTITION to KconfigPatrick Delaunay2017-01-281-1/+0
| | | | | Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com> Signed-off-by: Patrick Delaunay <patrick.delaunay73@gmail.com>
* Convert CONFIG_BOARD_EARLY_INIT_F to KconfigSimon Glass2017-01-251-1/+0
| | | | | | | This converts the following to Kconfig: CONFIG_BOARD_EARLY_INIT_F Signed-off-by: Simon Glass <sjg@chromium.org>
* Convert CONFIG_SYS_CONSOLE_INFO_QUIET to KconfigSimon Glass2016-10-231-1/+0
| | | | | | | | | This converts the following to Kconfig: CONFIG_SYS_CONSOLE_INFO_QUIET Signed-off-by: Simon Glass <sjg@chromium.org> [trini: Make this default n, re-run the migration] Signed-off-by: Tom Rini <trini@konsulko.com>
* Convert CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE to KconfigSimon Glass2016-10-231-1/+0
| | | | | | | | This converts the following to Kconfig: CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Tom Rini <trini@konsulko.com>
* Convert CONFIG_SYS_CONSOLE_ENV_OVERWRITE to KconfigSimon Glass2016-10-231-1/+0
| | | | | | | | This converts the following to Kconfig: CONFIG_SYS_CONSOLE_ENV_OVERWRITE Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Tom Rini <trini@konsulko.com>
* common: Add DISPLAY_BOARDINFOLokesh Vutla2016-10-121-1/+0
| | | | | | | | Create a Kconfig entry for DISPLAY_BOARDINFO and make it be the default in certain architectures. Migrate all config files. Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com> Signed-off-by: Tom Rini <trini@konsulko.com>
* common/Kconfig: Add DISPLAY_CPUINFOLokesh Vutla2016-10-121-1/+0
| | | | | | | | Create a Kconfig entry for DISPLAY_CPUINFO and make it be the default in certain architectures. Migrate all config files. Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com> Signed-off-by: Tom Rini <trini@konsulko.com>
* common, kconfig: move VERSION_VARIABLE to KconfigHeiko Schocher2016-09-091-1/+0
| | | | | | | move VERSION_VARIABLE from board config file into a Kconfig option. Signed-off-by: Heiko Schocher <hs@denx.de>
* Merge branch 'rmobile' of git://git.denx.de/u-boot-shTom Rini2016-08-201-1/+0
| | | | | [trini: Drop CMD_BOOTI as it's now on by default on ARM64] Signed-off-by: Tom Rini <trini@konsulko.com>
* ARM: rmobile: Remove duplicate configs by Kconfig in rcar-gen3-common.hNobuhiro Iwamatsu2016-08-171-7/+1
| | | | | | | | | | | | | This commit remove dupilicate following configs from rcar-gen3-common.h. - CONFIG_CMD_BOOTZ - CONFIG_BOOTDELAY - CONFIG_CMD_EDITENV - CONFIG_CMD_SAVEENV - CONFIG_CMD_MEMORY - CONFIG_CMD_RUN - CONFIG_CMD_LOADS Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
* ARM: rmobile: Add support salvator-x boardNobuhiro Iwamatsu2016-08-171-0/+105
Salvator-x is an entry level development board based on R-Car H3 SoC (R8A7795). This commit supports SCIF only. Signed-off-by: Hiroyuki Yokoyama <hiroyuki.yokoyama.vx@renesas.com> Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>