January 2012 - U-Boot

[U-Boot] Pull request: nand flash
by Scott Wood 11 Feb '12

11 Feb '12

These patches were posted before the close of the merge window. The following changes since commit 137703b811502dfea364650fb3e17f20b4c21333: overo: add SPL support (2012-01-16 08:40:13 +0100) are available in the git repository at: git://git.denx.de/u-boot-nand-flash.git master Christian Hitz (7): nand: Merge BCH code from Linux nand driver nand: Add more NAND types from Linux nand driver nand: cleanup whitespace nand: Merge changes from Linux nand driver nand: Merge changes to BBT from Linux nand driver nand: Sanitize ONFI strings. nand: make 1-bit software ECC configurable Scott Wood (4): NAND: Remove additional (CONFIG_SYS)_NAND_MAX_CHIPS nand_spl: store ecc data on the stack nand: Introduce CONFIG_SYS_NAND_SELF_INIT nand/fsl_elbc: Convert to self-init Shengzhou Liu (1): mtd/nand: Add ONFI support for FSL NAND controller Stefano Babic (1): nand_spl_simple: store ecc data on the stack Vladimir Zapolskiy (1): NAND: remove NAND_MAX_CHIPS definitions doc/README.nand | 62 ++ drivers/mtd/nand/Makefile | 3 +- drivers/mtd/nand/fsl_elbc_nand.c | 60 ++- drivers/mtd/nand/nand.c | 96 ++- drivers/mtd/nand/nand_base.c | 677 +++++++++++------ drivers/mtd/nand/nand_bbt.c | 427 ++++++++--- drivers/mtd/nand/nand_bch.c | 236 ++++++ drivers/mtd/nand/nand_ids.c | 35 + drivers/mtd/nand/nand_spl_simple.c | 42 +- include/configs/P1_P2_RDB.h | 3 +- include/configs/PMC440.h | 2 - include/configs/SIMPC8313.h | 3 +- include/configs/VCMA9.h | 1 - include/configs/acadia.h | 2 - include/configs/am3517_crane.h | 4 - include/configs/am3517_evm.h | 4 - include/configs/aria.h | 4 - include/configs/at91sam9m10g45ek.h | 1 - include/configs/bamboo.h | 2 - include/configs/bf526-ezbrd.h | 1 - include/configs/bf527-ad7160-eval.h | 1 - include/configs/bf527-ezkit.h | 1 - include/configs/bf548-ezkit.h | 1 - include/configs/cam_enc_4xx.h | 4 - include/configs/canyonlands.h | 2 - include/configs/cm-bf527.h | 1 - include/configs/cpu9260.h | 1 - include/configs/da830evm.h | 1 - include/configs/da850evm.h | 1 - include/configs/davinci_dm355leopard.h | 1 - include/configs/devkit8000.h | 5 - include/configs/ea20.h | 1 - include/configs/eb_cpux9k2.h | 1 - include/configs/enbw_cmc.h | 1 - include/configs/hawkboard.h | 6 +- include/configs/kilauea.h | 2 - include/configs/km/km_arm.h | 1 - include/configs/m28evk.h | 1 - include/configs/mecp5123.h | 2 - include/configs/mpc5121ads.h | 1 - include/configs/mv-common.h | 1 - include/configs/omap3_beagle.h | 4 - include/configs/omap3_evm.h | 4 - include/configs/omap3_evm_quick_nand.h | 4 - include/configs/pdm360ng.h | 2 - include/configs/pm9261.h | 1 - include/configs/pm9263.h | 1 - include/configs/pm9g45.h | 1 - include/configs/qi_lb60.h | 5 - include/configs/sequoia.h | 2 - include/configs/smdk2410.h | 1 - include/configs/smdk6400.h | 4 - include/configs/tam3517-common.h | 5 - include/configs/tnetv107x_evm.h | 1 - include/configs/tt01.h | 1 - include/linux/bch.h | 79 ++ include/linux/mtd/bbm.h | 25 +- include/linux/mtd/nand.h | 374 +++++---- include/linux/mtd/nand_bch.h | 72 ++ include/linux/mtd/nand_ecc.h | 25 + include/linux/string.h | 4 + include/nand.h | 16 + lib/Makefile | 1 + lib/bch.c | 1358 ++++++++++++++++++++++++++++++++ lib/string.c | 39 + nand_spl/nand_boot.c | 42 +- 66 files changed, 3082 insertions(+), 690 deletions(-) create mode 100644 drivers/mtd/nand/nand_bch.c create mode 100644 include/linux/bch.h create mode 100644 include/linux/mtd/nand_bch.h create mode 100644 lib/bch.c

