January 2018 - U-Boot

[U-Boot] [PATCH] freescale; Ensure common commands are not included in SPL binary
by Tom Rini 19 Jan '18

19 Jan '18

Both the "qixis_reset" and esbc_validate" commands can only be used in full U-Boot so do not build them in SPL. As part of this rework the qixis code to declare things as static and make use of __weak for function aliases. Cc; York Sun <york.sun(a)nxp.com> Signed-off-by: Tom Rini <trini(a)konsulko.com> --- board/freescale/common/cmd_esbc_validate.c | 2 ++ board/freescale/common/qixis.c | 14 +++++++------- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/board/freescale/common/cmd_esbc_validate.c b/board/freescale/common/cmd_esbc_validate.c index b3e5f019b87b..f45e2249fbac 100644 --- a/board/freescale/common/cmd_esbc_validate.c +++ b/board/freescale/common/cmd_esbc_validate.c @@ -23,6 +23,7 @@ loop: return 0; } +#ifndef CONFIG_SPL_BUILD static int do_esbc_validate(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) { @@ -82,3 +83,4 @@ U_BOOT_CMD( "Put the core in spin loop (Secure Boot Only)", "" ); +#endif diff --git a/board/freescale/common/qixis.c b/board/freescale/common/qixis.c index 0db0ed667002..24459f863578 100644 --- a/board/freescale/common/qixis.c +++ b/board/freescale/common/qixis.c @@ -10,6 +10,7 @@ #include <common.h> #include <command.h> #include <asm/io.h> +#include <linux/compiler.h> #include <linux/time.h> #include <i2c.h> #include "qixis.h" @@ -136,12 +137,13 @@ void board_deassert_mem_reset(void) } #endif -void qixis_reset(void) +#ifndef CONFIG_SPL_BUILD +static void qixis_reset(void) { QIXIS_WRITE(rst_ctl, QIXIS_RST_CTL_RESET); } -void qixis_bank_reset(void) +static void qixis_bank_reset(void) { QIXIS_WRITE(rcfg_ctl, QIXIS_RCFG_CTL_RECONFIG_IDLE); QIXIS_WRITE(rcfg_ctl, QIXIS_RCFG_CTL_RECONFIG_START); @@ -196,15 +198,12 @@ static void qixis_dump_regs(void) printf("stat_alrm = %02x\n", QIXIS_READ(stat_alrm)); } -static void __qixis_dump_switch(void) +void __weak qixis_dump_switch(void) { puts("Reverse engineering switch is not implemented for this board\n"); } -void qixis_dump_switch(void) - __attribute__((weak, alias("__qixis_dump_switch"))); - -int qixis_reset_cmd(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +static int qixis_reset_cmd(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) { int i; @@ -305,3 +304,4 @@ U_BOOT_CMD( "qixis_reset dump - display the QIXIS registers\n" "qixis_reset switch - display switch\n" ); +#endif -- 2.7.4

2 1

[U-Boot] [PATCH] arm: ls1021atwr: Rework local commands to not be included in SPL
by Tom Rini 19 Jan '18

19 Jan '18

