February 2013 - U-Boot

[U-Boot] undefined/undocumented CONFIG_CMD_* macros in u-boot
by Robert P. J. Day 05 Feb '13

05 Feb '13

some time ago, i wrote some simple shell scripts that scanned the kernel source tree and identified oddities in configuration files -- things like Kconfig variables that were defined but never used, macros that were being tested but were never set, etc. i just tweaked one of those scripts to scan the u-boot tree to locate CONFIG_CMD_* variables that were being tested, but weren't "#defined" anywhere. nothing wrong with that, most of them are still documented and i've added at the bottom the fairly short output of those u-boot variables as well as their occurrence in the tree. they fall into three categories, with examples. here's one where there's no #define, but the variable is at least documented so no problem: ===== CONFIG_CMD_DS4510_RST drivers/misc/ds4510.c:#ifdef CONFIG_CMD_DS4510_RST drivers/misc/ds4510.c:#ifdef CONFIG_CMD_DS4510_RST drivers/misc/ds4510.c:#ifdef CONFIG_CMD_DS4510_RST README: CONFIG_CMD_DS4510_RST * ds4510 I2C rst command here's one where there's no #define, and apparently no documentation anywhere: ===== CONFIG_CMD_NAND_YAFFS common/cmd_nand.c:#ifdef CONFIG_CMD_NAND_YAFFS common/cmd_nand.c:#ifdef CONFIG_CMD_NAND_YAFFS drivers/mtd/nand/nand_util.c:#ifdef CONFIG_CMD_NAND_YAFFS drivers/mtd/nand/nand_util.c:#ifdef CONFIG_CMD_NAND_YAFFS include/configs/M54418TWR.h:#undef CONFIG_CMD_NAND_YAFFS finally, here's a case that looks like a reference to a command that was never added and thus represents pointless code: ===== CONFIG_CMD_FUSE arch/powerpc/cpu/mpc512x/iim.c:#ifdef CONFIG_CMD_FUSE arch/powerpc/cpu/mpc512x/iim.c:#endif /* CONFIG_CMD_FUSE */ board/esd/mecp5123/mecp5123.c:#if defined(CONFIG_IIM) || defined(CONFIG_CMD_FUSE) board/pdm360ng/pdm360ng.c:#if defined(CONFIG_IIM) || defined(CONFIG_CMD_FUSE) board/davedenx/aria/aria.c:#if defined(CONFIG_IIM) || defined(CONFIG_CMD_FUSE) board/freescale/mpc5121ads/mpc5121ads.c:#if defined(CONFIG_IIM) || defined(CONFIG_CMD_FUSE) include/configs/mecp5123.h:#undef CONFIG_CMD_FUSE include/configs/aria.h:#undef CONFIG_CMD_FUSE include/configs/mpc5121ads.h:#undef CONFIG_CMD_FUSE here's the full list -- not all that long: ===== CONFIG_CMD_DS4510_MEM drivers/misc/ds4510.c:#ifdef CONFIG_CMD_DS4510_MEM drivers/misc/ds4510.c:#ifdef CONFIG_CMD_DS4510_MEM drivers/misc/ds4510.c:#ifdef CONFIG_CMD_DS4510_MEM drivers/misc/ds4510.c:#ifdef CONFIG_CMD_DS4510_MEM drivers/misc/ds4510.c:#ifdef CONFIG_CMD_DS4510_MEM README: CONFIG_CMD_DS4510_MEM * ds4510 I2C eeprom/sram commansd ===== CONFIG_CMD_DS4510_RST drivers/misc/ds4510.c:#ifdef CONFIG_CMD_DS4510_RST drivers/misc/ds4510.c:#ifdef CONFIG_CMD_DS4510_RST drivers/misc/ds4510.c:#ifdef CONFIG_CMD_DS4510_RST README: CONFIG_CMD_DS4510_RST * ds4510 I2C rst command ===== CONFIG_CMD_ENV_CALLBACK common/cmd_nvedit.c:#if defined(CONFIG_CMD_ENV_CALLBACK) common/cmd_nvedit.c:#if defined(CONFIG_CMD_ENV_CALLBACK) common/cmd_nvedit.c:#if defined(CONFIG_CMD_ENV_CALLBACK) README: CONFIG_CMD_ENV_CALLBACK * display details about env callbacks ===== CONFIG_CMD_ENV_FLAGS common/cmd_nvedit.c:#if defined(CONFIG_CMD_ENV_FLAGS) common/cmd_nvedit.c:#if defined(CONFIG_CMD_ENV_FLAGS) common/cmd_nvedit.c:#if defined(CONFIG_CMD_ENV_FLAGS) common/env_flags.c:#ifdef CONFIG_CMD_ENV_FLAGS common/env_flags.c:#endif /* CONFIG_CMD_ENV_FLAGS */ include/env_flags.h:#ifdef CONFIG_CMD_ENV_FLAGS README: CONFIG_CMD_ENV_FLAGS * display details about env flags ===== CONFIG_CMD_FUSE arch/powerpc/cpu/mpc512x/iim.c:#ifdef CONFIG_CMD_FUSE arch/powerpc/cpu/mpc512x/iim.c:#endif /* CONFIG_CMD_FUSE */ board/esd/mecp5123/mecp5123.c:#if defined(CONFIG_IIM) || defined(CONFIG_CMD_FUSE) board/pdm360ng/pdm360ng.c:#if defined(CONFIG_IIM) || defined(CONFIG_CMD_FUSE) board/davedenx/aria/aria.c:#if defined(CONFIG_IIM) || defined(CONFIG_CMD_FUSE) board/freescale/mpc5121ads/mpc5121ads.c:#if defined(CONFIG_IIM) || defined(CONFIG_CMD_FUSE) include/configs/mecp5123.h:#undef CONFIG_CMD_FUSE include/configs/aria.h:#undef CONFIG_CMD_FUSE include/configs/mpc5121ads.h:#undef CONFIG_CMD_FUSE ===== CONFIG_CMD_LINK_LOCAL common/cmd_net.c:#if defined(CONFIG_CMD_LINK_LOCAL) common/cmd_net.c:#endif /* CONFIG_CMD_LINK_LOCAL */ doc/README.link-local:When CONFIG_CMD_LINK_LOCAL is defined in the board config file, doc/README.link-local:by env variables. It depends on CONFIG_CMD_LINK_LOCAL, CONFIG_CMD_DHCP, include/config_uncmd_spl.h:#undef CONFIG_CMD_LINK_LOCAL include/common.h: defined(CONFIG_CMD_LINK_LOCAL) lib/Makefile:COBJS-$(CONFIG_CMD_LINK_LOCAL) += rand.o net/arp.c:#ifdef CONFIG_CMD_LINK_LOCAL net/net.c:#if defined(CONFIG_CMD_LINK_LOCAL) net/link_local.h:#if defined(CONFIG_CMD_LINK_LOCAL) net/Makefile:COBJS-$(CONFIG_CMD_LINK_LOCAL) += link_local.o README: CONFIG_CMD_LINK_LOCAL * link-local IP address auto-configuration ===== CONFIG_CMD_MTDPARTS_SHOW_NET_SIZES common/cmd_mtdparts.c:#if defined(CONFIG_CMD_MTDPARTS_SHOW_NET_SIZES) common/cmd_mtdparts.c:#if defined(CONFIG_CMD_MTDPARTS_SHOW_NET_SIZES) common/cmd_mtdparts.c:#else /* !defined(CONFIG_CMD_MTDPARTS_SHOW_NET_SIZES) */ common/cmd_mtdparts.c:#endif /* defined(CONFIG_CMD_MTDPARTS_SHOW_NET_SIZES) */ ===== CONFIG_CMD_MTDPARTS_SPREAD common/cmd_mtdparts.c:#if defined(CONFIG_CMD_MTDPARTS_SPREAD) common/cmd_mtdparts.c:#endif /* CONFIG_CMD_MTDPARTS_SPREAD */ common/cmd_mtdparts.c:#if defined(CONFIG_CMD_MTDPARTS_SPREAD) common/cmd_mtdparts.c:#if defined(CONFIG_CMD_MTDPARTS_SPREAD) common/cmd_mtdparts.c:#if defined(CONFIG_CMD_MTDPARTS_SPREAD) common/cmd_mtdparts.c:#endif /* CONFIG_CMD_MTDPARTS_SPREAD */ common/cmd_mtdparts.c:#if defined(CONFIG_CMD_MTDPARTS_SPREAD) common/cmd_mtdparts.c:#if defined(CONFIG_CMD_MTDPARTS_SPREAD) common/cmd_mtdparts.c:#endif /* CONFIG_CMD_MTDPARTS_SPREAD */ drivers/mtd/mtdcore.c:#if defined(CONFIG_CMD_MTDPARTS_SPREAD) drivers/mtd/mtdcore.c:#endif /* defined(CONFIG_CMD_MTDPARTS_SPREAD) */ ===== CONFIG_CMD_NAND_TORTURE common/cmd_nand.c:#ifdef CONFIG_CMD_NAND_TORTURE common/cmd_nand.c:#ifdef CONFIG_CMD_NAND_TORTURE doc/README.nand: CONFIG_CMD_NAND_TORTURE doc/README.nand: Enabled by the CONFIG_CMD_NAND_TORTURE configuration option. drivers/mtd/nand/nand_util.c:#ifdef CONFIG_CMD_NAND_TORTURE ===== CONFIG_CMD_NAND_TRIMFFS common/cmd_nand.c:#ifdef CONFIG_CMD_NAND_TRIMFFS common/cmd_nand.c:#ifdef CONFIG_CMD_NAND_TRIMFFS doc/README.nand: Enabled by the CONFIG_CMD_NAND_TRIMFFS macro. This command will write to drivers/mtd/nand/nand_util.c:#ifdef CONFIG_CMD_NAND_TRIMFFS drivers/mtd/nand/nand_util.c:#ifdef CONFIG_CMD_NAND_TRIMFFS ===== CONFIG_CMD_NAND_YAFFS common/cmd_nand.c:#ifdef CONFIG_CMD_NAND_YAFFS common/cmd_nand.c:#ifdef CONFIG_CMD_NAND_YAFFS drivers/mtd/nand/nand_util.c:#ifdef CONFIG_CMD_NAND_YAFFS drivers/mtd/nand/nand_util.c:#ifdef CONFIG_CMD_NAND_YAFFS include/configs/M54418TWR.h:#undef CONFIG_CMD_NAND_YAFFS ===== CONFIG_CMD_SF_TEST common/cmd_sf.c:#ifdef CONFIG_CMD_SF_TEST common/cmd_sf.c:#endif /* CONFIG_CMD_SF_TEST */ common/cmd_sf.c:#ifdef CONFIG_CMD_SF_TEST common/cmd_sf.c:#ifdef CONFIG_CMD_SF_TEST README: CONFIG_CMD_SF_TEST ===== CONFIG_CMD_TFTPSRV common/cmd_net.c:#ifdef CONFIG_CMD_TFTPSRV include/config_uncmd_spl.h:#undef CONFIG_CMD_TFTPSRV net/tftp.c:#ifdef CONFIG_CMD_TFTPSRV net/tftp.c:#ifdef CONFIG_CMD_TFTPSRV net/tftp.c:#endif /* CONFIG_CMD_TFTPSRV */ net/net.c:#ifdef CONFIG_CMD_TFTPSRV net/tftp.h:#ifdef CONFIG_CMD_TFTPSRV README: CONFIG_CMD_TFTPSRV * TFTP transfer in server mode ===== CONFIG_CMD_TIMER common/cmd_misc.c:#ifdef CONFIG_CMD_TIMER README: CONFIG_CMD_TIMER * access to the system tick timer rday

