September 2012 - U-Boot

[U-Boot] [NEXT PATCH v1 0/7] In this patchset, a new i.MX35 board is added implementing
by Stefano Babic 01 Oct '12

01 Oct '12

the internal boot mode and using the general SPL Framework. For this reason, this patchset depends on: Tom Rini's SPL generic framework: http://lists.denx.de/pipermail/u-boot/2012-August/132813.html To fix that relocation should not happen in SPL, the following patch is also required: http://patchwork.ozlabs.org/patch/181166/ The woodburn board boots from SD Card. However, the presented way introducing SPL is general, and can applied to other devices. Stefano Babic (7): ARM: Fix start.S when used with SPL in arm1136 NAND: added NAND type to nand_ids MX35: add LOW_LEVEL_SRAM_STACK to use SPL_FRAMEWORK MX35: Add soc_boot_mode and soc_boot_device to MX35 SPL: Added MLO for mx35 SOC to SPL Makefile ARM: Add MLO target to arm1136 MX35: add support for woodburn board MAINTAINERS | 1 + arch/arm/cpu/arm1136/config.mk | 3 + arch/arm/cpu/arm1136/mx35/generic.c | 80 ++++++ arch/arm/cpu/arm1136/start.S | 31 ++- arch/arm/cpu/arm1136/u-boot-spl.lds | 62 +++++ arch/arm/include/asm/arch-mx35/imx-regs.h | 2 + arch/arm/include/asm/arch-mx35/mmc_host_def.h | 31 +++ arch/arm/include/asm/arch-mx35/spl.h | 38 +++ arch/arm/include/asm/arch-mx35/sys_proto.h | 2 + board/woodburn/Makefile | 43 ++++ board/woodburn/imximage.cfg | 4 + board/woodburn/lowlevel_init.S | 93 +++++++ board/woodburn/mx35_sdram.c | 137 +++++++++++ board/woodburn/woodburn.c | 240 ++++++++++++++++++ boards.cfg | 2 + drivers/mtd/nand/nand_ids.c | 2 + include/configs/woodburn.h | 33 +++ include/configs/woodburn_common.h | 322 +++++++++++++++++++++++++ include/configs/woodburn_sd.h | 65 +++++ spl/Makefile | 6 + 20 files changed, 1186 insertions(+), 11 deletions(-) create mode 100644 arch/arm/cpu/arm1136/u-boot-spl.lds create mode 100644 arch/arm/include/asm/arch-mx35/mmc_host_def.h create mode 100644 arch/arm/include/asm/arch-mx35/spl.h create mode 100644 board/woodburn/Makefile create mode 100644 board/woodburn/imximage.cfg create mode 100644 board/woodburn/lowlevel_init.S create mode 100644 board/woodburn/mx35_sdram.c create mode 100644 board/woodburn/woodburn.c create mode 100644 include/configs/woodburn.h create mode 100644 include/configs/woodburn_common.h create mode 100644 include/configs/woodburn_sd.h -- 1.7.9.5

6 25

[U-Boot] [PATCH v4 1/2] usb: ulpi: add indicator configuration function
by Lucas Stach 01 Oct '12

01 Oct '12

