May 2014 - U-Boot

[U-Boot] Please pull u-boot-mpc85xx master
by York Sun 19 May '14

19 May '14

Tom, The following changes since commit 557a3319089499aa0e55d65a6b43b7137f362003: Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx (2014-05-13 17:09:28 -0400) are available in the git repository at: git://git.denx.de/u-boot-mpc85xx.git master for you to fetch changes up to e4911815cf98237b65a817a3c791f143794f2837: powerpc/srio-pcie-boot: Adjust addresses for SRIO/PCIE boot (2014-05-16 16:29:16 -0500) ---------------------------------------------------------------- Aneesh Bansal (1): powerpc/mpc85xx: SECURE BOOT- corrected CSPR settings for BSC9132QDS NAND Chunhe Lan (3): net: phy/vitesse: Add support for VSC8664 phy module fsl/pci: Add workaround for erratum A-005434 powerpc/85xx: Add T4160RDB board support Ebony Zhu (1): board/freescale: Move CRC32 offset in NXID v1 data format Kim Phillips (1): mpc85xx: configs: remove c=ffe from default environment Liu Gang (1): powerpc/srio-pcie-boot: Adjust addresses for SRIO/PCIE boot Nikhil Badola (1): drivers/usb : Define usb control register mask for w1c bits Prabhakar Kushwaha (1): board/p1_p2_rdb:Enable p1_p2_rdb boot from NAND/SD/SPI in SPL Shaveta Leekha (1): powerpc/mpc85xx: Added B4460 support Tang Yuantian (1): powerpc/t104xrdb: Toggle deep sleep management signals after resume ramneek mehresh (1): mpc85xx/p1020:Define number of USB controllers used on P1020RDB-PD platform arch/powerpc/cpu/mpc85xx/cmd_errata.c | 3 + arch/powerpc/cpu/mpc8xxx/cpu.c | 1 + arch/powerpc/include/asm/config_mpc85xx.h | 3 + arch/powerpc/include/asm/processor.h | 1 + board/freescale/common/sys_eeprom.c | 7 +- board/freescale/p1_p2_rdb/Makefile | 21 +- board/freescale/p1_p2_rdb/ddr.c | 16 +- board/freescale/p1_p2_rdb/spl.c | 141 +++++++++++++ board/freescale/p1_p2_rdb/spl_minimal.c | 84 ++++++++ board/freescale/p1_p2_rdb/tlb.c | 18 +- board/freescale/t104xrdb/t104xrdb.c | 2 + boards.cfg | 1 + drivers/net/phy/vitesse.c | 46 ++++ drivers/pci/fsl_pci_init.c | 9 +- drivers/usb/host/ehci-fsl.c | 15 +- include/configs/B4860QDS.h | 13 +- include/configs/BSC9132QDS.h | 2 +- include/configs/P1_P2_RDB.h | 265 ++++++++++++++++-------- include/configs/P2041RDB.h | 13 +- include/configs/T1040QDS.h | 3 +- include/configs/T104xRDB.h | 3 +- include/configs/T208xQDS.h | 13 +- include/configs/T208xRDB.h | 13 +- include/configs/T4240EMU.h | 3 +- include/configs/T4240QDS.h | 13 +- include/configs/T4240RDB.h | 4 + include/configs/corenet_ds.h | 13 +- include/configs/p1_p2_rdb_pc.h | 4 + include/usb/ehci-fsl.h | 2 + nand_spl/board/freescale/p1_p2_rdb/Makefile | 91 -------- nand_spl/board/freescale/p1_p2_rdb/nand_boot.c | 82 -------- 31 files changed, 578 insertions(+), 327 deletions(-) create mode 100644 board/freescale/p1_p2_rdb/spl.c create mode 100644 board/freescale/p1_p2_rdb/spl_minimal.c delete mode 100644 nand_spl/board/freescale/p1_p2_rdb/Makefile delete mode 100644 nand_spl/board/freescale/p1_p2_rdb/nand_boot.c Thanks, York

2 1

[U-Boot] [PATCH] at91: move CONFIG_AT91FAMILY from board config file to hardware.h
by Josh Wu 19 May '14

19 May '14