2 1

[U-Boot] [i2c] Pull request
by Heiko Schocher 11 Feb '12

11 Feb '12

Hello Wolfgang, The following changes since commit 137703b811502dfea364650fb3e17f20b4c21333: overo: add SPL support (2012-01-16 08:40:13 +0100) are available in the git repository at: git://git.denx.de/u-boot-i2c.git master Patil, Rachna (3): ARM: I2C: I2C Multi byte address support ARM: AM33XX: Add AM33XX I2C driver support ARM: AM33XX: Add i2c support arch/arm/cpu/armv7/am33xx/clock.c | 5 + arch/arm/include/asm/arch-am33xx/common_def.h | 1 + arch/arm/include/asm/arch-am33xx/cpu.h | 3 +- arch/arm/include/asm/arch-am33xx/i2c.h | 81 +++++ board/ti/am335x/evm.c | 7 + board/ti/am335x/mux.c | 13 + drivers/i2c/omap24xx_i2c.c | 475 ++++++++++++++++--------- drivers/i2c/omap24xx_i2c.h | 2 + include/configs/am335x_evm.h | 9 + 9 files changed, 421 insertions(+), 175 deletions(-) create mode 100644 arch/arm/include/asm/arch-am33xx/i2c.h bye, Heiko -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany

2 1

[U-Boot] [PATCH 0/3 v3] devkit3250: add Timll DevKit3250 board initial support
by Vladimir Zapolskiy 10 Feb '12

10 Feb '12

This patchset adds generic NXP LPC32XX SoC support and basic support for Embest/Timll DevKit3250 board, which powered by this SoC. The patchset is done on top of u-boot/master branch. The general difference of this resent series from the previous ones is that high speed UART driver was added into support. Changes from v2 to v3 * renamed register structures from *_t to *_regs * renamed clkpwr.c file to clk.c * fixed bi_boot_params initialization * applied some cosmetic fixes Changes from v1 to v2: * setbits_le32() and similar helpers are used * added general arch_cpu_init() routine Vladimir Zapolskiy (3): arm926ejs: add NXP LPC32x0 cpu series support serial: add LPC32X0 high-speed UART devices support devkit3250: add Timll DevKit3250 board initial support MAINTAINERS | 4 + arch/arm/cpu/arm926ejs/lpc32xx/Makefile | 45 +++++++ arch/arm/cpu/arm926ejs/lpc32xx/clk.c | 117 +++++++++++++++++ arch/arm/cpu/arm926ejs/lpc32xx/cpu.c | 70 ++++++++++ arch/arm/cpu/arm926ejs/lpc32xx/devices.c | 52 ++++++++ arch/arm/cpu/arm926ejs/lpc32xx/timer.c | 90 +++++++++++++ arch/arm/include/asm/arch-lpc32xx/clk.h | 170 +++++++++++++++++++++++++ arch/arm/include/asm/arch-lpc32xx/config.h | 76 +++++++++++ arch/arm/include/asm/arch-lpc32xx/cpu.h | 64 +++++++++ arch/arm/include/asm/arch-lpc32xx/emc.h | 92 +++++++++++++ arch/arm/include/asm/arch-lpc32xx/sys_proto.h | 25 ++++ arch/arm/include/asm/arch-lpc32xx/timer.h | 74 +++++++++++ arch/arm/include/asm/arch-lpc32xx/uart.h | 114 +++++++++++++++++ arch/arm/include/asm/arch-lpc32xx/wdt.h | 51 ++++++++ board/timll/devkit3250/Makefile | 44 +++++++ board/timll/devkit3250/devkit3250.c | 65 ++++++++++ boards.cfg | 1 + drivers/serial/Makefile | 1 + drivers/serial/lpc32xx_hsuart.c | 112 ++++++++++++++++ include/configs/devkit3250.h | 117 +++++++++++++++++ 20 files changed, 1384 insertions(+), 0 deletions(-) create mode 100644 arch/arm/cpu/arm926ejs/lpc32xx/Makefile create mode 100644 arch/arm/cpu/arm926ejs/lpc32xx/clk.c create mode 100644 arch/arm/cpu/arm926ejs/lpc32xx/cpu.c create mode 100644 arch/arm/cpu/arm926ejs/lpc32xx/devices.c create mode 100644 arch/arm/cpu/arm926ejs/lpc32xx/timer.c create mode 100644 arch/arm/include/asm/arch-lpc32xx/clk.h create mode 100644 arch/arm/include/asm/arch-lpc32xx/config.h create mode 100644 arch/arm/include/asm/arch-lpc32xx/cpu.h create mode 100644 arch/arm/include/asm/arch-lpc32xx/emc.h create mode 100644 arch/arm/include/asm/arch-lpc32xx/sys_proto.h create mode 100644 arch/arm/include/asm/arch-lpc32xx/timer.h create mode 100644 arch/arm/include/asm/arch-lpc32xx/uart.h create mode 100644 arch/arm/include/asm/arch-lpc32xx/wdt.h create mode 100644 board/timll/devkit3250/Makefile create mode 100644 board/timll/devkit3250/devkit3250.c create mode 100644 drivers/serial/lpc32xx_hsuart.c create mode 100644 include/configs/devkit3250.h -- 1.7.5.4

