January 2016 - U-Boot

[U-Boot] any value in moving ATA/SATA stuff from drivers/block to headers?
by Robert P. J. Day 14 Jan '16

14 Jan '16

currently poking around in drivers/block, adding a driver for another silicon image drive, and noticed that sata_sil3114.h has some content that looks more appropriate for a generic ATA/SATA header file. for example, this snippet: /* Missing ata defines */ #define ATA_CMD_STANDBY 0xE2 #define ATA_CMD_STANDBYNOW1 0xE0 #define ATA_CMD_IDLE 0xE3 #define ATA_CMD_IDLEIMMEDIATE 0xE1 seems already covered by include/libata.h, while the earlier structure definitions in that file: struct sata_ioports { ... snip ... }; struct sata_port { ... snip ... }; also look like they could be moved to a generic SATA-related header file. does that make any sense or sound like it has any value? rday -- ======================================================================== Robert P. J. Day Ottawa, Ontario, CANADA http://crashcourse.ca Twitter: http://twitter.com/rpjday LinkedIn: http://ca.linkedin.com/in/rpjday ========================================================================

2 1

[U-Boot] [PATCH 1/2] Revert "powerpc/mpc85xx: SECURE BOOT - Bypass PAMU in case of secure boot"
by Aneesh Bansal 14 Jan '16

14 Jan '16