Signed-off-by: Josh Wu <josh.wu(a)atmel.com> --- arch/arm/include/asm/arch-at91/at91sam9x5.h | 2 ++ include/configs/at91sam9m10g45ek.h | 1 - include/configs/at91sam9n12ek.h | 1 - include/configs/at91sam9x5ek.h | 1 - include/configs/sama5d3_xplained.h | 1 - include/configs/sama5d3xek.h | 1 - 6 files changed, 2 insertions(+), 5 deletions(-) diff --git a/arch/arm/include/asm/arch-at91/at91sam9x5.h b/arch/arm/include/asm/arch-at91/at91sam9x5.h index a471038..36a5cdf 100644 --- a/arch/arm/include/asm/arch-at91/at91sam9x5.h +++ b/arch/arm/include/asm/arch-at91/at91sam9x5.h @@ -12,6 +12,8 @@ #ifndef __AT91SAM9X5_H__ #define __AT91SAM9X5_H__ +#define CONFIG_AT91FAMILY /* it's a member of AT91 family */ + /* * Peripheral identifiers/interrupts. */ diff --git a/include/configs/at91sam9m10g45ek.h b/include/configs/at91sam9m10g45ek.h index 7a3c9b5..5d5fbe5 100644 --- a/include/configs/at91sam9m10g45ek.h +++ b/include/configs/at91sam9m10g45ek.h @@ -22,7 +22,6 @@ #define CONFIG_SYS_AT91_MAIN_CLOCK 12000000 /* from 12 MHz crystal */ #define CONFIG_AT91SAM9M10G45EK -#define CONFIG_AT91FAMILY #define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */ #define CONFIG_SETUP_MEMORY_TAGS diff --git a/include/configs/at91sam9n12ek.h b/include/configs/at91sam9n12ek.h index e23549d..ebfc26e 100644 --- a/include/configs/at91sam9n12ek.h +++ b/include/configs/at91sam9n12ek.h @@ -19,7 +19,6 @@ #define CONFIG_SYS_TEXT_BASE 0x26f00000 #define CONFIG_ARM926EJS -#define CONFIG_AT91FAMILY /* ARM asynchronous clock */ #define CONFIG_SYS_AT91_SLOW_CLOCK 32768 /* slow clock xtal */ diff --git a/include/configs/at91sam9x5ek.h b/include/configs/at91sam9x5ek.h index f0a6757..b2dd252 100644 --- a/include/configs/at91sam9x5ek.h +++ b/include/configs/at91sam9x5ek.h @@ -18,7 +18,6 @@ #define CONFIG_SYS_AT91_MAIN_CLOCK 12000000 /* 12 MHz crystal */ #define CONFIG_AT91SAM9X5EK -#define CONFIG_AT91FAMILY #define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */ #define CONFIG_SETUP_MEMORY_TAGS diff --git a/include/configs/sama5d3_xplained.h b/include/configs/sama5d3_xplained.h index 41c946d..d7fb850 100644 --- a/include/configs/sama5d3_xplained.h +++ b/include/configs/sama5d3_xplained.h @@ -18,7 +18,6 @@ #define CONFIG_SYS_AT91_SLOW_CLOCK 32768 #define CONFIG_SYS_AT91_MAIN_CLOCK 12000000 /* from 12 MHz crystal */ -#define CONFIG_AT91FAMILY #define CONFIG_ARCH_CPU_INIT #define CONFIG_SKIP_LOWLEVEL_INIT #define CONFIG_BOARD_EARLY_INIT_F diff --git a/include/configs/sama5d3xek.h b/include/configs/sama5d3xek.h index b509c2d..72f0f27 100644 --- a/include/configs/sama5d3xek.h +++ b/include/configs/sama5d3xek.h @@ -21,7 +21,6 @@ #define CONFIG_SYS_AT91_SLOW_CLOCK 32768 #define CONFIG_SYS_AT91_MAIN_CLOCK 12000000 /* from 12 MHz crystal */ -#define CONFIG_AT91FAMILY #define CONFIG_ARCH_CPU_INIT #ifndef CONFIG_SPL_BUILD -- 1.7.9.5

2 2

[U-Boot] [PATCH v2 0/3] Add atmel ROM code image
by Andreas Bießmann 19 May '14

19 May '14

This series add atmelimage support to mkimage. An atmelimage is a quite dumb image type cause it has no real header. The file is mostly unmodified but the 6'th ARM vector gets replaced by the image size to load. Heiko, I know your approach setting the vector in start.S but I think this solution is a bit smarter. We would need to patch at least 2 start.S files (arm926ejs and armv7), maybe also the arm920t one too. In fact is the conversion of executable BLOB to ROM detected executable BLOB something that should really be done afterwards as all other SoC vendors do. In version 2 of this patchset the atmelimage mkimage target can also generate PMECC NAND header. Changes in v2: * do not check filesize in atmelimage * add PMECC header generation and printout * add printout of 6'th vector * add -n switch to mkimage for PMECC type NAND and CONFIG_SYS_NANDFLASH Andreas Bießmann (3): mkimage: add atmelimage arm:at91: enable ROM loadable atmel image sama5d3xek: enable PMECC header generation arch/arm/cpu/armv7/at91/config.mk | 10 ++ common/image.c | 1 + doc/README.atmel_pmecc | 30 ++++ include/configs/sama5d3xek.h | 6 + include/image.h | 1 + spl/Makefile | 18 ++ tools/Makefile | 1 + tools/atmelimage.c | 345 +++++++++++++++++++++++++++++++++++++ tools/imagetool.c | 2 + tools/imagetool.h | 1 + 10 files changed, 415 insertions(+) create mode 100644 arch/arm/cpu/armv7/at91/config.mk create mode 100644 tools/atmelimage.c -- 1.7.10.4

