projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
colibri_imx6: remove obsolete USB_GADGET_MASS_STORAGE configuration
[oweals/u-boot.git]
/
include
/
configs
/
colibri_imx6.h
diff --git
a/include/configs/colibri_imx6.h
b/include/configs/colibri_imx6.h
index 0c372c5e0093432e2fbf5a2c0249f86b2f451941..f029a885d28e1e097f1b0b905b63f7a752ab1781 100644
(file)
--- a/
include/configs/colibri_imx6.h
+++ b/
include/configs/colibri_imx6.h
@@
-1,9
+1,8
@@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
/*
- * Copyright 2013-201
5
Toradex, Inc.
+ * Copyright 2013-201
9
Toradex, Inc.
*
* Configuration settings for the Toradex Colibri iMX6
*
* Configuration settings for the Toradex Colibri iMX6
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_H
*/
#ifndef __CONFIG_H
@@
-13,8
+12,6
@@
#undef CONFIG_DISPLAY_BOARDINFO
#undef CONFIG_DISPLAY_BOARDINFO
-#define CONFIG_SYS_GENERIC_BOARD
-
#include <asm/arch/imx-regs.h>
#include <asm/mach-imx/gpio.h>
#include <asm/arch/imx-regs.h>
#include <asm/mach-imx/gpio.h>
@@
-31,8
+28,6
@@
/* Size of malloc() pool */
#define CONFIG_SYS_MALLOC_LEN (32 * 1024 * 1024)
/* 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
#define CONFIG_MXC_UART
#define CONFIG_MXC_UART_BASE UART1_BASE
@@
-55,11
+50,9
@@
#define CONFIG_SYS_FSL_USDHC_NUM 2
#define CONFIG_SUPPORT_EMMC_BOOT /* eMMC specific */
#define CONFIG_SYS_FSL_USDHC_NUM 2
#define CONFIG_SUPPORT_EMMC_BOOT /* eMMC specific */
-#define CONFIG_BOUNCE_BUFFER
/* Network */
#define CONFIG_FEC_MXC
/* 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"
#define IMX_FEC_BASE ENET_BASE_ADDR
#define CONFIG_FEC_XCV_TYPE RMII
#define CONFIG_ETHPRIME "FEC"
@@
-77,15
+70,8
@@
/* Client */
#define CONFIG_USBD_HS
/* Client */
#define CONFIG_USBD_HS
-#define CONFIG_USB_GADGET_MASS_STORAGE
-/* USB DFU */
-#define CONFIG_DFU_MMC
-
-/* Miscellaneous commands */
-
/* Framebuffer and LCD */
#define CONFIG_VIDEO_IPUV3
/* Framebuffer and LCD */
#define CONFIG_VIDEO_IPUV3
-#define CONFIG_SYS_CONSOLE_IS_IN_ENV
#define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
#define CONFIG_VIDEO_BMP_RLE8
#define CONFIG_SPLASH_SCREEN
#define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
#define CONFIG_VIDEO_BMP_RLE8
#define CONFIG_SPLASH_SCREEN
@@
-229,7
+215,6
@@
#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
/* Physical Memory Map */
#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
/* Physical Memory Map */
-#define CONFIG_NR_DRAM_BANKS 1
#define PHYS_SDRAM MMDC0_ARB_BASE_ADDR
#define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM
#define PHYS_SDRAM MMDC0_ARB_BASE_ADDR
#define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM