summaryrefslogtreecommitdiff
path: root/include/configs/zynq-common.h
AgeCommit message (Collapse)Author
2019-10-24ARM: zynq: Move BOOTM_NETBSD to KconfigMichal Simek
The commit 4b0bcfa7c4ec ("Kconfig: Migrate CONFIG_BOOTM_* options") moved BOOTM_ options to Kconfig that's why align zynq defconfig with it. Disabling NETBSD was done by commit d6f48ea5ce18 ("ARM: zynq: Do not enable NETBSD support by default"). Signed-off-by: Michal Simek <michal.simek@xilinx.com>
2019-10-08ARM: zynq: Remove all Xilinx private commandsMichal Simek
All platforms have been moved to distro boot that's why remove the rest of configurations to have unified boot flow. Signed-off-by: Michal Simek <michal.simek@xilinx.com>
2019-10-08ARM: zynq: Use {} around variables for qspi and nand boot cmdsMichal Simek
Follow conventions and used {} around variables. Fixes: 90e97ab31e02 ("arm: zynq: Define distro boot commnads for qspi, nand and nor") Signed-off-by: Michal Simek <michal.simek@xilinx.com>
2019-10-08ARM: zynq: Fix NOR boot modeMichal Simek
There are two typos in this command that's why it couldn't work properly. This bootmode is almost unused from the beggining on this SoC. Fixes: 90e97ab31e02 ("arm: zynq: Define distro boot commnads for qspi, nand and nor") Signed-off-by: Michal Simek <michal.simek@xilinx.com>
2019-10-08ARM: zynq: Enable USB1 as secondary boot deviceMichal Simek
Xilinx Zynq SoC has two usb controllers and both could be used as secondary boot method. Signed-off-by: Michal Simek <michal.simek@xilinx.com>
2019-10-08ARM: zynq: Specify MMC controller number for boot sequenceMichal Simek
Xilinx Zynq SoC has two sdhci controllers but boot is only possible from the first one. That's why there is a need to specify controller number. mmc1 is supposed to be secondary boot device and should be also listed in distribution boot. Signed-off-by: Michal Simek <michal.simek@xilinx.com>
2019-10-08ARM: zynq: Increase input buffer console size to 2kMichal Simek
ZynqMP and Versal is using 2k that's why aligned all platform together to be able to use the same scripts. Signed-off-by: Michal Simek <michal.simek@xilinx.com>
2019-10-08ARM: zynq: Increase init ram size by 4KSiva Durga Prasad Paladugu
Increase init ram size by 4K such that more stack space will be available during initialization as the present stackspace is not sufficient if DEBUG option is enabled and causes system hang. Increasing init ram size provides sufficient stack space during init even if DEBUG enabled and solves the hang issue. Signed-off-by: Siva Durga Prasad Paladugu <siva.durga.paladugu@xilinx.com> Signed-off-by: Michal Simek <michal.simek@xilinx.com>
2019-10-08ARM: zynq: Do not enable NETBSD support by defaultMichal Simek
This option is disable in Xilinx tree for quite a long time that's why let's disable it in mainline. If there is anybody who requires this options then it should be moved to Kconfig first and should be removed from this config. Signed-off-by: Michal Simek <michal.simek@xilinx.com>
2019-08-25Convert CONFIG_SYS_SPI_U_BOOT_OFFS to KconfigHannes Schmelzer
This converts the following to Kconfig: CONFIG_SYS_SPI_U_BOOT_OFFS Signed-off-by: Hannes Schmelzer <hannes.schmelzer@br-automation.com> [trini: Expose this for SPL_SPI_SUNXI for now] Signed-off-by: Tom Rini <trini@konsulko.com>
2019-08-25moveconfig: prepare moving CONFIG_SYS_SPI_U_BOOT_OFFS to Kconfig step 2Hannes Schmelzer
some boards have common headers for several individual build-targets where CONFIG_SYS_SPI_U_BOOT_OFFS is defined even it is not needed (only needed if CONFIG_SPL_SPI_LOAD is defined also). Take this define here under '#ifdef CONFIG_SPL_SPI_LOAD' for having a clean run of moveconfig.py Signed-off-by: Hannes Schmelzer <hannes.schmelzer@br-automation.com>
2019-08-02Convert CONFIG_USE_PREBOOT and CONFIG_PREBOOT to KconfigSimon Glass
This converts the following to Kconfig: CONFIG_USE_PREBOOT CONFIG_PREBOOT Both are together in one commit, since otherwise the former causes kconfig to define the latter, which gives duplicate symbol errors. Includes a manual fixup for CONFIG_PREBOOT in ids8313_defconfig since the backslash lands in the wrong place. Similarly with socfpga_vining_fpga. Signed-off-by: Simon Glass <sjg@chromium.org>
2019-08-02Add CONFIG_USE_PREBOOT to boards that use CONFIG_PREBOOTSimon Glass
In order to use CONFIG_PREBOOT with Kconfig, CONFIG_USE_PREBOOT must be defined for each board. To prepare for conversion to Kconfig, add this. Signed-off-by: Simon Glass <sjg@chromium.org>
2019-07-30ARM: zynq: delete long-dead CONFIG_USB_CABLE_CHECKRobert P. J. Day
This Kbuild option disappeared way back in 2014: commit 75504e9592745021006cb8905b5ff5a51d9d1cb3 Author: Mateusz Zalega <m.zalega@samsung.com> Date: Wed Apr 30 13:07:48 2014 +0200 ... snip ... CONFIG_USB_CABLE_CHECK was removed. Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca> Signed-off-by: Michal Simek <michal.simek@xilinx.com>
2019-06-14configs: Migrate CONFIG_SYS_LDSCRIPT to KconfigTom Rini
In order to migrate this symbol to Kconfig introduce a new symbol to guard it, CONFIG_SYS_CUSTOM_LDSCRIPT. When that is set we can then provide the exact final location o the script. Signed-off-by: Tom Rini <trini@konsulko.com>
2019-05-18CONFIG_SPL_SYS_[DI]CACHE_OFF: addTrevor Woerner
While converting CONFIG_SYS_[DI]CACHE_OFF to Kconfig, there are instances where these configuration items are conditional on SPL. This commit adds SPL variants of these configuration items, uses CONFIG_IS_ENABLED(), and updates the configurations as required. Acked-by: Alexey Brodkin <abrodkin@synopsys.com> Signed-off-by: Trevor Woerner <trevor@toganlabs.com> [trini: Make the default depend on the setting for full U-Boot, update more zynq hardware] Signed-off-by: Tom Rini <trini@konsulko.com>
2019-04-29configs: move CONFIG_SPL_TEXT_BASE to KconfigSimon Goldschmidt
Moved CONFIG_SPL_TEXT_BASE to common/spl/Kconfig and migrate existing values. Signed-off-by: Simon Goldschmidt <simon.k.r.goldschmidt@gmail.com> [trini: Re-run migration] Signed-off-by: Tom Rini <trini@konsulko.com>
2019-04-16ARM: zynq: fix environment command syntaxMelin Tomas
Update EXTRA_ENV_SETTINGS and related commands to use 'setenv' instead of short name 'set' in commands. E.g. in case command setexpr is enabled the short form does not work properly as the name becomes ambigous. Fixes error messages like: U-Boot> set Unknown command 'set' - try 'help' Signed-off-by: Tomas Melin <tomas.melin@vaisala.com> Signed-off-by: Michal Simek <michal.simek@xilinx.com>
2019-03-25Convert CONFIG_SF_DEFAULT_* to KconfigPatrick Delaunay
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>
2019-02-14ARM: zynq: Convert dlc20 and zc70x board to DM_I2CMichal Simek
All these board have also eeprom enabled that's why it is also enabled via defconfig. There is also no need to have zc70x specific config file that's why also remove it. Signed-off-by: Michal Simek <michal.simek@xilinx.com> Reviewed-by: Heiko Schocher <hs@denx.de>
2019-02-14arm: zynq: Define distro boot commnads for qspi, nand and norSiva Durga Prasad Paladugu
This patch adds distro boot commands for qspi, nand and nor. The distro boot commands now reads the script from flash offset of 15.75MB and executes it. Setup default location via script_offset_f to 15.75MB to match the most xilinx reference boards for qspi, nand and set the same using script_offset_nor to 0xE2EC0000 for nor. 256kB allocated space for script size (script_size_f) should be more than enough to cover custom boot logic. Signed-off-by: Siva Durga Prasad Paladugu <siva.durga.paladugu@xilinx.com> Signed-off-by: Michal Simek <michal.simek@xilinx.com>
2019-02-14ARM: zynq: Run distribution boot commands firstMichal Simek
This patch is doing two things. 1. Exchanging order of boot commands. distro_bootcmd is run first followed by Xilinx boot command. 2. Remove CONFIG_BOOTCOMMAND from configs (and follow mainline) by creating Xilinx distribution bootcommand and wiring it as the last bootcommand. QSPI, NAND distribution boot command will be added later. Signed-off-by: Michal Simek <michal.simek@xilinx.com>
2019-01-24arm: zynq: Enable CONFIG_REMAKE_ELFSiva Durga Prasad Paladugu
This patch enables CONFIG_REMAKE_ELF for Zynq platform so that it generates u-boot.elf from binary which works for all Zynq boards with OF_SEPARATE option enabled. Signed-off-by: Siva Durga Prasad Paladugu <siva.durga.paladugu@xilinx.com> Signed-off-by: Michal Simek <michal.simek@xilinx.com>
2018-11-07arm: zynq: Setup non zero SPL FIT load addressMichal Simek
Default setup is 0 which is incorrect place because it points to OCM which is allocated for SPL only in our case. Use address in DDR. Signed-off-by: Michal Simek <michal.simek@xilinx.com>
2018-10-19Convert CONFIG_FLASH_CFI_DRIVER et al to KconfigAdam Ford
This converts the following to Kconfig: CONFIG_FLASH_CFI_DRIVER CONFIG_SYS_FLASH_USE_BUFFER_WRITE CONFIG_FLASH_CFI_MTD CONFIG_SYS_FLASH_PROTECTION CONFIG_SYS_FLASH_CFI Signed-off-by: Adam Ford <aford173@gmail.com> [trini: Re-migrate] Signed-off-by: Tom Rini <trini@konsulko.com>
2018-09-26arm: zynq: Remove useless comments from config fileMichal Simek
Moving options to Kconfig some comments are useless now. Signed-off-by: Michal Simek <michal.simek@xilinx.com>
2018-08-17Convert CONFIG_MII et al to KconfigAdam Ford
This converts the following to Kconfig: CONFIG_MII CONFIG_DRIVER_TI_EMAC Signed-off-by: Adam Ford <aford173@gmail.com> Acked-by: Jagan Teki <jagan@amarulasolutions.com> Acked-by: Joe Hershberger <joe.hershberger@ni.com>
2018-08-16configs: Migrate CONFIG_NR_DRAM_BANKSTom Rini
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>
2018-08-06Kconfig: Move config SYS_MALLOC_LEN to Kconfig for zynqSiva Durga Prasad Paladugu
This patch moves the the config SYS_MALLOC_LEN to Kconfig. It will be just for Zynq arch and to do will be for all other archs. Signed-off-by: Siva Durga Prasad Paladugu <siva.durga.paladugu@xilinx.com> Signed-off-by: Vipul Kumar <vipul.kumar@xilinx.com> Signed-off-by: Michal Simek <michal.simek@xilinx.com>
2018-08-06spi: Kconfig: Create ISSI Kconfig entryMichal Simek
Add ISSI to Kconfig to make it selectable via menuconfig. Also convert all current platforms. Signed-off-by: Michal Simek <michal.simek@xilinx.com>
2018-07-22Convert CONFIG_MTD_PARTITIONS et al to KconfigAdam Ford
This converts the following to Kconfig: CONFIG_MTD_PARTITIONS CONFIG_MTD_DEVICE Signed-off-by: Adam Ford <aford173@gmail.com>
2018-07-19env: Added support to save env to spi through KconfigVipul Kumar
This patch added support to enable CONFIG_ENV_SIZE, CONFIG_ENV_OFFSET and CONFIG_ENV_SECT_SIZE through Kconfig for Zynq and Zynqmp. Signed-off-by: Vipul Kumar <vipul.kumar@xilinx.com> Signed-off-by: Michal Simek <michal.simek@xilinx.com>
2018-07-10configs: Remove empty #ifdef/#ifndef blocks from configsAlex Kiernan
Remove empty #ifdef/#ifndef..#endif blocks where the configuration they guarded has been completely removed. Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
2018-05-07SPDX: Convert all of our single license tags to Linux Kernel styleTom Rini
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>
2018-04-28Migrate IMAGE_FORMAT_LEGACY to KconfigAlex Kiernan
This converts IMAGE_FORMAT_LEGACY to Kconfig Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> Reviewed-by: Tom Rini <trini@konsulko.com>
2018-04-23arm: zynq: Make ENV_SIZE and ENV_OFFSET optional via board fileMichal Simek
Boards have an option to rewrite variable locations in their own board files. This is necessary for qspi and nand configurations where boot image can be bigger then 896k(current limit). Signed-off-by: Michal Simek <michal.simek@xilinx.com>
2018-04-13xilinx: Only enable dist boot pxe when DHCP is enabledJoe Hershberger
Otherwise, we see this: In file included from include/configs/zynq-common.h:183:0, from include/config.h:5, from include/common.h:21, from env/common.c:11: include/config_distro_bootcmd.h:319:2: error: expected ?}? before ?BOOT_TARGET_DEVICES_references_PXE_without_CONFIG_CMD_DHCP_or_PXE? BOOT_TARGET_DEVICES_references_PXE_without_CONFIG_CMD_DHCP_or_PXE ^ include/config_distro_bootcmd.h:319:2: note: in definition of macro ?BOOTENV_DEV_NAME_PXE? Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
2018-04-11spl: spi: Move CONFIG_SPL_SPI_LOAD to KconfigMarek Vasut
Add Kconfig entry for CONFIG_SPL_SPI_LOAD symbol and move all configurations using it to Kconfig. Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com> Cc: Tom Rini <trini@konsulko.com>
2018-03-01mmc: Added Kconfig support for CONFIG_ZYNQ_SDHCI_MAX_FREQVipul Kumar
This patch added Kconfig support for CONFIG_ZYNQ_SDHCI_MAX_FREQ and enabled it in respective defconfig. Signed-off-by: Vipul Kumar <vipulk@xilinx.com> Signed-off-by: Siva Durga Prasad Paladugu <sivadur@xilinx.com> Signed-off-by: Michal Simek <michal.simek@xilinx.com>
2018-03-01i2c: Added Kconfig support for CONFIG_SYS_I2C_ZYNQ_SPEEDVipul Kumar
This patch added Kconfig support for CONFIG_SYS_I2C_ZYNQ_SPEED and set it to default value 100000. Signed-off-by: Vipul Kumar <vipulk@xilinx.com> Signed-off-by: Siva Durga Prasad Paladugu <sivadur@xilinx.com> Signed-off-by: Michal Simek <michal.simek@xilinx.com>
2018-03-01i2c: Added Kconfig support for CONFIG_SYS_I2C_ZYNQ_SLAVEVipul Kumar
This patch added Kconfig support for CONFIG_SYS_I2C_ZYNQ_SLAVE and set it default to 0. Signed-off-by: Vipul Kumar <vipulk@xilinx.com> Signed-off-by: Siva Durga Prasad Paladugu <sivadur@xilinx.com> Signed-off-by: Michal Simek <michal.simek@xilinx.com>
2018-03-01i2c: Enabled CONFIG_SYS_I2C_ZYNQ in the respective defconfigVipul Kumar
This patch enabled CONFIG_SYS_I2C_ZYNQ in the respective defconfig. Signed-off-by: Vipul Kumar <vipulk@xilinx.com> Signed-off-by: Siva Durga Prasad Paladugu <sivadur@xilinx.com> Signed-off-by: Michal Simek <michal.simek@xilinx.com>
2018-02-28arm: zynq: fpga: Added Kconfig support for CONFIG_FPGA_ZYNQPLVipul Kumar
This patch added Kconfig support for CONFIG_FPGA_ZYNQPL and migrates the values over to the defconfigs. Signed-off-by: Vipul Kumar <vipulk@xilinx.com> Signed-off-by: Siva Durga Prasad Paladugu <sivadur@xilinx.com>
2018-02-23Remove config_distro_defaults.hAdam Ford
With the contents of config_distro_defaults.h migrated to Kconfig, we can remove this header file completely Signed-off-by: Adam Ford <aford173@gmail.com>
2018-02-23Convert CONFIG_BOOTP_BOOTPATH et al to KconfigAdam Ford
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>
2018-02-14configs: Migrate CONFIG_SPL_FRAMEWORKTom Rini
Migrate the option CONFIG_SPL_FRAMEWORK and make this gate most of the current set of options we have in Kconfig. We will need to have some options available for SPL and !SPL_FRAMEWORK so this is important. In a few cases we re-order existing options so that we have less escapes from the SPL_FRAMEWORK guard. Signed-off-by: Tom Rini <trini@konsulko.com>
2018-02-02Kconfig: gadget: Move CONFIG_USB_FUNCTION_THOR to KconfigLukasz Majewski
This commit moves USB_FUNCTION_THOR config to Kconfig. Signed-off-by: Lukasz Majewski <lukma@denx.de> Acked-by: Michal Simek <michal.simek@xilinx.com> Reviewed-by: Jaehoon Chung <jh80.chung@samsung.com>
2018-01-31Merge tag 'xilinx-for-v2018.03' of git://git.denx.de/u-boot-microblazeTom Rini
Xilinx changes for v2018.03 - Several Kconfig fixes (also moving configs to defconfigs) - Some DTS updates - ZynqMP psu rework based on Zynq concept - Add low level initialization for zc770 and zcu102 - Add support for Zynq zc770 x16 nand configuration - Add mini nand/emmc ZynqMP targets - Some arasan nand changes
2018-01-30arm: zynq: Moved ethernet PHY configs of Zynq boards to defconfigVipul Kumar
This patch moved ethernet PHY configs of Zynq boards to respective defconfig. Signed-off-by: Vipul Kumar <vipulk@xilinx.com> Signed-off-by: Michal Simek <michal.simek@xilinx.com>
2018-01-30arm: zynq: Update years in copyright to reflect latest changesMichal Simek
Updating year in zynq files. Also add missing Copyright to board.c. Signed-off-by: Michal Simek <michal.simek@xilinx.com>