diff options
| author | Ye.Li <B37916@freescale.com> | 2015-07-09 11:19:13 +0800 |
|---|---|---|
| committer | Ye.Li <B37916@freescale.com> | 2015-07-13 14:44:02 +0800 |
| commit | ae7ffee7fe9f9b2e217d051971a98e1f28290cb1 (patch) | |
| tree | 606c01ebff4e867637f20b1040a553ebd977fc01 /common/board_r.c | |
| parent | 93e01750558e1ba2a1dfdb0cca24ed38326db091 (diff) | |
| download | u-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 'common/board_r.c')
| -rw-r--r-- | common/board_r.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/common/board_r.c b/common/board_r.c index ceccb80..b1ad605 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -58,8 +58,8 @@ #ifdef CONFIG_AVR32 #include <asm/arch/mmu.h> #endif -#ifdef CONFIG_FASTBOOT -#include <fastboot.h> +#ifdef CONFIG_FSL_FASTBOOT +#include <fsl_fastboot.h> #endif DECLARE_GLOBAL_DATA_PTR; @@ -676,7 +676,7 @@ static int initr_kbd(void) } #endif -#ifdef CONFIG_FASTBOOT +#ifdef CONFIG_FSL_FASTBOOT static int initr_fastboot_setup(void) { fastboot_setup(); @@ -865,7 +865,7 @@ init_fnc_t init_sequence_r[] = { #ifdef CONFIG_BOARD_LATE_INIT board_late_init, #endif -#ifdef CONFIG_FASTBOOT +#ifdef CONFIG_FSL_FASTBOOT initr_fastboot_setup, #endif #ifdef CONFIG_CMD_SCSI @@ -911,7 +911,7 @@ init_fnc_t init_sequence_r[] = { #ifdef CONFIG_PS2KBD initr_kbd, #endif -#ifdef CONFIG_FASTBOOT +#ifdef CONFIG_FSL_FASTBOOT initr_check_fastboot, #endif run_main_loop, |