July 2013 - U-Boot

[U-Boot] AM335x: env_{flash,nowhere} compile conflict
by Mark Jackson 11 Jul '13

11 Jul '13

I'm struggling to work out why I get the following compile error:- arm-linux-ld.bfd -r -o /home/mpfj/uboot/u-boot/spl/common/libcommon.o /home/mpfj/uboot/u-boot/spl/common/cmd_nvedit.o /home/mpfj/uboot/u-boot/spl/common/console.o /home/mpfj/uboot/u-boot/spl/common/dlmalloc.o /home/mpfj/uboot/u-boot/spl/common/env_common.o /home/mpfj/uboot/u-boot/spl/common/env_flash.o /home/mpfj/uboot/u-boot/spl/common/env_nowhere.o /home/mpfj/uboot/u-boot/spl/common/image-fdt.o /home/mpfj/uboot/u-boot/spl/common/image.o /home/mpfj/uboot/u-boot/spl/common/memsize.o /home/mpfj/uboot/u-boot/spl/common/miiphyutil.o /home/mpfj/uboot/u-boot/spl/common/stdio.o /home/mpfj/uboot/u-boot/spl/common/xyzModem.o /home/mpfj/uboot/u-boot/spl/common/env_nowhere.o: In function `env_relocate_spec': /home/mpfj/uboot/u-boot/common/env_nowhere.c:38: multiple definition of `env_relocate_spec' /home/mpfj/uboot/u-boot/spl/common/env_flash.o:/home/mpfj/uboot/u-boot/common/env_flash.c:321: first defined here /home/mpfj/uboot/u-boot/spl/common/env_nowhere.o: In function `env_init': /home/mpfj/uboot/u-boot/common/env_nowhere.c:47: multiple definition of `env_init' /home/mpfj/uboot/u-boot/spl/common/env_flash.o:/home/mpfj/uboot/u-boot/common/env_flash.c:78: first defined here /home/mpfj/uboot/u-boot/spl/common/env_nowhere.o: In function `env_relocate_spec': /home/mpfj/uboot/u-boot/common/env_nowhere.c:38: multiple definition of `env_ptr' /home/mpfj/uboot/u-boot/spl/common/env_flash.o:(.data.env_ptr+0x0): first defined here make[3]: *** [/home/mpfj/uboot/u-boot/spl/common/libcommon.o] Error 1 make[3]: Leaving directory `/home/mpfj/uboot/u-boot/common' make[2]: *** [/home/mpfj/uboot/u-boot/spl/common/libcommon.o] Error 2 make[2]: Leaving directory `/home/mpfj/uboot/u-boot/spl' make[1]: *** [spl/u-boot-spl.bin] Error 2 make[1]: Leaving directory `/home/mpfj/uboot/u-boot' make: *** [nanobone_sdboot] Error 2 I have 2 custom entries in the boards.cfg file:- nanobone arm armv7 nanobone newflow am33xx nanobone:NOR_BOOT nanobone_sdboot arm armv7 nanobone newflow am33xx nanobone:SD_BOOT My nanobone.h file is attached. I'd appreciate it is someone could tell me why env_nowhere.o is being compiled in even though CONFIG_ENV_IS_NOWHERE is not defined. Cheers Mark J.

1 0

[U-Boot] [PATCH 0/6] ARM: AM43xx: Add Support for AM43xx Soc's
by Lokesh Vutla 11 Jul '13

11 Jul '13

AM43xx is a low cost Cortex-A9 based application processor targets higher performance applications and new specific end equipments like Point of Sale requiring stringent security requirements. This series add support for AM43xx Soc's. Data for the following is not added: -> SDRAM -> DPLL Dividers and post dividers -> Pin mux data(only uart data added). Once this data is available Ill add them. Config file is kept minimal for now, ll add the corresponding configs when they are validated. This is based on top of u-boot mainline + my recent am33xx cleanup series: http://u-boot.10912.n7.nabble.com/PATCH-0-4-ARM-AM33xx-Cleanup-clocks-and-h… Testing: Tested on pre-silicon platform verified ./MAKEALL --cpu=armv7 ./MAKEALL -s omap/am33xx Lokesh Vutla (6): ARM: AM43xx: Add Board files ARM: AM43xx: Add header files ARM: AM43xx: clocks: Add dpll and clock data ARM: OMAP: Add CONFIG_OMAP_COMMON ARM: AM43xx: Add build support ARM: AM43xx: Add config file Makefile | 2 +- arch/arm/config.mk | 2 +- arch/arm/cpu/armv7/Makefile | 2 +- arch/arm/cpu/armv7/am33xx/Makefile | 7 +- arch/arm/cpu/armv7/am33xx/clock_am43xx.c | 120 ++++++++++++++ arch/arm/cpu/armv7/omap-common/Makefile | 2 +- arch/arm/cpu/armv7/omap-common/boot-common.c | 3 +- arch/arm/include/asm/arch-am33xx/cpu.h | 164 +++++++++++++++++++- arch/arm/include/asm/arch-am33xx/hardware.h | 8 +- arch/arm/include/asm/arch-am33xx/hardware_am33xx.h | 9 ++ .../{hardware_am33xx.h => hardware_am43xx.h} | 18 ++- arch/arm/include/asm/arch-am33xx/hardware_ti814x.h | 9 ++ arch/arm/include/asm/arch-am33xx/mux.h | 2 + arch/arm/include/asm/arch-am33xx/mux_am43xx.h | 151 ++++++++++++++++++ arch/arm/include/asm/arch-am33xx/omap.h | 9 +- arch/arm/include/asm/arch-am33xx/spl.h | 4 +- .../cpu/armv7/am33xx => board/ti/am43xx}/Makefile | 35 ++--- board/ti/am43xx/board.c | 55 +++++++ board/ti/am43xx/board.h | 25 +++ board/ti/am43xx/mux.c | 35 +++++ boards.cfg | 1 + drivers/serial/ns16550.c | 5 +- include/configs/am335x_evm.h | 1 + include/configs/am3517_crane.h | 1 + include/configs/am3517_evm.h | 1 + include/configs/am43xx_evm.h | 143 +++++++++++++++++ include/configs/cm_t35.h | 1 + include/configs/devkit8000.h | 1 + include/configs/dig297.h | 1 + include/configs/igep0033.h | 1 + include/configs/igep00x0.h | 1 + include/configs/mcx.h | 1 + include/configs/nokia_rx51.h | 1 + include/configs/omap3_beagle.h | 1 + include/configs/omap3_evm_common.h | 1 + include/configs/omap3_logic.h | 1 + include/configs/omap3_mvblx.h | 1 + include/configs/omap3_overo.h | 1 + include/configs/omap3_pandora.h | 1 + include/configs/omap3_sdp3430.h | 1 + include/configs/omap3_zoom1.h | 1 + include/configs/omap3_zoom2.h | 1 + include/configs/omap4_common.h | 1 + include/configs/omap5_common.h | 1 + include/configs/pcm051.h | 1 + include/configs/tam3517-common.h | 1 + include/configs/ti814x_evm.h | 1 + include/configs/tricorder.h | 1 + spl/Makefile | 2 +- 49 files changed, 783 insertions(+), 55 deletions(-) create mode 100644 arch/arm/cpu/armv7/am33xx/clock_am43xx.c copy arch/arm/include/asm/arch-am33xx/{hardware_am33xx.h => hardware_am43xx.h} (78%) create mode 100644 arch/arm/include/asm/arch-am33xx/mux_am43xx.h copy {arch/arm/cpu/armv7/am33xx => board/ti/am43xx}/Makefile (55%) create mode 100644 board/ti/am43xx/board.c create mode 100644 board/ti/am43xx/board.h create mode 100644 board/ti/am43xx/mux.c create mode 100644 include/configs/am43xx_evm.h -- 1.7.9.5