3 9

[U-Boot] [PATCH] edminiv2: add hush parser and long help
by Albert ARIBAUD 10 Feb '12

10 Feb '12

Signed-off-by: Albert ARIBAUD <albert.u.boot(a)aribaud.net> --- include/configs/edminiv2.h | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/include/configs/edminiv2.h b/include/configs/edminiv2.h index 88d32b2..9134884 100644 --- a/include/configs/edminiv2.h +++ b/include/configs/edminiv2.h @@ -221,6 +221,13 @@ #define CONFIG_SYS_RESET_ADDRESS 0xffff0000 #define CONFIG_SYS_MAXARGS 16 +/* Use the HUSH parser */ +#define CONFIG_SYS_HUSH_PARSER +#define CONFIG_SYS_PROMPT_HUSH_PS2 "> " + +/* provide extensive help */ +#define CONFIG_SYS_LONGHELP + /* additions for new relocation code, must be added to all boards */ #define CONFIG_SYS_SDRAM_BASE 0 #define CONFIG_SYS_INIT_SP_ADDR \ -- 1.7.5.4

2 4

[U-Boot] [PATCH v2] net/eth.c: fix eth_write_hwaddr() to use dev->enetaddr as fall back
by Dirk Behme 10 Feb '12

10 Feb '12