This reverts commit 7cad2e38d61e27ea59fb7944f7e647e97ef292d3. Signed-off-by: Aneesh Bansal <aneesh.bansal(a)nxp.com> CC: Ruchika Gupta <ruchika.gupta(a)nxp.com> --- arch/powerpc/cpu/mpc85xx/cpu_init.c | 9 +-------- arch/powerpc/include/asm/immap_85xx.h | 1 - 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/arch/powerpc/cpu/mpc85xx/cpu_init.c b/arch/powerpc/cpu/mpc85xx/cpu_init.c index 13a7d0f..c738c96 100644 --- a/arch/powerpc/cpu/mpc85xx/cpu_init.c +++ b/arch/powerpc/cpu/mpc85xx/cpu_init.c @@ -425,8 +425,7 @@ void fsl_erratum_a007212_workaround(void) ulong cpu_init_f(void) { extern void m8560_cpm_reset (void); -#if defined(CONFIG_SYS_DCSRBAR_PHYS) || \ - (defined(CONFIG_SECURE_BOOT) && defined(CONFIG_FSL_CORENET)) +#ifdef CONFIG_SYS_DCSRBAR_PHYS ccsr_gur_t *gur = (void *)(CONFIG_SYS_MPC85xx_GUTS_ADDR); #endif #if defined(CONFIG_SECURE_BOOT) @@ -458,12 +457,6 @@ ulong cpu_init_f(void) #if defined(CONFIG_SYS_CPC_REINIT_F) disable_cpc_sram(); #endif - -#if defined(CONFIG_FSL_CORENET) - /* Put PAMU in bypass mode */ - out_be32(&gur->pamubypenr, FSL_CORENET_PAMU_BYPASS); -#endif - #endif #ifdef CONFIG_CPM2 diff --git a/arch/powerpc/include/asm/immap_85xx.h b/arch/powerpc/include/asm/immap_85xx.h index 101b8db..667a97e 100644 --- a/arch/powerpc/include/asm/immap_85xx.h +++ b/arch/powerpc/include/asm/immap_85xx.h @@ -1933,7 +1933,6 @@ defined(CONFIG_PPC_T1020) || defined(CONFIG_PPC_T1022) u8 res24[64]; u32 pblsr; /* Preboot loader status */ u32 pamubypenr; /* PAMU bypass enable */ -#define FSL_CORENET_PAMU_BYPASS 0xffff0000 u32 dmacr1; /* DMA control */ u8 res25[4]; u32 gensr1; /* General status */ -- 1.8.1.4

4 5

[U-Boot] Please pull u-boot-marvell/master
by Stefan Roese 14 Jan '16

14 Jan '16

Hi Tom, please pull all the pending Marvell patches, mostly Armada XP and 38x related. Thanks, Stefan The following changes since commit d29892ba854f40980b84f86566cd0c2308c66afe: part_dos.c: Don't wrap to negative after 2G sectors (2016-01-13 16:33:20 -0500) are available in the git repository at: git://www.denx.de/git/u-boot-marvell.git for you to fetch changes up to f822d8578ba395d9af1cc315a2fb87b1eed3d355: MAINTAINERS: Update Marvell custodianship (2016-01-14 14:17:36 +0100) ---------------------------------------------------------------- Phil Sutter (10): drivers/pci: Fix for debug builds without CONFIG_PCI_ENUM_ONLY README: Review the u-boot porting guide list axp: Fix debugging support in DDR3 write leveling drivers/pci/pci_mvebu: Fix for boards with X4 lanes mvebu: axp: refactor board_sat_r_get() and caller mvebu: Introduce kconfig symbols for SoC variants mvebu: axp: Rename MV_DDR_32BIT to CONFIG_DDR_32BIT mvebu: Add rudimental MV78230 support mvebu: Support Synology DS414 mvebu: ds414: Implement Synology specific command set Stefan Roese (34): arm: mvebu/kirkwood: Use common timer functions arm: mvebu: ddr: Fix compilation warning arm: mvebu: Add DM and OF_CONTROL support to SPL spi: kirkwood_spi.c: Prepare for driver model support spi: kirkwood_spi.c: Add driver model support arm: mvebu: Add SPI driver model support arm: mvebu: Add armada-xp-maxbcm.dts for maxbcm board arm: mvebu: armada-388-gp.dts: Add ethernet aliases net: mvneta: Convert to driver model arm: mvebu: Move some defines to common include file arm: mvebu: Add SolidRun ClearFog Armada 38x initial support arm: mvebu: db-mv784mp-gp: Switch from IDE to SATA support arm: mvebu: db-mv784mp-gp: Enable common file-system support arm: mvebu: db-mv784mp-gp: Enable cache command arm: mvebu: Enable L2 cache on Armada XP arm: mvebu: Add v7_outer_cache_disable function for AXP & A38x arm: mvebu: Don't call arch_cpu_init() from SPL at all arm: mvebu: Remove SYS_MALLOC_CLEAR_ON_INIT from DB-MV784MP-GP AXP board arm: mvebu: Don't disable cache at startup on Armada XP at all arm: mvebu: Simplify code in setup_usb_phys() a bit arm: mvebu: Don't use 0 as board ID as its used for the custom boards arm: mvebu: Add support for MV78260 arm: mvebu: Make ECC support configurable on Armada XP arm: mvebu: Don't include "netdev.h" in cpu.c arm: mvebu: Make serdes setup on Armada XP less noisy arm: mvebu: Print CPU and SDRAM frequency upon startup arm: mvebu: Consolidate board Kconfig options into one file arm: mvebu: Move SoC selection (A38X vs AXP) into Kconfig arm: mvebu: Remove leftover Makefile arm: mvebu: Move SAR register defines into header arm: mvebu: Make local structs static const arm: mvebu: Add runtime boot-device detection arm: mvebu: Add runtime detection of UART (xmodem) boot-mode MAINTAINERS: Update Marvell custodianship Tor Krill (1): sata: Add SATA driver with DMA support for Marvell Kirkwood and Armada XP MAINTAINERS | 4 +- Makefile | 10 - README | 11 +- arch/arm/Kconfig | 9 +- arch/arm/Makefile | 2 +- arch/arm/dts/Makefile | 5 +- arch/arm/dts/armada-370-xp.dtsi | 1 + arch/arm/dts/armada-388-clearfog.dts | 509 ++++++++++ arch/arm/dts/armada-388-gp.dts | 9 + arch/arm/dts/armada-38x.dtsi | 2 + arch/arm/dts/armada-xp-gp.dts | 7 + arch/arm/dts/armada-xp-maxbcm.dts | 249 +++++ arch/arm/dts/armada-xp-synology-ds414.dts | 337 +++++++ arch/arm/dts/armada-xp.dtsi | 1 + arch/arm/mach-kirkwood/include/mach/config.h | 5 + arch/arm/mach-mvebu/Kconfig | 63 +- arch/arm/mach-mvebu/Makefile | 8 +- arch/arm/mach-mvebu/cpu.c | 207 ++-- arch/arm/mach-mvebu/dram.c | 20 +- arch/arm/mach-mvebu/include/mach/config.h | 26 +- arch/arm/mach-mvebu/include/mach/cpu.h | 10 + arch/arm/mach-mvebu/include/mach/soc.h | 63 +- arch/arm/mach-mvebu/lowlevel_spl.S | 6 - arch/arm/mach-mvebu/mbus.c | 2 +- arch/arm/mach-mvebu/serdes/axp/board_env_spec.h | 4 +- .../arm/mach-mvebu/serdes/axp/high_speed_env_lib.c | 88 +- arch/arm/mach-mvebu/spl.c | 87 +- arch/arm/mach-mvebu/timer.c | 136 +-- arch/arm/mach-mvebu/u-boot-spl.lds | 57 -- arch/arm/mvebu-common/Makefile | 14 - board/Marvell/db-88f6820-gp/Kconfig | 12 - board/Marvell/db-88f6820-gp/kwbimage.cfg | 2 +- board/Marvell/db-mv784mp-gp/Kconfig | 12 - board/Marvell/db-mv784mp-gp/db-mv784mp-gp.c | 32 +- board/Marvell/db-mv784mp-gp/kwbimage.cfg | 2 +- board/Synology/common/Makefile | 7 + board/Synology/common/cmd_syno.c | 227 +++++ board/Synology/ds414/Makefile | 7 + board/Synology/ds414/ds414.c | 185 ++++ board/Synology/ds414/kwbimage.cfg | 12 + board/maxbcm/Kconfig | 9 - board/maxbcm/kwbimage.cfg | 2 +- board/maxbcm/maxbcm.c | 20 +- board/solidrun/clearfog/MAINTAINERS | 6 + board/solidrun/clearfog/Makefile | 7 + board/solidrun/clearfog/README | 18 + board/solidrun/clearfog/clearfog.c | 156 +++ board/solidrun/clearfog/kwbimage.cfg | 12 + configs/clearfog_defconfig | 21 + configs/db-88f6820-gp_defconfig | 6 + configs/db-mv784mp-gp_defconfig | 7 + configs/ds414_defconfig | 18 + configs/maxbcm_defconfig | 8 +- drivers/Makefile | 4 +- drivers/block/Makefile | 1 + drivers/block/mvsata_ide.c | 6 +- drivers/block/sata_mv.c | 1045 ++++++++++++++++++++ drivers/ddr/marvell/a38x/ddr3_debug.c | 15 - drivers/ddr/marvell/a38x/ddr3_training_ip.h | 2 - drivers/ddr/marvell/axp/ddr3_axp.h | 3 + drivers/ddr/marvell/axp/ddr3_axp_config.h | 7 +- drivers/ddr/marvell/axp/ddr3_axp_mc_static.h | 20 +- drivers/ddr/marvell/axp/ddr3_write_leveling.c | 4 +- drivers/i2c/mvtwsi.c | 2 +- drivers/net/mvneta.c | 230 +++-- drivers/pci/pci_auto_old.c | 2 +- drivers/pci/pci_mvebu.c | 14 + drivers/spi/kirkwood_spi.c | 217 +++- include/configs/clearfog.h | 176 ++++ include/configs/db-88f6820-gp.h | 25 +- include/configs/db-mv784mp-gp.h | 60 +- include/configs/ds414.h | 162 +++ include/configs/maxbcm.h | 15 +- tools/Makefile | 2 +- tools/kwboot.c | 14 +- 75 files changed, 4047 insertions(+), 719 deletions(-) create mode 100644 arch/arm/dts/armada-388-clearfog.dts create mode 100644 arch/arm/dts/armada-xp-maxbcm.dts create mode 100644 arch/arm/dts/armada-xp-synology-ds414.dts delete mode 100644 arch/arm/mach-mvebu/u-boot-spl.lds delete mode 100644 arch/arm/mvebu-common/Makefile delete mode 100644 board/Marvell/db-88f6820-gp/Kconfig delete mode 100644 board/Marvell/db-mv784mp-gp/Kconfig create mode 100644 board/Synology/common/Makefile create mode 100644 board/Synology/common/cmd_syno.c create mode 100644 board/Synology/ds414/Makefile create mode 100644 board/Synology/ds414/ds414.c create mode 100644 board/Synology/ds414/kwbimage.cfg delete mode 100644 board/maxbcm/Kconfig create mode 100644 board/solidrun/clearfog/MAINTAINERS create mode 100644 board/solidrun/clearfog/Makefile create mode 100644 board/solidrun/clearfog/README create mode 100644 board/solidrun/clearfog/clearfog.c create mode 100644 board/solidrun/clearfog/kwbimage.cfg create mode 100644 configs/clearfog_defconfig create mode 100644 configs/ds414_defconfig create mode 100644 drivers/block/sata_mv.c create mode 100644 include/configs/clearfog.h create mode 100644 include/configs/ds414.h

2 1

[U-Boot] [PATCH 1/9] ARM: zynq: Remove memory division by 2 for ECC case
by Michal Simek 14 Jan '16

14 Jan '16

For ECC case u-boot divided memory by 2 because one u-boot could be used for both cases when ECC is off or on. Remove this division and make sure that dts file contain the correct memory size when ECC is enabled. Signed-off-by: Michal Simek <michal.simek(a)xilinx.com> --- arch/arm/mach-zynq/ddrc.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/arch/arm/mach-zynq/ddrc.c b/arch/arm/mach-zynq/ddrc.c index 5b20accbcb17..d74f8dbbc45d 100644 --- a/arch/arm/mach-zynq/ddrc.c +++ b/arch/arm/mach-zynq/ddrc.c @@ -42,8 +42,6 @@ void zynq_ddrc_init(void) */ /* cppcheck-suppress nullPointer */ memset((void *)0, 0, 1 * 1024 * 1024); - - gd->ram_size /= 2; } else { puts("ECC disabled "); } -- 1.9.1