1 6

[U-Boot] ERROR: new format image overwritten – must reset the board to recover
by David Lee 11 Jul '13

11 Jul '13

Hi. We had U-Boot booting Linux just fine. Then after some minor cleanup, we rebuild the images. Thereafter, we are now seeing U-Boot reporting the error below: *"ERROR: new format image overwritten –** must reset the board to recover"* We tried reverting the minor cleanup we had done and then rebuild the images. But we are still still getting the same U-Boot error message with the board reset after the Linux image was decompressed. We are at a loss at what the problem is. Any thoughts or guidance would be much appreciated. Thanks.

2 1

[U-Boot] [PATCH]mx6qsabresd: Add splash screen support via HDMI
by Pardeep Kumar Singla 11 Jul '13

11 Jul '13

Signed-off-by: Pardeep Kumar Singla <b45784(a)freescale.com> --- board/freescale/mx6qsabresd/mx6qsabresd.c | 92 ++++++++++++++++++++++++++++- include/configs/mx6qsabre_common.h | 3 +- include/configs/mx6qsabresd.h | 13 ++++ 3 files changed, 106 insertions(+), 2 deletions(-) diff --git a/board/freescale/mx6qsabresd/mx6qsabresd.c b/board/freescale/mx6qsabresd/mx6qsabresd.c index 2529826..301fd1b 100644 --- a/board/freescale/mx6qsabresd/mx6qsabresd.c +++ b/board/freescale/mx6qsabresd/mx6qsabresd.c @@ -31,6 +31,11 @@ #include <fsl_esdhc.h> #include <miiphy.h> #include <netdev.h> +#include <asm/arch/crm_regs.h> +#include <asm/arch/crm_regs.h> +#include <ipu_pixfmt.h> +#include <linux/fb.h> +#include <asm/arch/mxc_hdmi.h> DECLARE_GLOBAL_DATA_PTR; @@ -133,6 +138,80 @@ static void setup_iomux_uart(void) imx_iomux_v3_setup_multiple_pads(uart1_pads, ARRAY_SIZE(uart1_pads)); } +#if defined(CONFIG_VIDEO_IPUV3) +static void enable_hdmi(void) +{ + struct hdmi_regs *hdmi = (struct hdmi_regs *)HDMI_ARB_BASE_ADDR; + u8 reg; + reg = readb(&hdmi->phy_conf0); + reg |= HDMI_PHY_CONF0_PDZ_MASK; + writeb(reg, &hdmi->phy_conf0); + udelay(3000); + reg |= HDMI_PHY_CONF0_ENTMDS_MASK; + writeb(reg, &hdmi->phy_conf0); + udelay(3000); + reg |= HDMI_PHY_CONF0_GEN2_TXPWRON_MASK; + writeb(reg, &hdmi->phy_conf0); + writeb(HDMI_MC_PHYRSTZ_ASSERT, &hdmi->mc_phyrstz); +} + +static struct fb_videomode const hdmi = { + .name = "HDMI", + .refresh = 60, + .xres = 1024, + .yres = 768, + .pixclock = 15385, + .left_margin = 220, + .right_margin = 40, + .upper_margin = 21, + .lower_margin = 7, + .hsync_len = 60, + .vsync_len = 10, + .sync = FB_SYNC_EXT, + .vmode = FB_VMODE_NONINTERLACED +}; + +int board_video_skip(void) +{ + int ret; + ret = ipuv3_fb_init(&hdmi, 0, IPU_PIX_FMT_RGB24); + if (ret) + printf("HDMI cannot be configured: %d\n", ret); + enable_hdmi(); + return ret; +} + +static void setup_display(void) +{ + struct mxc_ccm_reg *mxc_ccm = (struct mxc_ccm_reg *)CCM_BASE_ADDR; + struct hdmi_regs *hdmi = (struct hdmi_regs *)HDMI_ARB_BASE_ADDR; + int reg; + + /* Turn on IPU clock */ + reg = readl(&mxc_ccm->CCGR3); + reg |= MXC_CCM_CCGR3_IPU1_IPU_DI0_OFFSET; + writel(reg, &mxc_ccm->CCGR3); + /* Turn on HDMI PHY clock */ + reg = readl(&mxc_ccm->CCGR2); + reg |= MXC_CCM_CCGR2_HDMI_TX_IAHBCLK_MASK| + MXC_CCM_CCGR2_HDMI_TX_ISFRCLK_MASK; + writel(reg, &mxc_ccm->CCGR2); + /* clear HDMI PHY reset */ + writeb(HDMI_MC_PHYRSTZ_DEASSERT, &hdmi->mc_phyrstz); + reg = readl(&mxc_ccm->chsccdr); + reg &= ~(MXC_CCM_CHSCCDR_IPU1_DI0_PRE_CLK_SEL_MASK| + MXC_CCM_CHSCCDR_IPU1_DI0_PODF_MASK| + MXC_CCM_CHSCCDR_IPU1_DI0_CLK_SEL_MASK); + reg |= (CHSCCDR_CLK_SEL_LDB_DI0 + << MXC_CCM_CHSCCDR_IPU1_DI0_CLK_SEL_OFFSET)| + (CHSCCDR_PODF_DIVIDE_BY_3 + << MXC_CCM_CHSCCDR_IPU1_DI0_PODF_OFFSET) + | (CHSCCDR_IPU_PRE_CLK_540M_PFD + << MXC_CCM_CHSCCDR_IPU1_DI0_PRE_CLK_SEL_OFFSET); + writel(reg, &mxc_ccm->chsccdr); +} +#endif /* CONFIG_VIDEO_IPUV3 */ + #ifdef CONFIG_FSL_ESDHC struct fsl_esdhc_cfg usdhc_cfg[3] = { {USDHC2_BASE_ADDR}, @@ -257,10 +336,21 @@ int board_eth_init(bd_t *bis) int board_early_init_f(void) { setup_iomux_uart(); - +#if defined(CONFIG_VIDEO_IPUV3) + setup_display(); +#endif return 0; } +/* + * Do not overwrite the console + * Use always serial for U-Boot console + */ +int overwrite_console(void) +{ + return 1; +} + int board_init(void) { /* address of boot parameters */ diff --git a/include/configs/mx6qsabre_common.h b/include/configs/mx6qsabre_common.h index bfaa420..438cb83 100644 --- a/include/configs/mx6qsabre_common.h +++ b/include/configs/mx6qsabre_common.h @@ -21,6 +21,7 @@ #define CONFIG_MX6Q #include "mx6_common.h" +#include <asm/sizes.h> #define CONFIG_DISPLAY_CPUINFO #define CONFIG_DISPLAY_BOARDINFO @@ -33,7 +34,7 @@ #define CONFIG_REVISION_TAG /* Size of malloc() pool */ -#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 2 * 1024 * 1024) +#define CONFIG_SYS_MALLOC_LEN (10 * SZ_1M) #define CONFIG_BOARD_EARLY_INIT_F #define CONFIG_BOARD_LATE_INIT diff --git a/include/configs/mx6qsabresd.h b/include/configs/mx6qsabresd.h index 44f07cb..5e561eb 100644 --- a/include/configs/mx6qsabresd.h +++ b/include/configs/mx6qsabresd.h @@ -26,6 +26,19 @@ #include "mx6qsabre_common.h" +/* Framebuffer */ +#define CONFIG_VIDEO +#define CONFIG_VIDEO_IPUV3 +#define CONFIG_CFB_CONSOLE +#define CONFIG_VGA_AS_SINGLE_DEVICE +#define CONFIG_SYS_CONSOLE_IS_IN_ENV +#define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE +#define CONFIG_VIDEO_BMP_RLE8 +#define CONFIG_SPLASH_SCREEN +#define CONFIG_BMP_16BPP +#define CONFIG_VIDEO_LOGO +#define CONFIG_IPUV3_CLK 260000000 + #define CONFIG_SYS_FSL_USDHC_NUM 3 #if defined(CONFIG_ENV_IS_IN_MMC) #define CONFIG_SYS_MMC_ENV_DEV 1 /* SDHC3 */ -- 1.7.9.5