Allows for easy configuration of the VBUS indicator related ULPI config bits. Also move the external indicator setup from ulpi_set_vbus() to the new function. Signed-off-by: Lucas Stach <dev(a)lynxeye.de> Acked-by: Igor Grinberg <grinberg(a)compulab.co.il> --- v4: - do r-m-w access on iface_ctrl register - align with coding style of other ulpi functions --- drivers/usb/ulpi/ulpi.c | 32 ++++++++++++++++++++++++++++---- include/usb/ulpi.h | 13 +++++++++++-- 2 Dateien geändert, 39 Zeilen hinzugefügt(+), 6 Zeilen entfernt(-) diff --git a/drivers/usb/ulpi/ulpi.c b/drivers/usb/ulpi/ulpi.c index dde2585..23b59e7 100644 --- a/drivers/usb/ulpi/ulpi.c +++ b/drivers/usb/ulpi/ulpi.c @@ -106,20 +106,44 @@ int ulpi_select_transceiver(struct ulpi_viewport *ulpi_vp, unsigned speed) return ulpi_write(ulpi_vp, &ulpi->function_ctrl, val); } -int ulpi_set_vbus(struct ulpi_viewport *ulpi_vp, int on, int ext_power, - int ext_ind) +int ulpi_set_vbus(struct ulpi_viewport *ulpi_vp, int on, int ext_power) { u32 flags = ULPI_OTG_DRVVBUS; u8 *reg = on ? &ulpi->otg_ctrl_set : &ulpi->otg_ctrl_clear; if (ext_power) flags |= ULPI_OTG_DRVVBUS_EXT; - if (ext_ind) - flags |= ULPI_OTG_EXTVBUSIND; return ulpi_write(ulpi_vp, reg, flags); } +int ulpi_set_vbus_indicator(struct ulpi_viewport *ulpi_vp, int external, + int passthu, int complement) +{ + u32 flags, val; + u8 *reg; + + reg = external ? &ulpi->otg_ctrl_set : &ulpi->otg_ctrl_clear; + val = ulpi_write(ulpi_vp, reg, ULPI_OTG_EXTVBUSIND); + if (val) + return val; + + flags = passthu ? ULPI_IFACE_PASSTHRU : 0; + flags |= complement ? ULPI_IFACE_EXTVBUS_COMPLEMENT : 0; + + val = ulpi_read(ulpi_vp, &ulpi->iface_ctrl); + if (val == ULPI_ERROR) + return val; + + val = val & ~(ULPI_IFACE_PASSTHRU & ULPI_IFACE_EXTVBUS_COMPLEMENT); + val |= flags; + val = ulpi_write(ulpi_vp, &ulpi->iface_ctrl, val); + if (val) + return val; + + return 0; +} + int ulpi_set_pd(struct ulpi_viewport *ulpi_vp, int enable) { u32 val = ULPI_OTG_DP_PULLDOWN | ULPI_OTG_DM_PULLDOWN; diff --git a/include/usb/ulpi.h b/include/usb/ulpi.h index 9a75c24..99166c4 100644 --- a/include/usb/ulpi.h +++ b/include/usb/ulpi.h @@ -61,8 +61,17 @@ int ulpi_select_transceiver(struct ulpi_viewport *ulpi_vp, unsigned speed); * * returns 0 on success, ULPI_ERROR on failure. */ -int ulpi_set_vbus(struct ulpi_viewport *ulpi_vp, - int on, int ext_power, int ext_ind); +int ulpi_set_vbus(struct ulpi_viewport *ulpi_vp, int on, int ext_power); + +/* + * Configure VBUS indicator + * @external - external VBUS over-current indicator is used + * @passthru - disables ANDing of internal VBUS comparator + * with external VBUS input + * @complement - inverts the external VBUS input + */ +int ulpi_set_vbus_indicator(struct ulpi_viewport *ulpi_vp, int external, + int passthru, int complement); /* * Enable/disable pull-down resistors on D+ and D- USB lines. -- 1.7.11.4

2 2

[U-Boot] mips port
by Dmytro Milinevskyy 01 Oct '12

01 Oct '12

Hi, I'm new to uboot mips port and first decided to try it with qemu. I've encountered some problems with UART, but I guess that's more qemu issue(lsr reg is not updated when the line is available). Another issue I faced was code execution after the relocation is done. The address of board_init_r is not computed correctly(it was relative to boot ROM address space/bfc00000). Is it specific to qemu(I don't see the reference here though) or is it a generic mips port issue? Attached patch allows me to proceed with the boot in qemu. And last - why do we need relocation at all with u-boot? Performance constraints? Thanks, -- dmytro

2 1

[U-Boot] [PATCH] configs: mx6qsabre_common.h: Use default clock definitions
by Fabio Estevam 30 Sep '12

30 Sep '12

From: Fabio Estevam <fabio.estevam(a)freescale.com> Since commit 0d4a707f07 (mx5/6: Define default SoC input clock frequencies) we can use the default clock values. Signed-off-by: Fabio Estevam <fabio.estevam(a)freescale.com> --- include/configs/mx6qsabre_common.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/include/configs/mx6qsabre_common.h b/include/configs/mx6qsabre_common.h index 1d52b52..247e8d6 100644 --- a/include/configs/mx6qsabre_common.h +++ b/include/configs/mx6qsabre_common.h @@ -18,8 +18,6 @@ #define __MX6QSABRE_COMMON_CONFIG_H #define CONFIG_MX6Q -#define CONFIG_SYS_MX6_HCLK 24000000 -#define CONFIG_SYS_MX6_CLK32 32768 #define CONFIG_DISPLAY_CPUINFO #define CONFIG_DISPLAY_BOARDINFO -- 1.7.9.5

1 0

[U-Boot] [PULL] u-boot-testing / dm-serial-1
by Marek Vasut 30 Sep '12

30 Sep '12

Please apply to u-boot/next. They are now compile tested on arm and ppc (and blackfin with gentoo compiler). The following changes since commit d05eb7acf0f6ad5682ab75c25af52921e9fa5863: MAINTAINERS: Move dbau1x00 to orphaned. (2012-09-27 13:04:42 -0700) are available in the git repository at: git://git.denx.de/u-boot-testing.git dm-serial-1 for you to fetch changes up to 51534f667e6106cc5fd3ff6065559a9b1d0d56bd: serial: Enhance the manual relocation (2012-09-29 02:29:22 +0200) ---------------------------------------------------------------- Marek Vasut (70): serial: Coding style cleanup of struct serial_device serial: Rename .init() and .uninit() in serial_device serial: Properly spell out the structure member names of serial_driver serial: pxa: Implement default_serial_console in serial_pxa.c serial: pxa: Make use of default_serial_console in serial_pxa serial: pxa: Make local functions static serial: mpc512x: Properly define CONFIG_SYS_PSC3 in config files serial: Implement serial_initfunc() macro serial: mpc8xx: Move serial registration from serial_initialize() serial: s3c24xx: Move serial registration from serial_initialize() serial: pxa: Move serial registration from serial_initialize() serial: s5p: Move serial registration from serial_initialize() serial: microblaze: Move serial registration from serial_initialize() serial: mpc512x: Move serial registration from serial_initialize() serial: ns16550: Move serial registration from serial_initialize() serial: bfin: Remove the bfin_serialN_device exports from serial.h serial: bfin: Adjust serial_register_bfin_uart() serial: zoom2: Remove zoom2 serial prototypes from serial.h serial: bfin: Flip the jtag serial console to CONFIG_SERIAL_MULTI serial: mips: Implement CONFIG_SERIAL_MULTI into au1x00 serial driver serial: mips: Implement CONFIG_SERIAL_MULTI into asc serial driver serial: mips: Implement CONFIG_SERIAL_MULTI into JZ serial driver serial: powerpc: Implement CONFIG_SERIAL_MULTI into mpc5xx serial driver serial: powerpc: Implement CONFIG_SERIAL_MULTI into mpc8220 serial driver serial: powerpc: Implement CONFIG_SERIAL_MULTI into mpc8260 serial drivers serial: powerpc: Implement CONFIG_SERIAL_MULTI into mpc85xx serial driver serial: powerpc: Implement CONFIG_SERIAL_MULTI into iop480 serial driver serial: sparc: Implement CONFIG_SERIAL_MULTI into leon2 serial driver serial: sparc: Implement CONFIG_SERIAL_MULTI into leon3 serial driver serial: powerpc: Implement CONFIG_SERIAL_MULTI into marvell serial driver serial: powerpc: Implement CONFIG_SERIAL_MULTI into amirix serial driver serial: powerpc: Implement CONFIG_SERIAL_MULTI into bmw serial driver serial: powerpc: Implement CONFIG_SERIAL_MULTI into cogent serial driver serial: powerpc: Implement CONFIG_SERIAL_MULTI into cpci750 serial driver serial: powerpc: Implement CONFIG_SERIAL_MULTI into evb64260 serial driver serial: powerpc: Implement CONFIG_SERIAL_MULTI into ml2 serial driver serial: powerpc: Implement CONFIG_SERIAL_MULTI into sconsole serial driver serial: powerpc: Implement CONFIG_SERIAL_MULTI into p3mx serial driver serial: arm: Implement CONFIG_SERIAL_MULTI into altera_jtag serial driver serial: arm: Implement CONFIG_SERIAL_MULTI into altera serial driver serial: arm: Implement CONFIG_SERIAL_MULTI into atmel serial driver serial: arm: Implement CONFIG_SERIAL_MULTI into lpc32xx serial driver serial: mcf: Implement CONFIG_SERIAL_MULTI into MCF serial driver serial: Implement CONFIG_SERIAL_MULTI into ns9750 serial driver serial: oc: Implement CONFIG_SERIAL_MULTI into OpenCores serial driver serial: arm: Implement CONFIG_SERIAL_MULTI into s3c4510b serial driver serial: arm: Implement CONFIG_SERIAL_MULTI into s3c64xx serial driver serial: sandbox: Implement CONFIG_SERIAL_MULTI into sandbox serial driver serial: arm: Implement CONFIG_SERIAL_MULTI into clps7111 serial driver serial: arm: Implement CONFIG_SERIAL_MULTI into imx serial driver serial: arm: Implement CONFIG_SERIAL_MULTI into ixp serial driver serial: arm: Implement CONFIG_SERIAL_MULTI into ks8695 serial driver serial: arm: Implement CONFIG_SERIAL_MULTI into lh7a40x serial driver serial: arm: Implement CONFIG_SERIAL_MULTI into lpc2292 serial driver serial: Implement CONFIG_SERIAL_MULTI into max3100 serial driver serial: arm: Implement CONFIG_SERIAL_MULTI into mxc serial driver serial: arm: Implement CONFIG_SERIAL_MULTI into netarm serial driver serial: arm: Implement CONFIG_SERIAL_MULTI into pl01x serial driver serial: arm: Implement CONFIG_SERIAL_MULTI into s3c44b0 serial driver serial: arm: Implement CONFIG_SERIAL_MULTI into sa1100 serial driver serial: sh: Implement CONFIG_SERIAL_MULTI into sh serial driver serial: mxs: spl: Remove empty serial_* functions from SPL code serial: ns16550: Call usbtty_poll only in non-SPL build serial: Use puts() and hang() instead of panic() in SPL serial: Unconditionally enable CONFIG_SERIAL_MULTI serial: Remove CONFIG_SERIAL_MULTI from config files serial: Remove CONFIG_SERIAL_MULTI from serial drivers serial: Remove CONFIG_SERIAL_MULTI from remaining sources serial: Compile common/serial.c by default serial: Enhance the manual relocation arch/arm/cpu/arm926ejs/mxs/spl_boot.c | 4 -- arch/arm/lib/board.c | 2 - arch/blackfin/cpu/jtag-console.c | 37 +++++++++--- arch/blackfin/cpu/serial.c | 6 +- arch/blackfin/lib/board.c | 2 - arch/m68k/lib/board.c | 2 - arch/microblaze/lib/board.c | 2 - arch/mips/cpu/mips32/au1x00/au1x00_serial.c | 42 ++++++++++---- arch/mips/cpu/mips32/incaip/asc_serial.c | 35 ++++++++++-- arch/mips/cpu/xburst/jz_serial.c | 35 ++++++++++-- arch/nds32/lib/board.c | 2 - arch/powerpc/cpu/mpc512x/serial.c | 92 ++++++++---------------------- arch/powerpc/cpu/mpc5xx/serial.c | 69 ++++++++++++++-------- arch/powerpc/cpu/mpc5xxx/serial.c | 181 +++++++++++++++++----------------------------------------- arch/powerpc/cpu/mpc8220/uart.c | 35 ++++++++++-- arch/powerpc/cpu/mpc8260/serial_scc.c | 39 +++++++++---- arch/powerpc/cpu/mpc8260/serial_smc.c | 39 +++++++++---- arch/powerpc/cpu/mpc85xx/serial_scc.c | 39 +++++++++---- arch/powerpc/cpu/mpc8xx/serial.c | 43 ++++++++------ arch/powerpc/cpu/ppc4xx/iop480_uart.c | 36 +++++++++--- arch/powerpc/lib/board.c | 2 - arch/sandbox/lib/board.c | 2 - arch/sparc/cpu/leon2/serial.c | 51 ++++++++++++----- arch/sparc/cpu/leon3/serial.c | 51 ++++++++++++----- arch/x86/lib/board.c | 2 - board/Marvell/common/serial.c | 48 +++++++++++----- board/amirix/ap1000/serial.c | 35 ++++++++++-- board/balloon3/balloon3.c | 5 -- board/bmw/serial.c | 36 ++++++++++-- board/cogent/serial.c | 34 +++++++++-- board/esd/cpci750/serial.c | 36 ++++++++++-- board/evb64260/serial.c | 54 +++++++++++------- board/logicpd/zoom2/zoom2_serial.c | 7 ++- board/logicpd/zoom2/zoom2_serial.h | 16 +++--- board/ml2/serial.c | 35 ++++++++++-- board/palmld/palmld.c | 5 -- board/palmtc/palmtc.c | 5 -- board/pcippc2/sconsole.c | 35 ++++++++++-- board/pdm360ng/pdm360ng.c | 6 -- board/prodrive/p3mx/serial.c | 36 ++++++++++-- board/toradex/colibri_pxa270/colibri_pxa270.c | 5 -- board/trizepsiv/conxs.c | 7 --- board/vpac270/vpac270.c | 5 -- board/zipitz2/zipitz2.c | 5 -- common/Makefile | 2 +- common/cmd_nvedit.c | 2 - common/fdt_support.c | 4 -- common/iomux.c | 2 - common/serial.c | 229 ++++++++++++++++++++++++++++++++++++++++++++++---------------------------- common/stdio.c | 2 - drivers/serial/altera_jtag_uart.c | 39 +++++++++++-- drivers/serial/altera_uart.c | 51 +++++++++++++---- drivers/serial/atmel_usart.c | 35 ++++++++++-- drivers/serial/lpc32xx_hsuart.c | 57 ++++++++----------- drivers/serial/mcfuart.c | 33 +++++++++-- drivers/serial/ns16550.c | 2 +- drivers/serial/ns9750_serial.c | 33 +++++++++-- drivers/serial/opencores_yanu.c | 35 +++++++++--- drivers/serial/s3c4510b_uart.c | 33 +++++++++-- drivers/serial/s3c64xx.c | 33 +++++++++-- drivers/serial/sandbox.c | 35 ++++++++++-- drivers/serial/serial.c | 128 ++++++++--------------------------------- drivers/serial/serial_clps7111.c | 34 ++++++++--- drivers/serial/serial_imx.c | 36 +++++++++--- drivers/serial/serial_ixp.c | 36 +++++++++--- drivers/serial/serial_ks8695.c | 41 +++++++++++--- drivers/serial/serial_lh7a40x.c | 34 ++++++++--- drivers/serial/serial_lpc2292.c | 34 ++++++++--- drivers/serial/serial_max3100.c | 42 +++++++++----- drivers/serial/serial_mxc.c | 40 +++++++++---- drivers/serial/serial_netarm.c | 33 +++++++++-- drivers/serial/serial_pl01x.c | 37 +++++++++--- drivers/serial/serial_pxa.c | 65 ++++++++++++--------- drivers/serial/serial_s3c24x0.c | 78 ++++++------------------- drivers/serial/serial_s3c44b0.c | 36 +++++++++--- drivers/serial/serial_s5p.c | 27 ++++++--- drivers/serial/serial_sa1100.c | 36 +++++++++--- drivers/serial/serial_sh.c | 33 +++++++++-- drivers/serial/serial_xuartlite.c | 69 +++++++++------------- include/common.h | 12 ---- include/configs/DU440.h | 1 - include/configs/KAREF.h | 1 - include/configs/METROBOX.h | 1 - include/configs/MPC8569MDS.h | 1 - include/configs/P1010RDB.h | 1 - include/configs/P1_P2_RDB.h | 1 - include/configs/P2020COME.h | 1 - include/configs/PMC440.h | 1 - include/configs/TB5200.h | 1 - include/configs/amcc-common.h | 1 - include/configs/aria.h | 1 + include/configs/balloon3.h | 1 + include/configs/bfin_adi_common.h | 1 - include/configs/colibri_pxa270.h | 1 + include/configs/coreboot.h | 1 - include/configs/eNET.h | 1 - include/configs/jadecpu.h | 1 - include/configs/korat.h | 1 - include/configs/lubbock.h | 1 + include/configs/lwmon.h | 1 - include/configs/lwmon5.h | 1 - include/configs/mcc200.h | 5 -- include/configs/mecp5123.h | 1 + include/configs/mpc5121ads.h | 1 + include/configs/omap3_zoom2.h | 3 +- include/configs/origen.h | 1 - include/configs/palmld.h | 1 + include/configs/palmtc.h | 1 + include/configs/pcs440ep.h | 1 - include/configs/pdm360ng.h | 3 - include/configs/pxa255_idp.h | 1 + include/configs/quad100hd.h | 1 - include/configs/s5p_goni.h | 1 - include/configs/s5pc210_universal.h | 1 - include/configs/sc3.h | 1 - include/configs/smdk5250.h | 1 - include/configs/smdkc100.h | 1 - include/configs/smdkv310.h | 1 - include/configs/tegra-common-post.h | 5 -- include/configs/trats.h | 1 - include/configs/trizepsiv.h | 2 +- include/configs/vpac270.h | 1 + include/configs/xaeniax.h | 2 +- include/configs/zeus.h | 1 - include/configs/zipitz2.h | 1 + include/serial.h | 79 +++++--------------------- post/board/pdm360ng/coproc_com.c | 3 - 127 files changed, 1728 insertions(+), 1156 deletions(-)

1 1

[U-Boot] [PATCH] mx31: Add more CCM access macros
by Benoît Thébaudeau 30 Sep '12

30 Sep '12

Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau(a)advansee.com> Cc: Stefano Babic <sbabic(a)denx.de> --- .../arch/arm/include/asm/arch-mx31/imx-regs.h | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git u-boot-4d3c95f.orig/arch/arm/include/asm/arch-mx31/imx-regs.h u-boot-4d3c95f/arch/arm/include/asm/arch-mx31/imx-regs.h index 7ddbbd6..75fc390 100644 --- u-boot-4d3c95f.orig/arch/arm/include/asm/arch-mx31/imx-regs.h +++ u-boot-4d3c95f/arch/arm/include/asm/arch-mx31/imx-regs.h @@ -575,6 +575,16 @@ struct esdc_regs { #define PDR0_MAX_PODF(x) (((x) & 0x7) << 3) #define PDR0_MCU_PODF(x) ((x) & 0x7) +#define PDR1_USB_PRDF(x) (((x) & 0x3) << 30) +#define PDR1_USB_PODF(x) (((x) & 0x7) << 27) +#define PDR1_FIRI_PRDF(x) (((x) & 0x7) << 24) +#define PDR1_FIRI_PODF(x) (((x) & 0x3f) << 18) +#define PDR1_SSI2_PRDF(x) (((x) & 0x7) << 15) +#define PDR1_SSI2_PODF(x) (((x) & 0x3f) << 9) +#define PDR1_SSI1_PRDF(x) (((x) & 0x7) << 6) +#define PDR1_SSI1_PODF(x) ((x) & 0x3f) + +#define PLL_BRMO(x) (((x) & 0x1) << 31) #define PLL_PD(x) (((x) & 0xf) << 26) #define PLL_MFD(x) (((x) & 0x3ff) << 16) #define PLL_MFI(x) (((x) & 0xf) << 10)

2 1

[U-Boot] [PATCH] mx6qsabreauto: Use ttymxc3 as console
by Otavio Salvador 30 Sep '12

30 Sep '12

The mx6qsabreauto console is different than mx6qsabresd so the console configuration is now set in the board file. Signed-off-by: Otavio Salvador <otavio(a)ossystems.com.br> --- include/configs/mx6qsabre_common.h | 2 +- include/configs/mx6qsabreauto.h | 4 +++- include/configs/mx6qsabresd.h | 4 +++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/include/configs/mx6qsabre_common.h b/include/configs/mx6qsabre_common.h index c541691..1d52b52 100644 --- a/include/configs/mx6qsabre_common.h +++ b/include/configs/mx6qsabre_common.h @@ -83,7 +83,7 @@ #define CONFIG_EXTRA_ENV_SETTINGS \ "script=boot.scr\0" \ "uimage=uImage\0" \ - "console=ttymxc0\0" \ + "console=" CONFIG_CONSOLE_DEV "\0" \ "fdt_high=0xffffffff\0" \ "initrd_high=0xffffffff\0" \ "mmcdev=0\0" \ diff --git a/include/configs/mx6qsabreauto.h b/include/configs/mx6qsabreauto.h index 825d3b8..a878dec 100644 --- a/include/configs/mx6qsabreauto.h +++ b/include/configs/mx6qsabreauto.h @@ -11,10 +11,12 @@ #ifndef __MX6QSABREAUTO_CONFIG_H #define __MX6QSABREAUTO_CONFIG_H -#include "mx6qsabre_common.h" #define CONFIG_MACH_TYPE 3529 #define CONFIG_MXC_UART_BASE UART4_BASE +#define CONFIG_CONSOLE_DEV "ttymxc3" #define PHYS_SDRAM_SIZE (2u * 1024 * 1024 * 1024) +#include "mx6qsabre_common.h" + #endif /* __MX6QSABREAUTO_CONFIG_H */ diff --git a/include/configs/mx6qsabresd.h b/include/configs/mx6qsabresd.h index ca91aa5..f2ce79e 100644 --- a/include/configs/mx6qsabresd.h +++ b/include/configs/mx6qsabresd.h @@ -16,10 +16,12 @@ #ifndef __MX6QSABRESD_CONFIG_H #define __MX6QSABRESD_CONFIG_H -#include "mx6qsabre_common.h" #define CONFIG_MACH_TYPE 3980 #define CONFIG_MXC_UART_BASE UART1_BASE +#define CONFIG_CONSOLE_DEV "ttymxc0" #define PHYS_SDRAM_SIZE (1u * 1024 * 1024 * 1024) +#include "mx6qsabre_common.h" + #endif /* __MX6QSABRESD_CONFIG_H */ -- 1.7.10.4

2 2

[U-Boot] [PATCH 1/7] mx25: Fix decode_pll
by Benoît Thébaudeau 30 Sep '12

30 Sep '12

The MFN bit-field of the PLL registers represents a signed value. See the reference manual. Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau(a)advansee.com> Cc: Stefano Babic <sbabic(a)denx.de> --- .../arch/arm/cpu/arm926ejs/mx25/generic.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git u-boot-imx-e1eb75b.orig/arch/arm/cpu/arm926ejs/mx25/generic.c u-boot-imx-e1eb75b/arch/arm/cpu/arm926ejs/mx25/generic.c index 90e584a..2283a89 100644 --- u-boot-imx-e1eb75b.orig/arch/arm/cpu/arm926ejs/mx25/generic.c +++ u-boot-imx-e1eb75b/arch/arm/cpu/arm926ejs/mx25/generic.c @@ -48,7 +48,7 @@ static unsigned int imx_decode_pll(unsigned int pll, unsigned int f_ref) { unsigned int mfi = (pll >> CCM_PLL_MFI_SHIFT) & CCM_PLL_MFI_MASK; - unsigned int mfn = (pll >> CCM_PLL_MFN_SHIFT) + int mfn = (pll >> CCM_PLL_MFN_SHIFT) & CCM_PLL_MFN_MASK; unsigned int mfd = (pll >> CCM_PLL_MFD_SHIFT) & CCM_PLL_MFD_MASK; @@ -56,9 +56,12 @@ static unsigned int imx_decode_pll(unsigned int pll, unsigned int f_ref) & CCM_PLL_PD_MASK; mfi = mfi <= 5 ? 5 : mfi; + mfn = mfn >= 512 ? mfn - 1024 : mfn; + mfd += 1; + pd += 1; - return lldiv(2 * (u64) f_ref * (mfi * (mfd + 1) + mfn), - (mfd + 1) * (pd + 1)); + return lldiv(2 * (u64) f_ref * (mfi * mfd + mfn), + mfd * pd); } static ulong imx_get_mpllclk(void)

3 12

[U-Boot] [PATCH v2] mx6: Remove lowlevel_init.S
by Fabio Estevam 30 Sep '12

30 Sep '12

From: Fabio Estevam <fabio.estevam(a)freescale.com> lowlevel_init.S is not used on mx6, so remove the file and the associated calls. Signed-off-by: Fabio Estevam <fabio.estevam(a)freescale.com> --- Changes since v1: - Also remove SOBJS arch/arm/cpu/armv7/mx6/Makefile | 5 ++--- arch/arm/cpu/armv7/mx6/lowlevel_init.S | 25 ------------------------- arch/arm/cpu/armv7/start.S | 24 ------------------------ 3 files changed, 2 insertions(+), 52 deletions(-) delete mode 100644 arch/arm/cpu/armv7/mx6/lowlevel_init.S diff --git a/arch/arm/cpu/armv7/mx6/Makefile b/arch/arm/cpu/armv7/mx6/Makefile index cbce411..10f512f 100644 --- a/arch/arm/cpu/armv7/mx6/Makefile +++ b/arch/arm/cpu/armv7/mx6/Makefile @@ -28,10 +28,9 @@ include $(TOPDIR)/config.mk LIB = $(obj)lib$(SOC).o COBJS = soc.o clock.o -SOBJS = lowlevel_init.o -SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) -OBJS := $(addprefix $(obj),$(SOBJS) $(COBJS)) +SRCS := $(COBJS:.o=.c) +OBJS := $(addprefix $(obj), $(COBJS)) all: $(obj).depend $(LIB) diff --git a/arch/arm/cpu/armv7/mx6/lowlevel_init.S b/arch/arm/cpu/armv7/mx6/lowlevel_init.S deleted file mode 100644 index acadef2..0000000 --- a/arch/arm/cpu/armv7/mx6/lowlevel_init.S +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright (C) 2010-2011 Freescale Semiconductor, Inc. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * 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, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, - * MA 02111-1307 USA - */ -.section ".text.init", "x" - -#include <linux/linkage.h> - -ENTRY(lowlevel_init) - mov pc, lr -ENDPROC(lowlevel_init) diff --git a/arch/arm/cpu/armv7/start.S b/arch/arm/cpu/armv7/start.S index 32658eb..4c7c385 100644 --- a/arch/arm/cpu/armv7/start.S +++ b/arch/arm/cpu/armv7/start.S @@ -152,7 +152,6 @@ reset: /* the mask ROM code should have PLL and others stable */ #ifndef CONFIG_SKIP_LOWLEVEL_INIT bl cpu_init_cp15 - bl cpu_init_crit #endif /* Set stackpointer in internal RAM to call board_init_f */ @@ -353,29 +352,6 @@ ENTRY(cpu_init_cp15) mov pc, lr @ back to my caller ENDPROC(cpu_init_cp15) -#ifndef CONFIG_SKIP_LOWLEVEL_INIT -/************************************************************************* - * - * CPU_init_critical registers - * - * setup important registers - * setup memory timing - * - *************************************************************************/ -ENTRY(cpu_init_crit) - /* - * Jump to board specific initialization... - * The Mask ROM will have already initialized - * basic memory. Go here to bump up clock rate and handle - * wake up conditions. - */ - mov ip, lr @ persevere link reg across call - bl lowlevel_init @ go setup pll,mux,memory - mov lr, ip @ restore link - mov pc, lr @ back to my caller -ENDPROC(cpu_init_crit) -#endif - #ifndef CONFIG_SPL_BUILD /* ************************************************************************* -- 1.7.9.5

3 10

[U-Boot] [PATCH] sandbox: Add asm/errno.h
by Simon Glass 29 Sep '12

29 Sep '12

This file is required for all archs. Fixes a sandbox build break on ext4. Signed-off-by: Simon Glass <sjg(a)chromium.org> --- arch/sandbox/include/asm/errno.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) create mode 100644 arch/sandbox/include/asm/errno.h diff --git a/arch/sandbox/include/asm/errno.h b/arch/sandbox/include/asm/errno.h new file mode 100644 index 0000000..4c82b50 --- /dev/null +++ b/arch/sandbox/include/asm/errno.h @@ -0,0 +1 @@ +#include <asm-generic/errno.h> -- 1.7.7.3

2 1