From: Eric Miao <eric.miao(a)linaro.org> Ignore the return value of eth_getenv_enetaddr_by_index(), and if it fails, fall back to use dev->enetaddr, which could be filled up by the ethernet device driver: With the current code, introduced with below commit, eth_write_hwaddr() will fail immediately if there is no eth<n>addr in the environment variables. However, e.g. for an overo based product that uses the SMSC911x ethernet chip (with the MAC address set via EEPROM connected to the SMSC911x chip), the MAC address is still OK. On mx28 boards that are depending on the OCOTP bits to set the MAC address (like the Denx m28 board), the OCOTP bits should be used instead of failing on the environment variables. Actually, this was the original behavior, and was later changed by commit 7616e7850804c7c69e0a22c179dfcba9e8f3f587. Signed-off-by: Eric Miao <eric.miao(a)linaro.org> Acked-by: Simon Glass <sjg(a)chromium.org> Acked-by: Dirk Behme <dirk.behme(a)de.bosch.com> CC: Stefan Roese <sr(a)denx.de> CC: Eric Miao <eric.miao(a)linaro.org> CC: Wolfgang Denk <wd(a)denx.de> CC: Philip Balister <philip(a)balister.org> CC: Zach Sadecki <zach(a)itwatchdogs.com> --- v2: Correct the referenced commit ID and update the commit message. No functional change at the code itself. Note: This resend is based on my understanding from http://lists.denx.de/pipermail/u-boot/2012-January/116118.html Please let Eric and me know if I missed anything there. net/eth.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/net/eth.c b/net/eth.c index b4b9b43..451568f 100644 --- a/net/eth.c +++ b/net/eth.c @@ -175,8 +175,7 @@ int eth_write_hwaddr(struct eth_device *dev, const char *base_name, unsigned char env_enetaddr[6]; int ret = 0; - if (!eth_getenv_enetaddr_by_index(base_name, eth_number, env_enetaddr)) - return -1; + eth_getenv_enetaddr_by_index(base_name, eth_number, env_enetaddr); if (memcmp(env_enetaddr, "\0\0\0\0\0\0", 6)) { if (memcmp(dev->enetaddr, "\0\0\0\0\0\0", 6) && -- 1.7.0.4

2 6

[U-Boot] [PATCH v2 0/7] tegra: Add I2C driver and associated parts
by Simon Glass 09 Feb '12

09 Feb '12

This series brings in an I2C driver for Tegra which can be configured by a flat device tree. It supports 8- and 16-bit addresses and both the normal I2C ports and the DVC port (for controlling the power management unit (PMU)). Recent Linux bindings are used, based on example .dts files found in branch for-3.3/dt at: git://git.kernel.org/pub/scm/linux/kernel/git/olof/tegra.git (I could not find the actual binding documentation to include here) Changes in v2: - Adjust definitions to fit new peripheral clock bindings - Change 'speed' to 'clock-frequency' - Remove u-boot,pinmux binding (sadly) - Use DIV_ROUND_UP() instead of a home-grown macro - Tidy comment style - Change i2c array to static - Remove i2c configuring using CONFIG (use fdt instead) - Make i2c/dvc decision come from fdt - Use new fdtdec alias decode function - Simplify code in i2c_addr_ok() - Return an error if an unavailable i2c bus is selected - Add build warning if CONFIG_SYS_I2C_INIT_BOARD is not defined - Disable port 2 as it is not used Simon Glass (6): tegra: Rename NV_PA_PMC_BASE to TEGRA2_PMC_BASE fdt: Add function to allow aliases to refer to multiple nodes tegra: fdt: Add extra I2C bindings for U-Boot tegra: Initialise I2C on Nvidia boards tegra: Select I2C ordering for Seaboard tegra: Enable I2C on Seaboard Yen Lin (1): tegra: Add I2C driver arch/arm/cpu/armv7/tegra2/ap20.c | 10 +- arch/arm/cpu/armv7/tegra2/board.c | 2 +- arch/arm/dts/tegra20.dtsi | 10 +- arch/arm/include/asm/arch-tegra2/tegra2.h | 4 +- arch/arm/include/asm/arch-tegra2/tegra2_i2c.h | 160 +++++++ board/nvidia/common/board.c | 7 + board/nvidia/dts/tegra2-seaboard.dts | 10 + drivers/i2c/Makefile | 1 + drivers/i2c/tegra2_i2c.c | 551 +++++++++++++++++++++++++ include/configs/seaboard.h | 8 + include/fdtdec.h | 17 + lib/fdtdec.c | 18 +- 12 files changed, 785 insertions(+), 13 deletions(-) create mode 100644 arch/arm/include/asm/arch-tegra2/tegra2_i2c.h create mode 100644 drivers/i2c/tegra2_i2c.c -- 1.7.7.3

4 34

[U-Boot] [PATCH] SMDK5250: Add ethernet support
by Chander Kashyap 09 Feb '12

09 Feb '12