3 2

[U-Boot] decompile u-boot.bin file
by Heer Lorcan 11 Jul '13

11 Jul '13

Hey, have this iriver cover story. would like to hack the damn thing, since it's linux based and could do some work. add some options, delete others. have gotten the firmware decompressed from a EB05.HEX file to a very nice extended directory. the rootfs.cramfs is also decompressed. just leaves me the few files, *.feb -> unknown format the zImage and the u-boot.bin could any of you here help me out with the u-boot.bin? kind regards, -- ShinSham DTL Heer Lorcan

3 2

[U-Boot] twister: usb host support
by Jeroen Hofstee 11 Jul '13

11 Jul '13

Hello Stefano, The twister always had a fragile usb support in u-boot in the past. Since some floating patches mentioned alternating success after usb hub resets, I had a look if these patches fixed the twister as well, they don't. Some fiddling around [1] makes the usb work however, by not attempting to reset the USB hub with gpio_25. I cannot find any document mentioning gpio_25 though. Any reason for this usage? It seems better to get rid of it completely.. Anything against that? --- Regards, Jeroen p.s. I found by sheer accidence that the usb is behaving completely normal (after the patch) on rev B1. It is broken on rev B without the patch and working buggy with it. On rev B1 + patch the USB to SATA converter is discovered as well, which I have never seen before. === [1] patch to disable the usb reset The change to port_mode[1] is not needed, but since it is unused, MODE_UNUSED seems appropriate. diff --git a/board/technexion/twister/twister.c b/board/technexion/twister/twister.c index a28c704..31cf6c0 100644 --- a/board/technexion/twister/twister.c +++ b/board/technexion/twister/twister.c @@ -63,7 +63,7 @@ static const u32 gpmc_XR16L2751[] = { #ifdef CONFIG_USB_EHCI static struct omap_usbhs_board_data usbhs_bdata = { .port_mode[0] = OMAP_EHCI_PORT_MODE_PHY, - .port_mode[1] = OMAP_EHCI_PORT_MODE_PHY, + .port_mode[1] = OMAP_USBHS_PORT_MODE_UNUSED, .port_mode[2] = OMAP_USBHS_PORT_MODE_UNUSED, }; @@ -92,9 +92,6 @@ int board_init(void) enable_gpmc_cs_config(gpmc_XR16L2751, &gpmc_cfg->cs[3], XR16L2751_UART2_BASE, GPMC_SIZE_16M); - gpio_request(CONFIG_OMAP_EHCI_PHY1_RESET_GPIO, "USB_PHY1_RESET"); - gpio_direction_output(CONFIG_OMAP_EHCI_PHY1_RESET_GPIO, 1); - === [2] current usb master (rev B1) === twister => usb start (Re)start USB... USB0: USB EHCI 1.00 scanning bus 0 for devices... 3 USB Device(s) found scanning usb for storage devices... 1 Storage Device(s) found twister => usb start (Re)start USB... USB0: USB EHCI 1.00 scanning bus 0 for devices... cannot reset port 1!? 1 USB Device(s) found scanning usb for storage devices... 0 Storage Device(s) found twister => usb start (Re)start USB... USB0: USB EHCI 1.00 scanning bus 0 for devices... 3 USB Device(s) found scanning usb for storage devices... 1 Storage Device(s) found twister => usb start (Re)start USB... USB0: USB EHCI 1.00 scanning bus 0 for devices... cannot reset port 1!? 1 USB Device(s) found scanning usb for storage devices... 0 Storage Device(s) found === [3] after the patch (rev B1) === twister => usb start (Re)start USB... USB0: USB EHCI 1.00 scanning bus 0 for devices... 4 USB Device(s) found scanning usb for storage devices... Device NOT ready Request Sense returned 02 3A 00 1 Storage Device(s) found twister => usb tree USB device tree: 1 Hub (480 Mb/s, 0mA) | u-boot EHCI Host Controller | +-2 Hub (480 Mb/s, 100mA) | USB2.0 Hub | +-3 Mass Storage (480 Mb/s, 96mA) | USB Storage 000000000033 | +-4 Mass Storage (480 Mb/s, 498mA) Philips USB Flash Drive 070825AEA237D121 === [4] after the patch (rev B) === Re)start USB... USB0: USB EHCI 1.00 scanning bus 0 for devices... 1 USB Device(s) found scanning usb for storage devices... 0 Storage Device(s) found bpp3=> usb start (Re)start USB... USB0: USB EHCI 1.00 scanning bus 0 for devices... 3 USB Device(s) found scanning usb for storage devices... 1 Storage Device(s) found bpp3=> usb start (Re)start USB... USB0: USB EHCI 1.00 scanning bus 0 for devices... cannot reset port 1!? 1 USB Device(s) found scanning usb for storage devices... 0 Storage Device(s) found === [5] twister => usb start (Re)start USB... USB0: USB EHCI 1.00 scanning bus 0 for devices... port(0) reset error cannot reset port 1!? 1 USB Device(s) found scanning usb for storage devices... 0 Storage Device(s) found twister => usb start (Re)start USB... USB0: USB EHCI 1.00 scanning bus 0 for devices... cannot reset port 1!? 1 USB Device(s) found scanning usb for storage devices... 0 Storage Device(s) found return 0; } diff --git a/include/configs/tam3517-common.h b/include/configs/tam3517-common.h index 2af504b..852bdd7 100644 --- a/include/configs/tam3517-common.h +++ b/include/configs/tam3517-common.h @@ -102,7 +102,6 @@ #define CONFIG_USB_EHCI_OMAP #define CONFIG_USB_ULPI #define CONFIG_USB_ULPI_VIEWPORT_OMAP -#define CONFIG_OMAP_EHCI_PHY1_RESET_GPIO 25 #define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 3 #define CONFIG_USB_STORAGE

