June 2013 - U-Boot

[U-Boot] [PATCH 0/6] nds32: fix build errors/warnings
by Gabor Juhos 24 Jul '13

24 Jul '13

Using 'MAKEALL -a nds32' to build U-Boot images from the master branch of the git.denx.de/u-boot.git tree, throws the following errors/warnings: $ ./MAKEALL -a nds32 Configuring for adp-ag101 board... ftsdc010_mci.c:178: error: 'FTSDC010_DCR_FIFO_RST' undeclared (first use in this function) ftsdc010_mci.c:178: error: (Each undeclared identifier is reported only once ftsdc010_mci.c:178: error: for each function it appears in.) make[1]: *** [ftsdc010_mci.o] Error 1 make: *** [drivers/mmc/libmmc.o] Error 2 size: './u-boot': No such file ftsdc010_mci.c: In function 'ftsdc010_clkset': ftsdc010_mci.c:118: warning: implicit declaration of function 'setbits_le32' ftsdc010_mci.c:123: warning: implicit declaration of function 'clrbits_le32' ftsdc010_mci.c: In function 'ftsdc010_request': ftsdc010_mci.c:178: error: 'FTSDC010_DCR_FIFO_RST' undeclared (first use in this function) ftsdc010_mci.c:178: error: (Each undeclared identifier is reported only once ftsdc010_mci.c:178: error: for each function it appears in.) make[1]: *** [ftsdc010_mci.o] Error 1 make: *** [drivers/mmc/libmmc.o] Error 2 make: *** Waiting for unfinished jobs.... Configuring for adp-ag101p board... ftsdc010_mci.c:178: error: 'FTSDC010_DCR_FIFO_RST' undeclared (first use in this function) ftsdc010_mci.c:178: error: (Each undeclared identifier is reported only once ftsdc010_mci.c:178: error: for each function it appears in.) make[1]: *** [ftsdc010_mci.o] Error 1 make: *** [drivers/mmc/libmmc.o] Error 2 size: './u-boot': No such file ftsdc010_mci.c: In function 'ftsdc010_clkset': ftsdc010_mci.c:118: warning: implicit declaration of function 'setbits_le32' ftsdc010_mci.c:123: warning: implicit declaration of function 'clrbits_le32' ftsdc010_mci.c: In function 'ftsdc010_request': ftsdc010_mci.c:178: error: 'FTSDC010_DCR_FIFO_RST' undeclared (first use in this function) ftsdc010_mci.c:178: error: (Each undeclared identifier is reported only once ftsdc010_mci.c:178: error: for each function it appears in.) make[1]: *** [ftsdc010_mci.o] Error 1 make: *** [drivers/mmc/libmmc.o] Error 2 make: *** Waiting for unfinished jobs.... Configuring for adp-ag102 board... make: *** [u-boot] Error 1 size: './u-boot': No such file ftsdc010_mci.c: In function 'ftsdc010_clkset': ftsdc010_mci.c:118: warning: implicit declaration of function 'setbits_le32' ftsdc010_mci.c:123: warning: implicit declaration of function 'clrbits_le32' cmd_ide.c: In function '__ide_output_data': cmd_ide.c:548: warning: passing argument 2 of 'ide_write_data' discards qualifiers from pointer target type /devel/u-boot.git/include/ide.h:76: note: expected 'ulong *' but argument is of type 'const ulong *' adp-ag102.c: In function 'pci_init_board': adp-ag102.c:95: warning: function declaration isn't a prototype drivers/mmc/libmmc.o: In function `ftsdc010_request': /devel/u-boot.git/drivers/mmc/ftsdc010_mci.c:230: undefined reference to `setbits_le32' /devel/u-boot.git/drivers/mmc/ftsdc010_mci.c:239: undefined reference to `clrbits_le32' /devel/u-boot.git/drivers/mmc/ftsdc010_mci.c:245: undefined reference to `clrbits_le32' drivers/mmc/libmmc.o: In function `ftsdc010_clkset': /devel/u-boot.git/drivers/mmc/ftsdc010_mci.c:118: undefined reference to `clrbits_le32' /devel/u-boot.git/drivers/mmc/ftsdc010_mci.c:118: undefined reference to `clrbits_le32' /devel/u-boot.git/drivers/mmc/ftsdc010_mci.c:121: undefined reference to `setbits_le32' /devel/u-boot.git/drivers/mmc/ftsdc010_mci.c:121: undefined reference to `setbits_le32' /devel/u-boot.git/drivers/mmc/ftsdc010_mci.c:123: undefined reference to `setbits_le32' make: *** [u-boot] Error 1 --------------------- SUMMARY ---------------------------- Boards compiled: 3 Boards with errors: 3 ( adp-ag101 adp-ag101p adp-ag102 ) ---------------------------------------------------------- $ After the patches are applied, all images can be compiled without errors/warnings: $ ./MAKEALL -a nds32 Configuring for adp-ag101 board... text data bss dec hex filename 141801 6104 211752 359657 57ce9 ./u-boot Configuring for adp-ag101p board... text data bss dec hex filename 143897 6104 211752 361753 58519 ./u-boot Configuring for adp-ag102 board... text data bss dec hex filename 177369 6712 291592 475673 74219 ./u-boot --------------------- SUMMARY ---------------------------- Boards compiled: 3 ---------------------------------------------------------- $ Cc: Macpaul Lin <macpaul(a)andestech.com> Gabor Juhos (6): nds32: introduce macros for bit manipulation mmc: ftsdc010_mci: fix build error if CONFIG_FTSDC010_SDIO is not defined block: constify sect_buf argument of ide_write_data pci: add prototype for pci_ftpci_init() function pci: move pci_ftpci100.h to include/faraday/ftpci100.h nds32: adp-ag102: use 'faraday/ftpci100.h' for pci_ftpci_init arch/nds32/include/asm/io.h | 37 ++++++++++++++++++++ board/AndesTech/adp-ag102/adp-ag102.c | 3 +- doc/driver-model/UDM-block.txt | 2 +- drivers/block/ftide020.c | 2 +- drivers/mmc/ftsdc010_mci.c | 6 +++- drivers/pci/pci_ftpci100.c | 4 +-- .../pci_ftpci100.h => include/faraday/ftpci100.h | 2 ++ include/ide.h | 2 +- 8 files changed, 50 insertions(+), 8 deletions(-) rename drivers/pci/pci_ftpci100.h => include/faraday/ftpci100.h (98%) -- 1.7.10