3 10

[U-Boot] [U-Boot, PATCH 1/1] mmc: emmc and hw partitions partition table id bugfix.
by Erik Tideman 14 Jan '16

14 Jan '16

On bootup the emmc's hw partition is always set to 0 and the partition table is read from it. When switching to another hw partition the partition table's id is not updated but instead the old one from hw partition 0 is used. If there is no partition table on hw partition 0 then the code will terminate and return error even if the desired hw partition contains a perfectly fine partition table. This fix updates the partition table struct to correspond to the specified hw partition before testing if the partition table is valid or not. Signed-off-by: Erik Tideman <erik.tideman(a)faltcom.se> --- disk/part.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/disk/part.c b/disk/part.c index 909712e..70a38c2 100644 --- a/disk/part.c +++ b/disk/part.c @@ -493,6 +493,14 @@ int get_device(const char *ifname, const char *dev_hwpart_str, goto cleanup; } + /* + * Updates the partition table for the specified hw partition. + * Does not need to be done for hwpart 0 since it is default and + * already loaded. + */ + if(hwpart != 0) + init_part(*dev_desc); + cleanup: free(dup_str); return dev; -- 2.5.0

2 1

[U-Boot] [PATCH] patman: Add --thread option
by Mateusz Kulikowski 14 Jan '16