3 4

[U-Boot] [PATCH 0/7] qspi controller: Normal, quad and memory mapped read support
by Sourav Poddar 11 Jul '13

11 Jul '13

This patch series add uboot ti qspi controller driver. QSPI is a kind of spi module that allows single, dual and quad read access to external spi devices. The module has a memory mapped interface which provide direct interface for accessing data form external spi devices. SPI mode ------- SPI mode uses mtd spi framework for transfer and reception of data. Can be used in: 1. Normal mode: use single pin for transfers 2. Dual Mode: use two pins for transfers. 3. Quad mode: use four pin for transfer Memory mapped read mode ----------------------- In this, SPI controller is configured using configuration port and then controler is switched to memory mapped port for data read. Series proposed suport for quad read as well as memory mapped read in spi mtd frameowrk as well as ti qpsi driver. Matt Porter (3): omap5: add qspi support spi: add TI QSPI driver dra7xx_evm: add SPL API, QSPI, and serial flash support Ravikumar Kattekola (1): drivers: mtd: qspi: Add quad read support Sourav Poddar (3): drivers: mtd: spi: Modify read/write command for sfl256s flash. driver: spi: Add memory mapped read support README: qspi usecase and testing documentation. arch/arm/cpu/armv7/omap5/hw_data.c | 7 +- arch/arm/cpu/armv7/omap5/prcm-regs.c | 1 + arch/arm/include/asm/arch-omap5/omap.h | 3 + arch/arm/include/asm/arch-omap5/spl.h | 1 + arch/arm/include/asm/omap_common.h | 1 + board/ti/dra7xx/mux_data.h | 10 + doc/README.ti_qspi_dra_test | 38 ++++ doc/README.ti_qspi_flash | 47 +++++ drivers/mtd/spi/spansion.c | 1 + drivers/mtd/spi/spi_flash.c | 177 +++++++++++++++++- drivers/mtd/spi/spi_flash_internal.h | 2 + drivers/spi/Makefile | 1 + drivers/spi/ti_qspi.c | 327 ++++++++++++++++++++++++++++++++ include/configs/dra7xx_evm.h | 24 +++ include/spi.h | 5 + 15 files changed, 640 insertions(+), 5 deletions(-) create mode 100644 doc/README.ti_qspi_dra_test create mode 100644 doc/README.ti_qspi_flash create mode 100644 drivers/spi/ti_qspi.c

5 16

[U-Boot] [PATCH V2] p1020rdb-pd: platform support
by Haijun.Zhang 11 Jul '13

11 Jul '13

