September 2012 - U-Boot

[U-Boot] [PATCH] pci: fix some warnings related to assumptions about
by Kumar Gala 22 Sep '12

22 Sep '12

The following commit introduced some warnings associated with using pci_addr_t instead of a proper 32-bit data type. commit af778c6d9e2b945ee03cbc53bb976238a3374f33 Author: Andrew Sharp <andywyse6(a)gmail.com> Date: Wed Aug 1 12:27:16 2012 +0000 pci: fix errant data types and corresponding access functions On some platforms pci_addr_t is defined as a 64-bit data type so its not proper to use with pci_{read,write}_config_dword. Signed-off-by: Kumar Gala <galak(a)kernel.crashing.org> --- drivers/pci/pci.c | 6 +++--- drivers/pci/pci_auto.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index 2a6d0a7..d864f13 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -118,11 +118,11 @@ PCI_WRITE_VIA_DWORD_OP(word, u16, 0x02, 0x0000ffff) void *pci_map_bar(pci_dev_t pdev, int bar, int flags) { pci_addr_t pci_bus_addr; - pci_addr_t bar_response; + u32 bar_response; /* read BAR address */ pci_read_config_dword(pdev, bar, &bar_response); - pci_bus_addr = bar_response & ~0xf; + pci_bus_addr = (pci_addr_t)(bar_response & ~0xf); /* * Pass "0" as the length argument to pci_bus_to_virt. The arg @@ -389,7 +389,7 @@ int pci_hose_config_device(struct pci_controller *hose, pci_addr_t mem, unsigned long command) { - pci_addr_t bar_response; + u32 bar_response; unsigned int old_command; pci_addr_t bar_value; pci_size_t bar_size; diff --git a/drivers/pci/pci_auto.c b/drivers/pci/pci_auto.c index ae61e24..cd78030 100644 --- a/drivers/pci/pci_auto.c +++ b/drivers/pci/pci_auto.c @@ -89,7 +89,7 @@ void pciauto_setup_device(struct pci_controller *hose, struct pci_region *prefetch, struct pci_region *io) { - pci_addr_t bar_response; + u32 bar_response; pci_size_t bar_size; u16 cmdstat = 0; int bar, bar_nr = 0; -- 1.7.9.7

6 17

[U-Boot] [RFC PATCH v2 0/6] Port of MUSB driver from Linux
by Ilya Yanok 22 Sep '12

22 Sep '12

Current MUSB driver in U-Boot uses old UDC API while new gagdet client drivers need new gadget API. Also current MUSB driver has some significant limitations (like inability to handle tx for endpoints other than ep0). So I think port of new Linux driver is desirable. This is initial port, performed mostly by putting DM and OTG code under #ifndef __UBOOT__ clauses. My intention was to be as close as possible to the original to ease of possible resyncs. Some warnings are suppressed via CFLAGS. There are some style problems but I'm not touching them for now for the above mentioned reason. There is obviously some room for optimisation, some structure fields are unused as well as (probably) some code. This is not a replacement for existing MUSB driver (at least for now), cause there are still consumers of the old interface and the only ported backend is for TI AM335X (while the old code has a bunch of other backends). OTG and DMA are not supported. The only ported driver is for TI AM33xx, but others should be easy to port too. Virtual root hub is not implemented but this shouldn't be a big problem as the old code has virtual root hub support enabled only for Blackfin platform. Tested it on AM335x EVM and BeagleBone with CDC Ethernet gadget and a bunch of storage devices. Pathes are rather big because of the original code size (and I didn't delete unused code, just disabled it). So it's probably better to look at changes as compared to Linux code. I prepared such version also, you can find it at [1]. Hopefully it will be also useful if resync with the kernel will be needed in future. [1] https://github.com/yanok/u-boot/tree/musb-changes-from-linux Changes in v2: - add missing linux-compat.h header - added host support - glue code moved from musb_gadget_uboot.c to musb_uboot.c and cleaned up slightly. - added check for malloc return value - define is_{host,peripheral}_capable conditionally to support compilation with only host or gadget enabled - added some more is_{host,peripheral}_capable guards to core code to support compilation with only host or gadget enabled - rename backend config option to CONFIG_USB_MUSB_DSPS - we are providing host support now so add yourself to usb.h - init both musb IPs (conditionally) from arch_init not from eth_initialize - host support enabled - define CONFIG_ARCH_INIT as now musb_register() is called from arch_init() - use new config options Ilya Yanok (6): linux/usb/ch9.h: update with the version from Linux tree usb: use linux/usb/ch9.h instead of usbdescriptors.h musb-new: port of Linux musb driver musb-new: dsps backend driver am33xx: init OTG hardware and new musb gadget driver am335x_evm: enable both musb gadget and host Makefile | 1 + arch/arm/cpu/arm920t/s3c24x0/usb_ohci.c | 2 +- arch/arm/cpu/armv7/am33xx/board.c | 107 +- arch/arm/cpu/armv7/am33xx/clock.c | 8 + arch/arm/include/asm/arch-am33xx/cpu.h | 11 +- arch/arm/include/asm/arch-am33xx/hardware.h | 4 + arch/arm/include/asm/omap_musb.h | 25 + arch/mips/cpu/mips32/au1x00/au1x00_usb_ohci.c | 2 +- arch/powerpc/cpu/mpc5xxx/usb_ohci.c | 2 +- arch/powerpc/cpu/ppc4xx/usb_ohci.c | 2 +- common/cmd_usb.c | 2 +- common/usb.c | 4 +- drivers/usb/gadget/config.c | 1 - drivers/usb/gadget/epautoconf.c | 1 - drivers/usb/gadget/ether.c | 1 - drivers/usb/gadget/gadget_chips.h | 2 + drivers/usb/gadget/s3c_udc_otg.c | 1 - drivers/usb/gadget/usbstring.c | 1 - drivers/usb/host/ehci-hcd.c | 16 +- drivers/usb/host/isp116x-hcd.c | 2 +- drivers/usb/host/ohci-hcd.c | 2 +- drivers/usb/host/sl811-hcd.c | 2 +- drivers/usb/musb-new/Makefile | 37 + drivers/usb/musb-new/linux-compat.h | 109 ++ drivers/usb/musb-new/musb_core.c | 2497 +++++++++++++++++++++++++ drivers/usb/musb-new/musb_core.h | 623 ++++++ drivers/usb/musb-new/musb_debug.h | 58 + drivers/usb/musb-new/musb_dma.h | 186 ++ drivers/usb/musb-new/musb_dsps.c | 771 ++++++++ drivers/usb/musb-new/musb_gadget.c | 2333 +++++++++++++++++++++++ drivers/usb/musb-new/musb_gadget.h | 130 ++ drivers/usb/musb-new/musb_gadget_ep0.c | 1089 +++++++++++ drivers/usb/musb-new/musb_host.c | 2400 ++++++++++++++++++++++++ drivers/usb/musb-new/musb_host.h | 114 ++ drivers/usb/musb-new/musb_io.h | 146 ++ drivers/usb/musb-new/musb_regs.h | 645 +++++++ drivers/usb/musb-new/musb_uboot.c | 237 +++ drivers/usb/musb-new/usb-compat.h | 88 + drivers/usb/musb/musb_hcd.c | 4 +- include/configs/am335x_evm.h | 27 + include/linux/usb/ch9.h | 514 ++++- include/linux/usb/musb.h | 162 ++ include/usb.h | 18 +- include/usb/s3c_udc.h | 1 - include/usb_defs.h | 6 - 45 files changed, 12336 insertions(+), 58 deletions(-) create mode 100644 arch/arm/include/asm/omap_musb.h create mode 100644 drivers/usb/musb-new/Makefile create mode 100644 drivers/usb/musb-new/linux-compat.h create mode 100644 drivers/usb/musb-new/musb_core.c create mode 100644 drivers/usb/musb-new/musb_core.h create mode 100644 drivers/usb/musb-new/musb_debug.h create mode 100644 drivers/usb/musb-new/musb_dma.h create mode 100644 drivers/usb/musb-new/musb_dsps.c create mode 100644 drivers/usb/musb-new/musb_gadget.c create mode 100644 drivers/usb/musb-new/musb_gadget.h create mode 100644 drivers/usb/musb-new/musb_gadget_ep0.c create mode 100644 drivers/usb/musb-new/musb_host.c create mode 100644 drivers/usb/musb-new/musb_host.h create mode 100644 drivers/usb/musb-new/musb_io.h create mode 100644 drivers/usb/musb-new/musb_regs.h create mode 100644 drivers/usb/musb-new/musb_uboot.c create mode 100644 drivers/usb/musb-new/usb-compat.h create mode 100644 include/linux/usb/musb.h -- 1.7.9.5

3 14

[U-Boot] RFC - PatchTrack Specification (revised)
by Graeme Russ 22 Sep '12

22 Sep '12

A revised version of the spec (sorry, I would have used reply-to but something went amiss with gmail and I've lost the original) Regards, Graeme --- PatchTrack is designed to help alleviate some of the load from custodians managing an email based work flow accepting patches from a large community of contributors Core Concepts: PatchTrack monitors an email inbox which has been configured to receive emails from a group mailing list. PatchTrack scans incoming emails and determines, for each inbound email, if the email is: - A new single stand-alone patch - A new patch which is part of a series of patches (i.e. patch x of y) - A summary patch of a series of patches (i.e. patch 0 of y) - A revised version of an existing patch - A comment on an existing patch - A 'feedback tag' (Ack, Nack, Tested, etc.) for an existing patch Based upon the above determination of the incoming email, PatchTrack performs one of several 'Operation Sequences' Operation Sequence - New single stand-alone patch: - Determine which git repository the patch is intended to be applied to - Add the patch to the top of the 'patch stack' of the target repository NOTE: Patches are placed in the patch stack in the order they are received - Run the configurable set of sanity checks on the raw patch. A typical example is the checkpatch.pl script which checks the patch for correct style - Perform a dummy git-apply of the patch onto the HEAD of the target repository with all patches already on the repositories 'patch stack' applied - Record the results of the sanity checks and git-apply against the patch Operation Sequence - New patch which is part of a series: - As part 'New single stand-alone patch' NOTE: Patches within a series are added to the patch stack in the order specified in the series - Record patch as being part of a series Operation Sequence - Summary patch of a series - Group all patches of the series under this patch Operation Sequence - Revised version of existing patch - Remove existing patch from patch stack - Insert new patch into patch stack at same location as the removed patch - Run the configurable set of sanity checks on the raw patch. A typical example is the checkpatch.pl script which checks the patch for correct style - Perform a dummy git-apply of the patch onto the HEAD of the target repository with all patches already on the repositories 'patch stack' applied - Record the results of the sanity checks and git-apply against the patch The Patch Stack: The patch stack is a doubly linked-list of patches. The 'zeroth' patch is the HEAD of the associated git repository to which all subsequent patches on the stack are applied. The objective of the patch stack is to quickly visualise which patches pass some basic, pre-determined sanity checks. By performing these basic tests, the maintainers (and the community as a whole) is spared the trouble of wasting time on broken patches. For reference, the first patch after the 'zeroth' patch is defined as being at the bottom of the stack. There are two types of tests performed against each patch - Stand-alone and inter-dependent tests. <<Hmmm, 'static' and 'dynamic' ?>> Stand-alone test are valid no matter where the patch is in the patch stack. Typically, these tests validate coding style, correct signed-off-by lines, compatible licensing (if present in the patch), etc. Stand-alone tests only need to be performed once per patch (and re-run when a new revision of the patch is submitted) Inter-Dependent tests are tests for which the outcome will depend on the order of the patches in the patch-set (including the zeroth patch). The most typical inter-dependent test is the 'git-apply' test which checks that the patch will apply cleanly to the repository. Every time the patch stack is modified (patch added, removed, replaced, re-ordered, etc.) all inter- dependent tests are re-run for each patch in the patch stack. When a patch fails an inter-dependent test, it may not be necessary to stop running the inter-dependent tests on subsequent patches. For example, if the first patch in the stack fails to apply to the head of the repository, it is not necessarily true that all subsequent patches will also fail. Therefore, the patch is marked as being excluded from the inter-dependency chain. The web interface (see below) will allow a user to clearly see which patches have passed all of the stand-alone and inter-dependent tests. Web Interface In addition to processing inbound emails, PatchTrack includes web interface which allows a user to: - Visualise the state of the patch stack for a given repository * Passed sanity checks * Passed git-apply * Acked * Tested * Committed NOTE: The patch stack is displayed as a series of rows in a table - One row per patch. The colour of the row can be configured for each patch state. For example, 'Acked' might be blue and 'Committed' white - View the meta data of each patch such as: * Patch Author * Date/Time patch was submitted * Next/Previous patches in the patch stack * Submitters of feedback tags * Result of each sanity check * Result of the git-apply * git commit id (for committed patches) - View the revision history of each patch - View the comments recorded against each patch - Alter the order of patches within a patch stack - Move patches between patch stacks - Formally reject patches - Commit patches - Purge committed patches from the patch stack (garbage collection) - Download a patch set of all patches meeting a specific criteria (pass all stand-alone and inter-dependent tests and have been acked for example) - Re-run inter-dependent tests using patches matching a specific criteria (all patches passing the stand-alone tests that have been acked for example) - Re-order patches based on specific criteria (move all patches which have passed stand-alone tests and have been acked to the bottom of the stack)

5 6

[U-Boot] [PATCH] i.MX6: define IOMUX_GPR3 register bitfields
by Eric Nelson 22 Sep '12

22 Sep '12

Signed-off-by: Eric Nelson <eric.nelson(a)boundarydevices.com> --- arch/arm/include/asm/arch-mx6/imx-regs.h | 48 ++++++++++++++++++++++++++++++ 1 files changed, 48 insertions(+), 0 deletions(-) diff --git a/arch/arm/include/asm/arch-mx6/imx-regs.h b/arch/arm/include/asm/arch-mx6/imx-regs.h index cb284e2..13fe1bf 100644 --- a/arch/arm/include/asm/arch-mx6/imx-regs.h +++ b/arch/arm/include/asm/arch-mx6/imx-regs.h @@ -273,6 +273,54 @@ struct iomuxc { #define IOMUXC_GPR2_LVDS_CH0_MODE_ENABLED_DI0 (IOMUXC_GPR2_MODE_ENABLED_DI0<<IOMUXC_GPR2_LVDS_CH0_MODE_OFFSET) #define IOMUXC_GPR2_LVDS_CH0_MODE_ENABLED_DI1 (IOMUXC_GPR2_MODE_ENABLED_DI1<<IOMUXC_GPR2_LVDS_CH0_MODE_OFFSET) +/* GPR3 bitfields */ +#define IOMUXC_GPR3_GPU_DBG_OFFSET 29 +#define IOMUXC_GPR3_GPU_DBG_MASK (3<<IOMUXC_GPR3_GPU_DBG_OFFSET) +#define IOMUXC_GPR3_BCH_WR_CACHE_CTL_OFFSET 28 +#define IOMUXC_GPR3_BCH_WR_CACHE_CTL_MASK (1<<IOMUXC_GPR3_BCH_WR_CACHE_CTL_OFFSET) +#define IOMUXC_GPR3_BCH_RD_CACHE_CTL_OFFSET 27 +#define IOMUXC_GPR3_BCH_RD_CACHE_CTL_MASK (1<<IOMUXC_GPR3_BCH_RD_CACHE_CTL_OFFSET) +#define IOMUXC_GPR3_uSDHCx_WR_CACHE_CTL_OFFSET 26 +#define IOMUXC_GPR3_uSDHCx_WR_CACHE_CTL_MASK (1<<IOMUXC_GPR3_uSDHCx_WR_CACHE_CTL_OFFSET) +#define IOMUXC_GPR3_uSDHCx_RD_CACHE_CTL_OFFSET 25 +#define IOMUXC_GPR3_uSDHCx_RD_CACHE_CTL_MASK (1<<IOMUXC_GPR3_uSDHCx_RD_CACHE_CTL_OFFSET) +#define IOMUXC_GPR3_OCRAM_CTL_OFFSET 21 +#define IOMUXC_GPR3_OCRAM_CTL_MASK (0xf<<IOMUXC_GPR3_OCRAM_CTL_OFFSET) +#define IOMUXC_GPR3_OCRAM_STATUS_OFFSET 17 +#define IOMUXC_GPR3_OCRAM_STATUS_MASK (0xf<<IOMUXC_GPR3_OCRAM_STATUS_OFFSET) +#define IOMUXC_GPR3_CORE3_DBG_ACK_EN_OFFSET 16 +#define IOMUXC_GPR3_CORE3_DBG_ACK_EN_MASK (1<<IOMUXC_GPR3_CORE3_DBG_ACK_EN_OFFSET) +#define IOMUXC_GPR3_CORE2_DBG_ACK_EN_OFFSET 15 +#define IOMUXC_GPR3_CORE2_DBG_ACK_EN_MASK (1<<IOMUXC_GPR3_CORE2_DBG_ACK_EN_OFFSET) +#define IOMUXC_GPR3_CORE1_DBG_ACK_EN_OFFSET 14 +#define IOMUXC_GPR3_CORE1_DBG_ACK_EN_MASK (1<<IOMUXC_GPR3_CORE1_DBG_ACK_EN_OFFSET) +#define IOMUXC_GPR3_CORE0_DBG_ACK_EN_OFFSET 13 +#define IOMUXC_GPR3_CORE0_DBG_ACK_EN_MASK (1<<IOMUXC_GPR3_CORE0_DBG_ACK_EN_OFFSET) +#define IOMUXC_GPR3_TZASC2_BOOT_LOCK_OFFSET 12 +#define IOMUXC_GPR3_TZASC2_BOOT_LOCK_MASK (1<<IOMUXC_GPR3_TZASC2_BOOT_LOCK_OFFSET) +#define IOMUXC_GPR3_TZASC1_BOOT_LOCK_OFFSET 11 +#define IOMUXC_GPR3_TZASC1_BOOT_LOCK_MASK (1<<IOMUXC_GPR3_TZASC1_BOOT_LOCK_OFFSET) +#define IOMUXC_GPR3_IPU_DIAG_OFFSET 10 +#define IOMUXC_GPR3_IPU_DIAG_MASK (1<<IOMUXC_GPR3_IPU_DIAG_OFFSET) + +#define IOMUXC_GPR3_MUX_SRC_IPU1_DI0 0 +#define IOMUXC_GPR3_MUX_SRC_IPU1_DI1 1 +#define IOMUXC_GPR3_MUX_SRC_IPU2_DI0 2 +#define IOMUXC_GPR3_MUX_SRC_IPU2_DI1 3 + +#define IOMUXC_GPR3_LVDS1_MUX_CTL_OFFSET 8 +#define IOMUXC_GPR3_LVDS1_MUX_CTL_MASK (3<<IOMUXC_GPR3_LVDS1_MUX_CTL_OFFSET) + +#define IOMUXC_GPR3_LVDS0_MUX_CTL_OFFSET 6 +#define IOMUXC_GPR3_LVDS0_MUX_CTL_MASK (3<<IOMUXC_GPR3_LVDS0_MUX_CTL_OFFSET) + +#define IOMUXC_GPR3_MIPI_MUX_CTL_OFFSET 4 +#define IOMUXC_GPR3_MIPI_MUX_CTL_MASK (3<<IOMUXC_GPR3_MIPI_MUX_CTL_OFFSET) + +#define IOMUXC_GPR3_HDMI_MUX_CTL_OFFSET 2 +#define IOMUXC_GPR3_HDMI_MUX_CTL_MASK (3<<IOMUXC_GPR3_HDMI_MUX_CTL_OFFSET) + + /* ECSPI registers */ struct cspi_regs { u32 rxdata; -- 1.7.9

2 2

[U-Boot] Pull request: u-boot-staging
by Anatolij Gustschin 22 Sep '12

22 Sep '12

Hello Tom, Please pull some patches from my staging branch. There is a warnings fix, so we will get a cleaner MAKEALL log. Three patches from Simon were submitted as part of tegra LCD driver series, other patches of this series still need rework. We should merge these three patches now so that there is no need to include them later again in the reworked LCD driver series. The following changes since commit 3ab270d5df7ae7bf8d7b5d225ab1abb37297d77e: Revert "memsize: Fix for bug in memory sizing code" (2012-09-21 08:14:05 -0700) are available in the git repository at: git://git.denx.de/u-boot-staging.git agust(a)denx.de Kumar Gala (1): pci: fix some warnings related to assumptions about Simon Glass (3): Add gpio_request() to asm-generic header fdt: Tidy debugging, add to fdtdec_get_int/addr() fdt: Add header guard to fdtdec.h drivers/pci/pci.c | 6 +++--- drivers/pci/pci_auto.c | 2 +- include/asm-generic/gpio.h | 9 +++++++++ include/fdtdec.h | 3 +++ lib/fdtdec.c | 27 +++++++++++++++++++-------- 5 files changed, 35 insertions(+), 12 deletions(-) Thanks, Anatolij

2 2

[U-Boot] Pull request: u-boot-arm/master
by Albert ARIBAUD 22 Sep '12

22 Sep '12

Hello Wolfgang, The following changes since commit 6e2fbdea1b26d75314d87c380a36b0015bf824cf: Merge branch 'agust(a)denx.de' of git://git.denx.de/u-boot-staging (2012-09-02 00:44:09 +0200) are available in the git repository at: git://git.denx.de/u-boot-arm master for you to fetch changes up to d193c1b6eb05041c94ad9aacd8c94189d1dbc5f8: Merge remote-tracking branch 'u-boot-imx/master' (2012-09-21 00:26:19 +0200) ---------------------------------------------------------------- Albert ARIBAUD (4): edminiv2: orion5x: fix GPIO inits and values Merge remote-tracking branch 'u-boot-atmel/master' into m Merge remote-tracking branch 'u-boot-ti/master' into m Merge remote-tracking branch 'u-boot-imx/master' Arnout Vandecappelle (Essensium/Mind) (1): OMAP3: add definition of CTRL_WKUP_CTRL register Ashok Kumar Reddy (2): ima3-mx53:Rename CONFIG_PRIME => CONFIG_ETHPRME, remove mx6qsabrelite:Use IMX_GPIO_NR Macro Benoît Thébaudeau (8): mx35: Fix decode_pll mx35: Add definitions for clock gate values mx35: Fix clock dividers mx25: Define default SoC input clock frequencies mx35: Define default SoC input clock frequencies mx35 timer: Switch to 32-kHz source Fix mx31_decode_pll mx31: Define default SoC input clock frequencies Fabio Estevam (3): mx28evk: Convert to mxs_adjust_memory_params() mx28evk: Add USB Ethernet support mx35pdk: README: Remove NAND references Holger Brunck (1): arm/km: remove unused code Jens Scharsig (2): eb_cpux9k2: fix chip select atmel: eb_cpux9k2: add ram target configuration Jim Lin (1): tegra: nand: Add Tegra NAND driver Karl O. Pinc (2): Cosmetic doc typo fixes to the kwbimage feature docs cosmetic: Better explain how to use the kirkwood kwbimage.cfg file. Linus Walleij (1): integrator: break out common config Lucas Stach (1): tegra20: usb: rework set_host_mode Marek Vasut (7): M28: Fix the use of gpmi-nand in mtdparts MX28: Cleanup mxsboot within make mrproper MX28: Fixup the ad-hoc use of DIGCTL_MICROSECONDS SCSPS1: Enable caches MX28: SPI: Fix the DMA DCache race condition MX28: SPI: Fix the DMA chaining MX28: MMC: Avoid DMA DCache race condition Markus Hubig (2): arm: Adds board_postclk_init to the init_sequence. Fixes the crippled console output on PortuxG20. Matt Sealey (1): efikamx: refine USB support Michael Walle (1): lsxl: support power switch Otavio Salvador (3): MX28: mx28evk: Align SSP clock speed MX28: mx28evk: Enable SPI DMA mx28evk: extend default environment Simon Glass (5): nand: Try to align the default buffers tegra: Add NAND support to funcmux tegra: fdt: Add NAND controller binding and definitions tegra: fdt: Add NAND definitions to fdt tegra: Enable NAND on Seaboard Stefano Babic (12): OMAP3: tam3517: add function to read MAC from EEPROM OMAP3: twister : get MAC address from EEPROM OMAP3: mt_ventoux: Correct board pinmux OMAP3: mt_ventoux: activate GPIO4 OMAP3: mt_ventoux: read MAC address from EEPROM OMAP3: mt_ventoux: disable the buzzer at start-up video: drop duplicate set of DISPC_CONFIG register OMAP3: video: add macros to set display parameters OMAP3: mt_ventoux: added video support MX: set a common place to share code for Freescale i.MX MX35: mx35pdk: add support for MMC MX6: drop binary constants from iomux header Stephen Warren (6): tegra: enable NAND on Harmony mmc: detect boot sectors using EXT_CSD_BOOT_MULT too env_mmc: allow environment to be in an eMMC partition tegra: put eMMC environment into the boot sectors ARM: tegra: remove redundant mkdirs from board Makefiles ARM: tegra: fix Ventana standalone build Thierry Reding (2): cmd_nand: dump: Align data and OOB buffers tegra: Enable NAND on TEC Tom Rini (1): am33xx: Remove redundant timer config Tom Warren (2): Tegra: Change Tegra20 to Tegra in common code, prep for T30 NAND: MXS: include common.h first so cache.h is included in correct order Valentin Longchamp (4): km/arm: set SPI NOR Flash default parameters kw_spi: fix clock prescaler computation km/ivm: fix string len check to support 7 char board names arm/km: fix frequency of the SPI NOR Flash Makefile | 8 +- arch/arm/cpu/arm1136/mx31/generic.c | 12 +- arch/arm/cpu/arm1136/mx31/timer.c | 16 +- arch/arm/cpu/arm1136/mx35/generic.c | 90 +- arch/arm/cpu/arm1136/mx35/timer.c | 46 +- arch/arm/cpu/arm720t/tegra20/cpu.c | 8 +- arch/arm/cpu/arm926ejs/mx25/generic.c | 2 +- arch/arm/cpu/arm926ejs/mx25/timer.c | 16 +- arch/arm/cpu/arm926ejs/mxs/spl_boot.c | 8 +- arch/arm/cpu/arm926ejs/orion5x/cpu.c | 2 + arch/arm/cpu/armv7/am33xx/board.c | 20 - arch/arm/cpu/armv7/tegra20/cmd_enterrcm.c | 2 +- arch/arm/cpu/armv7/tegra20/usb.c | 37 +- arch/arm/cpu/tegra20-common/Makefile | 2 +- arch/arm/cpu/tegra20-common/ap20.c | 6 +- arch/arm/cpu/tegra20-common/board.c | 14 +- arch/arm/cpu/tegra20-common/funcmux.c | 7 + arch/arm/cpu/tegra20-common/warmboot.c | 14 +- arch/arm/cpu/tegra20-common/warmboot_avp.c | 2 +- arch/arm/dts/tegra20.dtsi | 7 + arch/arm/{cpu/armv7 => }/imx-common/Makefile | 4 +- arch/arm/{cpu/armv7 => }/imx-common/cmd_bmode.c | 0 arch/arm/{cpu/armv7 => }/imx-common/cpu.c | 0 .../imx-common/i2c.c => imx-common/i2c-mxv7.c} | 0 arch/arm/{cpu/armv7 => }/imx-common/iomux-v3.c | 0 arch/arm/{cpu/armv7 => }/imx-common/speed.c | 0 arch/arm/{cpu/armv7 => }/imx-common/timer.c | 0 arch/arm/include/asm/arch-kirkwood/spi.h | 1 + arch/arm/include/asm/arch-mx25/clock.h | 14 + arch/arm/include/asm/arch-mx31/clock.h | 14 + arch/arm/include/asm/arch-mx35/clock.h | 14 + arch/arm/include/asm/arch-mx35/crm_regs.h | 48 +- arch/arm/include/asm/arch-mx6/iomux.h | 124 +-- arch/arm/include/asm/arch-omap3/dss.h | 11 +- arch/arm/include/asm/arch-omap3/mux.h | 5 + arch/arm/include/asm/arch-tegra20/ap20.h | 3 - arch/arm/include/asm/arch-tegra20/funcmux.h | 3 + arch/arm/include/asm/arch-tegra20/mmc.h | 8 +- arch/arm/include/asm/arch-tegra20/sys_proto.h | 4 +- arch/arm/include/asm/arch-tegra20/tegra20.h | 13 +- .../arm/include/asm/arch-tegra20}/tegra_mmc.h | 12 +- arch/arm/include/asm/arch-tegra20/tegra_spi.h | 2 +- arch/arm/include/asm/arch-tegra20/timer.h | 4 +- arch/arm/lib/board.c | 3 + board/BuS/eb_cpux9k2/cpux9k2.c | 6 +- board/Marvell/sheevaplug/kwbimage.cfg | 4 +- board/avionic-design/common/tamonten.c | 2 +- board/avionic-design/dts/tegra20-tec.dts | 11 + board/buffalo/lsxl/lsxl.c | 22 +- board/compal/paz00/paz00.c | 4 +- board/compulab/trimslice/trimslice.c | 4 +- board/freescale/mx28evk/iomux.c | 2 +- board/freescale/mx28evk/mx28evk.c | 4 +- board/freescale/mx35pdk/README | 78 +- board/freescale/mx35pdk/mx35pdk.c | 25 + board/freescale/mx6qsabrelite/mx6qsabrelite.c | 24 +- board/genesi/mx51_efikamx/Makefile | 6 +- board/genesi/mx51_efikamx/efikamx-usb.c | 12 + board/genesi/mx51_efikamx/efikamx.c | 3 - board/keymile/common/ivm.c | 2 +- board/keymile/km_arm/km_arm.c | 20 - board/nvidia/common/board.c | 8 +- board/nvidia/dts/tegra20-harmony.dts | 10 + board/nvidia/dts/tegra20-seaboard.dts | 10 + board/nvidia/harmony/Makefile | 4 - board/nvidia/harmony/harmony.c | 4 +- board/nvidia/seaboard/Makefile | 4 - board/nvidia/seaboard/seaboard.c | 4 +- board/nvidia/ventana/Makefile | 4 +- board/nvidia/whistler/Makefile | 4 - board/nvidia/whistler/whistler.c | 4 +- board/taskit/stamp9g20/stamp9g20.c | 21 +- board/technexion/twister/twister.c | 10 + board/teejet/mt_ventoux/mt_ventoux.c | 113 +++ board/teejet/mt_ventoux/mt_ventoux.h | 80 +- boards.cfg | 3 +- common/cmd_nand.c | 4 +- common/env_mmc.c | 64 +- doc/README.kwbimage | 19 +- .../nand/nvidia,tegra20-nand.txt | 53 + drivers/gpio/tegra_gpio.c | 8 +- drivers/i2c/tegra_i2c.c | 12 +- drivers/input/Makefile | 2 +- drivers/mmc/mmc.c | 3 +- drivers/mmc/mxsmmc.c | 4 + drivers/mmc/tegra_mmc.c | 34 +- drivers/mtd/nand/Makefile | 1 + drivers/mtd/nand/mxs_nand.c | 2 +- drivers/mtd/nand/nand_base.c | 3 +- drivers/mtd/nand/tegra_nand.c | 1026 ++++++++++++++++++++ drivers/mtd/nand/tegra_nand.h | 257 +++++ drivers/spi/kirkwood_spi.c | 5 +- drivers/spi/mxs_spi.c | 58 +- drivers/spi/tegra_spi.c | 6 +- drivers/video/omap3_dss.c | 3 +- include/configs/eb_cpux9k2.h | 7 +- include/configs/edminiv2.h | 13 +- include/configs/flea3.h | 1 - include/configs/harmony.h | 19 +- include/configs/ima3-mx53.h | 3 +- include/configs/imx31_litekit.h | 1 - include/configs/imx31_phycore.h | 1 - include/configs/integrator-common.h | 103 ++ include/configs/integratorap.h | 49 +- include/configs/integratorcp.h | 115 +-- include/configs/km/keymile-common.h | 1 - include/configs/km/km_arm.h | 6 +- include/configs/m28evk.h | 4 +- include/configs/medcom.h | 6 +- include/configs/mt_ventoux.h | 17 + include/configs/mx25pdk.h | 1 - include/configs/mx28evk.h | 86 +- include/configs/mx31ads.h | 2 - include/configs/mx31pdk.h | 2 - include/configs/mx35pdk.h | 18 +- include/configs/paz00.h | 9 +- include/configs/plutux.h | 6 +- include/configs/qong.h | 2 - include/configs/sc_sps_1.h | 2 - include/configs/seaboard.h | 30 +- include/configs/stamp9g20.h | 1 + include/configs/tam3517-common.h | 66 ++ include/configs/tec.h | 18 +- .../{tegra20-common-post.h => tegra-common-post.h} | 12 +- include/configs/tegra20-common.h | 14 +- include/configs/trimslice.h | 8 +- include/configs/tt01.h | 2 - include/configs/ventana.h | 9 +- include/configs/whistler.h | 11 +- include/configs/zmx25.h | 1 - include/fdtdec.h | 1 + include/linux/mtd/nand.h | 7 +- include/mmc.h | 1 + lib/fdtdec.c | 1 + 134 files changed, 2522 insertions(+), 816 deletions(-) rename arch/arm/{cpu/armv7 => }/imx-common/Makefile (94%) rename arch/arm/{cpu/armv7 => }/imx-common/cmd_bmode.c (100%) rename arch/arm/{cpu/armv7 => }/imx-common/cpu.c (100%) rename arch/arm/{cpu/armv7/imx-common/i2c.c => imx-common/i2c-mxv7.c} (100%) rename arch/arm/{cpu/armv7 => }/imx-common/iomux-v3.c (100%) rename arch/arm/{cpu/armv7 => }/imx-common/speed.c (100%) rename arch/arm/{cpu/armv7 => }/imx-common/timer.c (100%) rename {drivers/mmc => arch/arm/include/asm/arch-tegra20}/tegra_mmc.h (96%) create mode 100644 doc/device-tree-bindings/nand/nvidia,tegra20-nand.txt create mode 100644 drivers/mtd/nand/tegra_nand.c create mode 100644 drivers/mtd/nand/tegra_nand.h create mode 100644 include/configs/integrator-common.h rename include/configs/{tegra20-common-post.h => tegra-common-post.h} (96%) Amicalement, -- Albert.

2 1

[U-Boot] [PATCH] disk: make get_partition_info() always available to disk.c
by Stephen Warren 22 Sep '12

22 Sep '12

From: Stephen Warren <swarren(a)nvidia.com> Now that get_device_and_partition() always calls get_partition_info() when disk.c is compiled, we must always compile the function, rather than ifdef it away. Technically, this change is required before Rob's "disk/part: introduce get_device_and_partition" patch. However, at least when the compiler optimizer is turned on, it isn't required before then in practice, since get_device_and_partition() calls get_dev(), which is stubbed out in disk.c under exactly the same conditions that get_partition_info() is not compiled, and hence the compiler never generates code for the call to the missing function. However, in my later patch "disk: get_device_and_partition() "auto" partition and cleanup", the optimizer doesn't succeed at this, and may attempt to reference the undefined function. Signed-off-by: Stephen Warren <swarren(a)nvidia.com> --- Rob, I wonder if you shouldn't squash this into your series. Then, I'll need to rebase mine on your again since this causes a few nasty conflicts with my series. disk/part.c | 109 +++++++++++++++++++++++++++++------------------------------ 1 files changed, 54 insertions(+), 55 deletions(-) diff --git a/disk/part.c b/disk/part.c index 76f3939..d2ace50 100644 --- a/disk/part.c +++ b/disk/part.c @@ -291,61 +291,6 @@ void init_part (block_dev_desc_t * dev_desc) } -int get_partition_info (block_dev_desc_t *dev_desc, int part - , disk_partition_t *info) -{ - switch (dev_desc->part_type) { -#ifdef CONFIG_MAC_PARTITION - case PART_TYPE_MAC: - if (get_partition_info_mac(dev_desc,part,info) == 0) { - PRINTF ("## Valid MAC partition found ##\n"); - return (0); - } - break; -#endif - -#ifdef CONFIG_DOS_PARTITION - case PART_TYPE_DOS: - if (get_partition_info_dos(dev_desc,part,info) == 0) { - PRINTF ("## Valid DOS partition found ##\n"); - return (0); - } - break; -#endif - -#ifdef CONFIG_ISO_PARTITION - case PART_TYPE_ISO: - if (get_partition_info_iso(dev_desc,part,info) == 0) { - PRINTF ("## Valid ISO boot partition found ##\n"); - return (0); - } - break; -#endif - -#ifdef CONFIG_AMIGA_PARTITION - case PART_TYPE_AMIGA: - if (get_partition_info_amiga(dev_desc, part, info) == 0) - { - PRINTF ("## Valid Amiga partition found ##\n"); - return (0); - } - break; -#endif - -#ifdef CONFIG_EFI_PARTITION - case PART_TYPE_EFI: - if (get_partition_info_efi(dev_desc,part,info) == 0) { - PRINTF ("## Valid EFI partition found ##\n"); - return (0); - } - break; -#endif - default: - break; - } - return (-1); -} - static void print_part_header (const char *type, block_dev_desc_t * dev_desc) { puts ("\nPartition Map for "); @@ -433,3 +378,57 @@ void print_part (block_dev_desc_t * dev_desc) #endif #endif + +int get_partition_info(block_dev_desc_t *dev_desc, int part + , disk_partition_t *info) +{ + switch (dev_desc->part_type) { +#ifdef CONFIG_MAC_PARTITION + case PART_TYPE_MAC: + if (get_partition_info_mac(dev_desc, part, info) == 0) { + PRINTF("## Valid MAC partition found ##\n"); + return 0; + } + break; +#endif + +#ifdef CONFIG_DOS_PARTITION + case PART_TYPE_DOS: + if (get_partition_info_dos(dev_desc, part, info) == 0) { + PRINTF("## Valid DOS partition found ##\n"); + return 0; + } + break; +#endif + +#ifdef CONFIG_ISO_PARTITION + case PART_TYPE_ISO: + if (get_partition_info_iso(dev_desc, part, info) == 0) { + PRINTF("## Valid ISO boot partition found ##\n"); + return 0; + } + break; +#endif + +#ifdef CONFIG_AMIGA_PARTITION + case PART_TYPE_AMIGA: + if (get_partition_info_amiga(dev_desc, part, info) == 0) { + PRINTF("## Valid Amiga partition found ##\n"); + return 0; + } + break; +#endif + +#ifdef CONFIG_EFI_PARTITION + case PART_TYPE_EFI: + if (get_partition_info_efi(dev_desc, part, info) == 0) { + PRINTF("## Valid EFI partition found ##\n"); + return 0; + } + break; +#endif + default: + break; + } + return -1; +} -- 1.7.0.4

1 1

[U-Boot] [PATCH] video/powerpc: don't touch DIU registers that we don't need
by Timur Tabi 21 Sep '12

21 Sep '12

Several DIU registers were being initialized either unnecessarily or to wrong values. 1) All interrupts were enabled even though there's no interrupt handler. Interrupts were left enabled when booting Linux. 2) Don't configure a dummy area descriptor, since we don't support ADs in U-Boot. 3) Don't configure any write-back buffer registers, since we don't use that mode. 4) The default values for the THRESHOLDS, SYN_POL, and PLUT registers should be used, so don't touch those registers either. Signed-off-by: Timur Tabi <timur(a)freescale.com> --- drivers/video/fsl_diu_fb.c | 21 ++------------------- 1 files changed, 2 insertions(+), 19 deletions(-) diff --git a/drivers/video/fsl_diu_fb.c b/drivers/video/fsl_diu_fb.c index 648ffa3..a98cb67 100644 --- a/drivers/video/fsl_diu_fb.c +++ b/drivers/video/fsl_diu_fb.c @@ -271,7 +271,6 @@ int fsl_diu_init(u16 xres, u16 yres, u32 pixel_format, int gamma_fix) struct diu *hw = (struct diu *)CONFIG_SYS_DIU_ADDR; u8 *gamma_table_base; unsigned int i, j; - struct diu_ad *dummy_ad; struct diu_addr gamma; struct diu_addr cursor; @@ -302,14 +301,6 @@ int fsl_diu_init(u16 xres, u16 yres, u32 pixel_format, int gamma_fix) return -1; } - /* The AD struct for the dummy framebuffer and the FB itself */ - dummy_ad = allocate_fb(2, 4, 4, NULL); - if (!dummy_ad) { - printf("DIU: Out of memory\n"); - return -1; - } - dummy_ad->pix_fmt = 0x88883316; - /* read mode info */ info.var.xres = fsl_diu_mode_db->xres; info.var.yres = fsl_diu_mode_db->yres; @@ -376,10 +367,7 @@ int fsl_diu_init(u16 xres, u16 yres, u32 pixel_format, int gamma_fix) out_be32(&hw->gamma, gamma.paddr); out_be32(&hw->cursor, cursor.paddr); out_be32(&hw->bgnd, 0x007F7F7F); - out_be32(&hw->bgnd_wb, 0); out_be32(&hw->disp_size, info.var.yres << 16 | info.var.xres); - out_be32(&hw->wb_size, 0); - out_be32(&hw->wb_mem_addr, 0); out_be32(&hw->hsyn_para, info.var.left_margin << 22 | info.var.hsync_len << 11 | info.var.right_margin); @@ -388,18 +376,13 @@ int fsl_diu_init(u16 xres, u16 yres, u32 pixel_format, int gamma_fix) info.var.vsync_len << 11 | info.var.lower_margin); - out_be32(&hw->syn_pol, 0); - out_be32(&hw->thresholds, 0x00037800); - out_be32(&hw->int_status, 0); - out_be32(&hw->int_mask, 0); - out_be32(&hw->plut, 0x01F5F666); /* Pixel Clock configuration */ diu_set_pixel_clock(info.var.pixclock); /* Set the frame buffers */ out_be32(&hw->desc[0], virt_to_phys(ad)); - out_be32(&hw->desc[1], virt_to_phys(dummy_ad)); - out_be32(&hw->desc[2], virt_to_phys(dummy_ad)); + out_be32(&hw->desc[1], 0); + out_be32(&hw->desc[2], 0); /* Enable the DIU, set display to all three planes */ out_be32(&hw->diu_mode, 1); -- 1.7.3.4