This patch enable support for SMC911X based ethernet device. Signed-off-by: Chander Kashyap <chander.kashyap(a)linaro.org> --- board/samsung/smdk5250/smdk5250.c | 89 +++++++++++++++++++++++++++++++++++++ include/configs/smdk5250.h | 13 +++++- 2 files changed, 100 insertions(+), 2 deletions(-) diff --git a/board/samsung/smdk5250/smdk5250.c b/board/samsung/smdk5250/smdk5250.c index 2684620..a1b1a48 100644 --- a/board/samsung/smdk5250/smdk5250.c +++ b/board/samsung/smdk5250/smdk5250.c @@ -31,10 +31,95 @@ DECLARE_GLOBAL_DATA_PTR; struct exynos5_gpio_part1 *gpio1; +static void smc9115_pre_init(void) +{ + u32 smc_bw_conf, smc_bc_conf; + int i; + + /* + * SROM:CS1 and EBI + * + * GPY0[0] SROM_CSn[0] + * GPY0[1] SROM_CSn[1](2) + * GPY0[2] SROM_CSn[2] + * GPY0[3] SROM_CSn[3] + * GPY0[4] EBI_OEn(2) + * GPY0[5] EBI_EEn(2) + * + * GPY1[0] EBI_BEn[0](2) + * GPY1[1] EBI_BEn[1](2) + * GPY1[2] SROM_WAIT(2) + * GPY1[3] EBI_DATA_RDn(2) + */ + s5p_gpio_cfg_pin(&gpio1->y0, CONFIG_ENV_SROM_BANK, GPIO_FUNC(2)); + s5p_gpio_cfg_pin(&gpio1->y0, 4, GPIO_FUNC(2)); + s5p_gpio_cfg_pin(&gpio1->y0, 5, GPIO_FUNC(2)); + + for (i = 0; i < 4; i++) + s5p_gpio_cfg_pin(&gpio1->y1, i, GPIO_FUNC(2)); + + /* + * EBI: 8 Addrss Lines + * + * GPY3[0] EBI_ADDR[0](2) + * GPY3[1] EBI_ADDR[1](2) + * GPY3[2] EBI_ADDR[2](2) + * GPY3[3] EBI_ADDR[3](2) + * GPY3[4] EBI_ADDR[4](2) + * GPY3[5] EBI_ADDR{5](2) + * GPY3[6] EBI_ADDR[6](2) + * GPY3[7] EBI_ADDR{7](2) + * + * EBI: 16 Data Lines + * + * GPY5[0] EBI_DATA[0](2) + * GPY5[1] EBI_DATA[1](2) + * GPY5[2] EBI_DATA[2](2) + * GPY5[3] EBI_DATA[3](2) + * GPY5[4] EBI_DATA[4](2) + * GPY5[5] EBI_DATA{5](2) + * GPY5[6] EBI_DATA[6](2) + * GPY5[7] EBI_DATA{7](2) + * + * GPY6[0] EBI_DATA[8](2) + * GPY6[1] EBI_DATA[9](2) + * GPY6[2] EBI_DATA[10](2) + * GPY6[3] EBI_DATA110](2) + * GPY6[4] EBI_DATA[12](2) + * GPY6[5] EBI_DATA{13](2) + * GPY6[6] EBI_DATA[14](2) + * GPY6[7] EBI_DATA{15](2) + */ + for (i = 0; i < 8; i++) { + s5p_gpio_cfg_pin(&gpio1->y3, i, GPIO_FUNC(2)); + s5p_gpio_set_pull(&gpio1->y3, i, GPIO_PULL_UP); + + s5p_gpio_cfg_pin(&gpio1->y5, i, GPIO_FUNC(2)); + s5p_gpio_set_pull(&gpio1->y5, i, GPIO_PULL_UP); + + s5p_gpio_cfg_pin(&gpio1->y6, i, GPIO_FUNC(2)); + s5p_gpio_set_pull(&gpio1->y6, i, GPIO_PULL_UP); + } + + /* Ethernet needs data bus width of 16 bits */ + smc_bw_conf = SROMC_DATA16_WIDTH(CONFIG_ENV_SROM_BANK) + | SROMC_BYTE_ENABLE(CONFIG_ENV_SROM_BANK); + + smc_bc_conf = SROMC_BC_TACS(0x01) | SROMC_BC_TCOS(0x01) + | SROMC_BC_TACC(0x06) | SROMC_BC_TCOH(0x01) + | SROMC_BC_TAH(0x0C) | SROMC_BC_TACP(0x09) + | SROMC_BC_PMC(0x01); + + /* Select and configure the SROMC bank */ + s5p_config_sromc(CONFIG_ENV_SROM_BANK, smc_bw_conf, smc_bc_conf); +} + int board_init(void) { gpio1 = (struct exynos5_gpio_part1 *) samsung_get_base_gpio_part1(); + smc9115_pre_init(); + gd->bd->bi_boot_params = (PHYS_SDRAM_1 + 0x100UL); return 0; } @@ -79,6 +164,10 @@ void dram_init_banksize(void) gd->bd->bi_dram[7].size = get_ram_size((long *)PHYS_SDRAM_8, \ PHYS_SDRAM_8_SIZE); } +int board_eth_init(bd_t *bis) +{ + return smc911x_initialize(0, CONFIG_SMC911X_BASE); +} #ifdef CONFIG_DISPLAY_BOARDINFO int checkboard(void) diff --git a/include/configs/smdk5250.h b/include/configs/smdk5250.h index 6f2ef4c..4ad4bd2 100644 --- a/include/configs/smdk5250.h +++ b/include/configs/smdk5250.h @@ -98,8 +98,7 @@ #define CONFIG_CMD_MMC #define CONFIG_CMD_EXT2 #define CONFIG_CMD_FAT -#undef CONFIG_CMD_NET -#undef CONFIG_CMD_NFS +#define CONFIG_CMD_NET #define CONFIG_BOOTDELAY 3 #define CONFIG_ZERO_BOOTDELAY_CHECK @@ -196,6 +195,16 @@ #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_LOAD_ADDR - 0x1000000) #define MMC_MAX_CHANNEL 5 +/* Ethernet Controllor Driver */ +#ifdef CONFIG_CMD_NET +#define CONFIG_NET_MULTI +#define CONFIG_SMC911X +#define CONFIG_SMC911X_BASE 0x5000000 +#define CONFIG_SMC911X_16_BIT +#define CONFIG_ENV_SROM_BANK 1 +#define CONFIG_ETHADDR "00:40:5c:26:0a:5b" +#endif /*CONFIG_CMD_NET*/ + /* Enable devicetree support */ #define CONFIG_OF_LIBFDT -- 1.7.5.4