Move some of the code for the "lane_bank" and "cpld" code local commands so that they are not built for SPL as they can only be used in full U-Boot. This means we can mark a few functions as static as well now. Cc: Alison Wang <alison.wang(a)freescale.com> Cc: Sumit Garg <sumit.garg(a)nxp.com> Cc: York Sun <york.sun(a)nxp.com> Signed-off-by: Tom Rini <trini(a)konsulko.com> --- board/freescale/ls1021atwr/ls1021atwr.c | 91 ++++++++++++++++----------------- 1 file changed, 45 insertions(+), 46 deletions(-) diff --git a/board/freescale/ls1021atwr/ls1021atwr.c b/board/freescale/ls1021atwr/ls1021atwr.c index 2da06773c479..622a50095339 100644 --- a/board/freescale/ls1021atwr/ls1021atwr.c +++ b/board/freescale/ls1021atwr/ls1021atwr.c @@ -92,9 +92,7 @@ struct cpld_data { }; #if !defined(CONFIG_QSPI_BOOT) && !defined(CONFIG_SD_BOOT_QSPI) -static void convert_serdes_mux(int type, int need_reset); - -void cpld_show(void) +static void cpld_show(void) { struct cpld_data *cpld_data = (void *)(CONFIG_SYS_CPLD_BASE); @@ -292,6 +290,47 @@ int board_eth_init(bd_t *bis) } #if !defined(CONFIG_QSPI_BOOT) && !defined(CONFIG_SD_BOOT_QSPI) +static void convert_serdes_mux(int type, int need_reset) +{ + char current_serdes; + struct cpld_data *cpld_data = (void *)(CONFIG_SYS_CPLD_BASE); + + current_serdes = cpld_data->serdes_mux; + + switch (type) { + case LANEB_SATA: + current_serdes &= ~MASK_LANE_B; + break; + case LANEB_SGMII1: + current_serdes |= (MASK_LANE_B | MASK_SGMII | MASK_LANE_C); + break; + case LANEC_SGMII1: + current_serdes &= ~(MASK_LANE_B | MASK_SGMII | MASK_LANE_C); + break; + case LANED_SGMII2: + current_serdes |= MASK_LANE_D; + break; + case LANEC_PCIEX1: + current_serdes |= MASK_LANE_C; + break; + case (LANED_PCIEX2 | LANEC_PCIEX1): + current_serdes |= MASK_LANE_C; + current_serdes &= ~MASK_LANE_D; + break; + default: + printf("CPLD serdes MUX: unsupported MUX type 0x%x\n", type); + return; + } + + cpld_data->soft_mux_on |= CPLD_SET_MUX_SERDES; + cpld_data->serdes_mux = current_serdes; + + if (need_reset == 1) { + printf("Reset board to enable configuration\n"); + cpld_data->system_rst = CONFIG_RESET; + } +} + int config_serdes_mux(void) { struct ccsr_gur __iomem *gur = (void *)(CONFIG_SYS_FSL_GUTS_ADDR); @@ -584,7 +623,8 @@ u16 flash_read16(void *addr) return (((val) >> 8) & 0x00ff) | (((val) << 8) & 0xff00); } -#if !defined(CONFIG_QSPI_BOOT) && !defined(CONFIG_SD_BOOT_QSPI) +#if !defined(CONFIG_QSPI_BOOT) && !defined(CONFIG_SD_BOOT_QSPI) \ + && !defined(CONFIG_SPL_BUILD) static void convert_flash_bank(char bank) { struct cpld_data *cpld_data = (void *)(CONFIG_SYS_CPLD_BASE); @@ -645,48 +685,7 @@ U_BOOT_CMD( ); -static void convert_serdes_mux(int type, int need_reset) -{ - char current_serdes; - struct cpld_data *cpld_data = (void *)(CONFIG_SYS_CPLD_BASE); - - current_serdes = cpld_data->serdes_mux; - - switch (type) { - case LANEB_SATA: - current_serdes &= ~MASK_LANE_B; - break; - case LANEB_SGMII1: - current_serdes |= (MASK_LANE_B | MASK_SGMII | MASK_LANE_C); - break; - case LANEC_SGMII1: - current_serdes &= ~(MASK_LANE_B | MASK_SGMII | MASK_LANE_C); - break; - case LANED_SGMII2: - current_serdes |= MASK_LANE_D; - break; - case LANEC_PCIEX1: - current_serdes |= MASK_LANE_C; - break; - case (LANED_PCIEX2 | LANEC_PCIEX1): - current_serdes |= MASK_LANE_C; - current_serdes &= ~MASK_LANE_D; - break; - default: - printf("CPLD serdes MUX: unsupported MUX type 0x%x\n", type); - return; - } - - cpld_data->soft_mux_on |= CPLD_SET_MUX_SERDES; - cpld_data->serdes_mux = current_serdes; - - if (need_reset == 1) { - printf("Reset board to enable configuration\n"); - cpld_data->system_rst = CONFIG_RESET; - } -} - -void print_serdes_mux(void) +static void print_serdes_mux(void) { char current_serdes; struct cpld_data *cpld_data = (void *)(CONFIG_SYS_CPLD_BASE); -- 2.7.4

3 2

[U-Boot] [PATCH] powerpc: P1010RDB: Rework local command to not be included in SPL
by Tom Rini 19 Jan '18

19 Jan '18

