From: Tom Rini Date: Mon, 12 Feb 2018 17:08:32 +0000 (-0500) Subject: Merge git://git.denx.de/u-boot-fsl-qoriq X-Git-Tag: v2018.03-rc2~2 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=f3177d02f33472352b022adbaf5c47cceebc930d;p=u-boot Merge git://git.denx.de/u-boot-fsl-qoriq --- f3177d02f33472352b022adbaf5c47cceebc930d diff --cc configs/ls1012ardb_qspi_SECURE_BOOT_defconfig index e0ba24e3a1,0bec6b265f..13776236e8 --- a/configs/ls1012ardb_qspi_SECURE_BOOT_defconfig +++ b/configs/ls1012ardb_qspi_SECURE_BOOT_defconfig @@@ -1,9 -1,10 +1,11 @@@ CONFIG_ARM=y CONFIG_TARGET_LS1012ARDB=y +CONFIG_SYS_TEXT_BASE=0x40100000 CONFIG_SECURE_BOOT=y CONFIG_FSL_LS_PPA=y + CONFIG_QSPI_AHB_INIT=y CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1012a-rdb" + CONFIG_DISTRO_DEFAULTS=y # CONFIG_SYS_MALLOC_F is not set CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y diff --cc configs/ls1088aqds_qspi_SECURE_BOOT_defconfig index 9323595483,a234210726..f2b6be8c8e --- a/configs/ls1088aqds_qspi_SECURE_BOOT_defconfig +++ b/configs/ls1088aqds_qspi_SECURE_BOOT_defconfig @@@ -1,8 -1,8 +1,9 @@@ CONFIG_ARM=y CONFIG_TARGET_LS1088AQDS=y +CONFIG_SYS_TEXT_BASE=0x20100000 CONFIG_SECURE_BOOT=y CONFIG_FSL_LS_PPA=y + CONFIG_QSPI_AHB_INIT=y CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1088a-qds" # CONFIG_SYS_MALLOC_F is not set CONFIG_FIT_VERBOSE=y diff --cc configs/ls1088aqds_qspi_defconfig index 30064361b6,f174b1e429..43a2fccbab --- a/configs/ls1088aqds_qspi_defconfig +++ b/configs/ls1088aqds_qspi_defconfig @@@ -1,7 -1,7 +1,8 @@@ CONFIG_ARM=y CONFIG_TARGET_LS1088AQDS=y +CONFIG_SYS_TEXT_BASE=0x20100000 CONFIG_FSL_LS_PPA=y + CONFIG_QSPI_AHB_INIT=y CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1088a-qds" # CONFIG_SYS_MALLOC_F is not set CONFIG_FIT_VERBOSE=y