November 2012 - U-Boot

[U-Boot] [PATCH 00/10] USB: Gadget & DFU related fixes
by Pantelis Antoniou 17 Dec '12

17 Dec '12

Various bugfixes, g_dnl & DFU updates. Pantelis Antoniou (10): usb: Remove obsolete header file usb: Fix bug when both DFU & ETHER are defined g_dnl: Issue connect/disconnect as appropriate g_dnl: Properly terminate string list. dfu: Only perform DFU board_usb_init() for TRATS dfu: Fix crash when wrong number of arguments given dfu: Send correct DFU response from composite_setup dfu: Properly zero out timeout value dfu: Add a partition type target dfu: Support larger than memory transfers. common/cmd_dfu.c | 5 +- drivers/dfu/dfu.c | 206 +++++++++++++++++++++++++++++++---------- drivers/dfu/dfu_mmc.c | 106 ++++++++++++++++----- drivers/usb/gadget/Makefile | 13 ++- drivers/usb/gadget/composite.c | 27 ++++++ drivers/usb/gadget/ep0.c | 1 + drivers/usb/gadget/f_dfu.c | 10 +- drivers/usb/gadget/g_dnl.c | 12 ++- include/dfu.h | 19 +++- include/g_dnl.h | 1 - 10 files changed, 314 insertions(+), 86 deletions(-) -- 1.7.12

6 39

[U-Boot] [PATCH] Exynos: clock: support get_mmc_clk for exynos
by Jaehoon Chung 14 Dec '12

14 Dec '12

