projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://www.denx.de/git/u-boot-imx
[platform/kernel/u-boot.git]
/
include
/
configs
/
mx6_common.h
diff --git
a/include/configs/mx6_common.h
b/include/configs/mx6_common.h
index
411316d
..
cdf46f0
100644
(file)
--- a/
include/configs/mx6_common.h
+++ b/
include/configs/mx6_common.h
@@
-44,7
+44,8
@@
#define CONFIG_REVISION_TAG
/* Boot options */
#define CONFIG_REVISION_TAG
/* Boot options */
-#if (defined(CONFIG_MX6SX) || defined(CONFIG_MX6SL) || defined(CONFIG_MX6UL))
+#if (defined(CONFIG_MX6SX) || defined(CONFIG_MX6SL) || \
+ defined(CONFIG_MX6UL) || defined(CONFIG_MX6SLL))
#define CONFIG_LOADADDR 0x82000000
#ifndef CONFIG_SYS_TEXT_BASE
#define CONFIG_SYS_TEXT_BASE 0x87800000
#define CONFIG_LOADADDR 0x82000000
#ifndef CONFIG_SYS_TEXT_BASE
#define CONFIG_SYS_TEXT_BASE 0x87800000
@@
-64,7
+65,6
@@
/* Filesystems and image support */
#define CONFIG_SUPPORT_RAW_INITRD
/* Filesystems and image support */
#define CONFIG_SUPPORT_RAW_INITRD
-#define CONFIG_DOS_PARTITION
/* Miscellaneous configurable options */
#define CONFIG_SYS_LONGHELP
/* Miscellaneous configurable options */
#define CONFIG_SYS_LONGHELP
@@
-81,8
+81,6
@@
#define CONFIG_MXC_GPIO
/* MMC */
#define CONFIG_MXC_GPIO
/* MMC */
-#define CONFIG_MMC
-#define CONFIG_GENERIC_MMC
#define CONFIG_BOUNCE_BUFFER
#define CONFIG_FSL_ESDHC
#define CONFIG_FSL_USDHC
#define CONFIG_BOUNCE_BUFFER
#define CONFIG_FSL_ESDHC
#define CONFIG_FSL_USDHC
@@
-91,4
+89,14
@@
#define CONFIG_CMD_FUSE
#define CONFIG_MXC_OCOTP
#define CONFIG_CMD_FUSE
#define CONFIG_MXC_OCOTP
+/* Secure boot (HAB) support */
+#ifdef CONFIG_SECURE_BOOT
+#define CONFIG_CSF_SIZE 0x2000
+#define CONFIG_FSL_CAAM
+#define CONFIG_CMD_DEKBLOB
+#ifdef CONFIG_SPL_BUILD
+#define CONFIG_SPL_DRIVERS_MISC_SUPPORT
+#endif
+#endif
+
#endif
#endif