November 2014 - U-Boot

[U-Boot] [PATCH 1/3] powerpc: mpc52xx: a4m072: Convert to generic board
by Stefan Roese 19 Nov '14

19 Nov '14

Signed-off-by: Stefan Roese <sr(a)denx.de> Cc: Wolfgang Denk <wd(a)denx.de> --- include/configs/a4m072.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/configs/a4m072.h b/include/configs/a4m072.h index cc88ac1..3c67655 100644 --- a/include/configs/a4m072.h +++ b/include/configs/a4m072.h @@ -19,6 +19,8 @@ #define CONFIG_MPC5200 1 /* This is a MPC5200 CPU */ #define CONFIG_A4M072 1 /* ... on A4M072 board */ #define CONFIG_MPC5200_DDR 1 /* ... use DDR RAM */ +#define CONFIG_DISPLAY_BOARDINFO +#define CONFIG_SYS_GENERIC_BOARD #define CONFIG_SYS_TEXT_BASE 0xFE000000 -- 2.1.3

2 5

[U-Boot] [PATCH] mpc85xx/sleep: flush cache after restoring DDR data
by b29983＠freescale.com 19 Nov '14

19 Nov '14

From: Tang Yuantian <Yuantian.Tang(a)freescale.com> Cache needs to be flushed after restoring DDR data. Signed-off-by: Tang Yuantian <Yuantian.Tang(a)freescale.com> --- board/freescale/t102xrdb/t102xrdb.c | 2 ++ board/freescale/t104xrdb/t104xrdb.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/board/freescale/t102xrdb/t102xrdb.c b/board/freescale/t102xrdb/t102xrdb.c index c224b2b..69e9331 100644 --- a/board/freescale/t102xrdb/t102xrdb.c +++ b/board/freescale/t102xrdb/t102xrdb.c @@ -187,6 +187,8 @@ void fsl_dp_ddr_restore(void) dst = (u64 *)CONFIG_SYS_SDRAM_BASE; for (i = 0; i < DDR_BUFF_LEN / 8; i++) *dst++ = *src++; + + flush_dcache(); } int fsl_dp_resume(void) diff --git a/board/freescale/t104xrdb/t104xrdb.c b/board/freescale/t104xrdb/t104xrdb.c index ea0cac7..58ba649 100644 --- a/board/freescale/t104xrdb/t104xrdb.c +++ b/board/freescale/t104xrdb/t104xrdb.c @@ -144,6 +144,8 @@ void fsl_dp_ddr_restore(void) for (i = 0; i < DDR_BUFF_LEN / 8; i++) *dst++ = *src++; + + flush_dcache(); } int fsl_dp_resume(void) -- 2.1.0.27.g96db324

1 0

[U-Boot] [PATCH v2 0/7] Update gdsys board support
by dirk.eibach＠gdsys.cc 19 Nov '14

19 Nov '14

From: Dirk Eibach <dirk.eibach(a)gdsys.cc> Changes in v2: - fix compiler warning - fix cppcheck finding reported by Wolfgang - move cmd_ioloop from common to board/gdsys/common - remove debug code from hrcon.c Dirk Eibach (7): board: dlvision: Reduce memory footprint mtd: Handle 29LV800BT common: Fix cmd_fpgad addressing board: dlvision-10g: Compile fix board: iocon: Fix fpga index in print_fpga_info() board: iocon: Fix uninitialized access mpc83xx: Add gdsys hrcon board arch/powerpc/cpu/mpc83xx/Kconfig | 4 + board/gdsys/405ep/iocon.c | 201 +----------- board/gdsys/common/Makefile | 4 +- board/gdsys/common/cmd_ioloop.c | 295 +++++++++++++++++ board/gdsys/common/ihs_mdio.c | 88 +++++ board/gdsys/common/ihs_mdio.h | 18 ++ board/gdsys/common/osd.c | 7 +- board/gdsys/common/phy.c | 280 ++++++++++++++++ board/gdsys/common/phy.h | 14 + board/gdsys/mpc8308/Kconfig | 12 + board/gdsys/mpc8308/MAINTAINERS | 6 + board/gdsys/mpc8308/Makefile | 9 + board/gdsys/mpc8308/hrcon.c | 675 +++++++++++++++++++++++++++++++++++++++ board/gdsys/mpc8308/mpc8308.c | 109 +++++++ board/gdsys/mpc8308/mpc8308.h | 10 + board/gdsys/mpc8308/sdram.c | 82 +++++ common/cmd_fpgad.c | 32 +- configs/hrcon_defconfig | 3 + drivers/mtd/jedec_flash.c | 51 +++ include/configs/dlvision.h | 9 +- include/configs/hrcon.h | 614 +++++++++++++++++++++++++++++++++++ include/flash.h | 1 + include/gdsys_fpga.h | 64 +++- 23 files changed, 2375 insertions(+), 213 deletions(-) create mode 100644 board/gdsys/common/cmd_ioloop.c create mode 100644 board/gdsys/common/ihs_mdio.c create mode 100644 board/gdsys/common/ihs_mdio.h create mode 100644 board/gdsys/common/phy.c create mode 100644 board/gdsys/common/phy.h create mode 100644 board/gdsys/mpc8308/Kconfig create mode 100644 board/gdsys/mpc8308/MAINTAINERS create mode 100644 board/gdsys/mpc8308/Makefile create mode 100644 board/gdsys/mpc8308/hrcon.c create mode 100644 board/gdsys/mpc8308/mpc8308.c create mode 100644 board/gdsys/mpc8308/mpc8308.h create mode 100644 board/gdsys/mpc8308/sdram.c create mode 100644 configs/hrcon_defconfig create mode 100644 include/configs/hrcon.h -- 1.8.3