From: "Haijun.Zhang" <Haijun.Zhang(a)freescale.com> Add new board p1020RDB-PD. P1020RDB-PD board was update from P1020RDB. DDR changed from DDR2 1G to DDR3 2G. NAND: 128 MiB Flash: 64 MiB Also change P1020RDB to P1020RDB-PC to distinguish from P1020RDB board. Signed-off-by: Jerry Huang <Chang-Ming.Huang(a)freescale.com> Signed-off-by: Haijun Zhang <Haijun.Zhang(a)freescale.com> CC: Scott Wood <scottwood(a)freescale.com> CC: Sun Yusong-R58495 <yorksun(a)freescale.com> --- changes for V2: - Add change log and update the config name for pc board board/freescale/p1_p2_rdb_pc/README | 1 + board/freescale/p1_p2_rdb_pc/ddr.c | 4 +-- board/freescale/p1_p2_rdb_pc/tlb.c | 2 +- boards.cfg | 20 +++++++++------ include/configs/p1_p2_rdb_pc.h | 50 ++++++++++++++++++++++++++++++++++--- 5 files changed, 63 insertions(+), 14 deletions(-) diff --git a/board/freescale/p1_p2_rdb_pc/README b/board/freescale/p1_p2_rdb_pc/README index 4437731..f4cc43f 100644 --- a/board/freescale/p1_p2_rdb_pc/README +++ b/board/freescale/p1_p2_rdb_pc/README @@ -3,6 +3,7 @@ Overview P1_P2_RDB_PC represents a set of boards including P1020MSBG-PC P1020RDB-PC + P1020RDB-PD P1020UTM-PC P1021RDB-PC P1024RDB diff --git a/board/freescale/p1_p2_rdb_pc/ddr.c b/board/freescale/p1_p2_rdb_pc/ddr.c index 9355536..c8fde72 100644 --- a/board/freescale/p1_p2_rdb_pc/ddr.c +++ b/board/freescale/p1_p2_rdb_pc/ddr.c @@ -80,7 +80,7 @@ dimm_params_t ddr_raw_timing = { .refresh_rate_ps = 7800000, .tFAW_ps = 30000, }; -#elif defined(CONFIG_P1020MBG) +#elif (defined(CONFIG_P1020MBG) || defined(CONFIG_P1020RDB_PD)) /* Micron MT41J512M8_187E */ dimm_params_t ddr_raw_timing = { .n_ranks = 2, @@ -111,7 +111,7 @@ dimm_params_t ddr_raw_timing = { .refresh_rate_ps = 7800000, .tFAW_ps = 37500, }; -#elif defined(CONFIG_P1020RDB) +#elif defined(CONFIG_P1020RDB_PC) /* * Samsung K4B2G0846C-HCF8 * The following timing are for "downshift" diff --git a/board/freescale/p1_p2_rdb_pc/tlb.c b/board/freescale/p1_p2_rdb_pc/tlb.c index 3e4dffd..e19002f 100644 --- a/board/freescale/p1_p2_rdb_pc/tlb.c +++ b/board/freescale/p1_p2_rdb_pc/tlb.c @@ -110,7 +110,7 @@ struct fsl_e_tlb_entry tlb_table[] = { MAS3_SX|MAS3_SW|MAS3_SR, 0, 0, 8, BOOKE_PAGESZ_1G, 1), -#ifdef CONFIG_P1020MBG +#if defined(CONFIG_P1020MBG) || defined(CONFIG_P1020RDB_PD) /* 2G DDR on P1020MBG, map the second 1G */ SET_TLB_ENTRY(1, CONFIG_SYS_DDR_SDRAM_BASE + 0x40000000, CONFIG_SYS_DDR_SDRAM_BASE + 0x40000000, diff --git a/boards.cfg b/boards.cfg index 35f38f3..8f50927 100644 --- a/boards.cfg +++ b/boards.cfg @@ -758,16 +758,20 @@ P1020RDB_36BIT powerpc mpc85xx p1_p2_rdb freesca P1020RDB_36BIT_SDCARD powerpc mpc85xx p1_p2_rdb freescale - P1_P2_RDB:P1020RDB,36BIT,SDCARD P1020RDB_36BIT_SPIFLASH powerpc mpc85xx p1_p2_rdb freescale - P1_P2_RDB:P1020RDB,36BIT,SPIFLASH P1020RDB_NAND powerpc mpc85xx p1_p2_rdb freescale - P1_P2_RDB:P1020RDB,NAND -P1020RDB-PC powerpc mpc85xx p1_p2_rdb_pc freescale - p1_p2_rdb_pc:P1020RDB -P1020RDB-PC_36BIT powerpc mpc85xx p1_p2_rdb_pc freescale - p1_p2_rdb_pc:P1020RDB,36BIT -P1020RDB-PC_36BIT_NAND powerpc mpc85xx p1_p2_rdb_pc freescale - p1_p2_rdb_pc:P1020RDB,36BIT,NAND -P1020RDB-PC_36BIT_SDCARD powerpc mpc85xx p1_p2_rdb_pc freescale - p1_p2_rdb_pc:P1020RDB,36BIT,SDCARD -P1020RDB-PC_36BIT_SPIFLASH powerpc mpc85xx p1_p2_rdb_pc freescale - p1_p2_rdb_pc:P1020RDB,36BIT,SPIFLASH -P1020RDB-PC_NAND powerpc mpc85xx p1_p2_rdb_pc freescale - p1_p2_rdb_pc:P1020RDB,NAND -P1020RDB-PC_SDCARD powerpc mpc85xx p1_p2_rdb_pc freescale - p1_p2_rdb_pc:P1020RDB,SDCARD -P1020RDB-PC_SPIFLASH powerpc mpc85xx p1_p2_rdb_pc freescale - p1_p2_rdb_pc:P1020RDB,SPIFLASH +P1020RDB-PC powerpc mpc85xx p1_p2_rdb_pc freescale - p1_p2_rdb_pc:P1020RDB_PC +P1020RDB-PC_36BIT powerpc mpc85xx p1_p2_rdb_pc freescale - p1_p2_rdb_pc:P1020RDB_PC,36BIT +P1020RDB-PC_36BIT_NAND powerpc mpc85xx p1_p2_rdb_pc freescale - p1_p2_rdb_pc:P1020RDB_PC,36BIT,NAND +P1020RDB-PC_36BIT_SDCARD powerpc mpc85xx p1_p2_rdb_pc freescale - p1_p2_rdb_pc:P1020RDB_PC,36BIT,SDCARD +P1020RDB-PC_36BIT_SPIFLASH powerpc mpc85xx p1_p2_rdb_pc freescale - p1_p2_rdb_pc:P1020RDB_PC,36BIT,SPIFLASH +P1020RDB-PC_NAND powerpc mpc85xx p1_p2_rdb_pc freescale - p1_p2_rdb_pc:P1020RDB_PC,NAND +P1020RDB-PC_SDCARD powerpc mpc85xx p1_p2_rdb_pc freescale - p1_p2_rdb_pc:P1020RDB_PC,SDCARD +P1020RDB-PC_SPIFLASH powerpc mpc85xx p1_p2_rdb_pc freescale - p1_p2_rdb_pc:P1020RDB_PC,SPIFLASH P1020RDB_SDCARD powerpc mpc85xx p1_p2_rdb freescale - P1_P2_RDB:P1020RDB,SDCARD P1020RDB_SPIFLASH powerpc mpc85xx p1_p2_rdb freescale - P1_P2_RDB:P1020RDB,SPIFLASH +P1020RDB-PD powerpc mpc85xx p1_p2_rdb_pc freescale - p1_p2_rdb_pc:P1020RDB_PD +P1020RDB-PD_NAND powerpc mpc85xx p1_p2_rdb_pc freescale - p1_p2_rdb_pc:P1020RDB_PD,NAND +P1020RDB-PD_SDCARD powerpc mpc85xx p1_p2_rdb_pc freescale - p1_p2_rdb_pc:P1020RDB_PD,SDCARD +P1020RDB-PD_SPIFLASH powerpc mpc85xx p1_p2_rdb_pc freescale - p1_p2_rdb_pc:P1020RDB_PD,SPIFLASH P1020UTM-PC powerpc mpc85xx p1_p2_rdb_pc freescale - p1_p2_rdb_pc:P1020UTM P1020UTM-PC_36BIT powerpc mpc85xx p1_p2_rdb_pc freescale - p1_p2_rdb_pc:P1020UTM,36BIT P1020UTM-PC_36BIT_SDCARD powerpc mpc85xx p1_p2_rdb_pc freescale - p1_p2_rdb_pc:P1020UTM,36BIT,SDCARD diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h index 964bfcd..5e804e4 100644 --- a/include/configs/p1_p2_rdb_pc.h +++ b/include/configs/p1_p2_rdb_pc.h @@ -50,7 +50,7 @@ #define CONFIG_SYS_L2_SIZE (256 << 10) #endif -#if defined(CONFIG_P1020RDB) +#if defined(CONFIG_P1020RDB_PC) #define CONFIG_BOARDNAME "P1020RDB-PC" #define CONFIG_NAND_FSL_ELBC #define CONFIG_P1020 @@ -66,6 +66,35 @@ #define CONFIG_SYS_L2_SIZE (256 << 10) #endif +/* + * P1020RDB-PD board has user selectable switches for evaluating different + * frequency and boot options for the P1020 device. The table that + * follow describe the available options. The front six binary number was in + * accordance with SW3[1:6]. + * 111101 533 533 267 667 NOR Core0 boot; Core1 hold-off + * 101101 667 667 333 667 NOR Core0 boot; Core1 hold-off + * 011001 800 800 400 667 NOR Core0 boot; Core1 hold-off + * 001001 800 800 400 667 SD/MMC Core0 boot; Core1 hold-off + * 001101 800 800 400 667 SPI Core0 boot; Core1 hold-off + * 010001 800 800 400 667 NAND Core0 boot; Core1 hold-off + * 011101 800 800 400 667 PCIe-2 Core0 boot; Core1 hold-off + */ +#if defined(CONFIG_P1020RDB_PD) +#define CONFIG_BOARDNAME "P1020RDB-PD" +#define CONFIG_NAND_FSL_ELBC +#define CONFIG_P1020 +#define CONFIG_SPI_FLASH +#define CONFIG_VSC7385_ENET +#define CONFIG_SLIC +#define __SW_BOOT_MASK 0x03 +#define __SW_BOOT_NOR 0x64 +#define __SW_BOOT_SPI 0x34 +#define __SW_BOOT_SD 0x24 +#define __SW_BOOT_NAND 0x44 +#define __SW_BOOT_PCIE 0x74 +#define CONFIG_SYS_L2_SIZE (256 << 10) +#endif + #if defined(CONFIG_P1021RDB) #define CONFIG_BOARDNAME "P1021RDB-PC" #define CONFIG_NAND_FSL_ELBC @@ -274,7 +303,7 @@ #define SPD_EEPROM_ADDRESS 0x52 #undef CONFIG_FSL_DDR_INTERACTIVE -#ifdef CONFIG_P1020MBG +#if (defined(CONFIG_P1020MBG) || defined(CONFIG_P1020RDB_PD)) #define CONFIG_SYS_SDRAM_SIZE_LAW LAW_SIZE_2G #define CONFIG_CHIP_SELECTS_PER_CTRL 2 #else @@ -345,7 +374,7 @@ /* * Local Bus Definitions */ -#if defined(CONFIG_P1020MBG) +#if (defined(CONFIG_P1020MBG) || defined(CONFIG_P1020RDB_PD)) #define CONFIG_SYS_MAX_FLASH_SECT 512 /* 64M */ #define CONFIG_SYS_FLASH_BASE 0xec000000 #elif defined(CONFIG_P1020UTM) @@ -396,13 +425,27 @@ #define CONFIG_SYS_MAX_NAND_DEVICE 1 #define CONFIG_MTD_NAND_VERIFY_WRITE #define CONFIG_CMD_NAND +#if defined(CONFIG_P1020RDB_PD) +#define CONFIG_SYS_NAND_BLOCK_SIZE (128 * 1024) +#else #define CONFIG_SYS_NAND_BLOCK_SIZE (16 * 1024) +#endif #define CONFIG_SYS_NAND_BR_PRELIM (BR_PHYS_ADDR(CONFIG_SYS_NAND_BASE_PHYS) \ | (2<<BR_DECC_SHIFT) /* Use HW ECC */ \ | BR_PS_8 /* Port Size = 8 bit */ \ | BR_MS_FCM /* MSEL = FCM */ \ | BR_V) /* valid */ +#if defined(CONFIG_P1020RDB_PD) +#define CONFIG_SYS_NAND_OR_PRELIM (OR_AM_32KB \ + | OR_FCM_PGS /* Large Page*/ \ + | OR_FCM_CSCT \ + | OR_FCM_CST \ + | OR_FCM_CHT \ + | OR_FCM_SCY_1 \ + | OR_FCM_TRLX \ + | OR_FCM_EHTR) +#else #define CONFIG_SYS_NAND_OR_PRELIM (OR_AM_32KB /* small page */ \ | OR_FCM_CSCT \ | OR_FCM_CST \ @@ -410,6 +453,7 @@ | OR_FCM_SCY_1 \ | OR_FCM_TRLX \ | OR_FCM_EHTR) +#endif #endif /* CONFIG_NAND_FSL_ELBC */ #define CONFIG_BOARD_EARLY_INIT_R /* call board_early_init_r function */ -- 1.8.0