Add a CONFIG_SPL_BUILD guard around the code for the "mux" command so it is not included in SPL. Cc: Qiang Zhao <qiang.zhao(a)nxp.com> Cc: York Sun <york.sun(a)nxp.com> Signed-off-by: Tom Rini <trini(a)konsulko.com> --- board/freescale/p1010rdb/p1010rdb.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/board/freescale/p1010rdb/p1010rdb.c b/board/freescale/p1010rdb/p1010rdb.c index aa04e993c460..a5d85c228279 100644 --- a/board/freescale/p1010rdb/p1010rdb.c +++ b/board/freescale/p1010rdb/p1010rdb.c @@ -550,6 +550,7 @@ int misc_init_r(void) return 0; } +#ifndef CONFIG_SPL_BUILD static int pin_mux_cmd(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) { @@ -569,3 +570,4 @@ U_BOOT_CMD( "configure multiplexing pin for IFC/SDHC bus in runtime", "bus_type (e.g. mux sdhc)" ); +#endif -- 2.7.4

3 3

[U-Boot] [PATCH] board/ls2081ard: Correct code to get QMAP value in checkboard
by Priyanka Jain 19 Jan '18

19 Jan '18

QMAP value contains information about QSPI chip-selects. These bits are used to display information of boot device in checkboard() function. QMAP value is stored in most significant 3-bits of 8-bit register brdcfg[0] in Qixis, this patch corrects code to get QMAP bits using below logic: (brdcfg[0] >> 5) & 0x7 Signed-off-by: Priyanka Jain <priyanka.jain(a)nxp.com> --- This patch is split version of another patch https://patchwork.ozlabs.org/patch/803117/ board/freescale/ls2080ardb/ls2080ardb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/freescale/ls2080ardb/ls2080ardb.c b/board/freescale/ls2080ardb/ls2080ardb.c index ee0f3a2..34843d7 100644 --- a/board/freescale/ls2080ardb/ls2080ardb.c +++ b/board/freescale/ls2080ardb/ls2080ardb.c @@ -75,7 +75,7 @@ int checkboard(void) printf("Board version: %c, ", (sw & 0xf) + 'A'); sw = QIXIS_READ(brdcfg[0]); - sw = (sw & QIXIS_QMAP_MASK) >> QIXIS_QMAP_SHIFT; + sw = (sw >> QIXIS_QMAP_SHIFT) & QIXIS_QMAP_MASK; switch (sw) { case 0: puts("boot from QSPI DEV#0\n"); -- 2.7.4

2 1

[U-Boot] [PATCH] board/ls2081ardb: Update board related prints
by Priyanka Jain 19 Jan '18

19 Jan '18

Remove Board Arch print as its value is always constant '1' and does not contain any important information to display during boot Add print to display Board FPGA version. Signed-off-by: Priyanka Jain <priyanka.jain(a)nxp.com> --- This patch is split version of another patch https://patchwork.ozlabs.org/patch/803117/ board/freescale/ls2080ardb/ls2080ardb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/freescale/ls2080ardb/ls2080ardb.c b/board/freescale/ls2080ardb/ls2080ardb.c index 34843d7..802e497 100644 --- a/board/freescale/ls2080ardb/ls2080ardb.c +++ b/board/freescale/ls2080ardb/ls2080ardb.c @@ -71,7 +71,6 @@ int checkboard(void) #ifdef CONFIG_TARGET_LS2081ARDB #ifdef CONFIG_FSL_QIXIS sw = QIXIS_READ(arch); - printf("Board Arch: V%d, ", sw >> 4); printf("Board version: %c, ", (sw & 0xf) + 'A'); sw = QIXIS_READ(brdcfg[0]); @@ -101,6 +100,7 @@ int checkboard(void) printf("invalid setting of SW%u\n", sw); break; } + printf("FPGA: v%d.%d\n", QIXIS_READ(scver), QIXIS_READ(tagdata)); #endif puts("SERDES1 Reference : "); printf("Clock1 = 100MHz "); -- 2.7.4

2 1

[U-Boot] [PATCH v3] configs: SECURE_BOOT: Enable CONFIG_CMD_EXT4_WRITE
by Sumit Garg 19 Jan '18

19 Jan '18