4 19

[U-Boot] [PATCH] ubi: reset relevant globals in ubi_exit()
by Andrew Ruder 19 Nov '14

19 Nov '14

Before calling ubi_init() the U-Boot wrapper calls ubi_mtd_param_parse() to have the UBI driver add it to its mtd_dev_param[] array and increment mtd_devs. The first time ubi_init() is called, mtd_devs would be 1. Before ubi_init() is called again (another partition is attached), ubi_mtd_param_parse() is called again, incrementing mtd_devs again (now 2). This results in ubi_init() now trying to attach the first partition and the second partition. Fix this by adding a section at the end of ubi_exit() where we reset any globals that would need to be reset (in this case, just mtd_devs). Test case: $ ubi part <mtdname> ; ubi part <mtdname> Before patch: $ ubi part data UBI: attaching mtd1 to ubi0 UBI: scanning is finished UBI: attached mtd1 (name "mtd=4", size 4 MiB) to ubi0 [...] UBI: available PEBs: 0, total reserved PEBs: 32, [...] $ ubi part data UBI: detaching mtd1 from ubi0 UBI: mtd1 is detached from ubi0 UBI: attaching mtd1 to ubi0 [...] UBI: available PEBs: 0, total reserved PEBs: 32, [...] ** Note that this is where it tries to attach mtd1 again, fails, and ** then detaches everything as it errors out of ubi_init() UBI: detaching mtd1 from ubi0 UBI: mtd1 is detached from ubi0 UBI init error 17 $ After patch: $ ubi part data UBI: attaching mtd1 to ubi0 UBI: scanning is finished UBI: attached mtd1 (name "mtd=4", size 4 MiB) to ubi0 [...] UBI: available PEBs: 0, total reserved PEBs: 32, [...] $ ubi part data UBI: detaching mtd1 from ubi0 UBI: mtd1 is detached from ubi0 UBI: attaching mtd1 to ubi0 UBI: scanning is finished UBI: attached mtd1 (name "mtd=4", size 4 MiB) to ubi0 [...] UBI: available PEBs: 0, total reserved PEBs: 32, [...] $ Signed-off-by: Andrew Ruder <andrew.ruder(a)elecsyscorp.com> Cc: Heiko Schocher <hs(a)denx.de> Cc: Kyungmin Park <kmpark(a)infradead.org> --- drivers/mtd/ubi/build.c | 4 ++++ 1 file changed, 4 insertions(+) Not sure this is the best place to make the change, but it is one of the least obtrusive, IMO. Please Cc: me on any responses as it will go directly to my inbox! diff --git a/drivers/mtd/ubi/build.c b/drivers/mtd/ubi/build.c index 584cf5f..fc5cbce 100644 --- a/drivers/mtd/ubi/build.c +++ b/drivers/mtd/ubi/build.c @@ -1384,6 +1384,10 @@ void ubi_exit(void) misc_deregister(&ubi_ctrl_cdev); class_remove_file(ubi_class, &ubi_version); class_destroy(ubi_class); +#ifdef __UBOOT__ + /* Reset any globals that the driver depends on being zeroed */ + mtd_devs = 0; +#endif } module_exit(ubi_exit); -- 2.1.1

