diff options
| author | Tom Rini <trini@konsulko.com> | 2021-06-28 16:22:13 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-06-28 16:22:13 -0400 |
| commit | 6d0453d88915feeece6e55748a2476d8509e5fad (patch) | |
| tree | f4564a64f771cb071a74787f11471250fdbdf47b /configs/warp7_defconfig | |
| parent | 67edf2553f15e5148efca213af3f41cef3410680 (diff) | |
| parent | 3ef4572110a43acdd7d401b0cb184c6ebd6eaa17 (diff) | |
| download | u-boot-6d0453d88915feeece6e55748a2476d8509e5fad.tar.gz | |
Merge tag 'v2021.07-rc5' into next
Prepare v2021.07-rc5
# gpg: Signature made Mon 28 Jun 2021 03:39:36 PM EDT
# gpg: using RSA key 1A3C7F70E08FAB1707809BBF147C39FF9634B72C
# gpg: Good signature from "Thomas Rini <trini@konsulko.com>" [ultimate]
# Conflicts:
# configs/am64x_evm_r5_defconfig
Diffstat (limited to 'configs/warp7_defconfig')
| -rw-r--r-- | configs/warp7_defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/configs/warp7_defconfig b/configs/warp7_defconfig index 43471e754a9..5bac902dd0a 100644 --- a/configs/warp7_defconfig +++ b/configs/warp7_defconfig @@ -6,13 +6,13 @@ CONFIG_SYS_MEMTEST_END=0xa0000000 CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_OFFSET=0xC0000 CONFIG_DM_GPIO=y +CONFIG_DEFAULT_DEVICE_TREE="imx7s-warp" CONFIG_TARGET_WARP7=y CONFIG_ARMV7_BOOT_SEC_DEFAULT=y # CONFIG_ARMV7_VIRT is not set CONFIG_IMX_RDC=y CONFIG_IMX_BOOTAUX=y CONFIG_IMX_HAB=y -CONFIG_DEFAULT_DEVICE_TREE="imx7s-warp" CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/warp7/imximage.cfg" |