3 12

[U-Boot] [PATCH] fs/ext4: caculate log2blksz from blksz, other its value = 0
by Lan Yixun (dlan) 19 Jul '13

19 Jul '13

From: "Lan Yixun (dlan)" <dennis.yxun(a)gmail.com> err: lt703a # ext4ls nand 3:0 Failed to mount ext2 filesystem... ** Unrecognized filesystem type ** bug may introduced by commit: commit 50ce4c07df1c98aabf4630b35152ed95a87242f7 Author: Egbert Eich <eich(a)suse.com> Date: Wed May 1 01:13:19 2013 +0000 fs/ext4: Support device block sizes != 512 bytes Signed-off-by: Lan Yixun (dlan) <dennis.yxun(a)gmail.com> --- disk/part.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/disk/part.c b/disk/part.c index fc8404d..dbc94c4 100644 --- a/disk/part.c +++ b/disk/part.c @@ -551,6 +551,8 @@ int get_device_and_partition(const char *ifname, const char *dev_part_str, goto cleanup; } + (*dev_desc)->log2blksz = LOG2((*dev_desc)->blksz); + info->start = 0; info->size = (*dev_desc)->lba; info->blksz = (*dev_desc)->blksz; @@ -634,6 +636,8 @@ int get_device_and_partition(const char *ifname, const char *dev_part_str, goto cleanup; } + (*dev_desc)->log2blksz = LOG2((*dev_desc)->blksz); + ret = part; goto cleanup; -- 1.8.2.1

3 4

[U-Boot] [PATCH v2 1/7] am33xx/omap3: Clean up gpmc_init slightly
by Tom Rini 17 Jul '13

