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 https://gitlab.denx.de/u-boot/custodians/u-boot-imx
[platform/kernel/u-boot.git]
/
include
/
configs
/
sksimx6.h
diff --git
a/include/configs/sksimx6.h
b/include/configs/sksimx6.h
index
63c168c
..
7052d80
100644
(file)
--- a/
include/configs/sksimx6.h
+++ b/
include/configs/sksimx6.h
@@
-10,11
+10,7
@@
#include "mx6_common.h"
#include "imx6_spl.h"
#include "mx6_common.h"
#include "imx6_spl.h"
-/* Thermal */
-#define CONFIG_IMX_THERMAL
-
/* Serial */
/* Serial */
-#define CONFIG_MXC_UART
#define CONFIG_MXC_UART_BASE UART1_BASE
/* Size of malloc() pool */
#define CONFIG_MXC_UART_BASE UART1_BASE
/* Size of malloc() pool */
@@
-53,7
+49,6
@@
#define CONFIG_SYS_FSL_USDHC_NUM 1
/* Environment organization */
#define CONFIG_SYS_FSL_USDHC_NUM 1
/* Environment organization */
-#define CONFIG_SYS_MMC_ENV_DEV 0
/* Default environment */
#define CONFIG_EXTRA_ENV_SETTINGS \
/* Default environment */
#define CONFIG_EXTRA_ENV_SETTINGS \