December 2014 - U-Boot

[U-Boot] [PATCH 0/2] mtd: nand: mxs: fix PIO_WORD number
by Luca Ellero 16 Dec '14

16 Dec '14

In this driver, the CMDPIOWORDS field doesn't always reflect the real number of pio_words sent in the actual DMA transfer (see iMX6 Reference Manual, Ch. 14.2) This patchset fixes them. Luca Ellero (2): mtd: nand: mxs: fix PIO_WORDs in mxs_nand_read_buf() mtd: nand: mxs: fix PIO_WORDs in mxs_nand_write_buf() drivers/mtd/nand/mxs_nand.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 1.7.10.4

2 3

[U-Boot] [PATCH] arm: socfpga: board: Repair Micrel PHY tuning
by Marek Vasut 16 Dec '14

16 Dec '14

From: Pavel Machek <pavel(a)denx.de> Add proper error checking into the PHY tuning patch. Make the PHY tunning only happen in case the KSZ9021 PHY is enabled in config. Call the config callback after the tuning finished. Signed-off-by: Marek Vasut <marex(a)denx.de> Cc: Chin Liang See <clsee(a)opensource.altera.com> Cc: Dinh Nguyen <dinguyen(a)opensource.altera.com> Cc: Tom Rini <trini(a)ti.com> Cc: Pavel Machek <pavel(a)denx.de> --- board/altera/socfpga/socfpga_cyclone5.c | 34 +++++++++++++++++++++++++++------ 1 file changed, 28 insertions(+), 6 deletions(-) diff --git a/board/altera/socfpga/socfpga_cyclone5.c b/board/altera/socfpga/socfpga_cyclone5.c index 772a58e..459d82f 100644 --- a/board/altera/socfpga/socfpga_cyclone5.c +++ b/board/altera/socfpga/socfpga_cyclone5.c @@ -46,19 +46,41 @@ int board_init(void) return 0; } +/* + * PHY configuration + */ +#ifdef CONFIG_PHY_MICREL_KSZ9021 int board_phy_config(struct phy_device *phydev) { + int ret; /* * These skew settings for the KSZ9021 ethernet phy is required for ethernet * to work reliably on most flavors of cyclone5 boards. */ - ksz9021_phy_extended_write(phydev, MII_KSZ9021_EXT_RGMII_RX_DATA_SKEW, - 0x0); - ksz9021_phy_extended_write(phydev, MII_KSZ9021_EXT_RGMII_TX_DATA_SKEW, - 0x0); - ksz9021_phy_extended_write(phydev, MII_KSZ9021_EXT_RGMII_CLOCK_SKEW, - 0xf0f0); + ret = ksz9021_phy_extended_write(phydev, + MII_KSZ9021_EXT_RGMII_RX_DATA_SKEW, + 0x0); + if (ret) + return ret; + + ret = ksz9021_phy_extended_write(phydev, + MII_KSZ9021_EXT_RGMII_TX_DATA_SKEW, + 0x0); + if (ret) + return ret; + + ret = ksz9021_phy_extended_write(phydev, + MII_KSZ9021_EXT_RGMII_CLOCK_SKEW, + 0xf0f0); + if (ret) + return ret; + + if (phydev->drv->config) + return phydev->drv->config(phydev); + + return 0; } +#endif #ifdef CONFIG_USB_GADGET struct s3c_plat_otg_data socfpga_otg_data = { -- 2.0.0

1 1

Re: [U-Boot] Falcon mode boot support
by Tom Rini 16 Dec '14

16 Dec '14

On Mon, Dec 15, 2014 at 09:08:08PM -0000, Andy Pont wrote: > Hi Tom, > > > So first, take a look at drivers/mtd/spi/spi_spl_load.c as that's what > > will be doing falcon mode work on your SPI flash. > > > > Second, take a look at board/ti/am335x/README, you're looking for the > > lines that read like: > > Using Device Tree in place at 80f80000, end 80f85928 > > I have managed to make some progress and I think I have got what I think is > the right data stored in the flash. Unfortunately when I try to boot it > locks up at: > > spl: payload image: Linu load addr: 0x80007fc0 size: 3893360 > Jumping to Linux > Entering kernel arg pointer: 0x80000100 > > I'm guessing the kernel arg pointer value is incorrect either that or it has > ignored the boot arguments and not picked up the console parameter. > > Could you advise? How big is the args file? We default to placing the args at 0x88000000 in ti_am335x_common.h (see CONFIG_SYS_SPL_ARGS_ADDR) to make sure that we don't have an overlap between the DT and the kernel which is quite possible with a reasonably sized DT and placing it at 0x80000100. -- Tom