17 Jul '13

We don't really need the gpmc_config, base and size variables and can just call enable_gpmc_cs_config more directly, like the boards which need to re-configure CS0 or CS1 do. Signed-off-by: Tom Rini <trini(a)ti.com> --- Changes in v2: - New patch --- arch/arm/cpu/armv7/am33xx/mem.c | 12 ++---------- arch/arm/cpu/armv7/omap3/mem.c | 18 ++++-------------- 2 files changed, 6 insertions(+), 24 deletions(-) diff --git a/arch/arm/cpu/armv7/am33xx/mem.c b/arch/arm/cpu/armv7/am33xx/mem.c index b86b0de..45f5426 100644 --- a/arch/arm/cpu/armv7/am33xx/mem.c +++ b/arch/arm/cpu/armv7/am33xx/mem.c @@ -75,11 +75,6 @@ void gpmc_init(void) /* putting a blanket check on GPMC based on ZeBu for now */ gpmc_cfg = (struct gpmc *)GPMC_BASE; -#ifdef CONFIG_CMD_NAND - const u32 *gpmc_config = NULL; - u32 base = 0; - u32 size = 0; -#endif /* global settings */ writel(0x00000008, &gpmc_cfg->sysconfig); writel(0x00000100, &gpmc_cfg->irqstatus); @@ -92,10 +87,7 @@ void gpmc_init(void) sdelay(1000); #ifdef CONFIG_CMD_NAND - gpmc_config = gpmc_m_nand; - - base = PISMO1_NAND_BASE; - size = PISMO1_NAND_SIZE; - enable_gpmc_cs_config(gpmc_config, &gpmc_cfg->cs[0], base, size); + enable_gpmc_cs_config(gpmc_m_nand, &gpmc_cfg->cs[0], + CONFIG_SYS_NAND_BASE, GPMC_SIZE_256M); #endif } diff --git a/arch/arm/cpu/armv7/omap3/mem.c b/arch/arm/cpu/armv7/omap3/mem.c index d04a5a1..6f65a73 100644 --- a/arch/arm/cpu/armv7/omap3/mem.c +++ b/arch/arm/cpu/armv7/omap3/mem.c @@ -113,11 +113,6 @@ void gpmc_init(void) { /* putting a blanket check on GPMC based on ZeBu for now */ gpmc_cfg = (struct gpmc *)GPMC_BASE; -#if defined(CONFIG_CMD_NAND) || defined(CONFIG_CMD_ONENAND) - const u32 *gpmc_config = NULL; - u32 base = 0; - u32 size = 0; -#endif u32 config = 0; /* global settings */ @@ -136,17 +131,12 @@ void gpmc_init(void) sdelay(1000); #if defined(CONFIG_CMD_NAND) /* CS 0 */ - gpmc_config = gpmc_m_nand; - - base = PISMO1_NAND_BASE; - size = PISMO1_NAND_SIZE; - enable_gpmc_cs_config(gpmc_config, &gpmc_cfg->cs[0], base, size); + enable_gpmc_cs_config(gpmc_m_nand, &gpmc_cfg->cs[0], PISMO1_NAND_BASE, + PISMO1_NAND_SIZE); #endif #if defined(CONFIG_CMD_ONENAND) - gpmc_config = gpmc_onenand; - base = PISMO1_ONEN_BASE; - size = PISMO1_ONEN_SIZE; - enable_gpmc_cs_config(gpmc_config, &gpmc_cfg->cs[0], base, size); + enable_gpmc_cs_config(gpmc_onenand, &gpmc_cfg->cs[0], PISMO1_ONEN_BASE, + PISMO1_ONEN_SIZE); #endif } -- 1.7.9.5

6 42

[U-Boot] [PATCH v7 0/5] Add gdsys ControlCenter Digital board
by dirk.eibach＠gdsys.cc 17 Jul '13

17 Jul '13