14 Jan '16

Add option to create threaded series of patches. With it, it will be possible to create patch threads like this: [PATCH 0/10] Add support for time travel [PATCH 1/10] Add Flux Capacitor driver [PATCH 2/10] Add Mr. Fusion driver (...) Internally it will call git send-email with --thread option Signed-off-by: Mateusz Kulikowski <mateusz.kulikowski(a)gmail.com> --- tools/patman/gitutil.py | 6 +++++- tools/patman/patman.py | 4 +++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/tools/patman/gitutil.py b/tools/patman/gitutil.py index 9e739d8..5f1b4f6 100644 --- a/tools/patman/gitutil.py +++ b/tools/patman/gitutil.py @@ -328,7 +328,7 @@ def BuildEmailList(in_list, tag=None, alias=None, raise_on_error=True): return result def EmailPatches(series, cover_fname, args, dry_run, raise_on_error, cc_fname, - self_only=False, alias=None, in_reply_to=None): + self_only=False, alias=None, in_reply_to=None, thread=False): """Email a patch series. Args: @@ -342,6 +342,8 @@ def EmailPatches(series, cover_fname, args, dry_run, raise_on_error, cc_fname, self_only: True to just email to yourself as a test in_reply_to: If set we'll pass this to git as --in-reply-to. Should be a message ID that this is in reply to. + thread: True to add --thread to git send-email (make + all patches reply to cover-letter or first patch in series) Returns: Git command that was/would be run @@ -400,6 +402,8 @@ def EmailPatches(series, cover_fname, args, dry_run, raise_on_error, cc_fname, cmd = ['git', 'send-email', '--annotate'] if in_reply_to: cmd.append('--in-reply-to="%s"' % in_reply_to) + if thread: + cmd.append('--thread') cmd += to cmd += cc diff --git a/tools/patman/patman.py b/tools/patman/patman.py index 6fe8fe0..57ae8f3 100755 --- a/tools/patman/patman.py +++ b/tools/patman/patman.py @@ -61,6 +61,8 @@ parser.add_option('--no-check', action='store_false', dest='check_patch', help="Don't check for patch compliance") parser.add_option('--no-tags', action='store_false', dest='process_tags', default=True, help="Don't process subject tags as aliaes") +parser.add_option('--thread', action='store_true', dest='thread', + default=False, help='Create patches as a single thread') parser.usage += """ @@ -161,7 +163,7 @@ else: if its_a_go: cmd = gitutil.EmailPatches(series, cover_fname, args, options.dry_run, not options.ignore_bad_tags, cc_file, - in_reply_to=options.in_reply_to) + in_reply_to=options.in_reply_to, thread=options.thread) else: print col.Color(col.RED, "Not sending emails due to errors/warnings") -- 2.5.0