3 4

[U-Boot] [PATCH] * Fix: watchdog timed out, if flash blank (0xFF) blocks
by Jens Scharsig (BuS Elektronik) 09 Feb '12

09 Feb '12

The current implementation of cfi_flash uses udelay to reset watchdog. If several blocks are blank (0xff filled) the watchdog timed out. The reason is, udelay is never called, if flash device is ready to fast. e.g. mw.w $(copy_addr) FFFF 10000;cp.b $(copy_addr) 10880000 20000 -> watchdog timed out mw.w $(copy_addr) 0000 10000;cp.b $(copy_addr) 10880000 20000 -> watchdog not timed out This patch adds an extra watchdog reset in front of flash ready check. Signed-off-by: Jens Scharsig (BuS Elektronik) <esw(a)bus-elektronik.de> --- drivers/mtd/cfi_flash.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/drivers/mtd/cfi_flash.c b/drivers/mtd/cfi_flash.c index 5494bcf..722c3fc 100644 --- a/drivers/mtd/cfi_flash.c +++ b/drivers/mtd/cfi_flash.c @@ -40,6 +40,7 @@ #include <asm/byteorder.h> #include <environment.h> #include <mtd/cfi_flash.h> +#include <watchdog.h> /* * This file implements a Common Flash Interface (CFI) driver for @@ -577,6 +578,7 @@ static int flash_status_check (flash_info_t * info, flash_sect_t sector, reset_timer(); #endif start = get_timer (0); + WATCHDOG_RESET(); while (flash_is_busy (info, sector)) { if (get_timer (start) > tout) { printf ("Flash %s timeout at address %lx data %lx\n", @@ -668,6 +670,7 @@ static int flash_status_poll(flash_info_t *info, void *src, void *dst, reset_timer(); #endif start = get_timer(0); + WATCHDOG_RESET(); while (1) { switch (info->portwidth) { case FLASH_CFI_8BIT: -- 1.7.3.4