From: Dirk Eibach <dirk.eibach(a)gdsys.cc> Changes in v7: - access FPGA by C struct instead of base+offset - braces for multiline statement - clarify that boot commands are already NUL-terminated - insert some blank lines to serparate declarations and code - remove CONFIG_HDBOOT which was not used - remove unused controlcenterd entries from boards.cfg - undo .checkpatch.conf modification which was comitted by mistake Changes in v6: - Add CONFIG_PCI_INDIRECT_BRIDGE to controlcenterd.h - Add MAINTAINERS entry - drop "mpc85xx: Add CONFIG_RELEASE_CORE0_ONLY" and use mp_holdoff instead - rename CONFIG_ATMEL_TWI_TPM to CONFIG_TPM_ATMEL_TWI - rename drivers/tpm/atmel_twi_tpm.c to drivers/tpm/tpm_atmel_twi.c - replace DEBUG_ATMEL_TWI_TPM, simply use DEBUG - sort drivers/tpm/Makefile - timeout on waiting for TPM reply Changes in v5: - avoid probing dp501 i2c bridge addresses - fix i2c_probe Changes in v4: - consider CONFIG_CMD_BOOTM for all architectures Changes in v3: - fix email addresses Changes in v2: - configuration for SPI builds was missing - replace some numeric constants with named constants - style fixes (as shown by checkpatch.pl) in common/cmd_tpm.c and lib/tpm.c - whitespace fixes Dirk Eibach (3): Add Atmel I2C tpm Build arch/$ARCH/lib/bootm.o depending on CONFIG_CMD_BOOTM mpc85xx: Add gdsys ControlCenter Digital board Reinhard Pfau (2): tpm: add AUTH1 cmds for LoadKey2 and GetPubKey i2c: fsl_i2c: i2c_read(): dont try to write address w/ alen=0 MAINTAINERS | 3 +- README | 17 + arch/arm/lib/Makefile | 2 +- arch/avr32/lib/Makefile | 2 +- arch/m68k/lib/Makefile | 2 +- arch/microblaze/lib/Makefile | 2 +- arch/mips/lib/Makefile | 4 +- arch/nds32/lib/Makefile | 3 +- arch/nios2/lib/Makefile | 2 +- arch/openrisc/lib/Makefile | 2 +- arch/powerpc/lib/Makefile | 2 +- arch/sh/lib/Makefile | 2 +- arch/sparc/lib/Makefile | 3 +- arch/x86/lib/Makefile | 2 +- board/gdsys/common/Makefile | 1 + board/gdsys/common/dp501.c | 107 +++ board/gdsys/common/dp501.h | 30 + board/gdsys/p1022/Makefile | 37 + board/gdsys/p1022/controlcenterd-id.c | 1224 +++++++++++++++++++++++++++++++++ board/gdsys/p1022/controlcenterd-id.h | 29 + board/gdsys/p1022/controlcenterd.c | 425 ++++++++++++ board/gdsys/p1022/ddr.c | 71 ++ board/gdsys/p1022/diu.c | 87 +++ board/gdsys/p1022/law.c | 20 + board/gdsys/p1022/sdhc_boot.c | 63 ++ board/gdsys/p1022/tlb.c | 77 +++ boards.cfg | 4 + common/cmd_tpm.c | 100 +++ drivers/i2c/fsl_i2c.c | 9 +- drivers/tpm/Makefile | 1 + drivers/tpm/tpm_atmel_twi.c | 121 ++++ include/configs/controlcenterd.h | 522 ++++++++++++++ include/tpm.h | 174 +++++ lib/tpm.c | 351 +++++++++- 34 files changed, 3483 insertions(+), 18 deletions(-) create mode 100644 board/gdsys/common/dp501.c create mode 100644 board/gdsys/common/dp501.h create mode 100644 board/gdsys/p1022/Makefile create mode 100644 board/gdsys/p1022/controlcenterd-id.c create mode 100644 board/gdsys/p1022/controlcenterd-id.h create mode 100644 board/gdsys/p1022/controlcenterd.c create mode 100644 board/gdsys/p1022/ddr.c create mode 100644 board/gdsys/p1022/diu.c create mode 100644 board/gdsys/p1022/law.c create mode 100644 board/gdsys/p1022/sdhc_boot.c create mode 100644 board/gdsys/p1022/tlb.c create mode 100644 drivers/tpm/tpm_atmel_twi.c create mode 100644 include/configs/controlcenterd.h -- 1.8.3

