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/socfpga_de10_nano_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/socfpga_de10_nano_defconfig')
| -rw-r--r-- | configs/socfpga_de10_nano_defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/configs/socfpga_de10_nano_defconfig b/configs/socfpga_de10_nano_defconfig index 92d9336f35..ef2ce3c4f8 100644 --- a/configs/socfpga_de10_nano_defconfig +++ b/configs/socfpga_de10_nano_defconfig @@ -4,9 +4,9 @@ CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_OFFSET=0x4400 CONFIG_SYS_SPI_U_BOOT_OFFS=0x40000 CONFIG_DM_GPIO=y +CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_de10_nano" CONFIG_SPL_TEXT_BASE=0xFFFF0000 CONFIG_TARGET_SOCFPGA_TERASIC_DE10_NANO=y -CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_de10_nano" CONFIG_DISTRO_DEFAULTS=y CONFIG_FIT=y # CONFIG_USE_BOOTCOMMAND is not set |