MLK-18934 usb: fastboot: Remove CONFIG_BOOTLOADER_OFFSET_xxx configurations

We can get the bootimage SD/MMC offset at runtime according to the SOC type and
version. No need to use CONFIG_BOOTLOADER_OFFSET_33K and CONFIG_BOOTLOADER_OFFSET_32K
any longer, so remove them.

Signed-off-by: Ye Li <ye.li@nxp.com>

12 files changed, 12 insertions, 23 deletions

diff --git a/drivers/usb/gadget/f_fastboot.c b/drivers/usb/gadget/f_fastboot.c
index f2720b8894..c838d46f22 100755..100644
--- a/drivers/usb/gadget/f_fastboot.c
+++ b/drivers/usb/gadget/f_fastboot.c
@@ -305,14 +305,6 @@ static struct usb_gadget_strings *fastboot_strings[] = {
 
 #define ANDROID_MBR_OFFSET	    0
 #define ANDROID_MBR_SIZE	    0x200
-#ifdef  CONFIG_BOOTLOADER_OFFSET_33K
-#define ANDROID_BOOTLOADER_OFFSET   0x8400
-/* The Bootloader offset of imx8qxp B0 board is set to 32K */
-#elif defined(CONFIG_BOOTLOADER_OFFSET_32K)
-#define ANDROID_BOOTLOADER_OFFSET 0x8000
-#else
-#define ANDROID_BOOTLOADER_OFFSET   0x400
-#endif
 #define ANDROID_BOOTLOADER_SIZE	    0x1FFC00
 
 #define MMC_SATA_BLOCK_SIZE 512
@@ -790,6 +782,16 @@ static void process_flash_sata(const char *cmdbuf)
 }
 #endif
 