2 1

[U-Boot] [PATCH V2] common/lcd: add protection from null bmp pointer
by Nikita Kiryanov 21 Sep '12

21 Sep '12

If the bmp pointer is null then U-Boot will get stuck when trying to load the image. What's worse, it will get stuck before the U-Boot shell becomes available to the user, thus making it difficult to correct the situation. To protect from the above scenario, check if the pointer is valid. Signed-off-by: Nikita Kiryanov <nikita(a)compulab.co.il> --- This patch depends on the following patch: patchwork.ozlabs.org/patch/176058/ Changes in V2: - Previous commit message gave an incorrect example of when bmp pointer could be null, and was therefore removed. common/lcd.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/common/lcd.c b/common/lcd.c index 88dfa51..fcc09ac 100644 --- a/common/lcd.c +++ b/common/lcd.c @@ -674,7 +674,7 @@ int lcd_display_bitmap(ulong bmp_image, int x, int y) unsigned long pwidth = panel_info.vl_col; unsigned colors, bpix, bmp_bpix; - if (!((bmp->header.signature[0] == 'B') && + if (!bmp || !((bmp->header.signature[0] == 'B') && (bmp->header.signature[1] == 'M'))) { printf("Error: no valid bmp image at %lx\n", bmp_image); -- 1.7.5.4