As part of chain of trust with confidentiality along with distro boot, linux kernel image needs to be stored in encrypted form on ext4 boot partition. So enable CONFIG_CMD_EXT4_WRITE in case of Secure boot on ARM based platforms. Signed-off-by: Sumit Garg <sumit.garg(a)nxp.com> Reviewed-by: Tom Rini <trini(a)konsulko.com> --- Changes in v3: Enable CMD_EXT4_WRITE option for ARM platforms only. Changes in v2: Instead of adding CMD_EXT4_WRITE option in each defconfig, added this option in Kconfig. board/freescale/common/Kconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/board/freescale/common/Kconfig b/board/freescale/common/Kconfig index 8a5c456..280f7d4 100644 --- a/board/freescale/common/Kconfig +++ b/board/freescale/common/Kconfig @@ -7,6 +7,8 @@ config CHAIN_OF_TRUST select SHA_HW_ACCEL select SHA_PROG_HW_ACCEL select ENV_IS_NOWHERE + select CMD_EXT4 if ARM + select CMD_EXT4_WRITE if ARM bool default y -- 1.9.1

2 1

[U-Boot] [PATCH v2] armv8/ls1088a: configure PMU's PCTBENR to enable WDT
by ying.zhang22455＠nxp.com 19 Jan '18

19 Jan '18

From: Zhang Ying-22455 <ying.zhang22455(a)nxp.com> The SP805-WDT module on LS1088A requires configuration of PMU's PCTBENR register to enable watchdog counter decrement and reset signal generation. The watchdog clock needs to be enabled first. Signed-off-by: Zhang Ying-22455 <ying.zhang22455(a)nxp.com> --- arch/arm/cpu/armv8/fsl-layerscape/cpu.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/cpu/armv8/fsl-layerscape/cpu.c b/arch/arm/cpu/armv8/fsl-layerscape/cpu.c index d082629..05c0137 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/cpu.c +++ b/arch/arm/cpu/armv8/fsl-layerscape/cpu.c @@ -574,7 +574,7 @@ int timer_init(void) #ifdef CONFIG_FSL_LSCH3 u32 __iomem *cltbenr = (u32 *)CONFIG_SYS_FSL_PMU_CLTBENR; #endif -#ifdef CONFIG_ARCH_LS2080A +#if defined(CONFIG_ARCH_LS2080A) || defined(CONFIG_ARCH_LS1088A) u32 __iomem *pctbenr = (u32 *)FSL_PMU_PCTBENR_OFFSET; u32 svr_dev_id; #endif @@ -593,7 +593,7 @@ int timer_init(void) out_le32(cltbenr, 0xf); #endif -#ifdef CONFIG_ARCH_LS2080A +#if defined(CONFIG_ARCH_LS2080A) || defined(CONFIG_ARCH_LS1088A) /* * In certain Layerscape SoCs, the clock for each core's * has an enable bit in the PMU Physical Core Time Base Enable -- 1.7.1

2 1

[U-Boot] [PATCH] serial: lpuart: Proper device identification
by Sriram Dash 19 Jan '18

19 Jan '18