2 1

[U-Boot] [PATCH v2 1/3] mtd: pxa3xx_nand: Correct null dereference
by Kevin Smith 14 Jan '16

14 Jan '16

Correct a null pointer dereference in board_nand_init(). Zeroed memory was allocated, then immediately dereferenced. The dereference is completely removed, since this pointer is later initialized in alloc_nand_resources. Signed-off-by: Kevin Smith <kevin.smith(a)elecsyscorp.com> Cc: Stefan Roese <sr(a)denx.de> Cc: Luka Perkov <luka.perkov(a)sartura.hr> Cc: Scott Wood <scottwood(a)freescale.com> --- drivers/mtd/nand/pxa3xx_nand.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/drivers/mtd/nand/pxa3xx_nand.c b/drivers/mtd/nand/pxa3xx_nand.c index f65b499..9202459 100644 --- a/drivers/mtd/nand/pxa3xx_nand.c +++ b/drivers/mtd/nand/pxa3xx_nand.c @@ -1606,13 +1606,6 @@ void board_nand_init(void) if (!info) return; - /* - * If CONFIG_SYS_NAND_SELF_INIT is defined, each driver is responsible - * for instantiating struct nand_chip, while drivers/mtd/nand/nand.c - * still provides a "struct mtd_info nand_info" instance. - */ - info->host[0]->mtd = &nand_info[0]; - ret = pxa3xx_nand_probe(info); if (ret) return; -- 2.4.6

1 2

[U-Boot] [PATCH 01/23] ARM64: zynqmp: ep: Define minimum sdhci frequency for ep
by Michal Simek 14 Jan '16

14 Jan '16

