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
global: Migrate CONFIG_MXC_UART_BASE to CFG
[platform/kernel/u-boot.git]
/
include
/
configs
/
imx6-engicam.h
diff --git
a/include/configs/imx6-engicam.h
b/include/configs/imx6-engicam.h
index
fa73cab
..
786b70f
100644
(file)
--- a/
include/configs/imx6-engicam.h
+++ b/
include/configs/imx6-engicam.h
@@
-24,7
+24,7
@@
#endif
/* Default environment */
#endif
/* Default environment */
-#define C
ONFI
G_EXTRA_ENV_SETTINGS \
+#define C
F
G_EXTRA_ENV_SETTINGS \
"script=boot.scr\0" \
"splashpos=m,m\0" \
"splashimage=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
"script=boot.scr\0" \
"splashpos=m,m\0" \
"splashimage=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
@@
-109,16
+109,16
@@
/* Physical Memory Map */
#define PHYS_SDRAM MMDC0_ARB_BASE_ADDR
/* Physical Memory Map */
#define PHYS_SDRAM MMDC0_ARB_BASE_ADDR
-#define C
ONFIG_SYS_SDRAM_BASE
PHYS_SDRAM
-#define C
ONFIG_SYS_INIT_RAM_ADDR
IRAM_BASE_ADDR
-#define C
ONFIG_SYS_INIT_RAM_SIZE
IRAM_SIZE
+#define C
FG_SYS_SDRAM_BASE
PHYS_SDRAM
+#define C
FG_SYS_INIT_RAM_ADDR
IRAM_BASE_ADDR
+#define C
FG_SYS_INIT_RAM_SIZE
IRAM_SIZE
/* UART */
#ifdef CONFIG_MXC_UART
# ifdef CONFIG_MX6UL
/* UART */
#ifdef CONFIG_MXC_UART
# ifdef CONFIG_MX6UL
-# define C
ONFIG_MXC_UART_BASE
UART1_BASE
+# define C
FG_MXC_UART_BASE
UART1_BASE
# else
# else
-# define C
ONFIG_MXC_UART_BASE
UART4_BASE
+# define C
FG_MXC_UART_BASE
UART4_BASE
# endif
#endif
# endif
#endif
@@
-126,26
+126,10
@@
/* NAND */
#ifdef CONFIG_NAND_MXS
/* NAND */
#ifdef CONFIG_NAND_MXS
-# define CONFIG_SYS_MAX_NAND_DEVICE 1
-# define CONFIG_SYS_NAND_BASE 0x40000000
-# define CONFIG_SYS_NAND_U_BOOT_START CONFIG_TEXT_BASE
+# define CFG_SYS_NAND_BASE 0x40000000
+# define CFG_SYS_NAND_U_BOOT_START CONFIG_TEXT_BASE
/* MTD device */
#endif
/* MTD device */
#endif
-/* Falcon Mode */
-#ifdef CONFIG_SPL_OS_BOOT
-/* MMC support: args@1MB kernel@2MB */
-#endif
-
-/* Framebuffer */
-#ifdef CONFIG_VIDEO_IPUV3
-# define CONFIG_IMX_VIDEO_SKIP
-#endif
-
-/* SPL */
-#ifdef CONFIG_SPL
-# include "imx6_spl.h"
-#endif
-
#endif /* __IMX6_ENGICAM_CONFIG_H */
#endif /* __IMX6_ENGICAM_CONFIG_H */