diff options
| author | Haoran Wang <elven.wang@nxp.com> | 2017-02-11 12:01:33 +0800 |
|---|---|---|
| committer | Haoran Wang <elven.wang@nxp.com> | 2017-02-11 12:07:27 +0800 |
| commit | fd6ee4e63dd34c466d2ba1881655f2b6a59add4c (patch) | |
| tree | fc2b1ee6eb3bf0d305ec86fce6f1c0b0fb274564 | |
| parent | 2c14d018c186d530cc1c73737e3e08168be28c4c (diff) | |
| download | u-boot-imx-fd6ee4e63dd34c466d2ba1881655f2b6a59add4c.zip u-boot-imx-fd6ee4e63dd34c466d2ba1881655f2b6a59add4c.tar.gz u-boot-imx-fd6ee4e63dd34c466d2ba1881655f2b6a59add4c.tar.bz2 | |
Revert "Use bootctl instead of AVB"
Since use AVB in bootloader make no impact for mfgtool
for Android Things so add it back.
Also fixed typto bug in codes.
This reverts commit 2c14d018c186d530cc1c73737e3e08168be28c4c.
Change-Id: I6ed371e141dd8136cadbafe0a3e507953cfc53f9
Signed-off-by: Haoran Wang <elven.wang@nxp.com>
| -rw-r--r-- | configs/mx6ul_nxpu_iopb_defconfig | 2 | ||||
| -rw-r--r-- | configs/pico-imx7d_defconfig | 2 | ||||
| -rw-r--r-- | configs/picosom-imx6ul_defconfig | 2 | ||||
| -rwxr-xr-x | drivers/usb/gadget/f_fastboot.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/configs/mx6ul_nxpu_iopb_defconfig b/configs/mx6ul_nxpu_iopb_defconfig index 48d4fa0..8c5f939 100644 --- a/configs/mx6ul_nxpu_iopb_defconfig +++ b/configs/mx6ul_nxpu_iopb_defconfig @@ -1,4 +1,4 @@ -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6ul_nxpu_iopb/imximage.cfg,MX6UL,MX6UL_NXPU_IOPB,ANDROID_SUPPORT,BRILLO_SUPPORT,SYSTEM_RAMDISK_SUPPORT,FSL_BOOTCTL" +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6ul_nxpu_iopb/imximage.cfg,MX6UL,MX6UL_NXPU_IOPB,ANDROID_SUPPORT,BRILLO_SUPPORT,AVB_SUPPORT,SYSTEM_RAMDISK_SUPPORT,AVB_FUSE" CONFIG_ARM=y CONFIG_TARGET_MX6UL_NXPU_IOPB=y CONFIG_DM=y diff --git a/configs/pico-imx7d_defconfig b/configs/pico-imx7d_defconfig index 5dc661c..9cd5f6e 100644 --- a/configs/pico-imx7d_defconfig +++ b/configs/pico-imx7d_defconfig @@ -1,4 +1,4 @@ -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/technexion/pico-imx7d/imximage_512mb.cfg,MX7D,DDR_MB=512,ANDROID_SUPPORT,BRILLO_SUPPORT,EFI_PARTITION,SYSTEM_RAMDISK_SUPPORT,DDR_MB=512,FSL_BOOTCTL" +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/technexion/pico-imx7d/imximage_512mb.cfg,MX7D,,DDR_MB=512,ANDROID_SUPPORT,BRILLO_SUPPORT,EFI_PARTITION,AVB_SUPPORT,SYSTEM_RAMDISK_SUPPORT,DDR_MB=512" CONFIG_ARM=y CONFIG_TARGET_PICO_IMX7D=y CONFIG_SYS_MALLOC_F=y diff --git a/configs/picosom-imx6ul_defconfig b/configs/picosom-imx6ul_defconfig index 5f0dfda..67e679f 100644 --- a/configs/picosom-imx6ul_defconfig +++ b/configs/picosom-imx6ul_defconfig @@ -1,4 +1,4 @@ -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/technexion/picosom-imx6ul/imximage.cfg,MX6UL,ANDROID_SUPPORT,BRILLO_SUPPORT,SYSTEM_RAMDISK_SUPPORT,FSL_BOOTCTL" +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/technexion/picosom-imx6ul/imximage.cfg,MX6UL,ANDROID_SUPPORT,BRILLO_SUPPORT,AVB_SUPPORT,SYSTEM_RAMDISK_SUPPORT,AVB_FUSE" CONFIG_ARM=y CONFIG_TARGET_PICOSOM_IMX6UL=y CONFIG_DM=y diff --git a/drivers/usb/gadget/f_fastboot.c b/drivers/usb/gadget/f_fastboot.c index a593d88..271843e 100755 --- a/drivers/usb/gadget/f_fastboot.c +++ b/drivers/usb/gadget/f_fastboot.c @@ -2036,7 +2036,7 @@ int do_boota(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) { setenv("bootargs_sec", avb_out_data->cmdline); #ifdef CONFIG_SYSTEM_RAMDISK_SUPPORT if(!is_recovery_mode) - f,astboot_setup_system_boot_args(avb_out_data->ab_suffix); + fastboot_setup_system_boot_args(avb_out_data->ab_suffix); #endif image_size = avb_loadpart->data_size; memcpy((void *)load_addr, (void *)hdr, image_size); |