To get exactly clock value for mmc, support the get_mmc_clk() like set_mmc_clk(). Signed-off-by: Jaehoon Chung <jh80.chung(a)samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park(a)samsung.com> --- arch/arm/cpu/armv7/exynos/clock.c | 107 ++++++++++++++++++++++++++++++++ arch/arm/include/asm/arch-exynos/clk.h | 1 + 2 files changed, 108 insertions(+), 0 deletions(-) diff --git a/arch/arm/cpu/armv7/exynos/clock.c b/arch/arm/cpu/armv7/exynos/clock.c index fe61f88..731bbff 100644 --- a/arch/arm/cpu/armv7/exynos/clock.c +++ b/arch/arm/cpu/armv7/exynos/clock.c @@ -373,6 +373,100 @@ static unsigned long exynos5_get_uart_clk(int dev_index) return uclk; } +static unsigned long exynos4_get_mmc_clk(int dev_index) +{ + struct exynos4_clock *clk = + (struct exynos4_clock *)samsung_get_base_clock(); + unsigned long uclk, sclk; + unsigned int sel, ratio, pre_ratio; + int shift; + + sel = readl(&clk->src_fsys); + sel = (sel >> (dev_index << 2)) & 0xf; + + if (sel == 0x6) + sclk = get_pll_clk(MPLL); + else if (sel == 0x7) + sclk = get_pll_clk(EPLL); + else if (sel == 0x8) + sclk = get_pll_clk(VPLL); + else + return 0; + + switch (dev_index) { + case 0: + case 1: + ratio = readl(&clk->div_fsys1); + pre_ratio = readl(&clk->div_fsys1); + break; + case 2: + case 3: + ratio = readl(&clk->div_fsys2); + pre_ratio = readl(&clk->div_fsys2); + break; + case 4: + ratio = readl(&clk->div_fsys3); + pre_ratio = readl(&clk->div_fsys3); + break; + default: + return 0; + } + + if (dev_index == 1 || dev_index == 3) + shift = 16; + + ratio = (ratio >> shift) & 0xf; + pre_ratio = (pre_ratio >> (shift + 8)) & 0xff; + uclk = (sclk / (ratio + 1)) / (pre_ratio + 1); + + return uclk; +} + +static unsigned long exynos5_get_mmc_clk(int dev_index) +{ + struct exynos5_clock *clk = + (struct exynos5_clock *)samsung_get_base_clock(); + unsigned long uclk, sclk; + unsigned int sel, ratio, pre_ratio; + int shift; + + sel = readl(&clk->src_fsys); + sel = (sel >> (dev_index << 2)) & 0xf; + + if (sel == 0x6) + sclk = get_pll_clk(MPLL); + else if (sel == 0x7) + sclk = get_pll_clk(EPLL); + else if (sel == 0x8) + sclk = get_pll_clk(VPLL); + else + return 0; + + switch (dev_index) { + case 0: + case 1: + ratio = readl(&clk->div_fsys1); + pre_ratio = readl(&clk->div_fsys1); + break; + case 2: + case 3: + ratio = readl(&clk->div_fsys2); + pre_ratio = readl(&clk->div_fsys2); + break; + default: + return 0; + } + + if (dev_index == 1 || dev_index == 3) + shift = 16; + + ratio = (ratio >> shift) & 0xf; + pre_ratio = (pre_ratio >> (shift + 8)) & 0xff; + uclk = (sclk / (ratio + 1)) / (pre_ratio + 1); + + return uclk; +} + /* exynos4: set the mmc clock */ static void exynos4_set_mmc_clk(int dev_index, unsigned int div) { @@ -386,9 +480,14 @@ static void exynos4_set_mmc_clk(int dev_index, unsigned int div) * MMC0_PRE_RATIO [15:8], MMC1_PRE_RATIO [31:24] * CLK_DIV_FSYS2 * MMC2_PRE_RATIO [15:8], MMC3_PRE_RATIO [31:24] + * CLK_DIV_FSYS3 + * MMC4_PRE_RATIO [15:8] */ if (dev_index < 2) { addr = (unsigned int)&clk->div_fsys1; + } else if (dev_index == 4) { + addr = (unsigned int)&clk->div_fsys3; + dev_index -= 4; } else { addr = (unsigned int)&clk->div_fsys2; dev_index -= 2; @@ -963,6 +1062,14 @@ unsigned long get_uart_clk(int dev_index) return exynos4_get_uart_clk(dev_index); } +unsigned long get_mmc_clk(int dev_index) +{ + if (cpu_is_exynos5()) + return exynos5_get_mmc_clk(dev_index); + else + return exynos4_get_mmc_clk(dev_index); +} + void set_mmc_clk(int dev_index, unsigned int div) { if (cpu_is_exynos5()) diff --git a/arch/arm/include/asm/arch-exynos/clk.h b/arch/arm/include/asm/arch-exynos/clk.h index cd12323..ff155d8 100644 --- a/arch/arm/include/asm/arch-exynos/clk.h +++ b/arch/arm/include/asm/arch-exynos/clk.h @@ -34,6 +34,7 @@ unsigned long get_arm_clk(void); unsigned long get_i2c_clk(void); unsigned long get_pwm_clk(void); unsigned long get_uart_clk(int dev_index); +unsigned long get_mmc_clk(int deV_index); void set_mmc_clk(int dev_index, unsigned int div); unsigned long get_lcd_clk(void); void set_lcd_clk(void); -- 1.7.4.1

2 2

[U-Boot] [PATCH 0/57] RFC: Move arch-specific global data into its own structure
by Simon Glass 14 Dec '12

14 Dec '12

The previous generic board series hit a snag in that we needed generic code to access some of the architecture-specific fields in global_data. The solution eventually arrived at was to move these fields into a separate structure, so that global_data has the generic fields, and within that there is an arch_global_data structure holding the architecture-specific ones. This series makes that change. Assuming this is reasonable, the next step is to bring back the generic board patches on top of this. A few minor points need to be resolved in this series: - if it's ok with everyone, drop include/asm-generic/global_data_flags.h, since it should not be needed now - possibly unify brg_clk on powerpc (but that would involve unifying some ifdefs - decide what to do about PCI clock being present with there is no CONFIG_PCI. It seem wrong to me, but I haven't changed it for this series. I have completed a build of all commits for all builds and see no regressions. But the following boards had errors/warnings, so it seems I need to continue working on my toolchains: blackfin: + bf561-acvilon + dnp5370 + cm-bf561 + blackstamp + br4 + bct-brettl2 + cm-bf527 + bf506f-ezkit + ip04 + bf527-sdp + bf537-stamp + bf527-ezkit-v2 + cm-bf537e + tcm-bf518 + cm-bf537u + bf527-ezkit + bf537-pnav + cm-bf533 + pr1 + bf533-ezkit + ibf-dsp561 + bf537-srv1 + cm-bf548 + bf537-minotaur + bf538f-ezkit + bf548-ezkit + bf525-ucr2 + blackvme + tcm-bf537 + bf533-stamp + bf518f-ezbrd + bf527-ad7160-eval + bf526-ezbrd + bf561-ezkit avr32: + hammerhead + atngw100mkii + grasshopper + favr-32-ezkit + atstk1006 + atstk1004 + atstk1003 + atstk1002 + atngw100 + mimc200 m68k: + M5235EVB_Flash32 + M54455EVB_a66 + M5329AFEE + M5249EVB + idmr + M5208EVBE + eb_cpu5282 + M5475FFE + M54451EVB + astro_mcf5373l + M54418TWR_serial_rmii + M54455EVB_intel + M5282EVB + M54455EVB_i66 + M5475GFE + M5253DEMO + M54455EVB_stm33 + M5253EVBE + M5485BFE + M5485DFE + M5329BFEE + M52277EVB + M5475EFE + M54418TWR_nand_mii + M5475CFE + cobra5272 + M5485AFE + M53017EVB + M5475AFE + M5485HFE + M5235EVB + M5275EVB + M5271EVB + M54418TWR_nand_rmii_lowfreq + TASREG + M5475BFE + M5475DFE + M52277EVB_stmicro + eb_cpu5282_internal + M54451EVB_stmicro + M5485GFE + M5373EVB + M5485EFE + M5485FFE + M54418TWR + M54418TWR_nand_rmii + M54418TWR_serial_mii + M5485CFE + M54455EVB + M5272C3 powerpc: + MPC8641HPCN_36BIT + MPC8641HPCN + xpedite517x + MVBLM7 + MVSMR sparc: + grsim + grsim_leon2 + gr_cpci_ax2000 + gr_xc3s_1500 + gr_ep2s60 sh: + ap_sh4a_4a + ms7750se + sh7763rdp + r0p7734 + r2dplus + ms7720se + rsk7269 + rsk7264 + shmin + sh7757lcr + espt + mpr2 + ms7722se + r7780mp + ecovec + rsk7203 + MigoR + sh7785lcr_32bit + sh7785lcr + ap325rxa nios2: + PK1C20 + PCI5441 + nios2-generic microblaze: + microblaze-generic openrisc: + openrisc-generic mips: + incaip_150MHz + pb1000 + vct_premium_onenand + vct_platinum + qemu_mips + vct_premium_small + dbau1100 + vct_platinumavc_small + vct_premium_onenand_small + incaip + vct_platinum_small + dbau1550 + dbau1500 + qemu_mips64el + vct_platinumavc_onenand_small + incaip_133MHz + vct_platinum_onenand_small + vct_premium + vct_platinumavc_onenand + qemu_mips64 + qi_lb60 + vct_platinumavc + incaip_100MHz + vct_platinum_onenand + qemu_mipsel + dbau1550_el + dbau1000 arm: + VCMA9 + smdk2410 nds32: + adp-ag101p + adp-ag102 + adp-ag101 Simon Glass (57): Add architecture-specific global data at91: Move at91 global data into arch_global_data arm: Move timer_rate_hz into arch_global_data arm: Move tbu to arch_global_data arm: Move tbl to arch_global_data arm: Move lastinc to arch_global_data arm: Move timer_reset_value to arch_global_data ixp: Move timestamp to arch_global_data nds32: Drop tlb_addr from global data arm: Move tlb_addr to arch_global_data x86: Move gdt_addr, new_gd_addr to arch_global_data x86: Remove reset_status, relocoff from global_data x86: Move new_gd_addr to arch_global_data ppc: Move brg_clk to arch_global_data ppc: Remove extra pci_clk fields from global_data ppc: Move clock fields to arch_global_data ppc: Move mpc83xx clock fields to arch_global_data ppc: Move lbc_clk and cpu to arch_global_data ppc: m68k: Move i2c1_clk, i2c2_clk to arch_global_data ppc: Move CONFIG_QE to arch_global_data ppc: Move used_laws to arch_global_data ppc: Move used_tlb_cams to arch_global_data ppc: Move mpc5xxx clocks to arch_global_data ppc: Move mpc512x clocks to arch_global_data ppc: Move mpc8220 clocks to arch_global_data ppc: Move reset_status to arch_global_data ppc: Move arbiter fields to arch_global_data ppc: Move dp_alloc_base, dp_alloc_top to arch_global_data arm: Move uart_clk to arch_global_data ppc: Move mirror_hack to arch_global_data ppc: Remove console_addr from global data ppc: Move fpga_state to arch_global_data ppc: Move wdt_last to arch_global_data ppc: Move kbd_status to arch_global_data ppc: arm: Move sdhc_clk into arch_global_data sparc: Drop kbd_status and reset_status from global_data m68k: Move CONFIG_EXTRA_CLOCK to arch_global_data mips: Move per_clk and dev_clk to arch_global_data avr32: Move stack_end to arch_global_data avr32: Move cpu_hz to arch_global_data sandbox: Move ram_buf to arch_global_data Add generic global_data Only use fb_base if we have a display arm: Use generic global_data avr32: Use generic global_data blackfin: Use generic global_data m68k: Use generic global_data microblaze: Use generic global_data mips: Use generic global_data nds32: Use generic global_data nios2: Use generic global_data openrisc: Use generic global_data powerpc: Use generic global_data sandbox: Use generic global_data sh: Use generic global_data sparc: Use generic global_data x86: Use generic global_data arch/arm/cpu/arm1136/mx31/timer.c | 10 +- arch/arm/cpu/arm1136/mx35/generic.c | 6 +- arch/arm/cpu/arm1136/mx35/timer.c | 4 +- arch/arm/cpu/arm1136/omap24xx/timer.c | 23 +++-- arch/arm/cpu/arm920t/a320/timer.c | 18 ++-- arch/arm/cpu/arm920t/at91/clock.c | 24 +++-- arch/arm/cpu/arm920t/at91/timer.c | 14 ++-- arch/arm/cpu/arm920t/s3c24x0/timer.c | 30 +++--- arch/arm/cpu/arm926ejs/armada100/timer.c | 18 ++-- arch/arm/cpu/arm926ejs/at91/clock.c | 30 +++--- arch/arm/cpu/arm926ejs/at91/timer.c | 18 ++-- arch/arm/cpu/arm926ejs/davinci/timer.c | 21 ++-- arch/arm/cpu/arm926ejs/kirkwood/timer.c | 4 +- arch/arm/cpu/arm926ejs/mb86r0x/timer.c | 4 +- arch/arm/cpu/arm926ejs/mx25/generic.c | 4 +- arch/arm/cpu/arm926ejs/mx25/timer.c | 4 +- arch/arm/cpu/arm926ejs/mx27/timer.c | 4 +- arch/arm/cpu/arm926ejs/mxs/timer.c | 4 +- arch/arm/cpu/arm926ejs/omap/timer.c | 4 +- arch/arm/cpu/arm926ejs/orion5x/timer.c | 4 +- arch/arm/cpu/arm926ejs/pantheon/timer.c | 18 ++-- arch/arm/cpu/arm926ejs/spear/timer.c | 4 +- arch/arm/cpu/arm926ejs/versatile/timer.c | 4 +- arch/arm/cpu/armv7/omap-common/timer.c | 20 ++-- arch/arm/cpu/armv7/s5p-common/timer.c | 14 ++-- arch/arm/cpu/armv7/socfpga/timer.c | 15 ++-- arch/arm/cpu/armv7/u8500/timer.c | 16 ++-- arch/arm/cpu/armv7/zynq/timer.c | 14 ++-- arch/arm/cpu/ixp/timer.c | 12 +- arch/arm/cpu/pxa/timer.c | 4 +- arch/arm/cpu/tegra-common/timer.c | 12 +- arch/arm/imx-common/speed.c | 16 ++-- arch/arm/imx-common/timer.c | 4 +- arch/arm/include/asm/arch-at91/clk.h | 12 +- arch/arm/include/asm/global_data.h | 58 +++--------- arch/arm/lib/board.c | 2 +- arch/arm/lib/cache-cp15.c | 4 +- arch/avr32/cpu/cpu.c | 4 +- arch/avr32/cpu/exception.c | 6 +- arch/avr32/cpu/interrupts.c | 6 +- arch/avr32/include/asm/global_data.h | 34 +------ arch/avr32/lib/board.c | 2 +- arch/avr32/lib/bootm.c | 2 +- arch/blackfin/include/asm/global_data.h | 33 +------ arch/m68k/cpu/mcf5227x/cpu.c | 6 +- arch/m68k/cpu/mcf5227x/speed.c | 12 +- arch/m68k/cpu/mcf523x/speed.c | 2 +- arch/m68k/cpu/mcf52x2/speed.c | 4 +- arch/m68k/cpu/mcf532x/speed.c | 2 +- arch/m68k/cpu/mcf5445x/cpu.c | 10 +- arch/m68k/cpu/mcf5445x/speed.c | 14 ++-- arch/m68k/cpu/mcf547x_8x/speed.c | 2 +- arch/m68k/include/asm/global_data.h | 47 ++-------- arch/m68k/lib/board.c | 6 +- arch/microblaze/include/asm/global_data.h | 27 +----- arch/mips/cpu/xburst/timer.c | 20 ++-- arch/mips/include/asm/global_data.h | 38 +------- arch/nds32/include/asm/global_data.h | 35 +------ arch/nds32/lib/board.c | 11 -- arch/nios2/include/asm/global_data.h | 25 +---- arch/openrisc/include/asm/global_data.h | 25 +---- arch/powerpc/cpu/mpc512x/cpu.c | 4 +- arch/powerpc/cpu/mpc512x/cpu_init.c | 2 +- arch/powerpc/cpu/mpc512x/i2c.c | 2 +- arch/powerpc/cpu/mpc512x/ide.c | 2 +- arch/powerpc/cpu/mpc512x/serial.c | 2 +- arch/powerpc/cpu/mpc512x/speed.c | 15 ++- arch/powerpc/cpu/mpc5xxx/i2c.c | 2 +- arch/powerpc/cpu/mpc5xxx/ide.c | 2 +- arch/powerpc/cpu/mpc5xxx/serial.c | 4 +- arch/powerpc/cpu/mpc5xxx/speed.c | 18 +++- arch/powerpc/cpu/mpc8220/fec.c | 8 +- arch/powerpc/cpu/mpc8220/speed.c | 12 ++- arch/powerpc/cpu/mpc8260/commproc.c | 21 ++-- arch/powerpc/cpu/mpc8260/cpu_init.c | 4 +- arch/powerpc/cpu/mpc8260/i2c.c | 2 +- arch/powerpc/cpu/mpc8260/speed.c | 16 ++-- arch/powerpc/cpu/mpc83xx/cpu.c | 2 +- arch/powerpc/cpu/mpc83xx/cpu_init.c | 32 ++++--- arch/powerpc/cpu/mpc83xx/fdt.c | 2 +- arch/powerpc/cpu/mpc83xx/pcie.c | 4 +- arch/powerpc/cpu/mpc83xx/speed.c | 108 +++++++++++++--------- arch/powerpc/cpu/mpc85xx/commproc.c | 21 ++-- arch/powerpc/cpu/mpc85xx/cpu.c | 2 +- arch/powerpc/cpu/mpc85xx/fdt.c | 4 +- arch/powerpc/cpu/mpc85xx/speed.c | 28 +++--- arch/powerpc/cpu/mpc85xx/tlb.c | 8 +- arch/powerpc/cpu/mpc86xx/cpu.c | 2 +- arch/powerpc/cpu/mpc86xx/fdt.c | 4 +- arch/powerpc/cpu/mpc86xx/speed.c | 8 +- arch/powerpc/cpu/mpc8xx/commproc.c | 20 ++-- arch/powerpc/cpu/mpc8xx/fdt.c | 2 +- arch/powerpc/cpu/mpc8xx/speed.c | 2 +- arch/powerpc/cpu/mpc8xxx/cpu.c | 8 +- arch/powerpc/cpu/ppc4xx/4xx_uart.c | 4 +- arch/powerpc/cpu/ppc4xx/fdt.c | 4 +- arch/powerpc/include/asm/global_data.h | 140 +++++++++------------------- arch/powerpc/lib/board.c | 33 ++++--- arch/sandbox/cpu/cpu.c | 2 +- arch/sandbox/include/asm/global_data.h | 25 +---- arch/sandbox/lib/board.c | 6 +- arch/sh/include/asm/global_data.h | 21 +---- arch/sparc/include/asm/global_data.h | 51 +--------- arch/x86/cpu/cpu.c | 2 +- arch/x86/include/asm/global_data.h | 50 ++++------- arch/x86/lib/init_helpers.c | 12 +- board/evb64260/mpsc.c | 2 +- board/freescale/bsc9131rdb/bsc9131rdb.c | 2 +- board/freescale/corenet_ds/corenet_ds.c | 2 +- board/freescale/p1010rdb/ddr.c | 6 +- board/freescale/p1010rdb/p1010rdb.c | 6 +- board/freescale/p1_p2_rdb/ddr.c | 2 +- board/freescale/p1_p2_rdb/p1_p2_rdb.c | 2 +- board/freescale/p2041rdb/p2041rdb.c | 2 +- board/freescale/t4qds/t4qds.c | 2 +- board/gdsys/405ep/405ep.c | 15 ++-- board/gdsys/405ex/405ex.c | 13 ++- board/gdsys/405ex/io64.c | 2 +- board/inka4x0/inkadiag.c | 8 +- board/lwmon/lwmon.c | 10 +- board/lwmon5/kbd.c | 10 +- board/lwmon5/lwmon5.c | 8 +- common/cmd_bdinfo.c | 6 +- common/cmd_immap.c | 2 +- drivers/i2c/fsl_i2c.c | 7 +- drivers/input/ps2ser.c | 2 +- drivers/misc/fsl_law.c | 16 ++-- drivers/mmc/fsl_esdhc.c | 6 +- drivers/net/mpc512x_fec.c | 2 +- drivers/net/mpc5xxx_fec.c | 9 +- drivers/qe/fdt.c | 12 +- drivers/qe/qe.c | 21 ++-- examples/standalone/mem_to_mem_idma2intr.c | 4 +- include/asm-generic/global_data.h | 102 ++++++++++++++++++++ 134 files changed, 826 insertions(+), 1028 deletions(-) create mode 100644 include/asm-generic/global_data.h -- 1.7.7.3

6 77

[U-Boot] [PATCH] net: sh_eth: add support for SH7752
by Shimoda, Yoshihiro 13 Dec '12

13 Dec '12

SH7752 has two fast ethernet controllers and two gigabit ethernet controllers. It is similar to SH7757. Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh(a)renesas.com> --- drivers/net/sh_eth.c | 4 ++-- drivers/net/sh_eth.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/net/sh_eth.c b/drivers/net/sh_eth.c index 2d9cc32..e6fc8c8 100644 --- a/drivers/net/sh_eth.c +++ b/drivers/net/sh_eth.c @@ -417,7 +417,7 @@ static int sh_eth_config(struct sh_eth_dev *eth, bd_t *bd) printf(SHETHER_NAME ": 100Base/"); #if defined(SH_ETH_TYPE_GETHER) sh_eth_write(eth, GECMR_100B, GECMR); -#elif defined(CONFIG_CPU_SH7757) +#elif defined(CONFIG_CPU_SH7757) || defined(CONFIG_CPU_SH7752) sh_eth_write(eth, 1, RTRATE); #elif defined(CONFIG_CPU_SH7724) val = ECMR_RTM; @@ -426,7 +426,7 @@ static int sh_eth_config(struct sh_eth_dev *eth, bd_t *bd) printf(SHETHER_NAME ": 10Base/"); #if defined(SH_ETH_TYPE_GETHER) sh_eth_write(eth, GECMR_10B, GECMR); -#elif defined(CONFIG_CPU_SH7757) +#elif defined(CONFIG_CPU_SH7757) || defined(CONFIG_CPU_SH7752) sh_eth_write(eth, 0, RTRATE); #endif } diff --git a/drivers/net/sh_eth.h b/drivers/net/sh_eth.h index 61d2df9..568fafe 100644 --- a/drivers/net/sh_eth.h +++ b/drivers/net/sh_eth.h @@ -288,7 +288,7 @@ static const u16 sh_eth_offset_fast_sh4[SH_ETH_MAX_REGISTER_OFFSET] = { #if defined(CONFIG_CPU_SH7763) || defined(CONFIG_CPU_SH7734) #define SH_ETH_TYPE_GETHER #define BASE_IO_ADDR 0xfee00000 -#elif defined(CONFIG_CPU_SH7757) +#elif defined(CONFIG_CPU_SH7757) || defined(CONFIG_CPU_SH7752) #if defined(CONFIG_SH_ETHER_USE_GETHER) #define SH_ETH_TYPE_GETHER #define BASE_IO_ADDR 0xfee00000 @@ -346,7 +346,7 @@ enum DMAC_T_BIT { /* GECMR */ enum GECMR_BIT { -#if defined(CONFIG_CPU_SH7757) +#if defined(CONFIG_CPU_SH7757) || defined(CONFIG_CPU_SH7752) GECMR_1000B = 0x20, GECMR_100B = 0x01, GECMR_10B = 0x00, #else GECMR_1000B = 0x01, GECMR_100B = 0x04, GECMR_10B = 0x00, -- 1.7.1

3 4

[U-Boot] [PATCH v3 1/6] mx25pdk: Include CONFIG_MX25
by Fabio Estevam 11 Dec '12

11 Dec '12

It is necessary to include CONFIG_MX25 as several i.mx drivers handle the SoC differences based on the this config option. Signed-off-by: Fabio Estevam <fabio.estevam(a)freescale.com> --- Changes since v2: - No changes Changes since v1: - No changes include/configs/mx25pdk.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/configs/mx25pdk.h b/include/configs/mx25pdk.h index 96c143e..2087502 100644 --- a/include/configs/mx25pdk.h +++ b/include/configs/mx25pdk.h @@ -17,6 +17,7 @@ /* High Level Configuration Options */ +#define CONFIG_MX25 #define CONFIG_SYS_HZ 1000 #define CONFIG_SYS_TEXT_BASE 0x81200000 -- 1.7.9.5

4 13

[U-Boot] [RFC, PATCH] omap: Invalidate first page to avoid speculation
by Vincent Stehlé 11 Dec '12

11 Dec '12

Hello u-boot list, Here is a "request for comments" on the best way to solve a little "speculation" issue on recent OMAPs. Any guidance/feedback on the way to go would be greatly appreciated, please. I am using u-boot on an OMAP5 HS device (with security, that is), and I am experiencing "security violations" due to speculative accesses done by the Cortex-A15 processor to the region near address zero. This region is a secure region, where non-secure accesses are forbidden and reported by the security firmware on an OMAP HS device. On an OMAP GP device, those accesses may very well exist, but are silently ignored by the firmware. Note that the speculative accesses are not actual functional accesses, so their being aborted does not harm the functionality of u-boot as it is. A quick (and dirty) solution is to mark the region near address zero as being invalid, which prevents the processor from doing speculative accesses there (see patch). This patch as it is has a number of issues: it impacts all ARM devices and it unmaps too large a region. I am not sure how to cleanly rework the patch so that it would be made OMAP-only cleanly. Also, unmapping a smaller region to better fit the hardware characteristics would require using second level descriptors, and I do not know if this is recommended. To make this worse, chips in the OMAP family have differences in their secure rom boundaries. Does the u-boot community feels this issue needs to be addressed? What would be the best way to solve this? Best regards, V. Signed-off-by: Vincent Stehlé <v-stehle(a)ti.com> --- arch/arm/lib/cache-cp15.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/arch/arm/lib/cache-cp15.c b/arch/arm/lib/cache-cp15.c index 939de10..57e1974 100644 --- a/arch/arm/lib/cache-cp15.c +++ b/arch/arm/lib/cache-cp15.c @@ -72,8 +72,13 @@ static inline void mmu_setup(void) u32 reg; arm_init_before_mmu(); + + /* First page (starting at 0x0) is made invalid to avoid + * speculative accesses in secure rom. */ + page_table[0] = 0; + /* Set up an identity-mapping for all 4GB, rw for everyone */ - for (i = 0; i < 4096; i++) + for (i = 1; i < 4096; i++) page_table[i] = i << 20 | (3 << 10) | 0x12; for (i = 0; i < CONFIG_NR_DRAM_BANKS; i++) { -- 1.7.9.5

3 14

[U-Boot] [PATCH 0/5 v2] Add DT based ethernet driver for SMDK5250
by Hatim Ali 11 Dec '12

11 Dec '12

This patch series enables the DT support on SMDK5250. Ethernet is the first driver whose discovery is based on DT node. More DT based drivers to be added subsequently Changes since v1: - Renamed the smdk5250.h file to exynos5250-dt.h to create a common configuration file which can be used by all the boards based on exynos5250 using Device Tree. - Created a new smdk5250.h file specifying the dts file specific to SMDK5250 - Incorporated minor nit (removal of blank lines) Hatim Ali (5): EXYNOS5: FDT: add initial dts file for EXYNOS5250, SMDK5250 fdt: exynos5: Add DT node definition for SROM and SMSC9215 exynos5: Add DT based driver for SMC911X ethernet exynos5: config: Rename the smdk5250.h to exynos5250-dt.h SMDK5250: config: Add configuration file for SMDK5250 board arch/arm/dts/exynos5250.dtsi | 31 ++++ arch/arm/include/asm/arch-exynos/sromc.h | 18 ++ board/samsung/dts/exynos5250-smdk5250.dts | 29 +++ board/samsung/smdk5250/smdk5250.c | 115 +++++++++---- include/configs/exynos5250-dt.h | 267 +++++++++++++++++++++++++++++ include/configs/smdk5250.h | 245 +------------------------- include/fdtdec.h | 2 + lib/fdtdec.c | 2 + 8 files changed, 442 insertions(+), 267 deletions(-) create mode 100644 arch/arm/dts/exynos5250.dtsi create mode 100644 board/samsung/dts/exynos5250-smdk5250.dts create mode 100644 include/configs/exynos5250-dt.h -- 1.7.2.3

4 8

[U-Boot] [PATCH v2 0/8] NAND support for AM33XX
by Ilya Yanok 10 Dec '12

10 Dec '12

These series add support for NAND on AM33XX. AM33XX has the same GPMC controller as OMAP3 so the first part of the series just add required defines/initialization to enable the existing omap_gpmc driver to work on AM33XX. The rest of the series adds support for BCH8 error correction code. We use GPMC to generate codes/syndromes and ELM to find the errors. Changes in v2: -fix nand mux settings (profiles 2&3 don't have NAND) - rebased on current master - clean up mem.c (remove unused stuff that was copied from OMAP3) - nand headers: remove unneeded stuff - rebased onto master - minor config style fix (wrt nand) - fix wrong braces in Makefile Ilya Yanok (6): OMAP: include sys_proto.h from boot-common am335x_evm: add nand pinmux definition am33xx: NAND support am335x_evm: enable NAND support am33xx_spl_bch: simple SPL nand loader for AM33XX am335x_evm: enable SPL NAND support Mansoor Ahamed (2): am33xx: add ELM support omap_gpmc: BCH8 support (ELM based) arch/arm/cpu/armv7/am33xx/Makefile | 2 + arch/arm/cpu/armv7/am33xx/board.c | 1 + arch/arm/cpu/armv7/am33xx/clock.c | 10 + arch/arm/cpu/armv7/am33xx/elm.c | 212 ++++++++++++++ arch/arm/cpu/armv7/am33xx/mem.c | 101 +++++++ arch/arm/cpu/armv7/omap-common/boot-common.c | 1 + arch/arm/include/asm/arch-am33xx/cpu.h | 53 ++++ arch/arm/include/asm/arch-am33xx/elm.h | 93 ++++++ arch/arm/include/asm/arch-am33xx/hardware.h | 3 + arch/arm/include/asm/arch-am33xx/mem.h | 83 ++++++ arch/arm/include/asm/arch-am33xx/omap_gpmc.h | 120 ++++++++ arch/arm/include/asm/arch-am33xx/sys_proto.h | 3 + board/ti/am335x/board.c | 2 + board/ti/am335x/mux.c | 22 ++ drivers/mtd/nand/Makefile | 1 + drivers/mtd/nand/am335x_spl_bch.c | 238 +++++++++++++++ drivers/mtd/nand/omap_gpmc.c | 403 +++++++++++++++++++++++++- include/configs/am335x_evm.h | 46 +++ 18 files changed, 1393 insertions(+), 1 deletion(-) create mode 100644 arch/arm/cpu/armv7/am33xx/elm.c create mode 100644 arch/arm/cpu/armv7/am33xx/mem.c create mode 100644 arch/arm/include/asm/arch-am33xx/elm.h create mode 100644 arch/arm/include/asm/arch-am33xx/mem.h create mode 100644 arch/arm/include/asm/arch-am33xx/omap_gpmc.h create mode 100644 drivers/mtd/nand/am335x_spl_bch.c -- 1.7.10.2 (Apple Git-33)

4 16

[U-Boot] [PATCH 1/2] OMAP3: fix panel timing on the mt_ventoux board
by Stefano Babic 10 Dec '12

10 Dec '12

Signed-off-by: Stefano Babic <sbabic(a)denx.de> --- board/teejet/mt_ventoux/mt_ventoux.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/board/teejet/mt_ventoux/mt_ventoux.c b/board/teejet/mt_ventoux/mt_ventoux.c index 9622a81..98b92f3 100644 --- a/board/teejet/mt_ventoux/mt_ventoux.c +++ b/board/teejet/mt_ventoux/mt_ventoux.c @@ -73,10 +73,10 @@ static struct { static struct panel_config lcd_cfg[] = { { - .timing_h = PANEL_TIMING_H(4, 8, 41), - .timing_v = PANEL_TIMING_V(2, 4, 10), - .pol_freq = 0x00000000, /* Pol Freq */ - .divisor = 0x0001000d, /* 33Mhz Pixel Clock */ + .timing_h = PANEL_TIMING_H(40, 5, 2), + .timing_v = PANEL_TIMING_V(8, 8, 2), + .pol_freq = 0x00003000, /* Pol Freq */ + .divisor = 0x00010033, /* 9 Mhz Pixel Clock */ .panel_type = 0x01, /* TFT */ .data_lines = 0x03, /* 24 Bit RGB */ .load_mode = 0x02, /* Frame Mode */ -- 1.7.9.5

2 3

[U-Boot] [PATCH] omap3/mem.c: remove unused defines
by Andreas Bießmann 10 Dec '12

10 Dec '12

These GPMC_CS defines are a leftover from prior gpmc_init(). Commit 187af954 removed the need for these definitions but missed to remove them. Signed-off-by: Andreas Bießmann <andreas.devel(a)googlemail.com> Cc: Tom Rini <trini(a)ti.com> --- arch/arm/cpu/armv7/omap3/mem.c | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/arch/arm/cpu/armv7/omap3/mem.c b/arch/arm/cpu/armv7/omap3/mem.c index 2fe5ac7..1ca37a9 100644 --- a/arch/arm/cpu/armv7/omap3/mem.c +++ b/arch/arm/cpu/armv7/omap3/mem.c @@ -42,13 +42,6 @@ static const u32 gpmc_m_nand[GPMC_MAX_REG] = { M_NAND_GPMC_CONFIG5, M_NAND_GPMC_CONFIG6, 0 }; - -#if defined(CONFIG_ENV_IS_IN_NAND) -#define GPMC_CS 0 -#else -#define GPMC_CS 1 -#endif - #endif #if defined(CONFIG_CMD_ONENAND) @@ -60,13 +53,6 @@ static const u32 gpmc_onenand[GPMC_MAX_REG] = { ONENAND_GPMC_CONFIG5, ONENAND_GPMC_CONFIG6, 0 }; - -#if defined(CONFIG_ENV_IS_IN_ONENAND) -#define GPMC_CS 0 -#else -#define GPMC_CS 1 -#endif - #endif /******************************************************** -- 1.7.10.4

2 1