2 4

[U-Boot] [Patch v2] driver/ddr/fsl: Fix MRC_CYC calculation for DDR3
by York Sun 18 Nov '14

18 Nov '14

For DDR controller version 4.7 or newer, MRC_CYC (mode register set cycle time) is max(tMRD, tMOD). tMRD is 4nCK, or 8nCK (RDIMM). tMOD is max(12nCK, 15ns) according to JEDEC spec. DDR4 is not affected by this change. Signed-off-by: York Sun <yorksun(a)freescale.com> --- Change log v2: Apply the change only to DDR controller newer than v4.7 Older DDRC needs to take into account of RDIMM for tMRD drivers/ddr/fsl/ctrl_regs.c | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/drivers/ddr/fsl/ctrl_regs.c b/drivers/ddr/fsl/ctrl_regs.c index 9a156bf..7b28338 100644 --- a/drivers/ddr/fsl/ctrl_regs.c +++ b/drivers/ddr/fsl/ctrl_regs.c @@ -316,6 +316,7 @@ static void set_timing_cfg_0(fsl_ddr_cfg_regs_t *ddr, #elif defined(CONFIG_SYS_FSL_DDR3) unsigned int data_rate = get_ddr_freq(0); int txp; + unsigned int ip_rev; /* * (tXARD and tXARDS). Empirical? * The DDR3 spec has not tXARD, @@ -327,7 +328,25 @@ static void set_timing_cfg_0(fsl_ddr_cfg_regs_t *ddr, */ txp = max(mclk_ps * 3, (mclk_ps > 1540 ? 7500 : 6000)); - tmrd_mclk = 4; + ip_rev = fsl_ddr_get_version(); + if (ip_rev >= 0x40700) { + /* + * MRS_CYC = max(tMRD, tMOD) + * tMRD = 4nCK (8nCK for RDIMM) + * tMOD = max(12nCK, 15ns) + */ + tmrd_mclk = max(12, picos_to_mclk(15000)); + } else { + /* + * MRS_CYC = tMRD + * tMRD = 4nCK (8nCK for RDIMM) + */ + if (popts->registered_dimm_en) + tmrd_mclk = 8; + else + tmrd_mclk = 4; + } + /* set the turnaround time */ /* -- 1.7.9.5

1 0

[U-Boot] [PATCH] sunxi: gmac: Update bananapi fixup to the new CONFIG_TARGET_<BOARD> structure
by Zoltan HERPAI 18 Nov '14

18 Nov '14

The magic bit toucher needs to be updated to reflect the new board Kconfig structure Signed-off-by: Zoltan HERPAI <wigyori(a)uid0.hu> --- board/sunxi/gmac.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/sunxi/gmac.c b/board/sunxi/gmac.c index 6348d27..051aca0 100644 --- a/board/sunxi/gmac.c +++ b/board/sunxi/gmac.c @@ -29,7 +29,7 @@ int sunxi_gmac_initialize(bd_t *bis) * need to set bits 10-12 GTXDC "GMAC Transmit Clock Delay Chain" * of the GMAC clk register to 3. */ -#ifdef CONFIG_BANANAPI +#ifdef CONFIG_TARGET_BANANAPI setbits_le32(&ccm->gmac_clk_cfg, 0x3 << 10); #endif -- 1.7.10.4

2 1

[U-Boot] [PATCH] driver/ddr/fsl: Fix tMOD calculation for DDR3
by York Sun 18 Nov '14

18 Nov '14

JEDEC specifies tMOD = max(12nCK, 15ns) for DDR3. This value is used in mode register set cycle time. Signed-off-by: York Sun <yorksun(a)freescale.com> --- drivers/ddr/fsl/ctrl_regs.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/ddr/fsl/ctrl_regs.c b/drivers/ddr/fsl/ctrl_regs.c index 9a156bf..6fa7165 100644 --- a/drivers/ddr/fsl/ctrl_regs.c +++ b/drivers/ddr/fsl/ctrl_regs.c @@ -327,7 +327,12 @@ static void set_timing_cfg_0(fsl_ddr_cfg_regs_t *ddr, */ txp = max(mclk_ps * 3, (mclk_ps > 1540 ? 7500 : 6000)); - tmrd_mclk = 4; + /* + * MRS_CYC = max(tMRD, tMOD) + * tMRD = 4nCK, tMOD = max(12nCK, 15ns) + */ + tmrd_mclk = max(12, picos_to_mclk(15000)); + /* set the turnaround time */ /* -- 1.7.9.5

1 0

[U-Boot] [PATCH v4 0/2] sunxi: video: Add simplefb support
by Hans de Goede 18 Nov '14

18 Nov '14

Hi All, Here is v4 of my sunxi simplefb support set. Changes since v3: -Added a fdt_setup_simplefb_node() helper function (new patch) -Changed how u-boot finds the pre-populated simplefb node to use a compatible string Changes since v2: -Detect and handle address and size #cells Changes since v1: -Use fdt_setprop_string for strings Simon, can you review and ack the fdt_setup_simplefb_node() helper function patch please ? Since it is a dep. for sunxi patches I would like to take it upstream through the sunxi tree, but for obvious reasons I would also like your ack on this. Ian, I hope the sunxi specific patch is now more to your liking, please re-review. Also can you please review v2 of: -"sunxi: video: Add cfb console driver for sunxi" You've already reviewed and acked v1, v2 only has some Kconfig changes -"sunxi: Add usb keyboard Kconfig option" Kconfig changes / fixes as discussed You should have these in your mailbox, if not see patchwork. Thanks & Regards, Hans

3 11

[U-Boot] [PATCH] mcf: Fix cppcheck errors about uninitialized variables
by Alison Wang 18 Nov '14

18 Nov '14

This patch will initialize the variables to fix the cppcheck errors as follows. [arch/m68k/cpu/mcf5227x/speed.c:89]: (error) Uninitialized variable: bootmode [arch/m68k/cpu/mcf532x/speed.c:248]: (error) Uninitialized variable: fout [arch/m68k/cpu/mcf5445x/speed.c:194]: (error) Uninitialized variable: bootmode Signed-off-by: Alison Wang <alison.wang(a)freescale.com> --- arch/m68k/cpu/mcf5227x/speed.c | 2 +- arch/m68k/cpu/mcf532x/speed.c | 3 ++- arch/m68k/cpu/mcf5445x/speed.c | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/arch/m68k/cpu/mcf5227x/speed.c b/arch/m68k/cpu/mcf5227x/speed.c index 44de4a6..e991cd1 100644 --- a/arch/m68k/cpu/mcf5227x/speed.c +++ b/arch/m68k/cpu/mcf5227x/speed.c @@ -74,7 +74,7 @@ int get_clocks(void) ccm_t *ccm = (ccm_t *)MMAP_CCM; pll_t *pll = (pll_t *)MMAP_PLL; int vco, temp, pcrvalue, pfdr; - u8 bootmode; + u8 bootmode = 0; pcrvalue = in_be32(&pll->pcr) & 0xFF0F0FFF; pfdr = pcrvalue >> 24; diff --git a/arch/m68k/cpu/mcf532x/speed.c b/arch/m68k/cpu/mcf532x/speed.c index a440bbb..0495b16 100644 --- a/arch/m68k/cpu/mcf532x/speed.c +++ b/arch/m68k/cpu/mcf532x/speed.c @@ -143,7 +143,8 @@ int clock_pll(int fsys, int flags) #endif sdram_t *sdram = (sdram_t *)(MMAP_SDRAM); pll_t *pll = (pll_t *)(MMAP_PLL); - int fref, temp, fout, mfd; + int fref, temp, mfd; + int fout = 0; u32 i; fref = FREF; diff --git a/arch/m68k/cpu/mcf5445x/speed.c b/arch/m68k/cpu/mcf5445x/speed.c index 4e363a4..a166dcc 100644 --- a/arch/m68k/cpu/mcf5445x/speed.c +++ b/arch/m68k/cpu/mcf5445x/speed.c @@ -141,7 +141,7 @@ void setup_5445x_clocks(void) #ifdef CONFIG_M54455EVB u8 *cpld = (u8 *)(CONFIG_SYS_CS2_BASE + 3); #endif - u8 bootmode; + u8 bootmode = 0; /* To determine PCI is present or not */ if (((in_be16(&ccm->ccr) & CCM_CCR_360_FBCONFIG_MASK) == 0x00e0) || -- 2.1.0.27.g96db324

4 3

[U-Boot] [PATCH 0/2] mxssb: trivial fixes
by Marc Kleine-Budde 18 Nov '14

18 Nov '14

Hey, this is a trivial patch series for the mxssb tool. Please review and apply. regards, Marc

2 3