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 'tpm-030822' of https://source.denx.de/u-boot/custodians/u-boot-tpm
[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
fed6545
..
a2d5080
100644
(file)
--- a/
include/configs/imx6-engicam.h
+++ b/
include/configs/imx6-engicam.h
@@
-96,8
+96,6
@@
"run nandboot; " \
"fi\0"
"run nandboot; " \
"fi\0"
-#define CONFIG_BOOTCOMMAND "run $modeboot"
-
/* Miscellaneous configurable options */
#ifdef CONFIG_MX6UL
/* Miscellaneous configurable options */
#ifdef CONFIG_MX6UL
@@
-115,11
+113,6
@@
#define CONFIG_SYS_INIT_RAM_ADDR IRAM_BASE_ADDR
#define CONFIG_SYS_INIT_RAM_SIZE IRAM_SIZE
#define CONFIG_SYS_INIT_RAM_ADDR IRAM_BASE_ADDR
#define CONFIG_SYS_INIT_RAM_SIZE IRAM_SIZE
-#define CONFIG_SYS_INIT_SP_OFFSET (CONFIG_SYS_INIT_RAM_SIZE - \
- GENERATED_GBL_DATA_SIZE)
-#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_INIT_RAM_ADDR + \
- CONFIG_SYS_INIT_SP_OFFSET)
-
/* UART */
#ifdef CONFIG_MXC_UART
# ifdef CONFIG_MX6UL
/* UART */
#ifdef CONFIG_MXC_UART
# ifdef CONFIG_MX6UL
@@
-142,22
+135,12
@@
/* Falcon Mode */
#ifdef CONFIG_SPL_OS_BOOT
/* Falcon Mode */
#ifdef CONFIG_SPL_OS_BOOT
-# define CONFIG_SPL_FS_LOAD_ARGS_NAME "args"
-# define CONFIG_SPL_FS_LOAD_KERNEL_NAME "uImage"
-# define CONFIG_SYS_SPL_ARGS_ADDR 0x18000000
-
/* MMC support: args@1MB kernel@2MB */
/* MMC support: args@1MB kernel@2MB */
-# define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR 0x800 /* 1MB */
-# define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS (CONFIG_CMD_SPL_WRITE_SIZE / 512)
-# define CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR 0x1000 /* 2MB */
#endif
/* Framebuffer */
#ifdef CONFIG_VIDEO_IPUV3
# define CONFIG_IMX_VIDEO_SKIP
#endif
/* Framebuffer */
#ifdef CONFIG_VIDEO_IPUV3
# define CONFIG_IMX_VIDEO_SKIP
-
-# define CONFIG_VIDEO_LOGO
-# define CONFIG_VIDEO_BMP_LOGO
#endif
/* SPL */
#endif
/* SPL */