2 7

[U-Boot] [PATCH v2] net/fm: call fm_port_to_index() with proper checks
by Marian Rotariu 19 May '14

19 May '14

Some of the fm_port_to_index() callers did not check for -1 return value and used -1 as an array index. Signed-off-by: Marian Rotariu <marian.rotariu(a)freescale.com> --- drivers/net/fm/fm.h | 3 ++- drivers/net/fm/init.c | 6 ++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/drivers/net/fm/fm.h b/drivers/net/fm/fm.h index 43de114..316e06e 100644 --- a/drivers/net/fm/fm.h +++ b/drivers/net/fm/fm.h @@ -143,6 +143,7 @@ struct fm_eth { #define MAX_RXBUF_LOG2 11 #define MAX_RXBUF_LEN (1 << MAX_RXBUF_LOG2) -#define PORT_IS_ENABLED(port) fm_info[fm_port_to_index(port)].enabled +#define PORT_IS_ENABLED(port) (fm_port_to_index(port) == -1 ? \ + 0 : fm_info[fm_port_to_index(port)].enabled) #endif /* __FM_H__ */ diff --git a/drivers/net/fm/init.c b/drivers/net/fm/init.c index cd787f4..ff04695 100644 --- a/drivers/net/fm/init.c +++ b/drivers/net/fm/init.c @@ -147,6 +147,9 @@ void fm_disable_port(enum fm_port port) { int i = fm_port_to_index(port); + if (i == -1) + return; + fm_info[i].enabled = 0; fman_disable_port(port); } @@ -155,6 +158,9 @@ void fm_enable_port(enum fm_port port) { int i = fm_port_to_index(port); + if (i == -1) + return; + fm_info[i].enabled = 1; fman_enable_port(port); } -- 1.7.10.4

1 0

[U-Boot] [PATCH 1/3] arm: armadillo800eva: Enable CONFIG_SYS_GENERIC_BOARD
by Nobuhiro Iwamatsu 19 May '14

19 May '14

Add CONFIG_SYS_GENERIC_BOARD to use common/board_*.c for armadillo800eva. Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj(a)renesas.com> --- include/configs/armadillo-800eva.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/configs/armadillo-800eva.h b/include/configs/armadillo-800eva.h index 17a2da0..8bb932c 100644 --- a/include/configs/armadillo-800eva.h +++ b/include/configs/armadillo-800eva.h @@ -48,6 +48,7 @@ #define CONFIG_USE_ARCH_MEMCPY #define CONFIG_TMU_TIMER #define CONFIG_SYS_DCACHE_OFF +#define CONFIG_SYS_GENERIC_BOARD /* STACK */ #define CONFIG_SYS_INIT_SP_ADDR 0xE8083000 -- 1.9.2

1 2

[U-Boot] [PATCH] powerpc/85xx: add fdt_fixup_dma3
by Shengzhou Liu 19 May '14

19 May '14

On some SoC(e.g. T2080/T4240) the 3rd DMA is not functional if SRIO2 is chosen. we add fdt_fixup_dma3() to disable the 3rd DMA if SRIO2 is chosen. Signed-off-by: Shengzhou Liu <Shengzhou.Liu(a)freescale.com> --- arch/powerpc/cpu/mpc85xx/fdt.c | 47 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/arch/powerpc/cpu/mpc85xx/fdt.c b/arch/powerpc/cpu/mpc85xx/fdt.c index 594a9fc..a7e6cc8 100644 --- a/arch/powerpc/cpu/mpc85xx/fdt.c +++ b/arch/powerpc/cpu/mpc85xx/fdt.c @@ -615,6 +615,51 @@ static void fdt_fixup_usb(void *fdt) #define fdt_fixup_usb(x) #endif +#if defined(CONFIG_PPC_T2080) || defined(CONFIG_PPC_T4240) || \ + defined(CONFIG_PPC_T4160) || defined(CONFIG_PPC_T4080) +void fdt_fixup_dma3(void *blob) +{ + /* the 3rd DMA is not functional if SRIO2 is chosen */ + int nodeoff; + ccsr_gur_t __iomem *gur = (void *)(CONFIG_SYS_MPC85xx_GUTS_ADDR); + +#define CONFIG_SYS_ELO3_DMA3 (0xffe000000 + 0x102300) +#if defined(CONFIG_PPC_T2080) + u32 srds_prtcl_s2 = in_be32(&gur->rcwsr[4]) & + FSL_CORENET2_RCWSR4_SRDS2_PRTCL; + srds_prtcl_s2 >>= FSL_CORENET2_RCWSR4_SRDS2_PRTCL_SHIFT; + + switch (srds_prtcl_s2) { + case 0x29: + case 0x2d: + case 0x2e: +#elif defined(CONFIG_PPC_T4240) || defined(CONFIG_PPC_T4160) || \ + defined(CONFIG_PPC_T4080) + u32 srds_prtcl_s4 = in_be32(&gur->rcwsr[4]) & + FSL_CORENET2_RCWSR4_SRDS4_PRTCL; + srds_prtcl_s4 >>= FSL_CORENET2_RCWSR4_SRDS4_PRTCL_SHIFT; + + switch (srds_prtcl_s4) { + case 6: + case 8: + case 14: + case 16: +#endif + nodeoff = fdt_node_offset_by_compat_reg(blob, "fsl,elo3-dma", + CONFIG_SYS_ELO3_DMA3); + if (nodeoff > 0) + fdt_status_disabled(blob, nodeoff); + else + printf("WARNING: unable to disable dma3\n"); + break; + default: + break; + } +} +#else +#define fdt_fixup_dma3(x) +#endif + #if defined(CONFIG_PPC_T1040) static void fdt_fixup_l2_switch(void *blob) { @@ -784,6 +829,8 @@ void ft_cpu_setup(void *blob, bd_t *bd) fdt_fixup_usb(blob); fdt_fixup_l2_switch(blob); + + fdt_fixup_dma3(blob); } /* -- 1.8.0

1 0

[U-Boot] [PATCH] board: koelsch: Fix QoS revision 0.240 and 0.320
by Nobuhiro Iwamatsu 19 May '14

19 May '14

Add register define of DBSC3 operation adjustment register, and add initial value. Signed-off-by: Hisashi Nakamura <hisashi.nakamura.ak(a)renesas.com> Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj(a)renesas.com> --- arch/arm/include/asm/arch-rmobile/r8a7791.h | 1 + board/renesas/koelsch/qos.c | 1 + 2 files changed, 2 insertions(+) diff --git a/arch/arm/include/asm/arch-rmobile/r8a7791.h b/arch/arm/include/asm/arch-rmobile/r8a7791.h index 4791825..592c524 100644 --- a/arch/arm/include/asm/arch-rmobile/r8a7791.h +++ b/arch/arm/include/asm/arch-rmobile/r8a7791.h @@ -45,6 +45,7 @@ #define DBSC3_1_QOS_W13_BASE 0xE67A2D00 #define DBSC3_1_QOS_W14_BASE 0xE67A2E00 #define DBSC3_1_QOS_W15_BASE 0xE67A2F00 +#define DBSC3_1_DBADJ2 0xE67A00C8 #define R8A7791_CUT_ES2X 2 #define IS_R8A7791_ES2() \ diff --git a/board/renesas/koelsch/qos.c b/board/renesas/koelsch/qos.c index e6c5e48..55a0420 100644 --- a/board/renesas/koelsch/qos.c +++ b/board/renesas/koelsch/qos.c @@ -111,6 +111,7 @@ void qos_init(void) /* DBSC DBADJ2 */ writel(0x20042004, DBSC3_0_DBADJ2); + writel(0x20042004, DBSC3_1_DBADJ2); /* S3C -QoS */ s3c = (struct rcar_s3c *)S3C_BASE; -- 1.9.2

1 0

[U-Boot] [PATCH v2] arm: rmobile: r8a7791: Fix MOD_SEL3 function table about FN_SEL_IEB
by Nobuhiro Iwamatsu 19 May '14

19 May '14

FN_SEL_IEB is assigned 2bit, and 2bit can represent 4 patterns. However FN_SEL_IEB but we only use 3. It adds empty patterns as 0. Signed-off-by: Hisashi Nakamura <hisashi.nakamura.ak(a)renesas.com> Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj(a)renesas.com> --- v2: Add "arm:" Subject. arch/arm/cpu/armv7/rmobile/pfc-r8a7791.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/cpu/armv7/rmobile/pfc-r8a7791.c b/arch/arm/cpu/armv7/rmobile/pfc-r8a7791.c index f49f990..46d6e60 100644 --- a/arch/arm/cpu/armv7/rmobile/pfc-r8a7791.c +++ b/arch/arm/cpu/armv7/rmobile/pfc-r8a7791.c @@ -913,7 +913,7 @@ static struct pinmux_cfg_reg pinmux_config_regs[] = { /* SEL_SCIF3 [2] */ FN_SEL_SCIF3_0, FN_SEL_SCIF3_1, FN_SEL_SCIF3_2, FN_SEL_SCIF3_3, /* SEL_IEB [2] */ - FN_SEL_IEB_0, FN_SEL_IEB_1, FN_SEL_IEB_2, + FN_SEL_IEB_0, FN_SEL_IEB_1, FN_SEL_IEB_2, 0, /* SEL_MMC [1] */ FN_SEL_MMC_0, FN_SEL_MMC_1, /* SEL_SCIF5 [1] */ -- 1.9.2

1 0

[U-Boot] [PATCH] rmobile: r8a7791: Fix MOD_SEL3 function table about FN_SEL_IEB
by Nobuhiro Iwamatsu 19 May '14

19 May '14

FN_SEL_IEB is assigned 2bit, and 2bit can represent 4 patterns. However FN_SEL_IEB but we only use 3. It adds empty patterns as 0. Signed-off-by: Hisashi Nakamura <hisashi.nakamura.ak(a)renesas.com> Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj(a)renesas.com> --- arch/arm/cpu/armv7/rmobile/pfc-r8a7791.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/cpu/armv7/rmobile/pfc-r8a7791.c b/arch/arm/cpu/armv7/rmobile/pfc-r8a7791.c index f49f990..46d6e60 100644 --- a/arch/arm/cpu/armv7/rmobile/pfc-r8a7791.c +++ b/arch/arm/cpu/armv7/rmobile/pfc-r8a7791.c @@ -913,7 +913,7 @@ static struct pinmux_cfg_reg pinmux_config_regs[] = { /* SEL_SCIF3 [2] */ FN_SEL_SCIF3_0, FN_SEL_SCIF3_1, FN_SEL_SCIF3_2, FN_SEL_SCIF3_3, /* SEL_IEB [2] */ - FN_SEL_IEB_0, FN_SEL_IEB_1, FN_SEL_IEB_2, + FN_SEL_IEB_0, FN_SEL_IEB_1, FN_SEL_IEB_2, 0, /* SEL_MMC [1] */ FN_SEL_MMC_0, FN_SEL_MMC_1, /* SEL_SCIF5 [1] */ -- 1.9.2

1 0

[U-Boot] Going beyond CONFIG_SYS_CBSIZE limit causes a hang
by Fabio Estevam 19 May '14

19 May '14

Hi, When I enter the number of characters defined by CONFIG_SYS_CBSIZE into the console I noticed that further characters are no longer accepted. This part is fine. The problem is that after hitting Enter I get a system hang. To reproduce the problem more easily I set CONFIG_SYS_CBSIZE to only 50: => aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa Unknown command 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa' - try 'help ' (Then the console hangs) Also tried to enter the maximum of accepted characters (CONFIG_SYS_CBSIZE is only 50 in this example), then after it reaches the limit, I hit one backspace followed by Enter: => aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa Unknown command 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa' - try 'help' data abort pc : [<27706c6e>] lr : [<27706c65>] sp : 4f56cdc0 ip : 00000000 fp : 4f56ef70 data abort pc : [<66a53642>] lr : [<66653639>] sp : 4f56ccd8 ip : 0000000f fp : 4f56ef70 data abort pc : [<666fffce>] lr : [<66653635>] sp : 4f56cbf0 ip : 0000000f fp : 4f56ef70 data abort pc : [<666fffea>] lr : [<66653635>] sp : 4f56cb08 ip : 0000000f fp : 4f56ef70 data abort pc : [<4ff6f1e8>] lr : [<66653635>] sp : 4f56ca20 ip : 0000000f fp : 4f56ef70 data abort pc : [<666acd74>] lr : [<66653635>] sp : 4f56c938 ip : 0000000f fp : 4f56ef70 data abort pc : [<4ff6f1e8>] lr : [<66653635>] sp : 4f56c850 ip : 0000000f fp : 4f56ef70 data abort pc : [<666ffffa>] lr : [<66653635>] sp : 4f56c768 ip : 0000000f fp : 4f56ef70 These tests were made on a mx6qsabresd. What would be the correct way to to avoid such hangs? Thanks, Fabio Estevam

1 1