From: Siva Durga Prasad Paladugu <siva.durga.paladugu(a)xilinx.com> Define minimum sdhci frequency for ep, as not defining it causes the divisor to be 2048 as per sd version but keeping clock very low on ep causes command failures. Signed-off-by: Siva Durga Prasad Paladugu <sivadur(a)xilinx.com> Signed-off-by: Michal Simek <michal.simek(a)xilinx.com> --- include/configs/xilinx_zynqmp_ep.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/configs/xilinx_zynqmp_ep.h b/include/configs/xilinx_zynqmp_ep.h index ec39211af3db..ed7ae177bc9b 100644 --- a/include/configs/xilinx_zynqmp_ep.h +++ b/include/configs/xilinx_zynqmp_ep.h @@ -17,6 +17,7 @@ #define CONFIG_ZYNQ_SDHCI0 #define CONFIG_ZYNQ_SDHCI_MAX_FREQ 52000000 +#define CONFIG_ZYNQ_SDHCI_MIN_FREQ (CONFIG_ZYNQ_SDHCI_MAX_FREQ << 9) #define CONFIG_ZYNQ_I2C0 #define CONFIG_SYS_I2C_ZYNQ #define CONFIG_ZYNQ_EEPROM -- 1.9.1

1 22

[U-Boot] [PATCH 1/2] mmc: sdhci: Clear high speed if not supported
by Michal Simek 14 Jan '16

14 Jan '16

From: Siva Durga Prasad Paladugu <siva.durga.paladugu(a)xilinx.com> Clear high speed bit if it was not supported by the driver. Signed-off-by: Siva Durga Prasad Paladugu <sivadur(a)xilinx.com> Signed-off-by: Emil Lenchak <emill(a)xilinx.com> Signed-off-by: Michal Simek <michal.simek(a)xilinx.com> --- drivers/mmc/sdhci.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/mmc/sdhci.c b/drivers/mmc/sdhci.c index 02d71b934409..ff770b16e27a 100644 --- a/drivers/mmc/sdhci.c +++ b/drivers/mmc/sdhci.c @@ -530,6 +530,10 @@ int add_sdhci(struct sdhci_host *host, u32 max_clk, u32 min_clk) if (caps & SDHCI_CAN_DO_8BIT) host->cfg.host_caps |= MMC_MODE_8BIT; } + + if (host->quirks & SDHCI_QUIRK_NO_HISPD_BIT) + host->cfg.host_caps &= ~(MMC_MODE_HS | MMC_MODE_HS_52MHz); + if (host->host_caps) host->cfg.host_caps |= host->host_caps; -- 1.9.1

1 1

[U-Boot] [PATCH] sdhci: zynq: Remove hardcoded value zero as min frequency
by Michal Simek 14 Jan '16

14 Jan '16

From: Siva Durga Prasad Paladugu <siva.durga.paladugu(a)xilinx.com> Remove hardcoded value zero as min frequency and use config option CONFIG_ZYNQ_SDHCI_MIN_FREQ defined in board config Signed-off-by: Siva Durga Prasad Paladugu <sivadur(a)xilinx.com> Signed-off-by: Michal Simek <michal.simek(a)xilinx.com> --- drivers/mmc/zynq_sdhci.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/mmc/zynq_sdhci.c b/drivers/mmc/zynq_sdhci.c index 4fe3da93b206..f21ea524af9f 100644 --- a/drivers/mmc/zynq_sdhci.c +++ b/drivers/mmc/zynq_sdhci.c @@ -13,6 +13,10 @@ #include <malloc.h> #include <sdhci.h> +#ifndef CONFIG_ZYNQ_SDHCI_MIN_FREQ +# define CONFIG_ZYNQ_SDHCI_MIN_FREQ 0 +#endif + static int arasan_sdhci_probe(struct udevice *dev) { struct mmc_uclass_priv *upriv = dev_get_uclass_priv(dev); @@ -22,7 +26,8 @@ static int arasan_sdhci_probe(struct udevice *dev) SDHCI_QUIRK_BROKEN_R1B; host->version = sdhci_readw(host, SDHCI_HOST_VERSION); - add_sdhci(host, CONFIG_ZYNQ_SDHCI_MAX_FREQ, 0); + add_sdhci(host, CONFIG_ZYNQ_SDHCI_MAX_FREQ, + CONFIG_ZYNQ_SDHCI_MIN_FREQ); upriv->mmc = host->mmc; -- 1.9.1

1 0