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
MIPS: convert CONFIG_SYS_MIPS_TIMER_FREQ to Kconfig
[platform/kernel/u-boot.git]
/
include
/
configs
/
mx6cuboxi.h
diff --git
a/include/configs/mx6cuboxi.h
b/include/configs/mx6cuboxi.h
index
cfab9a7
..
cffbb64
100644
(file)
--- a/
include/configs/mx6cuboxi.h
+++ b/
include/configs/mx6cuboxi.h
@@
-13,24
+13,10
@@
#include "imx6_spl.h"
#include "imx6_spl.h"
-#define CONFIG_IMX_THERMAL
-
-#define CONFIG_SYS_MALLOC_LEN (10 * SZ_1M)
-
/* MMC Configs */
#define CONFIG_SYS_FSL_ESDHC_ADDR USDHC2_BASE_ADDR
/* MMC Configs */
#define CONFIG_SYS_FSL_ESDHC_ADDR USDHC2_BASE_ADDR
-/* SATA Configuration */
-#ifdef CONFIG_CMD_SATA
-#define CONFIG_SYS_SATA_MAX_DEVICE 1
-#define CONFIG_DWC_AHSATA_PORT_ID 0
-#define CONFIG_DWC_AHSATA_BASE_ADDR SATA_ARB_BASE_ADDR
-#define CONFIG_LBA48
-#endif
-
/* Framebuffer */
/* Framebuffer */
-#define CONFIG_VIDEO_LOGO
-#define CONFIG_VIDEO_BMP_LOGO
#define CONFIG_IMX_HDMI
#define CONFIG_IMX_VIDEO_SKIP
#define CONFIG_IMX_HDMI
#define CONFIG_IMX_VIDEO_SKIP
@@
-40,26
+26,24
@@
/* Command definition */
#define CONFIG_MXC_UART_BASE UART1_BASE
/* Command definition */
#define CONFIG_MXC_UART_BASE UART1_BASE
-#define CONSOLE_DEV "ttymxc0"
-#ifndef CONFIG_SPL_BUILD
#define CONFIG_EXTRA_ENV_SETTINGS \
"som_rev=undefined\0" \
"has_emmc=undefined\0" \
"fdtfile=undefined\0" \
"fdt_addr_r=0x18000000\0" \
"fdt_addr=0x18000000\0" \
#define CONFIG_EXTRA_ENV_SETTINGS \
"som_rev=undefined\0" \
"has_emmc=undefined\0" \
"fdtfile=undefined\0" \
"fdt_addr_r=0x18000000\0" \
"fdt_addr=0x18000000\0" \
- "kernel_addr_r=" __stringify(CONFIG_
LOAD
ADDR) "\0" \
- "pxefile_addr_r=" __stringify(CONFIG_
LOAD
ADDR) "\0" \
- "scriptaddr=" __stringify(CONFIG_
LOAD
ADDR) "\0" \
+ "kernel_addr_r=" __stringify(CONFIG_
SYS_LOAD_
ADDR) "\0" \
+ "pxefile_addr_r=" __stringify(CONFIG_
SYS_LOAD_
ADDR) "\0" \
+ "scriptaddr=" __stringify(CONFIG_
SYS_LOAD_
ADDR) "\0" \
"ramdisk_addr_r=0x13000000\0" \
"ramdiskaddr=0x13000000\0" \
"initrd_high=0xffffffff\0" \
"ip_dyn=yes\0" \
"ramdisk_addr_r=0x13000000\0" \
"ramdiskaddr=0x13000000\0" \
"initrd_high=0xffffffff\0" \
"ip_dyn=yes\0" \
- "console=
" CONSOLE_DEV ",11520
0\0" \
+ "console=
ttymxc
0\0" \
"bootm_size=0x10000000\0" \
"mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \
"bootm_size=0x10000000\0" \
"mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \
- "finduuid=part uuid mmc
0
:1 uuid\0" \
+ "finduuid=part uuid mmc
1
:1 uuid\0" \
"update_sd_firmware=" \
"if test ${ip_dyn} = yes; then " \
"setenv get_cmd dhcp; " \
"update_sd_firmware=" \
"if test ${ip_dyn} = yes; then " \
"setenv get_cmd dhcp; " \
@@
-102,20
+86,11
@@
#include <config_distro_bootcmd.h>
#include <config_distro_bootcmd.h>
-#else
-#define CONFIG_EXTRA_ENV_SETTINGS
-#endif /* CONFIG_SPL_BUILD */
-
/* Physical Memory Map */
#define CONFIG_SYS_SDRAM_BASE MMDC0_ARB_BASE_ADDR
#define CONFIG_SYS_INIT_RAM_ADDR IRAM_BASE_ADDR
#define CONFIG_SYS_INIT_RAM_SIZE IRAM_SIZE
/* Physical Memory Map */
#define CONFIG_SYS_SDRAM_BASE MMDC0_ARB_BASE_ADDR
#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)
-
/* Environment organization */
#endif /* __MX6CUBOXI_CONFIG_H */
/* Environment organization */
#endif /* __MX6CUBOXI_CONFIG_H */