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 branch 'master' of git://www.denx.de/git/u-boot-imx
[platform/kernel/u-boot.git]
/
include
/
configs
/
tbs2910.h
diff --git
a/include/configs/tbs2910.h
b/include/configs/tbs2910.h
index
33ac955
..
09a7942
100644
(file)
--- a/
include/configs/tbs2910.h
+++ b/
include/configs/tbs2910.h
@@
-16,8
+16,6
@@
#define CONFIG_MACH_TYPE 3980
#define CONFIG_MACH_TYPE 3980
-#define CONFIG_BOARD_EARLY_INIT_F
-
#define CONFIG_SYS_HZ 1000
#define CONFIG_IMX_THERMAL
#define CONFIG_SYS_HZ 1000
#define CONFIG_IMX_THERMAL
@@
-39,28
+37,19
@@
#define CONFIG_SYS_MEMTEST_END \
(CONFIG_SYS_MEMTEST_START + 500 * 1024 * 1024)
#define CONFIG_SYS_MEMTEST_END \
(CONFIG_SYS_MEMTEST_START + 500 * 1024 * 1024)
-#define CONFIG_SYS_BOOTMAPSZ 0x
6C
000000
+#define CONFIG_SYS_BOOTMAPSZ 0x
10
000000
/* Serial console */
#define CONFIG_MXC_UART
#define CONFIG_MXC_UART_BASE UART1_BASE /* select UART1/UART2 */
#define CONFIG_BAUDRATE 115200
/* Serial console */
#define CONFIG_MXC_UART
#define CONFIG_MXC_UART_BASE UART1_BASE /* select UART1/UART2 */
#define CONFIG_BAUDRATE 115200
-#define CONFIG_SYS_CONSOLE_IS_IN_ENV
-#define CONFIG_CONSOLE_MUX
#define CONFIG_CONS_INDEX 1
#define CONFIG_CONS_INDEX 1
-#define CONFIG_PRE_CONSOLE_BUFFER
-#define CONFIG_PRE_CON_BUF_SZ 4096
-#define CONFIG_PRE_CON_BUF_ADDR 0x7C000000
-
/* *** Command definition *** */
#define CONFIG_CMD_BMODE
/* *** Command definition *** */
#define CONFIG_CMD_BMODE
-#define CONFIG_CMD_MEMTEST
-#define CONFIG_CMD_TIME
/* Filesystems / image support */
/* Filesystems / image support */
-#define CONFIG_EFI_PARTITION
/* MMC */
#define CONFIG_SYS_FSL_USDHC_NUM 3
/* MMC */
#define CONFIG_SYS_FSL_USDHC_NUM 3
@@
-69,9
+58,6
@@
/* Ethernet */
#define CONFIG_FEC_MXC
/* Ethernet */
#define CONFIG_FEC_MXC
-#define CONFIG_CMD_PING
-#define CONFIG_CMD_DHCP
-#define CONFIG_CMD_MII
#define CONFIG_FEC_MXC
#define CONFIG_MII
#define IMX_FEC_BASE ENET_BASE_ADDR
#define CONFIG_FEC_MXC
#define CONFIG_MII
#define IMX_FEC_BASE ENET_BASE_ADDR
@@
-82,14
+68,9
@@
#define CONFIG_PHY_ATHEROS
/* Framebuffer */
#define CONFIG_PHY_ATHEROS
/* Framebuffer */
-#define CONFIG_VIDEO
#ifdef CONFIG_VIDEO
#define CONFIG_VIDEO_IPUV3
#define CONFIG_IPUV3_CLK 260000000
#ifdef CONFIG_VIDEO
#define CONFIG_VIDEO_IPUV3
#define CONFIG_IPUV3_CLK 260000000
-#define CONFIG_CFB_CONSOLE
-#define CONFIG_CFB_CONSOLE_ANSI
-#define CONFIG_VIDEO_SW_CURSOR
-#define CONFIG_VGA_AS_SINGLE_DEVICE
#define CONFIG_VIDEO_BMP_RLE8
#define CONFIG_IMX_HDMI
#define CONFIG_IMX_VIDEO_SKIP
#define CONFIG_VIDEO_BMP_RLE8
#define CONFIG_IMX_HDMI
#define CONFIG_IMX_VIDEO_SKIP
@@
-99,8
+80,6
@@
/* PCI */
#define CONFIG_CMD_PCI
#ifdef CONFIG_CMD_PCI
/* PCI */
#define CONFIG_CMD_PCI
#ifdef CONFIG_CMD_PCI
-#define CONFIG_PCI
-#define CONFIG_PCI_PNP
#define CONFIG_PCI_SCAN_SHOW
#define CONFIG_PCIE_IMX
#define CONFIG_PCIE_IMX_PERST_GPIO IMX_GPIO_NR(7, 12)
#define CONFIG_PCI_SCAN_SHOW
#define CONFIG_PCIE_IMX
#define CONFIG_PCIE_IMX_PERST_GPIO IMX_GPIO_NR(7, 12)
@@
-118,35
+97,22
@@
#endif
/* USB */
#endif
/* USB */
-#define CONFIG_CMD_USB
#ifdef CONFIG_CMD_USB
#define CONFIG_USB_EHCI
#define CONFIG_USB_EHCI_MX6
#define CONFIG_USB_MAX_CONTROLLER_COUNT 2
#define CONFIG_EHCI_HCD_INIT_AFTER_RESET
#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
#ifdef CONFIG_CMD_USB
#define CONFIG_USB_EHCI
#define CONFIG_USB_EHCI_MX6
#define CONFIG_USB_MAX_CONTROLLER_COUNT 2
#define CONFIG_EHCI_HCD_INIT_AFTER_RESET
#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_USB_STORAGE
-#define CONFIG_CMD_USB_MASS_STORAGE
#ifdef CONFIG_CMD_USB_MASS_STORAGE
#ifdef CONFIG_CMD_USB_MASS_STORAGE
-#define CONFIG_CI_UDC
#define CONFIG_USBD_HS
#define CONFIG_USBD_HS
-#define CONFIG_USB_GADGET
#define CONFIG_USB_FUNCTION_MASS_STORAGE
#define CONFIG_USB_FUNCTION_MASS_STORAGE
-#define CONFIG_USB_GADGET_DUALSPEED
-#define CONFIG_USB_GADGET_VBUS_DRAW 0
-#define CONFIG_USB_GADGET_DOWNLOAD
-#define CONFIG_G_DNL_VENDOR_NUM 0x0525
-#define CONFIG_G_DNL_PRODUCT_NUM 0xa4a5
-#define CONFIG_G_DNL_MANUFACTURER "TBS"
#endif /* CONFIG_CMD_USB_MASS_STORAGE */
#endif /* CONFIG_CMD_USB_MASS_STORAGE */
-#define CONFIG_USB_KEYBOARD
#ifdef CONFIG_USB_KEYBOARD
#define CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE
#ifdef CONFIG_USB_KEYBOARD
#define CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE
-#define CONFIG_SYS_STDIO_DEREGISTER
#define CONFIG_PREBOOT \
#define CONFIG_PREBOOT \
+ "usb start; " \
"if hdmidet; then " \
"if hdmidet; then " \
- "usb start; " \
- "run set_con_usb_hdmi; " \
+ "run set_con_hdmi; " \
"else " \
"run set_con_serial; " \
"fi;"
"else " \
"run set_con_serial; " \
"fi;"
@@
-156,13
+122,11
@@
/* RTC */
#define CONFIG_CMD_DATE
#ifdef CONFIG_CMD_DATE
/* RTC */
#define CONFIG_CMD_DATE
#ifdef CONFIG_CMD_DATE
-#define CONFIG_CMD_I2C
#define CONFIG_RTC_DS1307
#define CONFIG_SYS_RTC_BUS_NUM 2
#endif
/* I2C */
#define CONFIG_RTC_DS1307
#define CONFIG_SYS_RTC_BUS_NUM 2
#endif
/* I2C */
-#define CONFIG_CMD_I2C
#ifdef CONFIG_CMD_I2C
#define CONFIG_SYS_I2C
#define CONFIG_SYS_I2C_MXC
#ifdef CONFIG_CMD_I2C
#define CONFIG_SYS_I2C
#define CONFIG_SYS_I2C_MXC
@@
-198,12
+162,13
@@
"bootm 0x10800000 0x10d00000\0" \
"console=ttymxc0\0" \
"fan=gpio set 92\0" \
"bootm 0x10800000 0x10d00000\0" \
"console=ttymxc0\0" \
"fan=gpio set 92\0" \
- "set_con_serial=setenv stdin serial; " \
- "setenv stdout serial; " \
+ "set_con_serial=setenv stdout serial; " \
"setenv stderr serial;\0" \
"setenv stderr serial;\0" \
- "set_con_usb_hdmi=setenv stdin serial,usbkbd; " \
- "setenv stdout serial,vga; " \
- "setenv stderr serial,vga;\0"
+ "set_con_hdmi=setenv stdout serial,vga; " \
+ "setenv stderr serial,vga;\0" \
+ "stderr=serial,vga;\0" \
+ "stdin=serial,usbkbd;\0" \
+ "stdout=serial,vga;\0"
#define CONFIG_BOOTCOMMAND \
"mmc rescan; " \
#define CONFIG_BOOTCOMMAND \
"mmc rescan; " \