2 1

[U-Boot] please pull u-boot-samsung master
by Minkyu Kang 10 Jul '13

10 Jul '13

Dear Albert, The following changes since commit 7737c994609ffb50194d5ddb67467ae0fcd8f775: net2big_v2: initialize LEDs at startup (2013-06-20 14:01:23 +0530) are available in the git repository at: git://git.denx.de/u-boot-samsung master for you to fetch changes up to 1ae76d438b602fe8be1f0ef8b8ce47c89d371047: EXYNOS: Resolve the i2c compilation error (2013-07-10 14:20:26 +0900) ---------------------------------------------------------------- Ajay Kumar (1): video: exynos_fb: Add the missing #else clause Amar (2): EXYNOS5: I2C: Add FDT and non-FDT support for I2C EXYNOS: Resolve the i2c compilation error Axel Lin (2): gpio: s3c2440_gpio: Fix wrong writel arguments gpio: s5p_gpio: Call s5p_gpio_set_value() instead of open-code Bernie Thompson (1): exynos: Adjust the starting MIF voltage to 1.05v Minkyu Kang (1): arm: exynos: fix clock calculation Rajeshwari Shinde (9): EXYNOS5: FDT: Add compatible strings for Serial EXYNOS5: FDT: Add serial device node values S5P: Serial: Add fdt support to driver CONFIG: EXYNOS5: Enable silent console SMDK5250: Remove reduntant code EXYNOS: Add API for power reset and exit wakeup EXYNOS: LDS file move to common EXYNOS4210: Configure GPIO for uart EXYNOS: Move files from board/samsung to arch/arm Simon Glass (1): exynos: Enable mmc for snow Łukasz Majewski (2): arm:trats: Increase malloc pool size (for DFU ext4 transfers) power:bat:trats: Break battery charging with ctrl+C arch/arm/cpu/armv7/exynos/Makefile | 17 +- arch/arm/cpu/armv7/exynos/clock.c | 43 +- .../arm/cpu/armv7/exynos}/clock_init.h | 0 arch/arm/cpu/armv7/exynos/clock_init_exynos4.c | 95 +++++ .../arm/cpu/armv7/exynos/clock_init_exynos5.c | 56 +-- arch/arm/cpu/armv7/exynos/common_setup.h | 45 +++ .../arm/cpu/armv7/exynos}/dmc_common.c | 7 +- .../arm/cpu/armv7/exynos}/dmc_init_ddr3.c | 27 +- arch/arm/cpu/armv7/exynos/dmc_init_exynos4.c | 213 ++++++++++ .../arm/cpu/armv7/exynos/exynos4_setup.h | 397 +++++++++--------- .../arm/cpu/armv7/exynos/exynos5_setup.h | 28 +- arch/arm/cpu/armv7/exynos/lowlevel_init.c | 73 ++++ arch/arm/cpu/armv7/exynos/pinmux.c | 40 ++ arch/arm/cpu/armv7/exynos/power.c | 50 +++ .../arm/cpu/armv7/exynos}/spl_boot.c | 84 +++- arch/arm/dts/exynos5250.dtsi | 27 ++ arch/arm/include/asm/arch-exynos/cpu.h | 13 +- arch/arm/include/asm/arch-exynos/power.h | 12 + arch/arm/include/asm/arch-exynos/spl.h | 1 + .../exynos-uboot-spl.lds} | 0 board/samsung/dts/exynos5250-smdk5250.dts | 2 + board/samsung/dts/exynos5250-snow.dts | 26 ++ board/samsung/origen/Makefile | 11 +- board/samsung/origen/lowlevel_init.S | 357 ----------------- board/samsung/origen/mem_setup.S | 421 -------------------- board/samsung/origen/mmc_boot.c | 58 --- board/samsung/origen/origen.c | 46 +++ board/samsung/smdk5250/Makefile | 14 +- board/samsung/smdk5250/smdk5250.c | 12 +- board/samsung/smdkv310/Makefile | 10 +- board/samsung/smdkv310/lowlevel_init.S | 414 ------------------- board/samsung/smdkv310/mem_setup.S | 365 ----------------- board/samsung/smdkv310/mmc_boot.c | 60 --- board/samsung/smdkv310/smdkv310.c | 46 +++ drivers/gpio/s3c2440_gpio.c | 6 +- drivers/gpio/s5p_gpio.c | 9 +- drivers/i2c/s3c24x0_i2c.c | 3 +- drivers/power/battery/bat_trats.c | 13 +- drivers/power/power_core.c | 3 +- drivers/serial/serial_s5p.c | 78 ++++ drivers/video/exynos_fimd.c | 3 +- include/configs/exynos5250-dt.h | 12 +- include/configs/origen.h | 9 +- include/configs/smdkv310.h | 8 +- include/configs/trats.h | 2 +- include/fdtdec.h | 1 + include/power/max77686_pmic.h | 2 + lib/fdtdec.c | 1 + 48 files changed, 1194 insertions(+), 2026 deletions(-) rename {board/samsung/smdk5250 => arch/arm/cpu/armv7/exynos}/clock_init.h (100%) create mode 100644 arch/arm/cpu/armv7/exynos/clock_init_exynos4.c rename board/samsung/smdk5250/clock_init.c => arch/arm/cpu/armv7/exynos/clock_init_exynos5.c (94%) create mode 100644 arch/arm/cpu/armv7/exynos/common_setup.h rename {board/samsung/smdk5250 => arch/arm/cpu/armv7/exynos}/dmc_common.c (97%) rename {board/samsung/smdk5250 => arch/arm/cpu/armv7/exynos}/dmc_init_ddr3.c (92%) create mode 100644 arch/arm/cpu/armv7/exynos/dmc_init_exynos4.c rename board/samsung/origen/origen_setup.h => arch/arm/cpu/armv7/exynos/exynos4_setup.h (65%) rename board/samsung/smdk5250/setup.h => arch/arm/cpu/armv7/exynos/exynos5_setup.h (96%) create mode 100644 arch/arm/cpu/armv7/exynos/lowlevel_init.c rename {board/samsung/smdk5250 => arch/arm/cpu/armv7/exynos}/spl_boot.c (73%) rename board/samsung/{smdk5250/smdk5250-uboot-spl.lds => common/exynos-uboot-spl.lds} (100%) delete mode 100644 board/samsung/origen/lowlevel_init.S delete mode 100644 board/samsung/origen/mem_setup.S delete mode 100644 board/samsung/origen/mmc_boot.c delete mode 100644 board/samsung/smdkv310/lowlevel_init.S delete mode 100644 board/samsung/smdkv310/mem_setup.S delete mode 100644 board/samsung/smdkv310/mmc_boot.c -- Thanks, Minkyu Kang.

