Deprecare old board id scheme and use get_board_id
- necessary for DVT
Bug: 119213546
Test: test boot-up / reboot
Change-Id: I268521ac5d62435e71d67304285e39e0f42b42b4
diff --git a/board/freescale/imx8mq_phanbell/imx8m_phanbell.c b/board/freescale/imx8mq_phanbell/imx8m_phanbell.c
index 6f8fb77..f176d48 100644
--- a/board/freescale/imx8mq_phanbell/imx8m_phanbell.c
+++ b/board/freescale/imx8mq_phanbell/imx8m_phanbell.c
@@ -142,6 +142,7 @@
return val;
}
+#if 0 // old ID scheme, deprecate
int get_imx8m_baseboard_id(void)
{
int i = 0, value = 0;
@@ -171,20 +172,21 @@
return baseboard_id;
}
+#endif
+
#ifdef CONFIG_IMX_TRUSTY_OS
int get_tee_load(ulong *load)
{
int board_id;
- board_id = get_imx8m_baseboard_id();
+ board_id = get_board_id();
/* load TEE to the last 32M of DDR */
- if ((board_id == ENTERPRISE_MICRON_1G) ||
- (board_id == ENTERPRISE_HYNIX_1G)) {
- /* for 1G DDR board */
- *load = (ulong)TEE_LOAD_ADDR_1G;
- } else {
- /* for 3G DDR board */
+ if (board_id == 0) {
+ /* for 3G DDR board */
*load = (ulong)TEE_LOAD_ADDR_3G;
+ } else {
+ /* for 1G DDR board */
+ *load = (ulong)TEE_LOAD_ADDR_1G;
}
return 0;
@@ -193,19 +195,18 @@
int dram_init(void)
{
- int baseboard_id;
+ int board_id;
uint32_t ddr_size = 0;
/* different boards have different DDR type, distinguish the DDR
* type by board id.
*/
- baseboard_id = get_imx8m_baseboard_id();
- if ((baseboard_id == ENTERPRISE_MICRON_1G) ||
- (baseboard_id == ENTERPRISE_HYNIX_1G)) {
+ board_id = get_board_id();
+ if (board_id == 0) {
+ /* 3G DDR size */
+ ddr_size = 0xc0000000;
+ } else{
/* 1G DDR size */
ddr_size = 0x40000000;
- } else{
- /* Default to use 3G DDR size */
- ddr_size = 0xc0000000;
}
/* rom_pointer[1] contains the size of TEE occupies */
@@ -372,14 +373,12 @@
#ifdef CONFIG_ENV_IS_IN_MMC
board_late_mmc_env_init();
#endif
- int baseboard_id;
- baseboard_id = get_imx8m_baseboard_id();
- if ((baseboard_id == ENTERPRISE_MICRON_1G) ||
- (baseboard_id == ENTERPRISE_HYNIX_1G)) {
- /* 1G DDR size */
+ int board_id = get_board_id();
+ if (board_id == 0) {
+ /* 3G DDR size */
setenv("bootargs_ram_capacity", "cma=384M");
} else {
- /* 3G DDR size */
+ /* 1G DDR size */
setenv("bootargs_ram_capacity", "cma=384M");
}
diff --git a/drivers/usb/gadget/f_fastboot.c b/drivers/usb/gadget/f_fastboot.c
index 391c6cb..3b9d946 100755
--- a/drivers/usb/gadget/f_fastboot.c
+++ b/drivers/usb/gadget/f_fastboot.c
@@ -133,7 +133,7 @@
"variant",
"battery-soc-ok",
#if defined(CONFIG_ANDROID_THINGS_SUPPORT) && defined(CONFIG_ARCH_IMX8M)
- "baseboard_id"
+ "board_id"
#endif
};
@@ -2657,7 +2657,7 @@
#endif
#if defined(CONFIG_ANDROID_THINGS_SUPPORT) && defined(CONFIG_ARCH_IMX8M)
-int get_imx8m_baseboard_id(void);
+int get_board_id(void);
#endif
static int get_single_var(char *cmd, char *response)
@@ -2778,16 +2778,16 @@
#endif
}
#if defined(CONFIG_ANDROID_THINGS_SUPPORT) && defined(CONFIG_ARCH_IMX8M)
- else if (!strcmp_l1("baseboard_id", cmd)) {
- int baseboard_id;
+ else if (!strcmp_l1("board_id", cmd)) {
+ int board_id;
- baseboard_id = get_imx8m_baseboard_id();
- if (baseboard_id < 0) {
- printf("Get baseboard id failed!\n");
- strncat(response, "Get baseboard id failed!", chars_left);
+ board_id = get_board_id();
+ if (board_id < 0) {
+ printf("Get board id failed!\n");
+ strncat(response, "Get board id failed!", chars_left);
return -1;
} else
- snprintf(response + strlen(response), chars_left, "0x%x", baseboard_id);
+ snprintf(response + strlen(response), chars_left, "0x%x", board_id);
}
#endif
#ifdef CONFIG_AVB_ATX
