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 tag 'next-20220328' of https://source.denx.de/u-boot/custodians/u-boot-video...
[platform/kernel/u-boot.git]
/
include
/
configs
/
mx6memcal.h
diff --git
a/include/configs/mx6memcal.h
b/include/configs/mx6memcal.h
index
3d79a7e
..
42d5e24
100644
(file)
--- a/
include/configs/mx6memcal.h
+++ b/
include/configs/mx6memcal.h
@@
-13,14
+13,6
@@
#include "mx6_common.h"
#include "imx6_spl.h"
#include "mx6_common.h"
#include "imx6_spl.h"
-#undef CONFIG_MMC
-#undef CONFIG_SPL_MMC_SUPPORT
-#undef CONFIG_GENERIC_MMC
-#undef CONFIG_CMD_FUSE
-
-#define CONFIG_SYS_MALLOC_LEN (64 * 1024 * 1024)
-
-#define CONFIG_MXC_UART
#ifdef CONFIG_SERIAL_CONSOLE_UART1
#if defined(CONFIG_MX6SL)
#define CONFIG_MXC_UART_BASE UART1_IPS_BASE_ADDR
#ifdef CONFIG_SERIAL_CONSOLE_UART1
#if defined(CONFIG_MX6SL)
#define CONFIG_MXC_UART_BASE UART1_IPS_BASE_ADDR
@@
-32,7
+24,6
@@
#else
#error please define serial console (CONFIG_SERIAL_CONSOLE_UARTx)
#endif
#else
#error please define serial console (CONFIG_SERIAL_CONSOLE_UARTx)
#endif
-#define CONFIG_BAUDRATE 115200
#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + 16)
#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + 16)