2 1

[U-Boot] Please pull u-boot-ti/master
by Tom Rini 21 Sep '12

21 Sep '12

Hey Albert, The following changes since commit d193c1b6eb05041c94ad9aacd8c94189d1dbc5f8: Merge remote-tracking branch 'u-boot-imx/master' (2012-09-21 00:26:19 +0200) are available in the git repository at: git://git.denx.de/u-boot-ti master for you to fetch changes up to 2acdff706b6e762bac3d0f8ef20812e4d05e9a6b: am33xx: Fix fetching of mmc1 bootmode from bootrom for AM33XX (2012-09-20 16:46:35 -0700) ---------------------------------------------------------------- Andreas Bießmann (1): devkit8000: add rootwait to mmcboot option Bastian Ruppert (6): davinci: ea20: reorganisation LCD startup davinci: ea20: the console is always set to the serial line video: cfb_console: logo can be positioned via the splashpos variable video: cfb_console: add function to plot the logo area black da850/omap-l138: davinci_emac: Suppress auto negotiation if needed davinci: ea20: add some configs and default environmet variables Ilya Yanok (4): net/bootp: add VCI support for BOOTP also OMAP: spl: call timer_init() from SPL am335x_evm: enable networking in SPL OMAP: networking support for SPL Joel A Fernandes (1): am33xx: Fix fetching of mmc1 bootmode from bootrom for AM33XX arch/arm/cpu/armv7/omap-common/Makefile | 3 + arch/arm/cpu/armv7/omap-common/lowlevel_init.S | 6 +- arch/arm/cpu/armv7/omap-common/spl.c | 11 ++ arch/arm/cpu/armv7/omap-common/spl_net.c | 52 +++++++++ arch/arm/include/asm/omap_common.h | 13 ++- board/davinci/ea20/ea20.c | 32 ++++-- board/ti/beagle/beagle.c | 2 +- common/Makefile | 4 + common/cmd_nvedit.c | 8 ++ common/env_common.c | 7 +- drivers/net/davinci_emac.c | 3 +- drivers/video/cfb_console.c | 140 +++++++++++++++++++----- include/bootstage.h | 6 +- include/config_uncmd_spl.h | 44 ++++++++ include/configs/am335x_evm.h | 5 +- include/configs/devkit8000.h | 1 + include/configs/ea20.h | 108 +++++++++++------- lib/Makefile | 9 +- lib/hashtable.c | 2 + mkconfig | 1 + net/bootp.c | 27 ++++- spl/Makefile | 3 + 22 files changed, 391 insertions(+), 96 deletions(-) create mode 100644 arch/arm/cpu/armv7/omap-common/spl_net.c create mode 100644 include/config_uncmd_spl.h -- Tom

2 2