From 372f1e0c87e1e43b4d4dac7b05ddd077aff7d24e Mon Sep 17 00:00:00 2001 From: "Ye.Li" Date: Fri, 10 Jan 2014 17:55:46 +0800 Subject: ENGR00294746 ARM:imx6:sabresd/sabreauto/slevk Support android FDT embedded image Since the "mkbootimg" tool can't use the "unused" fields of bootimg header, Android will set the FDT info at the "second_addr" and "second_size" fields. To support this change, booti command was changed to use new fields. The memory management(lmb) is added in booti, and the relocation of DTB and ramdisk is disabled at default, to prevent relocating to a high address which overlaps kernel's vmalloc area. The kernel image which needs FDT accompanied is larger than old. So in making boot.img, suggest to set "--base" parameter enough offset from kernel entry "0x10008000" to keep ramdisk and DTB not be overwritten by zImage decompression. For example "--base 0x14000000" Signed-off-by: Ye.Li --- include/configs/mx6qsabreandroid_common.h | 6 ++++-- include/configs/mx6slevkandroid.h | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) (limited to 'include') diff --git a/include/configs/mx6qsabreandroid_common.h b/include/configs/mx6qsabreandroid_common.h index d024c01..cc099a4 100644 --- a/include/configs/mx6qsabreandroid_common.h +++ b/include/configs/mx6qsabreandroid_common.h @@ -1,6 +1,6 @@ /* - * Copyright (C) 2013 Freescale Semiconductor, Inc. + * Copyright (C) 2013-2014 Freescale Semiconductor, Inc. * * Configuration android settings for the MX6Q Sabre Freescale board. * @@ -64,6 +64,8 @@ #undef CONFIG_BOOTCOMMAND #define CONFIG_EXTRA_ENV_SETTINGS \ - "splashpos=m,m\0" + "splashpos=m,m\0" \ + "fdt_high=0xffffffff\0" \ + "initrd_high=0xffffffff\0" \ #endif diff --git a/include/configs/mx6slevkandroid.h b/include/configs/mx6slevkandroid.h index dfdf9ee..71d7a07 100644 --- a/include/configs/mx6slevkandroid.h +++ b/include/configs/mx6slevkandroid.h @@ -1,6 +1,6 @@ /* - * Copyright (C) 2013 Freescale Semiconductor, Inc. + * Copyright (C) 2013-2014 Freescale Semiconductor, Inc. * * Configuration android settings for the MX6SL EVK Freescale board. * @@ -82,6 +82,8 @@ #undef CONFIG_BOOTCOMMAND #define CONFIG_EXTRA_ENV_SETTINGS \ - "splashpos=m,m\0" + "splashpos=m,m\0" \ + "fdt_high=0xffffffff\0" \ + "initrd_high=0xffffffff\0" \ #endif -- cgit v1.1