1 0

[U-Boot] [PATCH] am33xx: Drop gpio0_7_pin_mux from phytec pcm051
by Tom Rini 05 Feb '13

05 Feb '13

This mux is not currently used and appears to be a carry-over from the am335x evm code. Cc: Lars Poeschel <poeschel(a)lemonage.de> Signed-off-by: Tom Rini <trini(a)ti.com> --- board/phytec/pcm051/mux.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/board/phytec/pcm051/mux.c b/board/phytec/pcm051/mux.c index 2cda331..4d3a1d5 100644 --- a/board/phytec/pcm051/mux.c +++ b/board/phytec/pcm051/mux.c @@ -63,11 +63,6 @@ static struct module_pin_mux spi0_pin_mux[] = { }; #endif -static struct module_pin_mux gpio0_7_pin_mux[] = { - {OFFSET(ecap0_in_pwm0_out), (MODE(7) | PULLUDEN)}, /* GPIO0_7 */ - {-1}, -}; - static struct module_pin_mux rmii1_pin_mux[] = { {OFFSET(mii1_crs), MODE(1) | RXACTIVE}, /* RMII1_CRS */ {OFFSET(mii1_rxerr), MODE(1) | RXACTIVE}, /* RMII1_RXERR */ -- 1.7.9.5

2 1