3 11

[U-Boot] [PATCH v2] board/p1010rdb: add pin mux and sdhc support in any boot
by Shengzhou Liu 17 Jul '13

17 Jul '13

SDHC pins are multiplexed with IFC and ULPI interfaces. This patch intends to enable SDHC function in case of NOR/NAND/SPI boot aside from SD boot. If "esdhc" is configured in hwconfig, u-boot will configure multiplexing pins from default IFC to SDHC at runtime to enable SD function. And add minimal necessary mux command for ifc/sdhc/ulpi to conveniently configure multiplexing pins without reboot or updating u-boot. Signed-off-by: Shengzhou Liu <Shengzhou.Liu(a)freescale.com> --- v2: updated description. board/freescale/p1010rdb/p1010rdb.c | 128 +++++++++++++++++++++++++++++++++--- include/configs/P1010RDB.h | 11 ++-- 2 files changed, 125 insertions(+), 14 deletions(-) diff --git a/board/freescale/p1010rdb/p1010rdb.c b/board/freescale/p1010rdb/p1010rdb.c index 0c30d76..5a2f1f0 100644 --- a/board/freescale/p1010rdb/p1010rdb.c +++ b/board/freescale/p1010rdb/p1010rdb.c @@ -37,10 +37,8 @@ #include <asm/fsl_serdes.h> #include <asm/fsl_ifc.h> #include <asm/fsl_pci.h> - -#ifndef CONFIG_SDCARD #include <hwconfig.h> -#endif +#include <i2c.h> DECLARE_GLOBAL_DATA_PTR; @@ -49,6 +47,19 @@ DECLARE_GLOBAL_DATA_PTR; #define MUX_CPLD_TDM 0x01 #define MUX_CPLD_SPICS0_FLASH 0x00 #define MUX_CPLD_SPICS0_SLIC 0x02 +#define PMUXCR1_IFC_MASK 0x00ffff00 +#define PMUXCR1_SDHC_MASK 0x00fff000 +#define PMUXCR1_SDHC_ENABLE 0x00555000 +#define PMUXCR1_ULPI_MASK 0x00ffffc0 +#define PMUXCR1_ULPI_ENABLE 0x00aaaa80 + +enum { + MUX_TYPE_IFC, + MUX_TYPE_SDHC, + MUX_TYPE_ULPI, +}; + +uint pin_mux; #ifndef CONFIG_SDCARD struct cpld_data { @@ -262,6 +273,16 @@ void fdt_del_sdhc(void *blob) } } +void fdt_del_ifc(void *blob) +{ + int nodeoff = 0; + + while ((nodeoff = fdt_node_offset_by_compatible(blob, 0, + "fsl,ifc")) >= 0) { + fdt_del_node(blob, nodeoff); + } +} + void fdt_disable_uart1(void *blob) { int nodeoff; @@ -305,9 +326,13 @@ void ft_board_setup(void *blob, bd_t *bd) fdt_del_flexcan(blob); fdt_del_node_and_alias(blob, "ethernet2"); } -#ifndef CONFIG_SDCARD - /* disable sdhc due to sdhc bug */ - fdt_del_sdhc(blob); + + /* Delete IFC node as IFC pins are multiplexing with SDHC */ + if (pin_mux != MUX_TYPE_IFC) + fdt_del_ifc(blob); + else + fdt_del_sdhc(blob); + if (hwconfig_subarg_cmp("fsl_p1010mux", "tdm_can", "can")) { fdt_del_tdm(blob); fdt_del_spi_slic(blob); @@ -325,13 +350,72 @@ void ft_board_setup(void *blob, bd_t *bd) fdt_del_flexcan(blob); fdt_disable_uart1(blob); } -#endif } #endif +int config_pin_mux(int if_type) +{ + ccsr_gur_t __iomem *gur = (void *)(CONFIG_SYS_MPC85xx_GUTS_ADDR); + u8 tmp; + uint orig_bus = i2c_get_bus_num(); + + i2c_set_bus_num(CONFIG_SYS_PCA9557_BUS_NUM); + tmp = 0xf0; + if (i2c_write(CONFIG_SYS_I2C_PCA9557_ADDR, 3, 1, &tmp, 1) < 0) + goto wr_err; + + switch (if_type) { + case MUX_TYPE_IFC: + tmp = 0x01; + if (i2c_write(CONFIG_SYS_I2C_PCA9557_ADDR, 1, 1, &tmp, 1) < 0) + goto wr_err; + pin_mux = MUX_TYPE_IFC; + clrbits_be32(&gur->pmuxcr, PMUXCR1_IFC_MASK); + debug("pin mux is configured for IFC, SDHC disabled\n"); + break; + case MUX_TYPE_SDHC: + tmp = 0x05; + if (i2c_write(CONFIG_SYS_I2C_PCA9557_ADDR, 1, 1, &tmp, 1) < 0) + goto wr_err; + pin_mux = MUX_TYPE_SDHC; + clrsetbits_be32(&gur->pmuxcr, PMUXCR1_SDHC_MASK, + PMUXCR1_SDHC_ENABLE); + debug("pin mux is configured for SDHC, IFC disabled\n"); + break; + case MUX_TYPE_ULPI: + tmp = 0x06; + if (i2c_write(CONFIG_SYS_I2C_PCA9557_ADDR, 1, 1, &tmp, 1) < 0) + goto wr_err; + pin_mux = MUX_TYPE_ULPI; + clrsetbits_be32(&gur->pmuxcr, PMUXCR1_ULPI_MASK, + PMUXCR1_ULPI_ENABLE); + debug("pin mux is configured for ULPI, IFC & SDHC disabled\n"); + break; + default: + printf("wrong mux interface type\n"); + i2c_set_bus_num(orig_bus); + return -1; + } + i2c_set_bus_num(orig_bus); + return 0; +wr_err: + printf("pca9557: i2c write failed\n"); + i2c_set_bus_num(orig_bus); + return -1; +} + #ifndef CONFIG_SDCARD +void board_reset(void) +{ + /* mux to IFC to enable CPLD for reset */ + if (pin_mux != MUX_TYPE_IFC) + config_pin_mux(MUX_TYPE_IFC); +} +#endif + int misc_init_r(void) { +#ifndef CONFIG_SDCARD struct cpld_data *cpld_data = (void *)(CONFIG_SYS_CPLD_BASE); ccsr_gur_t *gur = (void *)(CONFIG_SYS_MPC85xx_GUTS_ADDR); @@ -355,6 +439,34 @@ int misc_init_r(void) out_8(&cpld_data->spi_cs0_sel, MUX_CPLD_SPICS0_FLASH); } + if (hwconfig("esdhc")) { + pin_mux = MUX_TYPE_SDHC; + config_pin_mux(MUX_TYPE_SDHC); + } +#else + pin_mux = MUX_TYPE_SDHC; +#endif return 0; } -#endif + +static int pin_mux_cmd(cmd_tbl_t *cmdtp, int flag, int argc, + char * const argv[]) +{ + if (argc < 2) + return CMD_RET_USAGE; + if (strcmp(argv[1], "ifc") == 0) + config_pin_mux(MUX_TYPE_IFC); + else if (strcmp(argv[1], "sdhc") == 0) + config_pin_mux(MUX_TYPE_SDHC); + else if (strcmp(argv[1], "ulpi") == 0) + config_pin_mux(MUX_TYPE_ULPI); + else + return CMD_RET_USAGE; + return 0; +} + +U_BOOT_CMD( + mux, 2, 0, pin_mux_cmd, + "configure multiplexing pin for IFC/SDHC/ULPI buses", + "bus_type[ifc/sdhc/ulpi] (e.g. mux sdhc)" +); diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h index 5185597..259bb6a 100644 --- a/include/configs/P1010RDB.h +++ b/include/configs/P1010RDB.h @@ -156,11 +156,9 @@ #define CONFIG_DDR_CLK_FREQ 66666666 /* DDRCLK on P1010 RDB */ #define CONFIG_SYS_CLK_FREQ 66666666 /* SYSCLK for P1010 RDB */ -#ifndef CONFIG_SDCARD #define CONFIG_MISC_INIT_R -#endif - #define CONFIG_HWCONFIG + /* * These can be toggled for performance analysis, otherwise use default. */ @@ -485,6 +483,8 @@ extern unsigned long get_sdram_size(void); #define CONFIG_SYS_I2C_SLAVE 0x7F #define CONFIG_SYS_I2C_OFFSET 0x3000 #define CONFIG_SYS_I2C2_OFFSET 0x3100 +#define CONFIG_SYS_I2C_PCA9557_ADDR 0x18 +#define CONFIG_SYS_PCA9557_BUS_NUM 0 /* I2C EEPROM */ #undef CONFIG_ID_EEPROM @@ -570,11 +570,10 @@ extern unsigned long get_sdram_size(void); #define CONFIG_LBA48 #endif /* #ifdef CONFIG_FSL_SATA */ -/* SD interface will only be available in case of SD boot */ #ifdef CONFIG_SDCARD -#define CONFIG_MMC -#define CONFIG_DEF_HWCONFIG esdhc +#define CONFIG_DEF_HWCONFIG esdhc #endif +#define CONFIG_MMC #ifdef CONFIG_MMC #define CONFIG_CMD_MMC -- 1.8.0