2 1

[U-Boot] [PATCH] spl: if MMCSD_MODE_RAW fails, try MMCSD_MODE_FS, if available
by Guillaume GARDET 16 Dec '14

16 Dec '14

In SPL MMC, boot modes are exclusive. So, if MMCSD_MODE_RAW fails, the board hangs. This patch allows to try MMCSD_MODE_FS then, if available. It has been tested on a pandaboard (rev. A3). Signed-off-by: Guillaume GARDET <guillaume.gardet(a)free.fr> Cc: Tom Rini <trini(a)ti.com> --- common/spl/spl_mmc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/common/spl/spl_mmc.c b/common/spl/spl_mmc.c index ee71f79..2c34b75 100644 --- a/common/spl/spl_mmc.c +++ b/common/spl/spl_mmc.c @@ -101,7 +101,8 @@ void spl_mmc_load_image(void) err = mmc_load_image_raw(mmc, CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR); #if defined(CONFIG_SPL_FAT_SUPPORT) || defined(CONFIG_SPL_EXT_SUPPORT) - } else if (boot_mode == MMCSD_MODE_FS) { + } + if (err || boot_mode == MMCSD_MODE_FS) { debug("boot mode - FS\n"); #ifdef CONFIG_SPL_FAT_SUPPORT #ifdef CONFIG_SPL_OS_BOOT -- 1.8.4.5

4 6

[U-Boot] [PATCH] powerpc/t1024: add serdes protocol 0x40
by Shengzhou Liu 16 Dec '14

16 Dec '14

