diff options
author | Tom Rini | 2023-03-27 15:19:57 -0400 |
---|---|---|
committer | Tom Rini | 2023-03-27 15:19:57 -0400 |
commit | 605bc145f91d2a28ba2e517cae4e53e255e34b6f (patch) | |
tree | a8df36d6569d441bc013399ff7dafff07cd36657 /configs/xilinx_zynqmp_virt_defconfig | |
parent | fde439219ff53a46bdd5dff69e049ccd4be57310 (diff) | |
parent | 41a88ad529b3943b1e465846eb24fe2c29203e35 (diff) |
Merge branch 'master' into next
Diffstat (limited to 'configs/xilinx_zynqmp_virt_defconfig')
-rw-r--r-- | configs/xilinx_zynqmp_virt_defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/configs/xilinx_zynqmp_virt_defconfig b/configs/xilinx_zynqmp_virt_defconfig index d29df93f43f..fb6bf62265e 100644 --- a/configs/xilinx_zynqmp_virt_defconfig +++ b/configs/xilinx_zynqmp_virt_defconfig @@ -21,13 +21,13 @@ CONFIG_SYS_LOAD_ADDR=0x8000000 CONFIG_AHCI=y CONFIG_SYS_MEMTEST_START=0x00000000 CONFIG_SYS_MEMTEST_END=0x00001000 -CONFIG_DISTRO_DEFAULTS=y CONFIG_REMAKE_ELF=y CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_SPL_LOAD_FIT=y CONFIG_SPL_LOAD_FIT_ADDRESS=0x10000000 # CONFIG_ARCH_FIXUP_FDT_MEMORY is not set +CONFIG_DISTRO_DEFAULTS=y CONFIG_USE_PREBOOT=y CONFIG_PREBOOT="run scsi_init;usb start" CONFIG_BOARD_EARLY_INIT_R=y |