MA-9263-3 [Android] Partition: enable GPT partition on imx devices

1. pass androidboot.storage_type to android, 'init' use it to parse
different init.freescale.storage.rc.
2. store new ptable with gpt partition.
3. we use the last LBA as backup gpt table, there is many warning log
when boot, change print to debug

Change-Id: I84070735e9d4c2741b0e240bc1c61b357dabc5b8
Signed-off-by: Sanshan Zhang <sanshan.zhang@nxp.com>
(cherry picked from commit da0ce2787256a323371641b0764266d386d767a5)
Signed-off-by: Ye Li <ye.li@nxp.com>

19 files changed, 19 insertions, 0 deletions

diff --git a/configs/mx6dlsabreautoandroid_defconfig b/configs/mx6dlsabreautoandroid_defconfig
index ad89f2e..152d9c7 100644
--- a/configs/mx6dlsabreautoandroid_defconfig
+++ b/configs/mx6dlsabreautoandroid_defconfig
@@ -4,6 +4,7 @@ CONFIG_TARGET_MX6QSABREAUTO=y
 CONFIG_VIDEO=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6qsabreauto/mx6dl.cfg,MX6DL"
 CONFIG_FASTBOOT=y
+CONFIG_EFI_PARTITION=y
 CONFIG_BOOTDELAY=3
 # CONFIG_CONSOLE_MUX is not set
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
diff --git a/configs/mx6dlsabreautoandroid_nand_defconfig b/configs/mx6dlsabreautoandroid_nand_defconfig
index 907b3d8..52eec9c 100644
--- a/configs/mx6dlsabreautoandroid_nand_defconfig
+++ b/configs/mx6dlsabreautoandroid_nand_defconfig
@@ -4,6 +4,7 @@ CONFIG_TARGET_MX6QSABREAUTO=y
 CONFIG_VIDEO=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6qsabreauto/mx6dl.cfg,MX6DL"
 CONFIG_FASTBOOT=y
+CONFIG_EFI_PARTITION=y
 CONFIG_NAND_BOOT=y
 CONFIG_BOOTDELAY=3
 # CONFIG_CONSOLE_MUX is not set
diff --git a/configs/mx6dlsabresdandroid_defconfig b/configs/mx6dlsabresdandroid_defconfig
index a8838c0..fadd345 100644
--- a/configs/mx6dlsabresdandroid_defconfig
+++ b/configs/mx6dlsabresdandroid_defconfig
@@ -4,6 +4,7 @@ CONFIG_TARGET_MX6SABRESD=y
 CONFIG_VIDEO=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6sabresd/mx6dlsabresd.cfg,MX6DL"
 CONFIG_FASTBOOT=y
+CONFIG_EFI_PARTITION=y
 CONFIG_BOOTDELAY=3
 # CONFIG_CONSOLE_MUX is not set
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
diff --git a/configs/mx6qpsabreautoandroid_defconfig b/configs/mx6qpsabreautoandroid_defconfig
index 61eb1f1..a9a6bdd 100644
--- a/configs/mx6qpsabreautoandroid_defconfig
+++ b/configs/mx6qpsabreautoandroid_defconfig
@@ -4,6 +4,7 @@ CONFIG_TARGET_MX6QSABREAUTO=y
 CONFIG_VIDEO=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6qsabreauto/mx6qp.cfg,MX6QP"
 CONFIG_FASTBOOT=y
+CONFIG_EFI_PARTITION=y
 CONFIG_BOOTDELAY=3
 # CONFIG_CONSOLE_MUX is not set
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
diff --git a/configs/mx6qpsabreautoandroid_nand_defconfig b/configs/mx6qpsabreautoandroid_nand_defconfig
index 415db1e..1537f75 100644
--- a/configs/mx6qpsabreautoandroid_nand_defconfig
+++ b/configs/mx6qpsabreautoandroid_nand_defconfig
@@ -4,6 +4,7 @@ CONFIG_TARGET_MX6QSABREAUTO=y
 CONFIG_VIDEO=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6qsabreauto/mx6qp.cfg,MX6QP"
 CONFIG_FASTBOOT=y
+CONFIG_EFI_PARTITION=y
 CONFIG_NAND_BOOT=y
 CONFIG_BOOTDELAY=3
 # CONFIG_CONSOLE_MUX is not set
diff --git a/configs/mx6qpsabresdandroid_defconfig b/configs/mx6qpsabresdandroid_defconfig
index 8d6a76e..e4ac748 100644
--- a/configs/mx6qpsabresdandroid_defconfig
+++ b/configs/mx6qpsabresdandroid_defconfig
@@ -4,6 +4,7 @@ CONFIG_TARGET_MX6SABRESD=y
 CONFIG_VIDEO=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6sabresd/mx6qp.cfg,MX6QP"
 CONFIG_FASTBOOT=y
