X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=include%2Fconfigs%2Fcolibri_imx6.h;h=2d40ceb24e96db2c29319b3ea23343e0236b2bfc;hb=747fed56d3876d7de89959f9a927901e02166151;hp=96bc1e9edc8484f42cf58e7ff48f06ca9827caf4;hpb=a0e80c97c9ba1409c2370f6c8b2a4d6a48cdb15c;p=platform%2Fkernel%2Fu-boot.git diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h index 96bc1e9..2d40ceb 100644 --- a/include/configs/colibri_imx6.h +++ b/include/configs/colibri_imx6.h @@ -1,9 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright 2013-2015 Toradex, Inc. * * Configuration settings for the Toradex Colibri iMX6 - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __CONFIG_H @@ -12,16 +11,12 @@ #include "mx6_common.h" #undef CONFIG_DISPLAY_BOARDINFO -#define CONFIG_DISPLAY_BOARDINFO_LATE /* Calls show_board_info() */ - -#define CONFIG_SYS_GENERIC_BOARD #include #include #ifdef CONFIG_SPL #include "imx6_spl.h" -#define CONFIG_SPL_PAD_TO 0x11000 /* 4k IVT/DCD, 64k SPL */ #endif #define CONFIG_CMDLINE_TAG @@ -33,16 +28,9 @@ /* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN (32 * 1024 * 1024) -#define CONFIG_MISC_INIT_R - #define CONFIG_MXC_UART #define CONFIG_MXC_UART_BASE UART1_BASE -/* Make the HW version stuff available in U-Boot env */ -#define CONFIG_VERSION_VARIABLE /* ver environment variable */ -#define CONFIG_ENV_VARS_UBOOT_CONFIG -#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG - /* I2C Configs */ #define CONFIG_SYS_I2C #define CONFIG_SYS_I2C_MXC @@ -57,17 +45,14 @@ #endif /* MMC Configs */ -#define CONFIG_FSL_ESDHC #define CONFIG_FSL_USDHC #define CONFIG_SYS_FSL_ESDHC_ADDR 0 #define CONFIG_SYS_FSL_USDHC_NUM 2 #define CONFIG_SUPPORT_EMMC_BOOT /* eMMC specific */ -#define CONFIG_BOUNCE_BUFFER /* Network */ #define CONFIG_FEC_MXC -#define CONFIG_MII #define IMX_FEC_BASE ENET_BASE_ADDR #define CONFIG_FEC_XCV_TYPE RMII #define CONFIG_ETHPRIME "FEC" @@ -78,7 +63,6 @@ /* USB Configs */ /* Host */ -#define CONFIG_USB_HOST_ETHER #define CONFIG_USB_MAX_CONTROLLER_COUNT 2 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET /* For OTG port */ #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) @@ -87,12 +71,6 @@ #define CONFIG_USBD_HS #define CONFIG_USB_GADGET_MASS_STORAGE -#define CONFIG_USB_FUNCTION_MASS_STORAGE -/* USB DFU */ -#define CONFIG_DFU_MMC - -/* Miscellaneous commands */ -#define CONFIG_MXC_GPIO /* Framebuffer and LCD */ #define CONFIG_VIDEO_IPUV3 @@ -104,14 +82,12 @@ #define CONFIG_BMP_16BPP #define CONFIG_VIDEO_LOGO #define CONFIG_VIDEO_BMP_LOGO -#define CONFIG_IPUV3_CLK 260000000 #define CONFIG_CONSOLE_MUX #define CONFIG_IMX_HDMI #define CONFIG_IMX_VIDEO_SKIP /* allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE -#define CONFIG_CONS_INDEX 1 /* Command definition */ #undef CONFIG_CMD_LOADB @@ -126,7 +102,6 @@ #define CONFIG_SERVERIP 192.168.10.1 #define CONFIG_LOADADDR 0x12000000 -#define CONFIG_SYS_TEXT_BASE 0x17800000 #ifdef CONFIG_CMD_MMC #define CONFIG_DRIVE_MMC "mmc " @@ -231,24 +206,18 @@ "video=mxcfb1:off fbmem=8M\0 " /* Miscellaneous configurable options */ -#define CONFIG_SYS_LONGHELP -#define CONFIG_AUTO_COMPLETE #undef CONFIG_SYS_CBSIZE #define CONFIG_SYS_CBSIZE 1024 #undef CONFIG_SYS_MAXARGS #define CONFIG_SYS_MAXARGS 48 -#define CONFIG_SYS_ALT_MEMTEST #define CONFIG_SYS_MEMTEST_START 0x10000000 #define CONFIG_SYS_MEMTEST_END 0x10010000 #define CONFIG_SYS_MEMTEST_SCRATCH 0x10800000 #define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR -#define CONFIG_CMDLINE_EDITING - /* Physical Memory Map */ -#define CONFIG_NR_DRAM_BANKS 1 #define PHYS_SDRAM MMDC0_ARB_BASE_ADDR #define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM @@ -275,6 +244,4 @@ #define CONFIG_CMD_TIME -#define CONFIG_SUPPORT_RAW_INITRD - #endif /* __CONFIG_H */