September 2017 - U-Boot

[U-Boot] [PATCH] ARM: mvebu: add SAR frequency values for 1.8/2.0GHz
by Chris Packham 26 Sep '17

26 Sep '17

The Armada-38x has 1.8GHz and 2.0GHz variants. Add entries for these variants to the sar_freq_tab. Signed-off-by: Chris Packham <judge.packham(a)gmail.com> --- arch/arm/mach-mvebu/cpu.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/arch/arm/mach-mvebu/cpu.c b/arch/arm/mach-mvebu/cpu.c index f7f83bfa3655..74a63dd6560b 100644 --- a/arch/arm/mach-mvebu/cpu.c +++ b/arch/arm/mach-mvebu/cpu.c @@ -112,13 +112,15 @@ static const struct sar_freq_modes sar_freq_tab[] = { #elif defined(CONFIG_ARMADA_38X) /* SAR frequency values for Armada 38x */ static const struct sar_freq_modes sar_freq_tab[] = { - { 0x0, 0x0, 666, 333, 333 }, - { 0x2, 0x0, 800, 400, 400 }, - { 0x4, 0x0, 1066, 533, 533 }, - { 0x6, 0x0, 1200, 600, 600 }, - { 0x8, 0x0, 1332, 666, 666 }, - { 0xc, 0x0, 1600, 800, 800 }, - { 0xff, 0xff, 0, 0, 0 } /* 0xff marks end of array */ + { 0x0, 0x0, 666, 333, 333 }, + { 0x2, 0x0, 800, 400, 400 }, + { 0x4, 0x0, 1066, 533, 533 }, + { 0x6, 0x0, 1200, 600, 600 }, + { 0x8, 0x0, 1332, 666, 666 }, + { 0xc, 0x0, 1600, 800, 800 }, + { 0x10, 0x0, 1866, 933, 933 }, + { 0x13, 0x0, 2000, 1000, 933 }, + { 0xff, 0xff, 0, 0, 0 } /* 0xff marks end of array */ }; #else /* SAR frequency values for Armada XP */ -- 2.14.1

2 3

[U-Boot] [PATCH] ARM: mvebu: handle unused DRAM banks with ECC enabled
by Chris Packham 26 Sep '17

26 Sep '17

dram_ecc_scrubbing() had code to skip unused DRAM banks but it would not work because mvebu_sdram_bs() returns 0 and the code was subtracting 1 before checking the size. Remove the -1 from the bank size and the +1 from the total which will skip unused banks and still calculate the correct size. Put the -1 where it is needed for scrubbing via the xor engine. Reported-by: Joshua Scott <joshua.scott(a)alliedtelesis.co.nz> Signed-off-by: Chris Packham <judge.packham(a)gmail.com> --- arch/arm/mach-mvebu/dram.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm/mach-mvebu/dram.c b/arch/arm/mach-mvebu/dram.c index e3f304c366..f946c0cffe 100644 --- a/arch/arm/mach-mvebu/dram.c +++ b/arch/arm/mach-mvebu/dram.c @@ -179,11 +179,11 @@ static void dram_ecc_scrubbing(void) reg_write(REG_SDRAM_CONFIG_ADDR, temp); for (cs = 0; cs < CONFIG_NR_DRAM_BANKS; cs++) { - size = mvebu_sdram_bs(cs) - 1; + size = mvebu_sdram_bs(cs); if (size == 0) continue; - total = (u64)size + 1; + total = (u64)size; total_mem += (u32)(total / (1 << 30)); start_addr = 0; mv_xor_init2(cs); @@ -194,7 +194,7 @@ static void dram_ecc_scrubbing(void) size -= start_addr; } - mv_xor_mem_init(SCRB_XOR_CHAN, start_addr, size, + mv_xor_mem_init(SCRB_XOR_CHAN, start_addr, size - 1, SCRUB_MAGIC, SCRUB_MAGIC); /* Wait for previous transfer completion */ -- 2.14.1

3 2

[U-Boot] [PATCH v2 1/2] arm: mvebu: fix boot from UART on ClearFog Base
by Baruch Siach 26 Sep '17

26 Sep '17

The ClearFog Base boot from UART when setting the DIP switches to 01001. Unfortunately, the SPL code sometimes fails to detect the UART boot method at run-time. Add an alternative SAR UART boot value to fix this. Note that this alternative value is not documented (Armada 38x Hardware Specifications, Table 48). But experimentations showed it on the ClearFog Base. Signed-off-by: Baruch Siach <baruch(a)tkos.co.il> --- v2: put BOOT_FROM_UART_ALT under #ifdef to avoid build break for other mvebu variants --- arch/arm/mach-mvebu/include/mach/soc.h | 1 + arch/arm/mach-mvebu/spl.c | 3 +++ 2 files changed, 4 insertions(+) diff --git a/arch/arm/mach-mvebu/include/mach/soc.h b/arch/arm/mach-mvebu/include/mach/soc.h index 0900e4008c12..44bac63b4447 100644 --- a/arch/arm/mach-mvebu/include/mach/soc.h +++ b/arch/arm/mach-mvebu/include/mach/soc.h @@ -139,6 +139,7 @@ #define BOOT_DEV_SEL_MASK (0x3f << BOOT_DEV_SEL_OFFS) #define BOOT_FROM_UART 0x28 +#define BOOT_FROM_UART_ALT 0x3f #define BOOT_FROM_SPI 0x32 #define BOOT_FROM_MMC 0x30 #define BOOT_FROM_MMC_ALT 0x31 diff --git a/arch/arm/mach-mvebu/spl.c b/arch/arm/mach-mvebu/spl.c index 3cf02a54cea2..a72a769f7c74 100644 --- a/arch/arm/mach-mvebu/spl.c +++ b/arch/arm/mach-mvebu/spl.c @@ -42,6 +42,9 @@ static u32 get_boot_device(void) return BOOT_DEVICE_MMC1; #endif case BOOT_FROM_UART: +#ifdef BOOT_FROM_UART_ALT + case BOOT_FROM_UART_ALT: +#endif return BOOT_DEVICE_UART; case BOOT_FROM_SPI: default: -- 2.14.1

2 3

[U-Boot] DDR training code for Armada 38x
by Chris Packham 26 Sep '17

26 Sep '17

Hi Stefan, When you did the port from Marvell's source did you script any of the tidy-up that you did along the way? I'm running up a new board and with the upstream u-boot DDR training occasionally fails. But with the Marvell bootloader it doesn't fail. The initial port was done from TIP-1.29 but Marvell are now up to TIP-1.55 so there is probably some difference that results in my board working. One difference I've spotted so far is that Marvell enable 2T timing mode for all Armada 38x boards (the comment says "resolve low freq instability"). But doing that doesn't magically make my board work. I'm thinking I need to compare TIP-1.29 with TIP-1.55 to look for other differences but obviously that's going to be hard given the style changes. If you have any scripts (or even just a record of the regexes) that you used would you be able to share them? Thanks, Chris

2 4

[U-Boot] [PATCH] armv8: ls1046ardb: disable PPA loading during SPL stage for SD boot
by Yangbo Lu 25 Sep '17

25 Sep '17

PPA loading during SPL stage is not required for nornal SD boot scenario. Signed-off-by: Yangbo Lu <yangbo.lu(a)nxp.com> --- configs/ls1046ardb_sdcard_defconfig | 1 - 1 file changed, 1 deletion(-) diff --git a/configs/ls1046ardb_sdcard_defconfig b/configs/ls1046ardb_sdcard_defconfig index 600990ea60..1d7ed3b23a 100644 --- a/configs/ls1046ardb_sdcard_defconfig +++ b/configs/ls1046ardb_sdcard_defconfig @@ -1,7 +1,6 @@ CONFIG_ARM=y CONFIG_TARGET_LS1046ARDB=y CONFIG_FSL_LS_PPA=y -CONFIG_SPL_FSL_LS_PPA=y CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1046a-rdb" CONFIG_DISTRO_DEFAULTS=y CONFIG_FIT_VERBOSE=y -- 2.14.1

2 1

[U-Boot] [PATCH] armv8: ls1043ardb: disable PPA loading during SPL stage for SD boot
by Yangbo Lu 25 Sep '17

25 Sep '17

PPA loading during SPL stage is not required for nornal SD boot scenario. Signed-off-by: Yangbo Lu <yangbo.lu(a)nxp.com> --- configs/ls1043ardb_sdcard_defconfig | 1 - 1 file changed, 1 deletion(-) diff --git a/configs/ls1043ardb_sdcard_defconfig b/configs/ls1043ardb_sdcard_defconfig index efdaaa3d69..f6ea06bfb0 100644 --- a/configs/ls1043ardb_sdcard_defconfig +++ b/configs/ls1043ardb_sdcard_defconfig @@ -3,7 +3,6 @@ CONFIG_TARGET_LS1043ARDB=y CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_FSL_LS_PPA=y -CONFIG_SPL_FSL_LS_PPA=y CONFIG_SPL_MMC_SUPPORT=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_DRIVERS_MISC_SUPPORT=y -- 2.14.1

3 4

[U-Boot] [v2] armv8: ls1043a: disable IFC in SPL only when QSPI is used
by Yangbo Lu 25 Sep '17

25 Sep '17

Current u-boot disables IFC support for SD boot on all ls1043a boards. Actually IFC only conflicts with QSPI on ls1043a hardware. Only when QSPI is used, IFC should be disabled. Otherwise, the u-boot with ls1043aqds_sdcard_ifc_defconfig would not work. Signed-off-by: Yangbo Lu <yangbo.lu(a)nxp.com> --- Changes for v2: - Modified the commit message. --- include/configs/ls1043a_common.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/configs/ls1043a_common.h b/include/configs/ls1043a_common.h index 002830c27e..1f9efffa56 100644 --- a/include/configs/ls1043a_common.h +++ b/include/configs/ls1043a_common.h @@ -22,7 +22,7 @@ #if (defined(CONFIG_SPL_BUILD) && defined(CONFIG_NAND_BOOT)) #define SPL_NO_MMC #endif -#if (defined(CONFIG_SPL_BUILD) && defined(CONFIG_SD_BOOT)) +#if (defined(CONFIG_SPL_BUILD) && defined(CONFIG_SD_BOOT_QSPI)) #define SPL_NO_IFC #endif -- 2.14.1

2 1

[U-Boot] [PATCH][v3]board/ls2080ardb: Update board env based on SoC
by Priyanka Jain 25 Sep '17

25 Sep '17

As per current implementation, default value of board env is based on board filename i.e ls2080ardb. With distro support changes, this env is used to decide upon kernel dtb which is different for other SoCs (ls2088a, ls2081a) combination supported with this board. Add support to modify board env at runtime based on SoC type Signed-off-by: Priyanka Jain <priyanka.jain(a)nxp.com> --- Changes for v3: Corrected v2 patch for Replace setenv() with env_set() Changes for v2: Replace setenv() with env_set() board/freescale/ls2080ardb/ls2080ardb.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/board/freescale/ls2080ardb/ls2080ardb.c b/board/freescale/ls2080ardb/ls2080ardb.c index 07ba026..dba0988 100644 --- a/board/freescale/ls2080ardb/ls2080ardb.c +++ b/board/freescale/ls2080ardb/ls2080ardb.c @@ -247,6 +247,8 @@ int misc_init_r(void) char *env_hwconfig; u32 __iomem *dcfg_ccsr = (u32 __iomem *)DCFG_BASE; u32 val; + struct ccsr_gur __iomem *gur = (void *)(CONFIG_SYS_FSL_GUTS_ADDR); + u32 svr = gur_in32(&gur->svr); val = in_le32(dcfg_ccsr + DCFG_RCWSR13 / 4); @@ -274,6 +276,16 @@ int misc_init_r(void) if (adjust_vdd(0)) printf("Warning: Adjusting core voltage failed.\n"); + /* + * Default value of board env is based on filename which is + * ls2080ardb. Modify board env for other supported SoCs + */ + if ((SVR_SOC_VER(svr) == SVR_LS2088A) || + (SVR_SOC_VER(svr) == SVR_LS2048A)) + env_set("board", "ls2088ardb"); + else if ((SVR_SOC_VER(svr) == SVR_LS2081A) || + (SVR_SOC_VER(svr) == SVR_LS2041A)) + env_set("board", "ls2081ardb"); return 0; } -- 1.7.4.1

2 1

[U-Boot] [PATCH] board/ls2080ardb: Add mcmemsize variable in default env
by Priyanka Jain 25 Sep '17

25 Sep '17

For most of ls2080ardb use-cases, mc private DRAM block is required to be of 1.75GB. Henc set mcmemsize=0x70000000 in default env Signed-off-by: Priyanka Jain <priyanka.jain(a)nxp.com> --- include/configs/ls2080ardb.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/include/configs/ls2080ardb.h b/include/configs/ls2080ardb.h index b309d79..46f0f8f 100644 --- a/include/configs/ls2080ardb.h +++ b/include/configs/ls2080ardb.h @@ -392,6 +392,7 @@ unsigned long get_board_sys_clk(void); "load_addr=0xa0000000\0" \ "kernel_size=0x2800000\0" \ "console=ttyAMA0,38400n8\0" \ + "mcmemsize=0x70000000\0" \ MC_INIT_CMD \ BOOTENV \ "boot_scripts=ls2088ardb_boot.scr\0" \ -- 1.7.4.1

2 3

[U-Boot] [PATCH] armv8: fsl: i2c: Put I2C related code under CONFIG_SYS_I2C
by Sriram Dash 25 Sep '17

25 Sep '17

I2C code is put under CONFIG_SYS_I2C Signed-off-by: Sriram Dash <sriram.dash(a)nxp.com> --- arch/arm/cpu/armv8/fsl-layerscape/soc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/cpu/armv8/fsl-layerscape/soc.c b/arch/arm/cpu/armv8/fsl-layerscape/soc.c index 639e9d2..66afcea 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/soc.c +++ b/arch/arm/cpu/armv8/fsl-layerscape/soc.c @@ -155,8 +155,8 @@ static void erratum_rcw_src(void) #ifdef CONFIG_SYS_FSL_ERRATUM_A009203 static void erratum_a009203(void) { - u8 __iomem *ptr; #ifdef CONFIG_SYS_I2C + u8 __iomem *ptr; #ifdef I2C1_BASE_ADDR ptr = (u8 __iomem *)(I2C1_BASE_ADDR + I2C_DEBUG_REG); -- 1.9.1

2 1