+CONFIG_EFI_PARTITION=y
 CONFIG_BOOTDELAY=3
 # CONFIG_CONSOLE_MUX is not set
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
diff --git a/configs/mx6qsabreautoandroid_defconfig b/configs/mx6qsabreautoandroid_defconfig
index 4c02985..2d9b401 100644
--- a/configs/mx6qsabreautoandroid_defconfig
+++ b/configs/mx6qsabreautoandroid_defconfig
@@ -4,6 +4,7 @@ CONFIG_TARGET_MX6QSABREAUTO=y
 CONFIG_VIDEO=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6qsabreauto/imximage.cfg,MX6Q"
 CONFIG_FASTBOOT=y
+CONFIG_EFI_PARTITION=y
 CONFIG_BOOTDELAY=3
 # CONFIG_CONSOLE_MUX is not set
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
diff --git a/configs/mx6qsabreautoandroid_nand_defconfig b/configs/mx6qsabreautoandroid_nand_defconfig
index b802d10..74fd951 100644
--- a/configs/mx6qsabreautoandroid_nand_defconfig
+++ b/configs/mx6qsabreautoandroid_nand_defconfig
@@ -4,6 +4,7 @@ CONFIG_TARGET_MX6QSABREAUTO=y
 CONFIG_VIDEO=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6qsabreauto/imximage.cfg,MX6Q"
 CONFIG_FASTBOOT=y
+CONFIG_EFI_PARTITION=y
 CONFIG_NAND_BOOT=y
 CONFIG_BOOTDELAY=3
 # CONFIG_CONSOLE_MUX is not set
diff --git a/configs/mx6qsabresdandroid_defconfig b/configs/mx6qsabresdandroid_defconfig
index 5acc725..527c2cb 100644
--- a/configs/mx6qsabresdandroid_defconfig
+++ b/configs/mx6qsabresdandroid_defconfig
@@ -4,6 +4,7 @@ CONFIG_TARGET_MX6SABRESD=y
 CONFIG_VIDEO=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6sabresd/mx6q_4x_mt41j128.cfg,MX6Q"
 CONFIG_FASTBOOT=y
+CONFIG_EFI_PARTITION=y
 CONFIG_BOOTDELAY=3
 # CONFIG_CONSOLE_MUX is not set
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
diff --git a/configs/mx6slevkandroid_defconfig b/configs/mx6slevkandroid_defconfig
index 4dac282..85aa004 100644
--- a/configs/mx6slevkandroid_defconfig
+++ b/configs/mx6slevkandroid_defconfig
@@ -3,6 +3,7 @@ CONFIG_ARCH_MX6=y
 CONFIG_TARGET_MX6SLEVK=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6slevk/imximage.cfg,MX6SL"
 CONFIG_FASTBOOT=y
+CONFIG_EFI_PARTITION=y
 CONFIG_BOOTDELAY=3
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
diff --git a/configs/mx6solosabreautoandroid_defconfig b/configs/mx6solosabreautoandroid_defconfig
index 12bf71e..4fe7880 100644
--- a/configs/mx6solosabreautoandroid_defconfig
+++ b/configs/mx6solosabreautoandroid_defconfig
@@ -4,6 +4,7 @@ CONFIG_TARGET_MX6QSABREAUTO=y
 CONFIG_VIDEO=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6qsabreauto/mx6solo.cfg,MX6S"
 CONFIG_FASTBOOT=y
+CONFIG_EFI_PARTITION=y
 CONFIG_BOOTDELAY=3
 # CONFIG_CONSOLE_MUX is not set
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
diff --git a/configs/mx6solosabreautoandroid_nand_defconfig b/configs/mx6solosabreautoandroid_nand_defconfig
index 0f2f75d..ead5dcd 100644
--- a/configs/mx6solosabreautoandroid_nand_defconfig
+++ b/configs/mx6solosabreautoandroid_nand_defconfig
@@ -4,6 +4,7 @@ CONFIG_TARGET_MX6QSABREAUTO=y
 CONFIG_VIDEO=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6qsabreauto/mx6solo.cfg,MX6S"
 CONFIG_FASTBOOT=y
+CONFIG_EFI_PARTITION=y
 CONFIG_NAND_BOOT=y
 CONFIG_BOOTDELAY=3
 # CONFIG_CONSOLE_MUX is not set
diff --git a/configs/mx6solosabresdandroid_defconfig b/configs/mx6solosabresdandroid_defconfig
index f665602..4f83f74 100644
--- a/configs/mx6solosabresdandroid_defconfig
+++ b/configs/mx6solosabresdandroid_defconfig
@@ -4,6 +4,7 @@ CONFIG_TARGET_MX6SABRESD=y
 CONFIG_VIDEO=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6sabresd/mx6solo_4x_mt41j128.cfg,MX6S"
 CONFIG_FASTBOOT=y
