diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/display5.h | 3 | ||||
| -rw-r--r-- | include/configs/sunxi-common.h | 2 | ||||
| -rw-r--r-- | include/image-android-dt.h | 20 |
3 files changed, 22 insertions, 3 deletions
diff --git a/include/configs/display5.h b/include/configs/display5.h index fc8261373a..514638f684 100644 --- a/include/configs/display5.h +++ b/include/configs/display5.h @@ -166,7 +166,7 @@ "rootwait rootfstype=ext4 rw; " \ "run set_kernel_part;" \ "part start mmc ${mmcdev} ${kernel_part} lba_start; " \ - "mmc read ${loadaddr} ${lba_start} 0x2000; " \ + "mmc read ${loadaddr} ${lba_start} ${fitImg_fw_sz}; " \ "setenv fdt_conf imx6q-${board}-${display}.dtb; " /* All the numbers are in LBAs */ @@ -273,6 +273,7 @@ "fdt_high=0xffffffff\0" \ "initrd_high=0xffffffff\0" \ "kernel_file=fitImage\0" \ + "fitImg_fw_sz=0x2200\0" \ "up=run tftp_sf_SPL; run tftp_sf_uboot\0" \ "download_kernel=" \ "tftpboot ${loadaddr} ${kernel_file};\0" \ diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h index 2adf80464f..9819d9980c 100644 --- a/include/configs/sunxi-common.h +++ b/include/configs/sunxi-common.h @@ -153,8 +153,6 @@ #define CONFIG_SYS_MMC_ENV_DEV 0 #endif #define CONFIG_SYS_MMC_MAX_DEVICE 4 -#elif defined(CONFIG_ENV_IS_NOWHERE) -#define CONFIG_ENV_SIZE (128 << 10) #endif #ifndef CONFIG_MACH_SUN8I_V3S diff --git a/include/image-android-dt.h b/include/image-android-dt.h new file mode 100644 index 0000000000..9a3aa8fa30 --- /dev/null +++ b/include/image-android-dt.h @@ -0,0 +1,20 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* + * (C) Copyright 2018 Linaro Ltd. + * Sam Protsenko <semen.protsenko@linaro.org> + */ + +#ifndef IMAGE_ANDROID_DT_H +#define IMAGE_ANDROID_DT_H + +#include <linux/types.h> + +bool android_dt_check_header(ulong hdr_addr); +bool android_dt_get_fdt_by_index(ulong hdr_addr, u32 index, ulong *addr, + u32 *size); + +#if !defined(CONFIG_SPL_BUILD) +void android_dt_print_contents(ulong hdr_addr); +#endif + +#endif /* IMAGE_ANDROID_DT_H */ |