diff options
| author | Tom Rini <trini@konsulko.com> | 2019-10-25 11:23:46 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-10-25 11:23:46 -0400 |
| commit | e382713d224d6fc14cf8fe8f6bb852f24ab652a7 (patch) | |
| tree | 132e3dcd8c2ab9ae7b7e5e114216f0f52b13766c /include/configs | |
| parent | 17fd9915a4c639381804ed28274fa136ae3b0bee (diff) | |
| parent | 3ad95ed6f87de048861ea8b9c3ab9a77e548d7b1 (diff) | |
Merge tag 'xilinx-for-v2020.01-part2' of https://gitlab.denx.de/u-boot/custodians/u-boot-microblaze
Xilinx/FPGA changes for v2020.01 part 2
common:
- Fix manual relocation for repeatable commands
arm:
- Also clean up generated dtbos
microblaze:
- Add support for Manual relocation in crypto framework
- Tune and align architecture bootm support
zynq:
- DT sync ups
- Some defconfig updates
- Remove empty board_early_init_f()
zynqmp:
- Clean firmware handing via drivers/firmware/
- DT/defconfig name alignments
- DT cleanups with using firmware based clock driver
- Some defconfig updates
- Add IIO ina226 DT description
- Tune zynqmp_psu_init_minimalize.sh script
- Add single nand mini configuration, e-a2197, m-a2197-02/03 and zcu216
versal:
- Clean firmware handing via drivers/firmware/
- Add gpio support
- Enable DT overlay/USB/CLK/FPGA
- DT updates
- Tune mini configuration
spi:
- gqspi - Remove unused headers
Diffstat (limited to 'include/configs')
| -rw-r--r-- | include/configs/zynq-common.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h index b6c9f2c8dd5..274cc191128 100644 --- a/include/configs/zynq-common.h +++ b/include/configs/zynq-common.h @@ -227,8 +227,6 @@ /* Boot FreeBSD/vxWorks from an ELF image */ #define CONFIG_SYS_MMC_MAX_DEVICE 1 -#undef CONFIG_BOOTM_NETBSD - /* MMC support */ #ifdef CONFIG_MMC_SDHCI_ZYNQ #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1 |