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
powerpc: Remove unneccessary #ifdefs in reginfo
[platform/kernel/u-boot.git]
/
include
/
configs
/
apalis_imx6.h
diff --git
a/include/configs/apalis_imx6.h
b/include/configs/apalis_imx6.h
index
cad0420
..
a18ab12
100644
(file)
--- a/
include/configs/apalis_imx6.h
+++ b/
include/configs/apalis_imx6.h
@@
-19,7
+19,7
@@
#define CONFIG_SYS_GENERIC_BOARD
#include <asm/arch/imx-regs.h>
#define CONFIG_SYS_GENERIC_BOARD
#include <asm/arch/imx-regs.h>
-#include <asm/
imx-common
/gpio.h>
+#include <asm/
mach-imx
/gpio.h>
#ifdef CONFIG_SPL
#include "imx6_spl.h"
#ifdef CONFIG_SPL
#include "imx6_spl.h"
@@
-54,7
+54,6
@@
#define CONFIG_SYS_I2C_SPEED 100000
/* OCOTP Configs */
#define CONFIG_SYS_I2C_SPEED 100000
/* OCOTP Configs */
-#define CONFIG_CMD_FUSE
#ifdef CONFIG_CMD_FUSE
#define CONFIG_MXC_OCOTP
#endif
#ifdef CONFIG_CMD_FUSE
#define CONFIG_MXC_OCOTP
#endif
@@
-67,11
+66,6
@@
#define CONFIG_SUPPORT_EMMC_BOOT /* eMMC specific */
#define CONFIG_BOUNCE_BUFFER
#define CONFIG_SUPPORT_EMMC_BOOT /* eMMC specific */
#define CONFIG_BOUNCE_BUFFER
-#define CONFIG_FAT_WRITE
-
-#ifdef CONFIG_MX6Q
-#define CONFIG_CMD_SATA
-#endif
/*
* SATA Configs
/*
* SATA Configs
@@
-121,7
+115,6
@@
#define CONFIG_DFU_MMC
/* Miscellaneous commands */
#define CONFIG_DFU_MMC
/* Miscellaneous commands */
-#define CONFIG_CMD_BMODE
#define CONFIG_MXC_GPIO
/* Framebuffer and LCD */
#define CONFIG_MXC_GPIO
/* Framebuffer and LCD */
@@
-135,16
+128,13
@@
#define CONFIG_VIDEO_LOGO
#define CONFIG_VIDEO_BMP_LOGO
#define CONFIG_IPUV3_CLK 260000000
#define CONFIG_VIDEO_LOGO
#define CONFIG_VIDEO_BMP_LOGO
#define CONFIG_IPUV3_CLK 260000000
-#define CONFIG_CMD_HDMIDETECT
#define CONFIG_CONSOLE_MUX
#define CONFIG_IMX_HDMI
#define CONFIG_IMX_VIDEO_SKIP
#define CONFIG_CONSOLE_MUX
#define CONFIG_IMX_HDMI
#define CONFIG_IMX_VIDEO_SKIP
-#define CONFIG_CMD_BMP
/* allow to overwrite serial and ethaddr */
#define CONFIG_ENV_OVERWRITE
#define CONFIG_CONS_INDEX 1
/* allow to overwrite serial and ethaddr */
#define CONFIG_ENV_OVERWRITE
#define CONFIG_CONS_INDEX 1
-#define CONFIG_BAUDRATE 115200
/* Command definition */
#undef CONFIG_CMD_LOADB
/* Command definition */
#undef CONFIG_CMD_LOADB
@@
-196,6
+186,7
@@
"${fdt_file} && setenv dtbparam \" - ${fdt_addr_r}\" && true\0"
#define MEM_LAYOUT_ENV_SETTINGS \
"${fdt_file} && setenv dtbparam \" - ${fdt_addr_r}\" && true\0"
#define MEM_LAYOUT_ENV_SETTINGS \
+ "bootm_size=0x20000000\0" \
"fdt_addr_r=0x12000000\0" \
"fdt_high=0xffffffff\0" \
"initrd_high=0xffffffff\0" \
"fdt_addr_r=0x12000000\0" \
"fdt_high=0xffffffff\0" \
"initrd_high=0xffffffff\0" \
@@
-325,6
+316,4
@@
#define CONFIG_SUPPORT_RAW_INITRD
#define CONFIG_SUPPORT_RAW_INITRD
-#define CONFIG_CRC32_VERIFY
-
#endif /* __CONFIG_H */
#endif /* __CONFIG_H */