2 1

[U-Boot] [PATCH] common: remove unaligned access error in bootmenu_getoption()
by Lan Yixun (dlan) 16 Jul '13

16 Jul '13

From: "Lan Yixun (dlan)" <dennis.yxun(a)gmail.com> Some ARM compilers may emit code that makes unaligned accesses when faced with constructs such as: char name[12] = "bootmenu_"; same fix as commit: 064d55f8bc8d7d205ed0be6abb6717e92eeb7cad ========================================================= data abort MAYBE you should read doc/README.arm-unaligned-accesses pc : [<3ff4b60c>] lr : [<3ff4b7b0>] sp : 3f346a58 ip : 3ff9c8e6 fp : 02000060 r10: 00000000 r9 : 3df47fc0 r8 : 3f347f40 r7 : 00000000 r6 : 00000000 r5 : 00000003 r4 : 3f759140 r3 : 000003f0 r2 : 00000000 r1 : 000003f1 r0 : 00000000 Flags: nzCv IRQs on FIQs off Mode SVC_32 Resetting CPU ... ====================================================== Signed-off-by: Lan Yixun (dlan) <dennis.yxun(a)gmail.com> --- common/cmd_bootmenu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/cmd_bootmenu.c b/common/cmd_bootmenu.c index 7041273..d414c17 100644 --- a/common/cmd_bootmenu.c +++ b/common/cmd_bootmenu.c @@ -65,12 +65,12 @@ enum bootmenu_key { static char *bootmenu_getoption(unsigned short int n) { - char name[MAX_ENV_SIZE] = "bootmenu_"; + char name[MAX_ENV_SIZE]; if (n > MAX_COUNT) return NULL; - sprintf(name + 9, "%d", n); + sprintf(name, "bootmenu_%d", n); return getenv(name); } -- 1.8.2.1

2 1

Re: [U-Boot] [PATCH] Fix block device accesses beyond 2TiB
by Albert ARIBAUD 16 Jul '13

16 Jul '13

Hi Frédéric, On Sat, 22 Jun 2013 14:29:26 +0200, Frédéric Leroy <fredo(a)starox.org> wrote: > Hello Albert, Sascha, Marek > > Le 22/06/2013 12:07, Albert ARIBAUD a écrit : > > > Quick review looks OK. > > > > > > Best regards, > > > Marek Vasut > > > > Anyone could test Sascha's patch? Especially Frédédic, can you test it > > and see how this works with your enabling 64-bit LBA on LaCie kirkwood > > products? > > > > Amicalement, > > I applied Sascha patch with 64-bit LBA enabled. > I verifyed it by using the "ide read" command. > Logs are attached for u-boot tests, with and without the patch. > I added the output of dd of the same block on a linux machine in order > to verify the content. > There is still issues to access file on a ext fs beyond the 2.1 limit > (see end of logs). > > However, the patch issues no warning at compile time and fixes the ide > block layer. OK -- anyone has any idea why Sasha's patch fixes reading from "far" blocks but does not fix ex2ls? Frankly, I'd prefer it if the patch fixed it all. :) > Best regards, Amicalement, -- Albert.

5 9

[U-Boot] [PATCH v1 1/1] patman: README documentation nits
by Gerhard Sittig 16 Jul '13

16 Jul '13

the -t flag appears to have a different meaning now, refer to the --test option for the builtin unit test, and adjust a directory location (it's 'tools/patman' instead of 'tools/scripts/patman') Signed-off-by: Gerhard Sittig <gsi(a)denx.de> --- tools/patman/README | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/patman/README b/tools/patman/README index 8cffcd1..b26573a 100644 --- a/tools/patman/README +++ b/tools/patman/README @@ -452,12 +452,12 @@ Most of these are indicated by a TODO in the code. It would be nice if this could handle the In-reply-to side of things. -The tests are incomplete, as is customary. Use the -t flag to run them, +The tests are incomplete, as is customary. Use the --test flag to run them, and make sure you are in the tools/scripts/patman directory first: $ cd /path/to/u-boot - $ cd tools/scripts/patman - $ patman -t + $ cd tools/patman + $ patman --test Error handling doesn't always produce friendly error messages - e.g. putting an incorrect tag in a commit may provide a confusing message. -- 1.7.10.4

3 5

[U-Boot] [PATCH 2/2] PPC MPC83xx: Fix MPC8323ERDB build warning
by Wolfgang Denk 16 Jul '13

16 Jul '13

Fix: mpc8323erdb.c: In function 'mac_read_from_eeprom': mpc8323erdb.c:198:3: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] Signed-off-by: Wolfgang Denk <wd(a)denx.de> cc: Michael Barkowski <michael.barkowski(a)freescale.com> cc: Kim Phillips <kim.phillips(a)freescale.com> --- board/freescale/mpc8323erdb/mpc8323erdb.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/board/freescale/mpc8323erdb/mpc8323erdb.c b/board/freescale/mpc8323erdb/mpc8323erdb.c index f29b2f4..533cb08 100644 --- a/board/freescale/mpc8323erdb/mpc8323erdb.c +++ b/board/freescale/mpc8323erdb/mpc8323erdb.c @@ -195,7 +195,11 @@ int mac_read_from_eeprom(void) printf("\nEEPROM @ 0x%02x read FAILED!!!\n", CONFIG_SYS_I2C_EEPROM_ADDR); } else { - if (crc32(crc, buf, 24) == *(unsigned int *)&buf[24]) { + unsigned int crc_buf; + + memcpy(&crc_buf, &buf[24], sizeof(unsigned int)); + + if (crc32(crc, buf, 24) == crc_buf) { printf("Reading MAC from EEPROM\n"); for (i = 0; i < 4; i++) { if (memcmp(&buf[i * 6], "\0\0\0\0\0\0", 6)) { -- 1.7.11.7

5 14

[U-Boot] [ANN] v2013.07-rc2
by Tom Rini 16 Jul '13

16 Jul '13

Hey all, I've tagged and pushed v2013.07-rc2. A bit more over the place than I should have gone, but picked up a lot of things that have been outstanding for a while. The big thing is a refactor of the boot loop. Everything should be working right now, but please test. Related to this is the ability to have crytpographically signed images. It's like secure boot in UEFI land, but hopefully without the kerfuffle. If you've got changes outstanding still, please start gently poking custodians with patchwork links. I've got a good bit of stuff I need to deal with myself still, but please prod me all the same. Thanks all! -- Tom

7 16