2 1

[U-Boot] [PATCH] OMAP5: USB_EHCI: Enable ehci support for omap5
by Dan Murphy 10 Jul '13

10 Jul '13

From: "Govindraj.R" <govindraj.raja(a)ti.com> * Enable all usb ehci related clocks. * Add ehci support to omap5 board file and arch specific sysc reg mask values. * Enable config options for usb support and ethernet support Signed-off-by: Govindraj.R <govindraj.raja(a)ti.com> --- arch/arm/cpu/armv7/omap5/clocks.c | 20 +++++++++++--- arch/arm/include/asm/arch-omap5/clocks.h | 6 ++++ arch/arm/include/asm/arch-omap5/ehci.h | 44 ++++++++++++++++++++++++++++++ board/ti/omap5_evm/evm.c | 33 ++++++++++++++++++++++ include/configs/omap5_evm5430.h | 23 ++++++++++++++-- 5 files changed, 120 insertions(+), 6 deletions(-) create mode 100644 arch/arm/include/asm/arch-omap5/ehci.h diff --git a/arch/arm/cpu/armv7/omap5/clocks.c b/arch/arm/cpu/armv7/omap5/clocks.c index 7e69d2b..f914b60 100644 --- a/arch/arm/cpu/armv7/omap5/clocks.c +++ b/arch/arm/cpu/armv7/omap5/clocks.c @@ -375,6 +375,8 @@ void enable_basic_clocks(void) &prcm->cm_l4per_gpio4_clkctrl, &prcm->cm_l4per_gpio5_clkctrl, &prcm->cm_l4per_gpio6_clkctrl, + &prcm->cm_clksel_usb_60mhz, + &prcm->cm_l3init_hsusbtll_clkctrl, 0 }; @@ -385,6 +387,7 @@ void enable_basic_clocks(void) &prcm->cm_wkup_wdtimer2_clkctrl, &prcm->cm_l4per_uart3_clkctrl, &prcm->cm_l4per_i2c1_clkctrl, + &prcm->cm_l3init_hsusbhost_clkctrl, 0 }; @@ -408,10 +411,13 @@ void enable_basic_clocks(void) setbits_le32(&prcm->cm_wkup_gptimer1_clkctrl, GPTIMER1_CLKCTRL_CLKSEL_MASK); - do_enable_clocks(clk_domains_essential, - clk_modules_hw_auto_essential, - clk_modules_explicit_en_essential, - 1); + /* Enbale all 3 usb ports enable uhh, utmi and hsic clocks*/ + setbits_le32(&prcm->cm_l3init_hsusbhost_clkctrl, + USB_HOST_HS_CLKCTRL_MASK); + + /* Enbale all 3 usb host ports tll clocks*/ + setbits_le32(&prcm->cm_l3init_hsusbtll_clkctrl, + USB_TLL_HS_CLKCTRL_MASK); /* Select 384Mhz for GPU as its the POR for ES1.0 */ setbits_le32(&prcm->cm_sgx_sgx_clkctrl, @@ -429,6 +435,12 @@ void enable_basic_clocks(void) setbits_le32(&prcm->cm_coreaon_bandgap_clkctrl, ((OMAP_TS_CLK_ENABLE_MASK | OMAP_19M_TS_CLK_DIVIDER_MASK) & ~OMAP_38M_TS_CLK_DIVIDER_MASK)); + + do_enable_clocks(clk_domains_essential, + clk_modules_hw_auto_essential, + clk_modules_explicit_en_essential, + 1); + } void enable_basic_uboot_clocks(void) diff --git a/arch/arm/include/asm/arch-omap5/clocks.h b/arch/arm/include/asm/arch-omap5/clocks.h index c944f35..43fc5b8 100644 --- a/arch/arm/include/asm/arch-omap5/clocks.h +++ b/arch/arm/include/asm/arch-omap5/clocks.h @@ -613,6 +613,12 @@ struct omap5_prcm_regs { /* CM_L3INIT_USBPHY_CLKCTRL */ #define USBPHY_CLKCTRL_OPTFCLKEN_PHY_48M_MASK 8 +/* CM_L3INIT_USB_HOST_HS_CLKCTRL */ +#define USB_HOST_HS_CLKCTRL_MASK 0xFFC0 + +/* CM_L3INIT_USB_TLL_HS_CLKCTRL */ +#define USB_TLL_HS_CLKCTRL_MASK 0x700 + /* CM_MPU_MPU_CLKCTRL */ #define MPU_CLKCTRL_CLKSEL_EMIF_DIV_MODE_SHIFT 24 #define MPU_CLKCTRL_CLKSEL_EMIF_DIV_MODE_MASK (1 << 24) diff --git a/arch/arm/include/asm/arch-omap5/ehci.h b/arch/arm/include/asm/arch-omap5/ehci.h new file mode 100644 index 0000000..49197f2 --- /dev/null +++ b/arch/arm/include/asm/arch-omap5/ehci.h @@ -0,0 +1,44 @@ +/* + * OMAP EHCI port support + * Based on LINUX KERNEL + * drivers/usb/host/ehci-omap.c and drivers/mfd/omap-usb-host.c + * + * Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com* + * Author: Govindraj R <govindraj.raja(a)ti.com> + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 of + * the License as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + +#ifndef _EHCI_H +#define _EHCI_H + +#define OMAP_EHCI_BASE (OMAP54XX_L4_CORE_BASE + 0x64C00) +#define OMAP_UHH_BASE (OMAP54XX_L4_CORE_BASE + 0x64000) +#define OMAP_USBTLL_BASE (OMAP54XX_L4_CORE_BASE + 0x62000) + +/* TLL Register Set */ +#define OMAP_USBTLL_SYSCONFIG_SIDLEMODE (1 << 3) +#define OMAP_USBTLL_SYSCONFIG_ENAWAKEUP (1 << 2) +#define OMAP_USBTLL_SYSCONFIG_SOFTRESET (1 << 1) +#define OMAP_USBTLL_SYSCONFIG_CACTIVITY (1 << 8) +#define OMAP_USBTLL_SYSSTATUS_RESETDONE 1 + +#define OMAP_UHH_SYSCONFIG_SOFTRESET 1 +#define OMAP_UHH_SYSSTATUS_EHCI_RESETDONE (1 << 2) +#define OMAP_UHH_SYSCONFIG_NOIDLE (1 << 2) +#define OMAP_UHH_SYSCONFIG_NOSTDBY (1 << 4) + +#define OMAP_UHH_SYSCONFIG_VAL (OMAP_UHH_SYSCONFIG_NOIDLE | \ + OMAP_UHH_SYSCONFIG_NOSTDBY) + +#endif /* _EHCI_H */ diff --git a/board/ti/omap5_evm/evm.c b/board/ti/omap5_evm/evm.c index 7b426d9..30fcd95 100644 --- a/board/ti/omap5_evm/evm.c +++ b/board/ti/omap5_evm/evm.c @@ -29,6 +29,12 @@ #include "mux_data.h" +#ifdef CONFIG_USB_EHCI +#include <usb.h> +#include <asm/arch/ehci.h> +#include <asm/ehci-omap.h> +#endif + DECLARE_GLOBAL_DATA_PTR; const struct omap_sysinfo sysinfo = { @@ -107,3 +113,30 @@ int board_mmc_init(bd_t *bis) } #endif #endif + +#ifdef CONFIG_USB_EHCI +static struct omap_usbhs_board_data usbhs_bdata = { + .port_mode[0] = OMAP_USBHS_PORT_MODE_UNUSED, + .port_mode[1] = OMAP_EHCI_PORT_MODE_HSIC, + .port_mode[2] = OMAP_EHCI_PORT_MODE_HSIC, +}; + +int ehci_hcd_init(void) +{ + int ret; + + ret = omap_ehci_hcd_init(&usbhs_bdata); + if (ret < 0) + return ret; + + return 0; +} + +int ehci_hcd_stop(void) +{ + int ret; + + ret = omap_ehci_hcd_stop(); + return ret; +} +#endif diff --git a/include/configs/omap5_evm5430.h b/include/configs/omap5_evm5430.h index 3145e53..e81c560 100644 --- a/include/configs/omap5_evm5430.h +++ b/include/configs/omap5_evm5430.h @@ -128,6 +128,27 @@ /* Flash */ #define CONFIG_SYS_NO_FLASH 1 +/* USB UHH support options */ +#define CONFIG_CMD_USB +#define CONFIG_USB_HOST +#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_OMAP +#define CONFIG_USB_STORAGE +#define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 3 + +#define CONFIG_OMAP_EHCI_PHY1_RESET_GPIO 172 +#define CONFIG_OMAP_EHCI_PHY2_RESET_GPIO 173 + +/* Enabled commands */ +#define CONFIG_NET_MULTI +#define CONFIG_CMD_DHCP /* DHCP Support */ +#define CONFIG_CMD_NET /* bootp, tftpboot, rarpboot */ +#define CONFIG_CMD_NFS /* NFS support */ + +/* USB Networking options */ +#define CONFIG_USB_HOST_ETHER +#define CONFIG_USB_ETHER_SMSC95XX + /* commands to include */ #include <config_cmd_default.h> @@ -139,8 +160,6 @@ #define CONFIG_CMD_SAVEENV /* Disabled commands */ -#undef CONFIG_CMD_NET -#undef CONFIG_CMD_NFS #undef CONFIG_CMD_FPGA /* FPGA configuration Support */ #undef CONFIG_CMD_IMLS /* List all found images */ -- 1.7.9.5

4 11