+static ulong bootloader_mmc_offset(void)
+{
+	if (is_imx8m() || (is_imx8() && is_soc_rev(CHIP_REV_A)))
+		return 0x8400;
+	else if (is_imx8())
+		return 0x8000;
+	else
+		return 0x400;
+}
+
 #if defined(CONFIG_FASTBOOT_STORAGE_MMC)
 static int is_raw_partition(struct fastboot_ptentry *ptn)
 {
@@ -878,7 +880,7 @@ static lbaint_t mmc_sparse_reserve(struct sparse_storage *info,
 bool bootloader_gpt_overlay(void)
 {
 	return (g_ptable[PTN_GPT_INDEX].partition_id  == g_ptable[PTN_BOOTLOADER_INDEX].partition_id  &&
-		ANDROID_BOOTLOADER_OFFSET < ANDROID_GPT_END);
+		bootloader_mmc_offset() < ANDROID_GPT_END);
 }
 
 int write_backup_gpt(void)
@@ -1424,7 +1426,7 @@ static int _fastboot_parts_load_from_ptable(void)
 	/* Bootloader */
 	strcpy(ptable[PTN_BOOTLOADER_INDEX].name, FASTBOOT_PARTITION_BOOTLOADER);
 	ptable[PTN_BOOTLOADER_INDEX].start =
-				ANDROID_BOOTLOADER_OFFSET / dev_desc->blksz;
+				bootloader_mmc_offset() / dev_desc->blksz;
 	ptable[PTN_BOOTLOADER_INDEX].length =
 				 ANDROID_BOOTLOADER_SIZE / dev_desc->blksz;
 	ptable[PTN_BOOTLOADER_INDEX].partition_id = boot_partition;
diff --git a/include/configs/imx8mm_evk_android.h b/include/configs/imx8mm_evk_android.h
index 5db73bd92a..3291579044 100644
--- a/include/configs/imx8mm_evk_android.h
+++ b/include/configs/imx8mm_evk_android.h
@@ -7,7 +7,6 @@
 #ifndef IMX8MM_EVK_ANDROID_H
 #define IMX8MM_EVK_ANDROID_H
 
-#define CONFIG_BOOTLOADER_OFFSET_33K
 #define CONFIG_BCB_SUPPORT
 #define CONFIG_CMD_READ
 
diff --git a/include/configs/imx8mq_evk_android.h b/include/configs/imx8mq_evk_android.h
index 09ac0ea8d7..226a376c00 100644
--- a/include/configs/imx8mq_evk_android.h
+++ b/include/configs/imx8mq_evk_android.h
@@ -7,7 +7,6 @@
 #ifndef IMX8MQ_EVK_ANDROID_H
 #define IMX8MQ_EVK_ANDROID_H
 
-#define CONFIG_BOOTLOADER_OFFSET_33K
 #define CONFIG_BCB_SUPPORT
 #define CONFIG_CMD_READ
 
diff --git a/include/configs/imx8mq_evk_androidthings.h b/include/configs/imx8mq_evk_androidthings.h
index 9b33fcb8b7..e69cfaa4bd 100644
--- a/include/configs/imx8mq_evk_androidthings.h
+++ b/include/configs/imx8mq_evk_androidthings.h
@@ -7,7 +7,6 @@
 #ifndef IMX8MQ_EVK_ANDROID_THINGS_H
 #define IMX8MQ_EVK_ANDROID_THINGS_H
 
-#define CONFIG_BOOTLOADER_OFFSET_33K
 #define CONFIG_BCB_SUPPORT
 #define CONFIG_CMD_READ
 
diff --git a/include/configs/imx8qm_arm2_android.h b/include/configs/imx8qm_arm2_android.h
index 4b7b92cc0d..32cd12cb64 100644
--- a/include/configs/imx8qm_arm2_android.h
+++ b/include/configs/imx8qm_arm2_android.h
@@ -8,7 +8,6 @@
 #define IMX8QM_ARM2_ANDROID_H
 
 #define CONFIG_USBD_HS
-#define CONFIG_BOOTLOADER_OFFSET_33K
 
 #define CONFIG_BCB_SUPPORT
 #define CONFIG_CMD_READ
diff --git a/include/configs/imx8qm_mek_android.h b/include/configs/imx8qm_mek_android.h
index b87af8ba0f..7b49184ead 100644
--- a/include/configs/imx8qm_mek_android.h
+++ b/include/configs/imx8qm_mek_android.h
@@ -8,7 +8,6 @@
 #define IMX8QM_MEK_ANDROID_H
 
 #define CONFIG_USBD_HS
-#define CONFIG_BOOTLOADER_OFFSET_33K
 
 #define CONFIG_BCB_SUPPORT
 #define CONFIG_CMD_READ
diff --git a/include/configs/imx8qm_mek_android_auto.h b/include/configs/imx8qm_mek_android_auto.h
index 83885778cb..eec8cfeea5 100644
--- a/include/configs/imx8qm_mek_android_auto.h
+++ b/include/configs/imx8qm_mek_android_auto.h
@@ -8,7 +8,6 @@
 #define IMX8QM_MEK_ANDROID_AUTO_H
 
 #define CONFIG_USBD_HS
-#define CONFIG_BOOTLOADER_OFFSET_33K
 
 #define CONFIG_BCB_SUPPORT
 #define CONFIG_CMD_READ
diff --git a/include/configs/imx8qxp_arm2_android.h b/include/configs/imx8qxp_arm2_android.h
index f948a5fe5f..590fb329cd 100644
--- a/include/configs/imx8qxp_arm2_android.h
+++ b/include/configs/imx8qxp_arm2_android.h
@@ -8,7 +8,6 @@
 #define IMX8QXP_ARM2_ANDROID_H
 
 #define CONFIG_USBD_HS
-#define CONFIG_BOOTLOADER_OFFSET_33K
 
 #define CONFIG_BCB_SUPPORT
 #define CONFIG_CMD_READ
diff --git a/include/configs/imx8qxp_mek.h b/include/configs/imx8qxp_mek.h
index eb0785909e..d72b09aae2 100644
--- a/include/configs/imx8qxp_mek.h
+++ b/include/configs/imx8qxp_mek.h
@@ -281,8 +281,6 @@
 #define CONFIG_MMCROOT			"/dev/mmcblk1p2"  /* USDHC2 */
 #define CONFIG_SYS_FSL_USDHC_NUM	2
 
-#define CONFIG_BOOTLOADER_OFFSET_32K
-
 /* Size of malloc() pool */
 #define CONFIG_SYS_MALLOC_LEN		((CONFIG_ENV_SIZE + (32*1024)) * 1024)
 
diff --git a/include/configs/imx8qxp_mek_android.h b/include/configs/imx8qxp_mek_android.h
index b2435d948d..87c5ff59f8 100644
--- a/include/configs/imx8qxp_mek_android.h
+++ b/include/configs/imx8qxp_mek_android.h
@@ -8,7 +8,6 @@
 #define IMX8QXP_MEK_ANDROID_H
 
 #define CONFIG_USBD_HS
-#define CONFIG_BOOTLOADER_OFFSET_32K
 
 #define CONFIG_BCB_SUPPORT
 #define CONFIG_CMD_READ
diff --git a/include/configs/imx8qxp_mek_android_auto.h b/include/configs/imx8qxp_mek_android_auto.h
index d0f7f82594..bdab1e43a4 100644
--- a/include/configs/imx8qxp_mek_android_auto.h
+++ b/include/configs/imx8qxp_mek_android_auto.h
@@ -8,7 +8,6 @@
 #define IMX8QXP_MEK_ANDROID_AUTO_H
 
 #define CONFIG_USBD_HS
-#define CONFIG_BOOTLOADER_OFFSET_32K
 
 #define CONFIG_BCB_SUPPORT
 #define CONFIG_CMD_READ
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index bc206a8706..0b748eca77 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -334,8 +334,6 @@ CONFIG_BOOTCOUNT_I2C
 CONFIG_BOOTCOUNT_LIMIT
 CONFIG_BOOTCOUNT_RAM
 CONFIG_BOOTFILE
-CONFIG_BOOTLOADER_OFFSET_32K
-CONFIG_BOOTLOADER_OFFSET_33K
 CONFIG_BOOTMAPSZ
 CONFIG_BOOTMODE
 CONFIG_BOOTM_LINUX