X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=include%2Fconfigs%2Ftbs2910.h;h=84ca1c443e41de948d29603efb0c393f21ffbda3;hb=5b8e76c35ec312a3f73126bd1a2d2c0965b98a9f;hp=42e5821807493d06288a2aee72faf875f4f93bb9;hpb=fb69b6cd270444c8d248e70e6be7c58f9828debd;p=platform%2Fkernel%2Fu-boot.git diff --git a/include/configs/tbs2910.h b/include/configs/tbs2910.h index 42e5821..84ca1c4 100644 --- a/include/configs/tbs2910.h +++ b/include/configs/tbs2910.h @@ -12,16 +12,12 @@ #include "mx6_common.h" /* General configuration */ -#define CONFIG_SYS_THUMB_BUILD #define CONFIG_MACH_TYPE 3980 -#define CONFIG_BOARD_EARLY_INIT_F - -#define CONFIG_SYS_PROMPT "Matrix U-Boot> " #define CONFIG_SYS_HZ 1000 -#define CONFIG_IMX6_THERMAL +#define CONFIG_IMX_THERMAL /* Physical Memory Map */ #define CONFIG_NR_DRAM_BANKS 1 @@ -40,29 +36,15 @@ #define CONFIG_SYS_MEMTEST_END \ (CONFIG_SYS_MEMTEST_START + 500 * 1024 * 1024) -#define CONFIG_SYS_BOOTMAPSZ 0x6C000000 +#define CONFIG_SYS_BOOTMAPSZ 0x10000000 /* 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_PRE_CONSOLE_BUFFER -#define CONFIG_PRE_CON_BUF_SZ 4096 -#define CONFIG_PRE_CON_BUF_ADDR 0x7C000000 - -/* *** Command definition *** */ -#define CONFIG_CMD_BMODE -#define CONFIG_CMD_MEMTEST -#define CONFIG_CMD_TIME - /* Filesystems / image support */ -#define CONFIG_EFI_PARTITION -#define CONFIG_FIT /* MMC */ #define CONFIG_SYS_FSL_USDHC_NUM 3 @@ -71,9 +53,6 @@ /* 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 @@ -84,25 +63,17 @@ #define CONFIG_PHY_ATHEROS /* Framebuffer */ -#define CONFIG_VIDEO #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_CMD_HDMIDETECT #endif /* 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) @@ -120,35 +91,20 @@ #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) -#define CONFIG_USB_STORAGE -#define CONFIG_CMD_USB_MASS_STORAGE #ifdef CONFIG_CMD_USB_MASS_STORAGE -#define CONFIG_CI_UDC #define CONFIG_USBD_HS -#define CONFIG_USB_GADGET -#define CONFIG_USB_GADGET_MASS_STORAGE -#define CONFIG_USB_GADGET_DUALSPEED -#define CONFIG_USB_GADGET_VBUS_DRAW 0 -#define CONFIG_USBDOWNLOAD_GADGET -#define CONFIG_G_DNL_VENDOR_NUM 0x0525 -#define CONFIG_G_DNL_PRODUCT_NUM 0xa4a5 -#define CONFIG_G_DNL_MANUFACTURER "TBS" +#define CONFIG_USB_FUNCTION_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 -#define CONFIG_SYS_STDIO_DEREGISTER #define CONFIG_PREBOOT \ + "usb start; " \ "if hdmidet; then " \ - "usb start; " \ - "run set_con_usb_hdmi; " \ + "run set_con_hdmi; " \ "else " \ "run set_con_serial; " \ "fi;" @@ -156,33 +112,26 @@ #endif /* CONFIG_CMD_USB */ /* 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_CMD_I2C #ifdef CONFIG_CMD_I2C #define CONFIG_SYS_I2C #define CONFIG_SYS_I2C_MXC +#define CONFIG_SYS_I2C_MXC_I2C1 /* enable I2C bus 1 */ +#define CONFIG_SYS_I2C_MXC_I2C2 /* enable I2C bus 2 */ #define CONFIG_SYS_I2C_MXC_I2C3 /* enable I2C bus 3 */ #define CONFIG_SYS_I2C_SPEED 100000 #define CONFIG_I2C_EDID #endif -/* Fuses */ -#define CONFIG_CMD_FUSE -#ifdef CONFIG_CMD_FUSE -#define CONFIG_MXC_OCOTP -#endif - /* Environment organization */ #define CONFIG_ENV_IS_IN_MMC -#define CONFIG_SYS_MMC_ENV_DEV 2 -#define CONFIG_SYS_MMC_ENV_PART 1 +#define CONFIG_SYS_MMC_ENV_DEV 2 /* overwritten on SD boot */ +#define CONFIG_SYS_MMC_ENV_PART 1 /* overwritten on SD boot */ #define CONFIG_ENV_SIZE (8 * 1024) #define CONFIG_ENV_OFFSET (384 * 1024) #define CONFIG_ENV_OVERWRITE @@ -197,19 +146,20 @@ "bootargs_upd=setenv bootargs console=ttymxc0,115200 " \ "rdinit=/sbin/init enable_wait_mode=off\0" \ "bootcmd_mmc=run bootargs_mmc; mmc dev 2; " \ - "mmc read 0x10800000 0x800 0x4000; bootm\0" \ + "mmc read 0x10800000 0x800 0x4000; bootm 0x10800000\0" \ "bootcmd_up1=load mmc 1 0x10800000 uImage\0" \ "bootcmd_up2=load mmc 1 0x10d00000 uramdisk.img; " \ "run bootargs_upd; " \ "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" \ - "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; " \