Remove qcs9100_defconfig since it is now identical to qcom_defconfig. Additionally remove the load address and REMAKE_ELF from other Qualcomm defconfigs.
For these platforms you should explicitly build the u-boot.mbn target which will have the correct load address and Qualcomm MBN signatures. Signed-off-by: Casey Connolly <casey.conno...@linaro.org> --- configs/qcm6490_defconfig | 4 ---- configs/qcom_ipq9574_mmc_defconfig | 1 - configs/qcs9100_defconfig | 12 ------------ 3 files changed, 17 deletions(-) diff --git a/configs/qcm6490_defconfig b/configs/qcm6490_defconfig index 22afa7be1a944e5e0d712ef8aed21ea2b7fa2fa1..b9d0ca113a798582a83cccd3aa19c2a94b771b64 100644 --- a/configs/qcm6490_defconfig +++ b/configs/qcm6490_defconfig @@ -7,12 +7,8 @@ # Otherwise buildman thinks this isn't an ARM platform CONFIG_ARM=y -# Address where U-Boot will be loaded -CONFIG_TEXT_BASE=0x9fc00000 -CONFIG_REMAKE_ELF=y - CONFIG_DEFAULT_DEVICE_TREE="qcom/qcs6490-rb3gen2" # Enable capsule updates CONFIG_EFI_RUNTIME_UPDATE_CAPSULE=y diff --git a/configs/qcom_ipq9574_mmc_defconfig b/configs/qcom_ipq9574_mmc_defconfig index 8d7d3d92c73a30b246acc2eae6da1d7b04892691..00abc8430596dadd574d5d2b7353ecfdef01e2b4 100644 --- a/configs/qcom_ipq9574_mmc_defconfig +++ b/configs/qcom_ipq9574_mmc_defconfig @@ -11,9 +11,8 @@ CONFIG_DEFAULT_DEVICE_TREE="qcom/ipq9574-rdp433" CONFIG_SYS_LOAD_ADDR=0x50000000 CONFIG_DEBUG_UART_BASE=0x78b1000 CONFIG_DEBUG_UART_CLOCK=1843200 CONFIG_DEBUG_UART=y -CONFIG_REMAKE_ELF=y # CONFIG_EFI_LOADER is not set CONFIG_FIT=y CONFIG_FIT_VERBOSE=y # CONFIG_BOOTSTD is not set diff --git a/configs/qcs9100_defconfig b/configs/qcs9100_defconfig deleted file mode 100644 index 4ceeba63ec12cebbc2124eb256a255450500152f..0000000000000000000000000000000000000000 --- a/configs/qcs9100_defconfig +++ /dev/null @@ -1,12 +0,0 @@ -# Configuration for building U-Boot to be flashed -# to the uefi partition of QCS9100 based dev boards with -# the "Linux Embedded" partition layout (which have -# a dedicated "uefi" partition for edk2/U-Boot) - -#include "qcom_defconfig" - -# Address where U-Boot will be loaded -CONFIG_TEXT_BASE=0xaf000000 -CONFIG_REMAKE_ELF=y - -CONFIG_DEFAULT_DEVICE_TREE="qcom/qcs9100-ride-r3" -- 2.49.0