+CONFIG_EFI_PARTITION=y
 CONFIG_BOOTDELAY=3
 # CONFIG_CONSOLE_MUX is not set
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
diff --git a/configs/mx6sxsabreautoandroid_defconfig b/configs/mx6sxsabreautoandroid_defconfig
index 68fea61..57c5f09 100644
--- a/configs/mx6sxsabreautoandroid_defconfig
+++ b/configs/mx6sxsabreautoandroid_defconfig
@@ -4,6 +4,7 @@ CONFIG_TARGET_MX6SXSABREAUTO=y
 CONFIG_DEFAULT_DEVICE_TREE="imx6sx-sabreauto"
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6sxsabreauto/imximage.cfg"
 CONFIG_FASTBOOT=y
+CONFIG_EFI_PARTITION=y
 CONFIG_BOOTDELAY=3
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
diff --git a/configs/mx6sxsabreautoandroid_nand_defconfig b/configs/mx6sxsabreautoandroid_nand_defconfig
index e3510b0..db628fc 100644
--- a/configs/mx6sxsabreautoandroid_nand_defconfig
+++ b/configs/mx6sxsabreautoandroid_nand_defconfig
@@ -4,6 +4,7 @@ CONFIG_TARGET_MX6SXSABREAUTO=y
 CONFIG_DEFAULT_DEVICE_TREE="imx6sx-sabreauto"
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6sxsabreauto/imximage.cfg"
 CONFIG_FASTBOOT=y
+CONFIG_EFI_PARTITION=y
 CONFIG_NAND_BOOT=y
 CONFIG_BOOTDELAY=3
 CONFIG_HUSH_PARSER=y
diff --git a/configs/mx6sxsabresdandroid_defconfig b/configs/mx6sxsabresdandroid_defconfig
index 0c30dc6..9847885 100644
--- a/configs/mx6sxsabresdandroid_defconfig
+++ b/configs/mx6sxsabresdandroid_defconfig
@@ -4,6 +4,7 @@ CONFIG_TARGET_MX6SXSABRESD=y
 CONFIG_VIDEO=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6sxsabresd/imximage.cfg"
 CONFIG_FASTBOOT=y
+CONFIG_EFI_PARTITION=y
 CONFIG_BOOTDELAY=3
 # CONFIG_CONSOLE_MUX is not set
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
diff --git a/configs/mx6ul_14x14_evk_android_defconfig b/configs/mx6ul_14x14_evk_android_defconfig
index e66c214..f5e234b 100644
--- a/configs/mx6ul_14x14_evk_android_defconfig
+++ b/configs/mx6ul_14x14_evk_android_defconfig
@@ -5,6 +5,7 @@ CONFIG_VIDEO=y
 CONFIG_DEFAULT_DEVICE_TREE="imx6ul-14x14-evk"
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6ul_14x14_evk/imximage.cfg"
 CONFIG_FASTBOOT=y
+CONFIG_EFI_PARTITION=y
 CONFIG_BOOTDELAY=3
 CONFIG_BOARD_EARLY_INIT_F=y
 CONFIG_HUSH_PARSER=y
diff --git a/configs/mx7dsabresdandroid_defconfig b/configs/mx7dsabresdandroid_defconfig
index f3b2614..28f034a 100644
--- a/configs/mx7dsabresdandroid_defconfig
+++ b/configs/mx7dsabresdandroid_defconfig
@@ -8,6 +8,7 @@ CONFIG_VIDEO=y
 CONFIG_DEFAULT_DEVICE_TREE="imx7d-sdb"
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx7dsabresd/imximage.cfg"
 CONFIG_FASTBOOT=y
+CONFIG_EFI_PARTITION=y
 CONFIG_BOOTDELAY=3
 # CONFIG_CONSOLE_MUX is not set
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
diff --git a/configs/mx7ulp_evk_android_defconfig b/configs/mx7ulp_evk_android_defconfig
index 34f6f21..e2a946e 100644
--- a/configs/mx7ulp_evk_android_defconfig
+++ b/configs/mx7ulp_evk_android_defconfig
@@ -4,6 +4,7 @@ CONFIG_TARGET_MX7ULP_EVK=y
 CONFIG_DEFAULT_DEVICE_TREE="imx7ulp-evk-qspi"
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx7ulp_evk/imximage.cfg"
 CONFIG_FASTBOOT=y
+CONFIG_EFI_PARTITION=y
 CONFIG_BOARD_LATE_INIT=y
 CONFIG_BOARD_EARLY_INIT_F=y
 CONFIG_HUSH_PARSER=y