Identify and distinguish between platform device type of MX7ULP and LS1021A. This is a fix to: 7edf5c45 serial: lpuart: add i.MX7ULP support Signed-off-by: Sriram Dash <sriram.dash(a)nxp.com> Acked-by: Peng Fan <peng.fan(a)nxp.com> --- drivers/serial/serial_lpuart.c | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/drivers/serial/serial_lpuart.c b/drivers/serial/serial_lpuart.c index 382f8ba..536d30f 100644 --- a/drivers/serial/serial_lpuart.c +++ b/drivers/serial/serial_lpuart.c @@ -265,11 +265,9 @@ static int _lpuart32_serial_getc(struct lpuart_serial_platdata *plat) lpuart_read32(plat->flags, &base->data, &val); - if (plat->devtype & DEV_MX7ULP) { - lpuart_read32(plat->flags, &base->stat, &stat); - if (stat & STAT_OR) - lpuart_write32(plat->flags, &base->stat, STAT_OR); - } + lpuart_read32(plat->flags, &base->stat, &stat); + if (stat & STAT_OR) + lpuart_write32(plat->flags, &base->stat, STAT_OR); return val & 0x3ff; } @@ -280,10 +278,8 @@ static void _lpuart32_serial_putc(struct lpuart_serial_platdata *plat, struct lpuart_fsl_reg32 *base = plat->reg; u32 stat; - if (plat->devtype & DEV_MX7ULP) { - if (c == '\n') - serial_putc('\r'); - } + if (c == '\n') + serial_putc('\r'); while (true) { lpuart_read32(plat->flags, &base->stat, &stat); @@ -330,7 +326,7 @@ static int _lpuart32_serial_init(struct lpuart_serial_platdata *plat) lpuart_write32(plat->flags, &base->match, 0); - if (plat->devtype & DEV_MX7ULP) { + if (plat->devtype == DEV_MX7ULP) { _lpuart32_serial_setbrg_7ulp(plat, gd->baudrate); } else { /* provide data bits, parity, stop bit, etc */ @@ -347,7 +343,7 @@ static int lpuart_serial_setbrg(struct udevice *dev, int baudrate) struct lpuart_serial_platdata *plat = dev->platdata; if (is_lpuart32(dev)) { - if (plat->devtype & DEV_MX7ULP) + if (plat->devtype == DEV_MX7ULP) _lpuart32_serial_setbrg_7ulp(plat, baudrate); else _lpuart32_serial_setbrg(plat, baudrate); -- 1.9.1

2 1

[U-Boot] [PATCH v2 1/2] armv8/kconfig: Align boards of same family at one place
by Bhaskar Upadhaya 19 Jan '18

19 Jan '18

Align boards belonging to LS1012A, LS2080A SoC at one place Signed-off-by: Bhaskar Upadhaya <Bhaskar.Upadhaya(a)nxp.com> --- arch/arm/cpu/armv8/Kconfig | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/arch/arm/cpu/armv8/Kconfig b/arch/arm/cpu/armv8/Kconfig index 12aba9d..51f48e1 100644 --- a/arch/arm/cpu/armv8/Kconfig +++ b/arch/arm/cpu/armv8/Kconfig @@ -85,11 +85,12 @@ endmenu config PSCI_RESET bool "Use PSCI for reset and shutdown" default y - depends on !ARCH_EXYNOS7 && !ARCH_BCM283X && !TARGET_LS2080A_EMU && \ + depends on !ARCH_EXYNOS7 && !ARCH_BCM283X && \ !TARGET_LS2080A_SIMU && !TARGET_LS2080AQDS && \ - !TARGET_LS2080ARDB && !TARGET_LS1012AQDS && \ + !TARGET_LS2080ARDB && !TARGET_LS2080A_EMU && \ !TARGET_LS1088ARDB && !TARGET_LS1088AQDS && \ !TARGET_LS1012ARDB && !TARGET_LS1012AFRDM && \ + !TARGET_LS1012AQDS && \ !TARGET_LS1043ARDB && !TARGET_LS1043AQDS && \ !TARGET_LS1046ARDB && !TARGET_LS1046AQDS && \ !TARGET_LS2081ARDB && \ -- 1.9.1

2 3

[U-Boot] [PATCH] cmd: console: Add serial devices probe command
by Wilson Lee 19 Jan '18

19 Jan '18

U-boot will only probe and register single serial device that selected to be used as stdio device. This will cause changing of stdio devices from one serial devices to another serial devices is not possible due to others serial devices are not registered on the stdio list. This command will allow user to probe others possible serial console and register them to stdio list for stdio switching. Signed-off-by: Wilson Lee <wilson.lee(a)ni.com> Cc: Joe Hershberger <joe.hershberger(a)ni.com> Cc: Keng Soon Cheah <keng.soon.cheah(a)ni.com> Cc: Chen Yee Chew <chen.yee.chew(a)ni.com> --- cmd/console.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/cmd/console.c b/cmd/console.c index 9a356ec..5bf897f 100644 --- a/cmd/console.c +++ b/cmd/console.c @@ -8,6 +8,7 @@ /* * Boot support */ +#include <dm.h> #include <common.h> #include <command.h> #include <stdio_dev.h> @@ -43,6 +44,22 @@ static int do_coninfo(cmd_tbl_t *cmd, int flag, int argc, char * const argv[]) return 0; } +static int do_conprobe(cmd_tbl_t *cmd, int flag, int argc, char * const argv[]) +{ + struct udevice *dev; + struct uclass *uc; + + uclass_get(UCLASS_SERIAL, &uc); + uclass_foreach_dev(dev, uc) { + /* + * Loop through all serial devices, probe and register + * them with stdio services. + */ + if (device_probe(dev)) + debug("%s: %s: PROBE FAIL\n", __func__, dev->name); + } + return 0; +} /***************************************************/ @@ -51,3 +68,9 @@ U_BOOT_CMD( "print console devices and information", "" ); + +U_BOOT_CMD( + conprobe, 3, 1, do_conprobe, + "probe serial devices and register with stdio list", + "" +); -- 2.7.4

2 1