With mkmbn integrated we now no longer need CONFIG_REMAKE_ELF to then run qtestsign and can instead just enable QCOM_GENERATE_MBN to have mkmbn emit an MBN file directly.
While we're here, finally rename the db410c and 820c defconfigs to have the qcom_ prefix. Tested on qcs6490 and sm8550. Signed-off-by: Casey Connolly <[email protected]> --- configs/qcm6490_defconfig | 2 +- configs/{dragonboard410c_defconfig => qcom_dragonboard410c_defconfig} | 2 +- configs/{dragonboard820c_defconfig => qcom_dragonboard820c_defconfig} | 0 configs/qcom_ipq9574_mmc_defconfig | 2 +- configs/qcom_qcs615_defconfig | 2 +- configs/qcom_qcs8300_defconfig | 2 +- configs/qcom_qcs9100_defconfig | 2 +- 7 files changed, 6 insertions(+), 6 deletions(-) diff --git a/configs/qcm6490_defconfig b/configs/qcm6490_defconfig index b088367f86c0..56ec771ba1e4 100644 --- a/configs/qcm6490_defconfig +++ b/configs/qcm6490_defconfig @@ -9,9 +9,9 @@ CONFIG_ARM=y # Address where U-Boot will be loaded CONFIG_TEXT_BASE=0x9fc00000 -CONFIG_REMAKE_ELF=y +CONFIG_QCOM_GENERATE_MBN=y CONFIG_DEFAULT_DEVICE_TREE="qcom/qcs6490-rb3gen2" CONFIG_FASTBOOT_BUF_ADDR=0xd8800000 diff --git a/configs/dragonboard410c_defconfig b/configs/qcom_dragonboard410c_defconfig similarity index 98% rename from configs/dragonboard410c_defconfig rename to configs/qcom_dragonboard410c_defconfig index 51ad265688c4..e93f5f3094f4 100644 --- a/configs/dragonboard410c_defconfig +++ b/configs/qcom_dragonboard410c_defconfig @@ -11,9 +11,9 @@ CONFIG_ENV_OFFSET=0x0 CONFIG_DEFAULT_DEVICE_TREE="qcom/apq8016-sbc" CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_SYS_LOAD_ADDR=0x80080000 CONFIG_IDENT_STRING="\nQualcomm-DragonBoard 410C" -CONFIG_REMAKE_ELF=y +CONFIG_QCOM_GENERATE_MBN=y CONFIG_BUTTON_CMD=y CONFIG_FIT=y CONFIG_BOOTSTD_FULL=y CONFIG_OF_BOARD_SETUP=y diff --git a/configs/dragonboard820c_defconfig b/configs/qcom_dragonboard820c_defconfig similarity index 100% rename from configs/dragonboard820c_defconfig rename to configs/qcom_dragonboard820c_defconfig diff --git a/configs/qcom_ipq9574_mmc_defconfig b/configs/qcom_ipq9574_mmc_defconfig index 6592d9de39da..98614f6196b2 100644 --- a/configs/qcom_ipq9574_mmc_defconfig +++ b/configs/qcom_ipq9574_mmc_defconfig @@ -11,9 +11,9 @@ 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_QCOM_GENERATE_MBN=y # CONFIG_EFI_LOADER is not set CONFIG_FIT=y CONFIG_FIT_VERBOSE=y # CONFIG_BOOTSTD is not set diff --git a/configs/qcom_qcs615_defconfig b/configs/qcom_qcs615_defconfig index 27666a8129d7..f4760703c94a 100644 --- a/configs/qcom_qcs615_defconfig +++ b/configs/qcom_qcs615_defconfig @@ -15,9 +15,9 @@ CONFIG_DEBUG_UART_MSM_GENI=y CONFIG_DEBUG_UART_CLOCK=7372800 CONFIG_DEFAULT_DEVICE_TREE="qcom/qcs615-ride" -CONFIG_REMAKE_ELF=y +CONFIG_QCOM_GENERATE_MBN=y # Address where U-Boot will be loaded CONFIG_TEXT_BASE=0x9fc00000 diff --git a/configs/qcom_qcs8300_defconfig b/configs/qcom_qcs8300_defconfig index 5fffcddc16e9..8ff790f2889d 100644 --- a/configs/qcom_qcs8300_defconfig +++ b/configs/qcom_qcs8300_defconfig @@ -15,7 +15,7 @@ CONFIG_DEBUG_UART_MSM_GENI=y CONFIG_DEBUG_UART_CLOCK=14745600 # Address where U-Boot will be loaded CONFIG_TEXT_BASE=0xaf000000 -CONFIG_REMAKE_ELF=y +CONFIG_QCOM_GENERATE_MBN=y CONFIG_DEFAULT_DEVICE_TREE="qcom/qcs8300-ride" diff --git a/configs/qcom_qcs9100_defconfig b/configs/qcom_qcs9100_defconfig index 082106157bbc..84b2b9a1bd1b 100644 --- a/configs/qcom_qcs9100_defconfig +++ b/configs/qcom_qcs9100_defconfig @@ -6,9 +6,9 @@ #include "qcom_defconfig" # Address where U-Boot will be loaded CONFIG_TEXT_BASE=0xaf000000 -CONFIG_REMAKE_ELF=y +CONFIG_QCOM_GENERATE_MBN=y CONFIG_FASTBOOT_BUF_ADDR=0xdb300000 CONFIG_DEFAULT_DEVICE_TREE="qcom/qcs9100-ride-r3" CONFIG_ENV_IS_IN_SCSI=y CONFIG_ENV_SCSI_PART_UUID="71cb9cd0-acf1-b6cb-ad91-be9572fe11a9" -- 2.53.0
