From 17a30851ad9dec60a27481bd695e09d1f38fe685 Mon Sep 17 00:00:00 2001 From: Adrian Alonso Date: Wed, 7 Sep 2016 18:00:54 -0500 Subject: [PATCH] MLK-13130: configs: mx6qarm2: android lpddr2 pop support Add Android support for mx6qarm2 lpddr2 pop target Signed-off-by: Adrian Alonso (Cherry picked from commit 6356f2b420f3571493755f6b3a307a66a539b60c) --- configs/mx6qarm2android_pop_lpddr2_revb_defconfig | 5 ++ include/configs/mx6qarm2.h | 6 +- include/configs/mx6qarm2_android.h | 84 +++++++++++++++++++++++ 3 files changed, 94 insertions(+), 1 deletion(-) create mode 100644 configs/mx6qarm2android_pop_lpddr2_revb_defconfig create mode 100644 include/configs/mx6qarm2_android.h diff --git a/configs/mx6qarm2android_pop_lpddr2_revb_defconfig b/configs/mx6qarm2android_pop_lpddr2_revb_defconfig new file mode 100644 index 0000000..73ded4f --- /dev/null +++ b/configs/mx6qarm2android_pop_lpddr2_revb_defconfig @@ -0,0 +1,5 @@ +CONFIG_ARM=y +CONFIG_ARCH_MX6=y +CONFIG_TARGET_MX6QARM2=y +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6qarm2/mt128x64mx32.cfg,MX6Q,MX6DQ_POP_LPDDR2,DDR_MB=512,ANDROID_SUPPORT" +CONFIG_CMD_GPIO=y diff --git a/include/configs/mx6qarm2.h b/include/configs/mx6qarm2.h index 91257ae..349673b 100644 --- a/include/configs/mx6qarm2.h +++ b/include/configs/mx6qarm2.h @@ -176,4 +176,8 @@ #define CONFIG_USB_MAX_CONTROLLER_COUNT 1 #endif -#endif /* __CONFIG_H */ +#if defined(CONFIG_ANDROID_SUPPORT) +#include "mx6qarm2_android.h" +#endif + +#endif /* __CONFIG_H */ diff --git a/include/configs/mx6qarm2_android.h b/include/configs/mx6qarm2_android.h new file mode 100644 index 0000000..2c9fa2a --- /dev/null +++ b/include/configs/mx6qarm2_android.h @@ -0,0 +1,84 @@ +/* + * Copyright (C) 2013-2016 Freescale Semiconductor, Inc. All Rights Reserved. + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#ifndef IMX6Q_ARM2_ANDROID_H +#define IMX6Q_ARM2_ANDROID_H + +#define CONFIG_CI_UDC +#define CONFIG_USBD_HS +#define CONFIG_USB_GADGET_DUALSPEED + +#define CONFIG_USB_GADGET +#define CONFIG_CMD_USB_MASS_STORAGE +#define CONFIG_USB_FUNCTION_MASS_STORAGE +#define CONFIG_USB_GADGET_DOWNLOAD +#define CONFIG_USB_GADGET_VBUS_DRAW 2 + +#define CONFIG_G_DNL_VENDOR_NUM 0x18d1 +#define CONFIG_G_DNL_PRODUCT_NUM 0x0d02 +#define CONFIG_G_DNL_MANUFACTURER "FSL" + +#define CONFIG_USB_FUNCTION_FASTBOOT +#define CONFIG_CMD_FASTBOOT +#define CONFIG_CMD_READ +#define CONFIG_BCB_SUPPORT +#define CONFIG_ANDROID_BOOT_IMAGE +#define CONFIG_FASTBOOT_FLASH + +/* For NAND we don't support lock/unlock */ +#ifndef CONFIG_SYS_BOOT_NAND +#define CONFIG_FASTBOOT_LOCK +#endif + +#define FSL_FASTBOOT_FB_DEV "mmc" +#define FSL_FASTBOOT_DATA_PART_NUM 4 +#define FSL_FASTBOOT_FB_PART_NUM 11 +#define FSL_FASTBOOT_PR_DATA_PART_NUM 12 + +#define CONFIG_FSL_CAAM_KB +#define CONFIG_CMD_FSL_CAAM_KB +#define CONFIG_SHA1 +#define CONFIG_SHA256 + +#define CONFIG_FSL_FASTBOOT +#define CONFIG_ANDROID_RECOVERY + +#if defined CONFIG_SYS_BOOT_NAND +#define CONFIG_FASTBOOT_STORAGE_NAND +#elif defined CONFIG_SYS_BOOT_SATA +#define CONFIG_FASTBOOT_STORAGE_SATA +#else +#define CONFIG_FASTBOOT_STORAGE_MMC +#endif + +#define CONFIG_ANDROID_MAIN_MMC_BUS 2 +#define CONFIG_ANDROID_BOOT_PARTITION_MMC 1 +#define CONFIG_ANDROID_SYSTEM_PARTITION_MMC 5 +#define CONFIG_ANDROID_RECOVERY_PARTITION_MMC 2 +#define CONFIG_ANDROID_CACHE_PARTITION_MMC 6 +#define CONFIG_ANDROID_DATA_PARTITION_MMC 4 +#define CONFIG_ANDROID_MISC_PARTITION_MMC 8 + +#if defined(CONFIG_FASTBOOT_STORAGE_NAND) +#define ANDROID_FASTBOOT_NAND_PARTS "16m@64m(boot) 16m@80m(recovery) 810m@96m(android_root)ubifs" +#endif + +#define CONFIG_CMD_BOOTA +#define CONFIG_SUPPORT_RAW_INITRD +#define CONFIG_SERIAL_TAG + +#undef CONFIG_EXTRA_ENV_SETTINGS +#undef CONFIG_BOOTCOMMAND + +#define CONFIG_EXTRA_ENV_SETTINGS \ + "splashpos=m,m\0" \ + "fdt_high=0xffffffff\0" \ + "initrd_high=0xffffffff\0" \ + +#define CONFIG_FASTBOOT_BUF_ADDR CONFIG_SYS_LOAD_ADDR +#define CONFIG_FASTBOOT_BUF_SIZE 0x19000000 + +#endif /* IMX6Q_ARM2_ANDROID_H */ -- 1.9.1