Re: [U-Boot] [PATCH] mvsata_ide.c: Correction of typo in comments
by Prafulla Wadaskar 05 Feb '13

05 Feb '13

> -----Original Message----- > From: Gray Remlin [mailto:gryrmln@gmail.com] > Sent: 05 February 2013 03:22 > To: u-boot(a)lists.denx.de > Cc: Prafulla Wadaskar > Subject: [PATCH] mvsata_ide.c: Correction of typo in comments > > Signed-off-by: Gray Remlin <gryrmln(a)gmail.com> > > diff --git a/drivers/block/mvsata_ide.c b/drivers/block/mvsata_ide.c > index a88d0f7..42c177f 100644 > --- a/drivers/block/mvsata_ide.c > +++ b/drivers/block/mvsata_ide.c > @@ -56,8 +56,8 @@ struct mvsata_port_registers { > * Sanity checks: > * - to compile at all, we need CONFIG_SYS_ATA_BASE_ADDR. > * - for ide_preinit to make sense, we need at least one of > - * CONFIG_SYS_ATA_IDE0_OFFSET or CONFIG_SYS_ATA_IDE0_OFFSET; > - * - for inde_preinit to be called, we need CONFIG_IDE_PREINIT. > + * CONFIG_SYS_ATA_IDE0_OFFSET or CONFIG_SYS_ATA_IDE1_OFFSET; > + * - for ide_preinit to be called, we need CONFIG_IDE_PREINIT. > * Fail with an explanation message if these conditions are not met. > * This is particularly important for CONFIG_IDE_PREINIT, because > * its lack would not cause a build error. Acked-by: Prafulla Wadaskar <prafulla(a)marvell.com> Regards... Prafulla . . .

1 0

[U-Boot] [PATCH v2 00/10] MIPS: initial support for emulated Malta board
by Gabor Juhos 05 Feb '13

05 Feb '13

This patch set adds initial support for the MIPS Malta CoreLV board emulated under Qemu. The patches are against the testing branch of the MIPS custodian tree. The changes since the previous version of the series are described in the individual patches. Gabor Juhos (10): MIPS: qemu-malta: add support for emulated MIPS Malta board MIPS: qemu-malta: add reset support MIPS: qemu-malta: enable flash support MIPS: import gt64120.h header from Linux 3.8-rc3 MIPS: qemu-malta: setup GT64120 registers as done by YAMON MIPS: qemu-malta: add PCI support net: pcnet: use pci_virt_to_mem to obtain buffer addresses MIPS: qemu-malta: bring up ethernet MIPS: bootm.c: add YAMON style Linux preparation/jump code MIPS: start.S: emulate REVISION register for qemu-malta arch/mips/cpu/mips32/start.S | 8 +- arch/mips/include/asm/gt64120.h | 550 ++++++++++++++++++++++++++++++++++++++ arch/mips/include/asm/malta.h | 23 ++ arch/mips/lib/bootm.c | 60 ++++- board/qemu-malta/Makefile | 48 ++++ board/qemu-malta/lowlevel_init.S | 70 +++++ board/qemu-malta/pci.c | 168 ++++++++++++ board/qemu-malta/qemu-malta.c | 37 +++ boards.cfg | 2 + drivers/net/pcnet.c | 2 +- include/configs/qemu-malta.h | 119 +++++++++ 11 files changed, 1083 insertions(+), 4 deletions(-) create mode 100644 arch/mips/include/asm/gt64120.h create mode 100644 arch/mips/include/asm/malta.h create mode 100644 board/qemu-malta/Makefile create mode 100644 board/qemu-malta/lowlevel_init.S create mode 100644 board/qemu-malta/pci.c create mode 100644 board/qemu-malta/qemu-malta.c create mode 100644 include/configs/qemu-malta.h -- 1.7.10

3 20

[U-Boot] [PATCH] cmd_df.c: Delete this clearly unused source file.
by Robert P. J. Day 05 Feb '13

05 Feb '13

Nothing appears to use or compile cmd_df.c anymore. Signed-off-by: Robert P. J. Day <rpjday(a)crashcourse.ca> --- hope this is the right format for deleting a file. diff --git a/common/cmd_df.c b/common/cmd_df.c deleted file mode 100644 index f7e5df3..0000000 --- a/common/cmd_df.c +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Command for accessing DataFlash. - * - * Copyright (C) 2008 Atmel Corporation - */ -#include <common.h> -#include <df.h> - -static int do_df(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) -{ - const char *cmd; - - /* need at least two arguments */ - if (argc < 2) - goto usage; - - cmd = argv[1]; - - if (strcmp(cmd, "init") == 0) { - df_init(0, 0, 1000000); - return 0; - } - - if (strcmp(cmd, "info") == 0) { - df_show_info(); - return 0; - } - -usage: - return CMD_RET_USAGE; -} - -U_BOOT_CMD( - sf, 2, 1, do_serial_flash, - "Serial flash sub-system", - "probe [bus:]cs - init flash device on given SPI bus and CS") -- ======================================================================== Robert P. J. Day Ottawa, Ontario, CANADA http://crashcourse.ca Twitter: http://twitter.com/rpjday LinkedIn: http://ca.linkedin.com/in/rpjday ========================================================================

1 0

[U-Boot] [PATCH] cmd_mtdparts.c: Correct "reseting" to "resetting" in error msgs
by Robert P. J. Day 05 Feb '13

05 Feb '13

Signed-off-by: Robert P. J. Day <rpjday(a)crashcourse.ca> --- diff --git a/common/cmd_mtdparts.c b/common/cmd_mtdparts.c index 06fc171..7398371 100644 --- a/common/cmd_mtdparts.c +++ b/common/cmd_mtdparts.c @@ -1422,7 +1422,7 @@ static int delete_partition(const char *id) return 1; if (generate_mtdparts_save(last_parts, MTDPARTS_MAXLEN) != 0) { - printf("generated mtdparts too long, reseting to null\n"); + printf("generated mtdparts too long, resetting to null\n"); return 1; } return 0; @@ -1520,7 +1520,7 @@ static int spread_partitions(void) index_partitions(); if (generate_mtdparts_save(last_parts, MTDPARTS_MAXLEN) != 0) { - printf("generated mtdparts too long, reseting to null\n"); + printf("generated mtdparts too long, resetting to null\n"); return 1; } return 0; @@ -2018,7 +2018,7 @@ static int do_mtdparts(cmd_tbl_t *cmdtp, int flag, int argc, } if (generate_mtdparts_save(last_parts, MTDPARTS_MAXLEN) != 0) { - printf("generated mtdparts too long, reseting to null\n"); + printf("generated mtdparts too long, resetting to null\n"); return 1; } -- ======================================================================== Robert P. J. Day Ottawa, Ontario, CANADA http://crashcourse.ca Twitter: http://twitter.com/rpjday LinkedIn: http://ca.linkedin.com/in/rpjday ========================================================================

1 0

[U-Boot] Please pull u-boot-x86.git
by Simon Glass 04 Feb '13

04 Feb '13

Hi Tom, Here are the patman changes. I have left that ones that buildman requires for now, since they are not needed for patman. The following changes since commit 6ad77d88e57f6ab815ec7e85c5ac329054318c73: vfat: Fix mkcksum argument sizes (2013-01-31 14:43:01 -0500) are available in the git repository at: git://git.denx.de/u-boot-x86.git master for you to fetch changes up to 99adf6eda7bed1beb3fa3e18951342f67b108db7: patman: Allow use outside of u-boot tree (2013-01-31 15:23:40 -0800) ---------------------------------------------------------------- Doug Anderson (9): patman: Add spaces back into patman test patman: Allow tests to run even if patman is in the path patman: Look for checkpatch in the scripts directory patman: Cache the CC list from MakeCcFile() for use in ShowActions() patman: Add all CC addresses to the cover letter patman: Add a call to get_maintainer.pl if it exists patman: Add support for settings in .patman patman: Add the concept of multiple projects patman: Add settings to the list of modules to doctest Vadim Bendebury (1): patman: Allow use outside of u-boot tree tools/patman/README | 43 +++++++++- tools/patman/checkpatch.py | 14 ++-- tools/patman/get_maintainer.py | 63 +++++++++++++++ tools/patman/gitutil.py | 13 ++- tools/patman/patman.py | 29 +++++-- tools/patman/project.py | 43 ++++++++++ tools/patman/series.py | 27 +++++-- tools/patman/settings.py | 180 ++++++++++++++++++++++++++++++++++++++++- tools/patman/test.py | 6 +- 9 files changed, 389 insertions(+), 29 deletions(-) create mode 100644 tools/patman/get_maintainer.py create mode 100644 tools/patman/project.py Regards, Simon

2 1

[U-Boot] [PATCH 0/9 v7] Add TMU support for Exynos5250 based SMDK5250
by Akshay Saraswat 04 Feb '13

04 Feb '13

This patch series adds support for TMU driver using device tree for Exynos5250 based SMDK5250 board. Changes since v6: - Patch-1: None. - Patch-2: None. - Patch-3: None. - Patch-4: None. - Patch-5: None. - Patch-6: Integrated old and new code to exploit both tmu and i2c-dtt features simultaneously. - Patch-7: None. - Patch-8: Added 'Acked-by'. - Patch-9: Fixed spelling mistakes. Akshay Saraswat (9): EXYNOS5: TMU: Add driver for Thermal Management Unit EXYNOS5: Implement board_poweroff for Thermal Management Unit EXYNOS5: FDT: Add TMU device node values EXYNOS5: TMU: Add TMU init and status check EXYNOS5: Config: Enable support for Exynos TMU driver TMU: Add TMU support in dtt command EXYNOS5: Config: Enable dtt command for TMU EXYNOS5: TMU: Add hardware tripping EXYNOS5: FDT: Add a H/W-trip member to TMU node arch/arm/cpu/armv7/exynos/power.c | 25 ++ arch/arm/dts/exynos5250.dtsi | 5 + arch/arm/include/asm/arch-exynos/exynos-tmu.h | 58 +++++ arch/arm/include/asm/arch-exynos/power.h | 6 + board/samsung/dts/exynos5250-smdk5250.dts | 13 + board/samsung/smdk5250/smdk5250.c | 35 +++ common/cmd_dtt.c | 22 ++ doc/device-tree-bindings/exynos/tmu.txt | 49 ++++ drivers/power/Makefile | 1 + drivers/power/exynos-tmu.c | 317 +++++++++++++++++++++++++ include/configs/exynos5250-dt.h | 5 + include/fdtdec.h | 1 + include/tmu.h | 46 ++++ lib/fdtdec.c | 1 + 14 files changed, 584 insertions(+) create mode 100644 arch/arm/include/asm/arch-exynos/exynos-tmu.h create mode 100644 doc/device-tree-bindings/exynos/tmu.txt create mode 100644 drivers/power/exynos-tmu.c create mode 100644 include/tmu.h -- 1.7.9.5

2 11

[U-Boot] [PATCH] mxs: mxsboot: Add support for SD card generation for i.MX23
by Otavio Salvador 04 Feb '13

04 Feb '13

The mxsboot now receives the SoC type as parameter to generate binary compatible with the SoC. Currently the NAND support has not been add for i.MX23 as it is not yet supported in U-Boot. Signed-off-by: Otavio Salvador <otavio(a)ossystems.com.br> --- doc/README.mx28_common | 4 +-- tools/mxsboot.c | 92 ++++++++++++++++++++++++++++++++++++++++++++------ 2 files changed, 83 insertions(+), 13 deletions(-) diff --git a/doc/README.mx28_common b/doc/README.mx28_common index 8bacaf8..f0a5112 100644 --- a/doc/README.mx28_common +++ b/doc/README.mx28_common @@ -134,7 +134,7 @@ The partition layout is ready, next the special partition must be filled with proper contents. The contents is generated by running the following command (see chapter 2)): - $ ./tools/mxsboot sd u-boot.sb u-boot.sd + $ ./tools/mxsboot mx28 sd u-boot.sb u-boot.sd The resulting file, "u-boot.sd", shall then be written to the partition. In this case, we assume the first partition of the SD card is /dev/mmcblk0p1: @@ -162,7 +162,7 @@ There are two possibilities when preparing an image writable to NAND flash. there is a tool called "mxsboot" in the "tools/" directory. The tool is invoked on "u-boot.sb" file from chapter 2): - $ ./tools/mxsboot nand u-boot.sb u-boot.nand + $ ./tools/mxsboot mx28 nand u-boot.sb u-boot.nand NOTE: The above invokation works for NAND flash with geometry of 2048b per page, 64b OOB data, 128kb erase size. If your chip diff --git a/tools/mxsboot.c b/tools/mxsboot.c index 6c05aa4..e348877 100644 --- a/tools/mxsboot.c +++ b/tools/mxsboot.c @@ -1,7 +1,7 @@ /* - * Freescale i.MX28 image generator + * Freescale i.MX23/i.MX28 image generator * - * Copyright (C) 2011 Marek Vasut <marek.vasut(a)gmail.com> + * Copyright (C) 2011, 2013 Marek Vasut <marek.vasut(a)gmail.com> * on behalf of DENX Software Engineering GmbH * * See file CREDITS for list of people who contributed to this @@ -49,6 +49,11 @@ uint32_t nand_oobsize = 64; uint32_t nand_erasesize = 128 * 1024; /* + * SoC type + */ +enum { MX23, MX28 } soc_type; + +/* * Sector on which the SigmaTel boot partition (0x53) starts. */ uint32_t sd_sector = 2048; @@ -125,6 +130,13 @@ struct mx28_nand_bbt { uint32_t badblock[510]; }; +struct mx23_sd_config_block { + uint32_t reserved1[2]; + uint32_t first_sector_number; + uint32_t reserved2; + uint32_t sector_count; +}; + struct mx28_sd_drive_info { uint32_t chip_num; uint32_t drive_type; @@ -453,9 +465,10 @@ static int mx28_nand_write_firmware(struct mx28_nand_fcb *fcb, int infd, void usage(void) { printf( - "Usage: mxsboot [ops] <type> <infile> <outfile>\n" - "Augment BootStream file with a proper header for i.MX28 boot\n" + "Usage: mxsboot [ops] <soc> <type> <infile> <outfile>\n" + "Augment BootStream file with a proper header for i.MX23/i.MX28 boot\n" "\n" + " <soc> \"mx23\" or \"mx28\"\n" " <type> type of image:\n" " \"nand\" for NAND image\n" " \"sd\" for SD image\n" @@ -540,6 +553,50 @@ err0: return ret; } +static int mx23_create_sd_image(int infd, int outfd) +{ + int ret = -1; + uint32_t *buf; + int size; + off_t fsize; + ssize_t wr_size; + ssize_t offset = 512 * 4; + struct mx23_sd_config_block *cb; + + fsize = lseek(infd, 0, SEEK_END); + lseek(infd, 0, SEEK_SET); + size = fsize + offset; + + buf = malloc(size); + if (!buf) { + printf("Can not allocate output buffer of %d bytes\n", size); + goto err0; + } + + ret = read(infd, (uint8_t *)buf + offset, fsize); + if (ret != fsize) { + ret = -1; + goto err1; + } + + cb = (struct mx23_sd_config_block *)buf; + + cb->first_sector_number = sd_sector + 1; + cb->sector_count = (size - 1) / 512; + wr_size = write(outfd, buf, size); + if (wr_size != size) { + ret = -1; + goto err1; + } + + ret = 0; + +err1: + free(buf); +err0: + return ret; +} + static int mx28_create_sd_image(int infd, int outfd) { int ret = -1; @@ -576,7 +633,6 @@ static int mx28_create_sd_image(int infd, int outfd) cb->drv_info[0].tag = 0x1; cb->drv_info[0].first_sector_number = sd_sector + 1; cb->drv_info[0].sector_count = (size - 1) / 512; - wr_size = write(outfd, buf, size); if (wr_size != size) { ret = -1; @@ -606,7 +662,7 @@ int parse_ops(int argc, char **argv) }; int type; - if (argc < 4) + if (argc < 5) return -1; for (i = 1; i < argc; i++) { @@ -618,7 +674,7 @@ int parse_ops(int argc, char **argv) type = PARAM_ERASE; else if (!strncmp(argv[i], "-p", 2)) type = PARAM_PART; - else /* SD/MMC */ + else /* SoC type */ break; tmp = strtol(argv[++i], &end, 10); @@ -636,7 +692,14 @@ int parse_ops(int argc, char **argv) if (type == PARAM_PART) sd_sector = tmp; } + if (strcmp(argv[i], "mx23") == 0) + soc_type = MX23; + else if (strcmp(argv[i], "mx28") == 0) + soc_type = MX28; + else + return -1; + i++; if (strcmp(argv[i], "sd") && strcmp(argv[i], "nand")) return -1; @@ -674,10 +737,17 @@ int main(int argc, char **argv) goto err2; } - if (!strcmp(argv[offset], "sd")) - ret = mx28_create_sd_image(infd, outfd); - else if (!strcmp(argv[offset], "nand")) - ret = mx28_create_nand_image(infd, outfd); + if (!strcmp(argv[offset], "sd")) { + if (soc_type == MX23) + ret = mx23_create_sd_image(infd, outfd); + else + ret = mx28_create_sd_image(infd, outfd); + } else if (!strcmp(argv[offset], "nand")) { + if (soc_type == MX23) + printf("Not implemented yet\n"); + else + ret = mx28_create_nand_image(infd, outfd); + } close(outfd); err2: -- 1.8.1

3 17

[U-Boot] [PATCH] sf: spansion: Correct the first byte of idcode1 for S25FL256S part
by Michal Simek 04 Feb '13

04 Feb '13

From: Jagannadha Sutradharudu Teki <jaganna(a)xilinx.com> This patch corrected the first byte of idcode1 for S25FL256S SPI flash. Signed-off-by: Jagannadha Sutradharudu Teki <jaganna(a)xilinx.com> Signed-off-by: Michal Simek <michal.simek(a)xilinx.com> --- drivers/mtd/spi/spansion.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/mtd/spi/spansion.c b/drivers/mtd/spi/spansion.c index 32b76e0..9288672 100644 --- a/drivers/mtd/spi/spansion.c +++ b/drivers/mtd/spi/spansion.c @@ -97,7 +97,7 @@ static const struct spansion_spi_flash_params spansion_spi_flash_table[] = { .name = "S25FL129P_64K", }, { - .idcode1 = 0x2019, + .idcode1 = 0x0219, .idcode2 = 0x4d01, .pages_per_sector = 256, .nr_sectors = 512, -- 1.7.0.4

4 3