diff options
| author | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2019-07-16 19:28:14 +0200 |
|---|---|---|
| committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2019-07-16 19:28:14 +0200 |
| commit | 25f68add54118b931df462333d869da4a21ef774 (patch) | |
| tree | aaa3ad583536ea7143477c609367d7447242cf85 | |
| parent | b395ff0d10e75994e33f3c227495fd80406b5d44 (diff) | |
apalis-imx8/colibri-imx8qxp: integrate fastboot recovery
Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
| -rw-r--r-- | configs/apalis-imx8_defconfig | 7 | ||||
| -rw-r--r-- | configs/colibri-imx8qxp_defconfig | 19 | ||||
| -rw-r--r-- | include/configs/apalis-imx8.h | 6 | ||||
| -rw-r--r-- | include/configs/colibri-imx8qxp.h | 2 |
4 files changed, 17 insertions, 17 deletions
diff --git a/configs/apalis-imx8_defconfig b/configs/apalis-imx8_defconfig index df2849f44c..fc0794e922 100644 --- a/configs/apalis-imx8_defconfig +++ b/configs/apalis-imx8_defconfig @@ -13,6 +13,12 @@ CONFIG_LOG=y CONFIG_VERSION_VARIABLE=y # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_BOARD_EARLY_INIT_F=y +CONFIG_FASTBOOT=y +CONFIG_FSL_FASTBOOT=y +CONFIG_FASTBOOT_BUF_ADDR=0x82800000 +CONFIG_FASTBOOT_BUF_SIZE=0x08000000 +CONFIG_FASTBOOT_FLASH=y +CONFIG_FASTBOOT_FLASH_MMC_DEV=0 CONFIG_CMD_MEMTEST=y CONFIG_CMD_CLK=y CONFIG_CMD_FUSE=y @@ -56,7 +62,6 @@ CONFIG_USB_GADGET_MANUFACTURER="FSL" CONFIG_USB_GADGET_VENDOR_NUM=0x0525 CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 CONFIG_CI_UDC=y -CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_VIDEO=y CONFIG_VIDEO_IMX_HDP_LOAD=y # CONFIG_EFI_LOADER is not set diff --git a/configs/colibri-imx8qxp_defconfig b/configs/colibri-imx8qxp_defconfig index c946b432d9..a91129b04c 100644 --- a/configs/colibri-imx8qxp_defconfig +++ b/configs/colibri-imx8qxp_defconfig @@ -13,6 +13,12 @@ CONFIG_LOG=y CONFIG_VERSION_VARIABLE=y # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_BOARD_EARLY_INIT_F=y +CONFIG_FASTBOOT=y +CONFIG_FSL_FASTBOOT=y +CONFIG_FASTBOOT_BUF_ADDR=0x82800000 +CONFIG_FASTBOOT_BUF_SIZE=0x08000000 +CONFIG_FASTBOOT_FLASH=y +CONFIG_FASTBOOT_FLASH_MMC_DEV=0 CONFIG_CMD_MEMTEST=y CONFIG_CMD_CLK=y CONFIG_CMD_FUSE=y @@ -51,16 +57,9 @@ CONFIG_USB_XHCI_HCD=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_STORAGE=y CONFIG_USB_GADGET=y +CONFIG_USB_GADGET_MANUFACTURER="FSL" +CONFIG_USB_GADGET_VENDOR_NUM=0x0525 +CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 CONFIG_CI_UDC=y -CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_VIDEO=y # CONFIG_EFI_LOADER is not set -CONFIG_FASTBOOT=y -CONFIG_FASTBOOT_USB_DEV=0 -CONFIG_FASTBOOT_FLASH=y -CONFIG_FASTBOOT_FLASH_MMC_DEV=0 -CONFIG_FASTBOOT_CMD_OEM_FORMAT=y -CONFIG_USB_FUNCTION_FASTBOOT=y -CONFIG_FASTBOOT_BUF_ADDR=0x82800000 -CONFIG_FASTBOOT_BUF_SIZE=0x08000000 -CONFIG_FSL_FASTBOOT=y diff --git a/include/configs/apalis-imx8.h b/include/configs/apalis-imx8.h index 79d26fca53..73e747689f 100644 --- a/include/configs/apalis-imx8.h +++ b/include/configs/apalis-imx8.h @@ -103,7 +103,7 @@ BOOTENV \ M4_BOOT_ENV \ MEM_LAYOUT_ENV_SETTINGS \ - "bootcmd_mfg=source 0x82e00000\0" \ + "bootcmd_mfg=fastboot 0\0" \ "script=boot.scr\0" \ "image=Image\0" \ "panel=NULL\0" \ @@ -162,9 +162,6 @@ "fi;\0" #undef CONFIG_BOOTCOMMAND -#ifdef CONFIG_TDX_EASY_INSTALLER -#define CONFIG_BOOTCOMMAND "run distro_bootcmd" -#else #define CONFIG_BOOTCOMMAND \ "mmc dev ${mmcdev}; if mmc rescan; then " \ "if run loadbootscript; then " \ @@ -176,7 +173,6 @@ "fi; " \ "fi; " \ "else booti ${loadaddr} - ${fdt_addr}; fi" -#endif /* Link Definitions */ #define CONFIG_LOADADDR 0x80280000 diff --git a/include/configs/colibri-imx8qxp.h b/include/configs/colibri-imx8qxp.h index 3521fa7047..7f724138f0 100644 --- a/include/configs/colibri-imx8qxp.h +++ b/include/configs/colibri-imx8qxp.h @@ -84,7 +84,7 @@ M4_BOOT_ENV \ AHAB_ENV \ MEM_LAYOUT_ENV_SETTINGS \ - "bootcmd_mfg=source 0x82e00000\0" \ + "bootcmd_mfg=fastboot 0\0" \ "script=boot.scr\0" \ "image=Image\0" \ "panel=NULL\0" \ |