Add serdes protocol 0x40. Signed-off-by: Shengzhou Liu <Shengzhou.Liu(a)freescale.com> --- arch/powerpc/cpu/mpc85xx/t1024_serdes.c | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/powerpc/cpu/mpc85xx/t1024_serdes.c b/arch/powerpc/cpu/mpc85xx/t1024_serdes.c index 7dc8385..cd0a9d7 100644 --- a/arch/powerpc/cpu/mpc85xx/t1024_serdes.c +++ b/arch/powerpc/cpu/mpc85xx/t1024_serdes.c @@ -11,6 +11,7 @@ static u8 serdes_cfg_tbl[][4] = { + [0x40] = {PCI1, PCIE1, PCIE1, PCIE1}, [0xD5] = {QSGMII_FM1_A, PCIE3, PCIE2, PCIE1}, [0xD6] = {QSGMII_FM1_A, PCIE3, PCIE2, SATA1}, [0x95] = {XFI_FM1_MAC1, PCIE3, PCIE2, PCIE1}, -- 1.8.0

1 0

[U-Boot] [PATCH] mtd: nand: revive "nand scrub" command
by Masahiro Yamada 16 Dec '14

16 Dec '14

Since commit ff94bc40af34 (mtd, ubi, ubifs: resync with Linux-3.14), the "nand scrub" command has not been working. The scrub is a U-Boot extension and we have to modify nand_base.c that originates in Linux. Mark the code with #ifdef __UBOOT__ so we will never accidentally drop it when we re-sync the NAND framework with Linux in the future. Signed-off-by: Masahiro Yamada <yamada.m(a)jp.panasonic.com> Cc: Scott Wood <scottwood(a)freescale.com> Cc: Heiko Schocher <hs(a)denx.de> --- drivers/mtd/nand/nand_base.c | 5 +++++ include/linux/mtd/mtd.h | 2 ++ 2 files changed, 7 insertions(+) diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c index 70e780c..83bd033 100644 --- a/drivers/mtd/nand/nand_base.c +++ b/drivers/mtd/nand/nand_base.c @@ -2905,8 +2905,13 @@ int nand_erase_nand(struct mtd_info *mtd, struct erase_info *instr, WATCHDOG_RESET(); /* Check if we have a bad block, we do not erase bad blocks! */ +#ifdef __UBOOT__ + if (!instr->scrub && nand_block_checkbad(mtd, ((loff_t) page) << + chip->page_shift, 0, allowbbt)) { +#else if (nand_block_checkbad(mtd, ((loff_t) page) << chip->page_shift, 0, allowbbt)) { +#endif pr_warn("%s: attempt to erase a bad block at page 0x%08x\n", __func__, page); instr->state = MTD_ERASE_FAILED; diff --git a/include/linux/mtd/mtd.h b/include/linux/mtd/mtd.h index 8666413..2b4e218 100644 --- a/include/linux/mtd/mtd.h +++ b/include/linux/mtd/mtd.h @@ -52,7 +52,9 @@ struct erase_info { u_long priv; u_char state; struct erase_info *next; +#ifdef __UBOOT__ int scrub; +#endif }; struct mtd_erase_region_info { -- 1.9.1

5 12

[U-Boot] [PATCH v2] mtd: nand: revive "nand scrub" command
by Masahiro Yamada 16 Dec '14

16 Dec '14

Since commit ff94bc40af34 (mtd, ubi, ubifs: resync with Linux-3.14), the "nand scrub" command has not been working. Signed-off-by: Masahiro Yamada <yamada.m(a)jp.panasonic.com> Cc: Scott Wood <scottwood(a)freescale.com> Cc: Heiko Schocher <hs(a)denx.de> --- Changes in v2: - Drop #ifdef __UBOOT__ drivers/mtd/nand/nand_base.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c index 70e780c..d04c7ea 100644 --- a/drivers/mtd/nand/nand_base.c +++ b/drivers/mtd/nand/nand_base.c @@ -2905,7 +2905,7 @@ int nand_erase_nand(struct mtd_info *mtd, struct erase_info *instr, WATCHDOG_RESET(); /* Check if we have a bad block, we do not erase bad blocks! */ - if (nand_block_checkbad(mtd, ((loff_t) page) << + if (!instr->scrub && nand_block_checkbad(mtd, ((loff_t) page) << chip->page_shift, 0, allowbbt)) { pr_warn("%s: attempt to erase a bad block at page 0x%08x\n", __func__, page); -- 1.9.1

1 0

[U-Boot] [PATCH 0/8] x86: Support microcode in a single place
by Simon Glass 16 Dec '14

16 Dec '14

As part of the effort to support Atom processors it became apparent the they can only support microcode updates before RAM is available. In this early environment the device tree is not available. This series solves this problem by updating ifdtool to provide very early microcode access on these platforms. Simon Glass (8): x86: Add a script to process Intel microcode files x86: ifdtool: Correct a debug() missing parameter x86: ifdtool: Display filename when file errors are reported x86: ifdtool: Use a structure for the file/address list x86: ifdtool: Add support for early microcode access x86: Move microcode updates into a separate directory x86: ivybridge: Update the microcode x86: Convert microcode format to device-tree-only Makefile | 4 +- arch/x86/cpu/ivybridge/microcode_intel.c | 2 + arch/x86/cpu/queensbay/M0220661105.inc | 1288 ------------------------- arch/x86/cpu/queensbay/tnc_car.S | 11 +- arch/x86/dts/crownbay.dts | 7 + arch/x86/dts/link.dts | 4 +- arch/x86/dts/m12206a7_00000028.dtsi | 622 ------------ arch/x86/dts/m12306a9_00000017.dtsi | 750 -------------- arch/x86/dts/microcode/m0120661104.dtsi | 366 +++++++ arch/x86/dts/microcode/m12206a7_00000029.dtsi | 686 +++++++++++++ arch/x86/dts/microcode/m12306a9_0000001b.dtsi | 814 ++++++++++++++++ tools/Makefile | 1 + tools/ifdtool.c | 162 +++- tools/microcode-tool | 1 + tools/microcode-tool.py | 165 ++++ 15 files changed, 2189 insertions(+), 2694 deletions(-) delete mode 100644 arch/x86/cpu/queensbay/M0220661105.inc delete mode 100644 arch/x86/dts/m12206a7_00000028.dtsi delete mode 100644 arch/x86/dts/m12306a9_00000017.dtsi create mode 100644 arch/x86/dts/microcode/m0120661104.dtsi create mode 100644 arch/x86/dts/microcode/m12206a7_00000029.dtsi create mode 100644 arch/x86/dts/microcode/m12306a9_0000001b.dtsi create mode 120000 tools/microcode-tool create mode 100755 tools/microcode-tool.py -- 2.2.0.rc0.207.ga3a616c

2 24

[U-Boot] [PATCH 0/17] buildman: A few more features and improvements (Christmas edition)
by Simon Glass 16 Dec '14

16 Dec '14

Various people (on CC) have suggested improvements and reported bugs in buildman. I've done a pass through these and this series is the result. In summary the main changes are: - Flatten the output tree for 'current source builds' - Improve docs to talk about Python environment and ~/.buildman file - Toolchain path improvements and changes - Download and install a new toolchain automatically - Guess the upstream commit instead of requiring it to be set - Access to the full build output - Support for building an arbitrary range of commits Simon Glass (17): buildman: Add tests that check the correct output directory is used buildman: Put build in 'current', not 'current/current' buildman: Don't prune output space for 'current source' build buildman: Try to guess the upstream commit buildman: Add an option to flatten output directory trees buildman: Don't remove entire output directory when testing buildman: Allow specifying a range of commits to build buildman: Try to avoid hard-coded string parsing buildman: Put the toolchain path first instead of last in PATH buildman: Add an option to use the full tool chain path buildman: Add a note about Python pre-requisites buildman: Add documentation about the .buildman file buildman: Don't complain about missing sections in ~/.buildman buildman: Don't use the local settings when running tests buildman: Allow architecture to alias to multiple toolchains buildman: Add the option to download toolchains from kernel.org buildman: Add an option to write the full build output tools/buildman/README | 142 +++++++++++++++++---- tools/buildman/bsettings.py | 11 +- tools/buildman/builder.py | 21 +++- tools/buildman/builderthread.py | 7 +- tools/buildman/cmdline.py | 10 ++ tools/buildman/control.py | 58 +++++++-- tools/buildman/test.py | 75 ++++++++++- tools/buildman/toolchain.py | 270 +++++++++++++++++++++++++++++++++++++--- tools/patman/gitutil.py | 90 ++++++++++++-- 9 files changed, 606 insertions(+), 78 deletions(-) -- 2.2.0.rc0.207.ga3a616c

3 22

[U-Boot] [PATCH] x86: ifdtool: Separate out filenames for -D and -i
by Simon Glass 16 Dec '14

16 Dec '14

To allow these options to be specified together, separate them out. Signed-off-by: Simon Glass <sjg(a)chromium.org> --- tools/ifdtool.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/ifdtool.c b/tools/ifdtool.c index a4b481f..09f33a8 100644 --- a/tools/ifdtool.c +++ b/tools/ifdtool.c @@ -778,8 +778,8 @@ int main(int argc, char *argv[]) int mode_spifreq = 0, mode_em100 = 0, mode_locked = 0; int mode_unlocked = 0, mode_write = 0, mode_write_descriptor = 0; int create = 0; - char *region_type_string = NULL, *src_fname = NULL; - char *addr_str = NULL; + char *region_type_string = NULL, *inject_fname = NULL; + char *desc_fname = NULL, *addr_str = NULL; int region_type = -1, inputfreq = 0; enum spi_frequency spifreq = SPI_FREQUENCY_20MHZ; unsigned int addr = 0; @@ -820,14 +820,14 @@ int main(int argc, char *argv[]) break; case 'D': mode_write_descriptor = 1; - src_fname = optarg; + desc_fname = optarg; break; case 'e': mode_em100 = 1; break; case 'i': if (get_two_words(optarg, &region_type_string, - &src_fname)) { + &inject_fname)) { print_usage(argv[0]); exit(EXIT_FAILURE); } @@ -997,10 +997,10 @@ int main(int argc, char *argv[]) } if (mode_write_descriptor) - ret = write_data(image, size, -size, src_fname); + ret = write_data(image, size, -size, desc_fname); if (mode_inject) - ret = inject_region(image, size, region_type, src_fname); + ret = inject_region(image, size, region_type, inject_fname); if (mode_write) ret = write_data(image, size, addr, src_fname); -- 2.2.0.rc0.207.ga3a616c

1 1