summaryrefslogtreecommitdiff
path: root/arch/arm/lib
diff options
context:
space:
mode:
authorYe.Li <B37916@freescale.com>2015-07-09 11:19:13 +0800
committerYe.Li <B37916@freescale.com>2015-07-13 14:44:02 +0800
commitae7ffee7fe9f9b2e217d051971a98e1f28290cb1 (patch)
tree606c01ebff4e867637f20b1040a553ebd977fc01 /arch/arm/lib
parent93e01750558e1ba2a1dfdb0cca24ed38326db091 (diff)
downloadu-boot-imx-ae7ffee7fe9f9b2e217d051971a98e1f28290cb1.zip
u-boot-imx-ae7ffee7fe9f9b2e217d051971a98e1f28290cb1.tar.gz
u-boot-imx-ae7ffee7fe9f9b2e217d051971a98e1f28290cb1.tar.bz2
MLK-11228-1 android: Integrate community fastboot with FSL i.MX fastboot
1. Replace the UDC driver with community's USB gadget d_dnl driver. 2. Integrate the FSL SD/SATA/NAND flash operations, since the GPT and EFI partitions are not support by i.MX. 3. Add FDT support to community's android image. 4. Change the booti command to boota, due to the booti has been used for ARM64 image boot. 5. Modify boota implementation to load ramdisk and fdt to their loading addresses specified in boot.img header, while bootm won't do it for android image. 6. Modify the android image HAB implementation. Authenticate the boot.img on the "load_addr" for both SD and NAND. 7. Enable new configuration CONFIG_FSL_FASTBOOT for Freescale's fastboot with relevant header file "fsl_fastboot.h". While disabling the configuration, the community fastboot is used. 8. Use community's way to combine cmdline in boot.img and u-boot environment, not overwrite the cmdline in boot.img Signed-off-by: Ye.Li <B37916@freescale.com>
Diffstat (limited to 'arch/arm/lib')
-rw-r--r--arch/arm/lib/board.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/lib/board.c b/arch/arm/lib/board.c
index 8045c9d..1f2bab1 100644
--- a/arch/arm/lib/board.c
+++ b/arch/arm/lib/board.c
@@ -45,8 +45,8 @@
#include <miiphy.h>
#endif
-#ifdef CONFIG_FASTBOOT
-#include <fastboot.h>
+#ifdef CONFIG_FSL_FASTBOOT
+#include <fsl_fastboot.h>
#endif
DECLARE_GLOBAL_DATA_PTR;
@@ -643,7 +643,7 @@ void board_init_r(gd_t *id, ulong dest_addr)
board_late_init();
#endif
-#ifdef CONFIG_FASTBOOT
+#ifdef CONFIG_FSL_FASTBOOT
fastboot_setup();
#endif
@@ -686,7 +686,7 @@ void board_init_r(gd_t *id, ulong dest_addr)
}
#endif
-#ifdef CONFIG_FASTBOOT
+#ifdef CONFIG_FSL_FASTBOOT
check_fastboot();
#endif