2 1

[U-Boot] [PATCH V6 - Part 1 - 1/1] mx6q: define GPIO macros for translating between ordinals and port:index
by Eric Nelson 09 Feb '12

09 Feb '12

The interface to the mxc_gpio driver uses integer (ordinal) values to refer to all GPIOs on the i.MX processors. The registers themselves and much of the i.MX documentation are banked in groups of 32, and these macros allow the use of the port:index numbering for clarity. GPIO_NUMBER() converts to ordinal value from port:index GPIO_PORT() returns the port of an ordinal value GPIO_INDEX() returns the index or offset of the ordinal. Discussion on the mailing list at http://lists.denx.de/pipermail/u-boot/2012-January/116927.html Signed-off-by: Eric Nelson <eric.nelson(a)boundarydevices.com> --- arch/arm/include/asm/arch-mx6/imx-regs.h | 4 ++++ 1 files changed, 4 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 5227b44..8a9eeb4 100644 --- a/arch/arm/include/asm/arch-mx6/imx-regs.h +++ b/arch/arm/include/asm/arch-mx6/imx-regs.h @@ -164,6 +164,10 @@ #define IRAM_SIZE 0x00040000 #define IMX_IIM_BASE OCOTP_BASE_ADDR +#define GPIO_NUMBER(port, index) ((((port)-1)*32)+((index)&31)) +#define GPIO_TO_PORT(number) (((number)/32)+1) +#define GPIO_TO_INDEX(number) ((number)&31) + #if !(defined(__KERNEL_STRICT_NAMES) || defined(__ASSEMBLY__)) #include <asm/types.h> -- 1.7.1

5 34

[U-Boot] v2011.12 and later do not boot on dreamplug.
by Ian Campbell 09 Feb '12

09 Feb '12

v2011.12 hangs on boot on my dreamplug with: U-Boot 2011.12-dirty (Jan 08 2012 - 15:16:44) Marvell-DreamPlug SoC: Kirkwood 88F6281_A1 DRAM: 512 MiB WARNING: Caches not enabled I bisected it down to: commit ca4b55800ed74207c35271bf7335a092d4955416 Author: Heiko Schocher <hs(a)denx.de> Date: Wed Nov 9 20:06:23 2011 +0000 arm, arm926ejs: always do cpu critical inits always do the cpu critical inits in cpu_init_crit, and only jump to lowlevel_init, if CONFIG_SKIP_LOWLEVEL_INIT is not defined. Signed-off-by: Heiko Schocher <hs(a)denx.de> Cc: Albert ARIBAUD <albert.u.boot(a)aribaud.net> Cc: Wolfgang Denk <hs(a)denx.de> Cc: Sandeep Paulraj <s-paulraj(a)ti.com> Cc: Tom Rini <tom.rini(a)gmail.com> Cc: Christian Riesch <christian.riesch(a)omicron.at> and in particular the line orr r0, r0, #0x00000002 /* set bit 2 (A) Align */ Commenting out just that one line causes things to work. Is the error setting this bit or is it that there is a bug somewhere else which prevents us setting this bit? A different approach to the original patch was suggested in http://lists.denx.de/pipermail/u-boot/2011-December/112353.html and I suppose that combined with s/CONFIG_SKIP_LOWLEVEL_INIT/CONFIG_SKIP_CPU_INIT_CRIT/g in the relevant config files (at least include/configs/dreamplug.h, but perhaps everywhere except whichever platform caused this change?) would fix things. Thanks, Ian. -- Ian Campbell Q: How do you play religious roulette? A: You stand around in a circle and blaspheme and see who gets struck by lightning first.

4 12