June 2016 - U-Boot

[U-Boot] [PATCH] rtc: Tidy up the code style
by Simon Glass 20 Jun '16

20 Jun '16

This code generates lots of checkpatch errors. Fix them. Signed-off-by: Simon Glass <sjg(a)chromium.org> --- drivers/rtc/date.c | 79 +++++++++++++++++++++++++----------------------------- 1 file changed, 36 insertions(+), 43 deletions(-) diff --git a/drivers/rtc/date.c b/drivers/rtc/date.c index 8c643a0..5ab6770 100644 --- a/drivers/rtc/date.c +++ b/drivers/rtc/date.c @@ -5,10 +5,6 @@ * SPDX-License-Identifier: GPL-2.0+ */ -/* - * Date & Time support for Philips PCF8563 RTC - */ - #include <common.h> #include <command.h> #include <errno.h> @@ -25,7 +21,11 @@ #define days_in_month(a) (month_days[(a) - 1]) static int month_days[12] = { - 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 + 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 +}; + +static int month_offset[] = { + 0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334 }; /* @@ -33,48 +33,43 @@ static int month_days[12] = { */ int rtc_calc_weekday(struct rtc_time *tm) { - int leapsToDate; + int leaps_to_date; int lastYear; int day; - int MonthOffset[] = { 0,31,59,90,120,151,181,212,243,273,304,334 }; if (tm->tm_year < 1753) - return -EINVAL; - lastYear=tm->tm_year-1; + return -1; + lastYear = tm->tm_year - 1; - /* - * Number of leap corrections to apply up to end of last year - */ - leapsToDate = lastYear/4 - lastYear/100 + lastYear/400; + /* Number of leap corrections to apply up to end of last year */ + leaps_to_date = lastYear / 4 - lastYear / 100 + lastYear / 400; /* * This year is a leap year if it is divisible by 4 except when it is * divisible by 100 unless it is divisible by 400 * - * e.g. 1904 was a leap year, 1900 was not, 1996 is, and 2000 will be + * e.g. 1904 was a leap year, 1900 was not, 1996 is, and 2000 is. */ - if((tm->tm_year%4==0) && - ((tm->tm_year%100!=0) || (tm->tm_year%400==0)) && - (tm->tm_mon>2)) { - /* - * We are past Feb. 29 in a leap year - */ - day=1; + if (tm->tm_year % 4 == 0 && + ((tm->tm_year % 100 != 0) || (tm->tm_year % 400 == 0)) && + tm->tm_mon > 2) { + /* We are past Feb. 29 in a leap year */ + day = 1; } else { - day=0; + day = 0; } - day += lastYear*365 + leapsToDate + MonthOffset[tm->tm_mon-1] + tm->tm_mday; - - tm->tm_wday=day%7; + day += lastYear * 365 + leaps_to_date + month_offset[tm->tm_mon - 1] + + tm->tm_mday; + tm->tm_wday = day % 7; return 0; } int rtc_to_tm(int tim, struct rtc_time *tm) { - register int i; - register long hms, day; + register int i; + register long hms, day; day = tim / SECDAY; hms = tim % SECDAY; @@ -85,22 +80,19 @@ int rtc_to_tm(int tim, struct rtc_time *tm) tm->tm_sec = (hms % 3600) % 60; /* Number of years in days */ - for (i = STARTOFTIME; day >= days_in_year(i); i++) { + for (i = STARTOFTIME; day >= days_in_year(i); i++) day -= days_in_year(i); - } tm->tm_year = i; /* Number of months in days left */ - if (leapyear(tm->tm_year)) { + if (leapyear(tm->tm_year)) days_in_month(FEBRUARY) = 29; - } - for (i = 1; day >= days_in_month(i); i++) { + for (i = 1; day >= days_in_month(i); i++) day -= days_in_month(i); - } days_in_month(FEBRUARY) = 28; tm->tm_mon = i; - /* Days are what is left over (+1) from all that. */ + /* Days are what is left over (+1) from all that */ tm->tm_mday = day + 1; /* Zero unused fields */ @@ -113,30 +105,31 @@ int rtc_to_tm(int tim, struct rtc_time *tm) return rtc_calc_weekday(tm); } -/* Converts Gregorian date to seconds since 1970-01-01 00:00:00. - * Assumes input in normal date format, i.e. 1980-12-31 23:59:59 - * => year=1980, mon=12, day=31, hour=23, min=59, sec=59. +/* + * Converts Gregorian date to seconds since 1970-01-01 00:00:00. + * Assumes input in normal date format, i.e. 1980-12-31 23:59:59 + * => year=1980, mon=12, day=31, hour=23, min=59, sec=59. * * [For the Julian calendar (which was used in Russia before 1917, - * Britain & colonies before 1752, anywhere else before 1582, + * Britain & colonies before 1752, anywhere else before 1582, * and is still in use by some communities) leave out the - * -year/100+year/400 terms, and add 10.] + * -year / 100 + year / 400 terms, and add 10.] * * This algorithm was first published by Gauss (I think). * * WARNING: this function will overflow on 2106-02-07 06:28:16 on - * machines were long is 32-bit! (However, as time_t is signed, we + * machines where long is 32-bit! (However, as time_t is signed, we * will already get problems at other places on 2038-01-19 03:14:08) */ unsigned long rtc_mktime(const struct rtc_time *tm) { int mon = tm->tm_mon; int year = tm->tm_year; - int days, hours; + int days, hours; mon -= 2; - if (0 >= (int)mon) { /* 1..12 -> 11,12,1..10 */ - mon += 12; /* Puts Feb last since it has leap day */ + if (0 >= (int)mon) { /* 1..12 -> 11, 12, 1..10 */ + mon += 12; /* Puts Feb last since it has leap day */ year -= 1; } -- 2.8.0.rc3.226.g39d4020

2 1

[U-Boot] [PATCH v2 00/18] at91: Convert Ethernet and LCD to driver model
by Simon Glass 20 Jun '16

20 Jun '16

This series is mainly designed to move the macb Ethernet to driver model, along with the LCD controller. It also includes a few fixes: - NAND with ECC doesn't build properly - The instruction cache is off by default - Ethernet macb doesn't send packets when the cache is enabled A Snapper 9G45-based board is used for this work. It includes an AT91SAM9G45 CPU so is a good test of driver model on this chip. Changes in v2: - Correct commit author in several cases - Rebase to master Andre Renaud (7): at91: Add support for the AT91 slow clock controller net: Handle an empty bootp extension section arm: at91: Add a header file for the real-time clock at91: Correct NAND ECC register access at91: nand: Set up the ECC strength correctly mtd: nand: Drop a blank line in nand_wait() arm: at91: Add support for gurnard Simon Glass (11): arm: Allow skipping of low-level init with I-cache on bootm: Align cache flush end address correctly net: macb: Prepare for driver-model conversion net: macb: Flush correct cache portion when sending net: macb: Convert to driver model arm: at91: dts: Bring in device tree file for AT91SAM9G45 at91: Add driver-model GPIO devices for AT91SAM9G45 at91: mtd: nand: Add dev_warn() to correct build error in driver at91: video: Prepare for driver-model conversion at91: video: Support driver-model for the LCD driver fdt: Correct return value in fdtdec_decode_display_timing() README | 5 + arch/arm/cpu/arm1136/start.S | 2 + arch/arm/cpu/arm920t/start.S | 3 +- arch/arm/cpu/arm926ejs/start.S | 2 + arch/arm/cpu/arm946es/start.S | 2 + arch/arm/cpu/armv7/start.S | 5 +- arch/arm/cpu/sa1100/start.S | 2 + arch/arm/dts/Makefile | 1 + arch/arm/dts/at91sam9g45-gurnard.dts | 157 ++ arch/arm/dts/at91sam9g45.dtsi | 1335 ++++++++++ arch/arm/mach-at91/Kconfig | 9 + .../mach-at91/arm926ejs/at91sam9m10g45_devices.c | 18 + arch/arm/mach-at91/include/mach/at91_rtc.h | 71 + arch/arm/mach-at91/include/mach/at91_sck.h | 21 + arch/arm/mach-at91/include/mach/at91sam9g45.h | 1 + board/bluewater/gurnard/Kconfig | 12 + board/bluewater/gurnard/MAINTAINERS | 6 + board/bluewater/gurnard/Makefile | 11 + board/bluewater/gurnard/gurnard.c | 449 ++++ board/bluewater/gurnard/splash_logo.h | 2619 ++++++++++++++++++++ common/bootm.c | 2 +- configs/gurnard_defconfig | 19 + drivers/mtd/nand/atmel_nand.c | 7 +- drivers/mtd/nand/nand_base.c | 1 - drivers/net/macb.c | 320 ++- drivers/video/atmel_lcdfb.c | 197 +- include/atmel_lcd.h | 9 + include/configs/snapper9g45.h | 156 ++ include/dt-bindings/clock/at91.h | 23 + include/dt-bindings/dma/at91.h | 52 + include/dt-bindings/pinctrl/at91.h | 40 + lib/fdtdec.c | 2 +- net/bootp.c | 9 + 33 files changed, 5449 insertions(+), 119 deletions(-) create mode 100644 arch/arm/dts/at91sam9g45-gurnard.dts create mode 100644 arch/arm/dts/at91sam9g45.dtsi create mode 100644 arch/arm/mach-at91/include/mach/at91_rtc.h create mode 100644 arch/arm/mach-at91/include/mach/at91_sck.h create mode 100644 board/bluewater/gurnard/Kconfig create mode 100644 board/bluewater/gurnard/MAINTAINERS create mode 100644 board/bluewater/gurnard/Makefile create mode 100644 board/bluewater/gurnard/gurnard.c create mode 100644 board/bluewater/gurnard/splash_logo.h create mode 100644 configs/gurnard_defconfig create mode 100644 include/configs/snapper9g45.h create mode 100644 include/dt-bindings/clock/at91.h create mode 100644 include/dt-bindings/dma/at91.h create mode 100644 include/dt-bindings/pinctrl/at91.h -- 2.8.0.rc3.226.g39d4020

4 55

[U-Boot] [PATCH v3 1/2] nand: nand torture: follow sync with linux v4.6
by Max Krummenacher 20 Jun '16

20 Jun '16

follow parameter name change (nand to mtd) to fix compiler error. Signed-off-by: Max Krummenacher <max.krummenacher(a)toradex.com> --- Changes in v3: - none Changes in v2: - Patch v1 1/1 went into master, but Scott's patch series syncing with kernel v4.6 introduced an additional compile time error. drivers/mtd/nand/nand_util.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/mtd/nand/nand_util.c b/drivers/mtd/nand/nand_util.c index 5bba66a..e8bcc34 100644 --- a/drivers/mtd/nand/nand_util.c +++ b/drivers/mtd/nand/nand_util.c @@ -820,7 +820,7 @@ int nand_torture(struct mtd_info *mtd, loff_t offset) { u_char patterns[] = {0xa5, 0x5a, 0x00}; struct erase_info instr = { - .mtd = nand, + .mtd = mtd, .addr = offset, .len = mtd->erasesize, }; -- 2.5.5

3 3

[U-Boot] [PATCH 1/1] common: fb_nand: won't compile
by Sergey Kubushyn 20 Jun '16

20 Jun '16

Somehow this got overlooked when getting rid of nand_info. Small patch, won't affect anything else, no reason to wait for the next cycle. Signed-off-by: Sergey Kubushyn <ksi(a)koi8.net> --- diff --git a/common/fb_nand.c b/common/fb_nand.c index e55ea38..ae34f48 100644 --- a/common/fb_nand.c +++ b/common/fb_nand.c @@ -34,7 +34,7 @@ __weak int board_fastboot_write_partition_setup(char *name) } static int fb_nand_lookup(const char *partname, char *response, - struct mtd_info **nand, + struct mtd_info **mtd, struct part_info **part) { struct mtd_device *dev; --- ****************************************************************** * KSI@home KOI8 Net < > The impossible we do immediately. * * Las Vegas NV, USA < > Miracles require 24-hour notice. * ******************************************************************

2 1

[U-Boot] [PATCH 0/4] ARM: uniphier: some more updates for UniPhier SoCs
by Masahiro Yamada 20 Jun '16

20 Jun '16

Masahiro Yamada (4): ARM: uniphier: introduce CONFIG_ARM_UNIPHIER_{32,64}BIT ARM: uniphier: move CONFIG_ARMV8_MULTIENTRY to Kconfig ARM: uniphier: reserve memory for DRAM PHY training on PH1-LD20 ARM: uniphier: use the default CONFIG_BOOTDELAY=2 arch/arm/Kconfig | 1 + arch/arm/mach-uniphier/Kconfig | 25 ++++++++++++++-------- arch/arm/mach-uniphier/dram_init.c | 40 ++++++++++++++++++++++++++++++++++++ configs/uniphier_ld11_defconfig | 1 - configs/uniphier_ld20_defconfig | 1 - configs/uniphier_ld4_sld8_defconfig | 1 - configs/uniphier_pro4_defconfig | 1 - configs/uniphier_pxs2_ld6b_defconfig | 1 - configs/uniphier_sld3_defconfig | 1 - include/configs/uniphier.h | 1 - 10 files changed, 58 insertions(+), 15 deletions(-) -- 1.9.1

1 5

[U-Boot] [PATCH] ARM: uniphier: change CPU_RELEASE_ADDR to the head of DRAM space
by Masahiro Yamada 20 Jun '16

20 Jun '16

At first, 256 byte of the head of DRAM space was reserved for some reasons. However, as the progress of development, it turned out unnecessary, and it was never used in the end. Move the CPU release address to leave no space. Signed-off-by: Masahiro Yamada <yamada.masahiro(a)socionext.com> --- include/configs/uniphier.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/configs/uniphier.h b/include/configs/uniphier.h index 9d14c2d..68f6c9f 100644 --- a/include/configs/uniphier.h +++ b/include/configs/uniphier.h @@ -100,7 +100,7 @@ #ifdef CONFIG_ARM64 #define CONFIG_ARMV8_MULTIENTRY -#define CPU_RELEASE_ADDR 0x80000100 +#define CPU_RELEASE_ADDR 0x80000000 #define COUNTER_FREQUENCY 50000000 #define CONFIG_GICV3 #define GICD_BASE 0x5fe00000 -- 1.9.1

1 1

[U-Boot] [PATCH 1/2] serial: Introduce linflex uart support
by Eddy Petrișor 19 Jun '16

19 Jun '16

From: Stoica Cosmin-Stefan <cosminstefan.stoica(a)freescale.com> The Linflex module is integrated on some NXP automotive SoCs part of the former Freescale portfolio, like S32V234, an SoC for Advanced Driver Assistance Systems. Signed-off-by: Stoica Cosmin-Stefan <cosminstefan.stoica(a)freescale.com> Signed-off-by: Chircu Bogdan <Bogdan.Chircu(a)freescale.com> Signed-off-by: Depons Eric <eric.depons(a)freescale.com> Signed-off-by: Eddy Petrișor <eddy.petrisor(a)gmail.com> --- drivers/serial/Makefile | 1 + drivers/serial/serial_linflexuart.c | 147 ++++++++++++++++++++++++++++++++++++ 2 files changed, 148 insertions(+) create mode 100644 drivers/serial/serial_linflexuart.c diff --git a/drivers/serial/Makefile b/drivers/serial/Makefile index ee7147a..b009478 100644 --- a/drivers/serial/Makefile +++ b/drivers/serial/Makefile @@ -33,6 +33,7 @@ obj-$(CONFIG_SCIF_CONSOLE) += serial_sh.o obj-$(CONFIG_ZYNQ_SERIAL) += serial_zynq.o obj-$(CONFIG_BFIN_SERIAL) += serial_bfin.o obj-$(CONFIG_FSL_LPUART) += serial_lpuart.o +obj-$(CONFIG_FSL_LINFLEXUART) += serial_linflexuart.o obj-$(CONFIG_ARC_SERIAL) += serial_arc.o obj-$(CONFIG_UNIPHIER_SERIAL) += serial_uniphier.o obj-$(CONFIG_STM32_SERIAL) += serial_stm32.o diff --git a/drivers/serial/serial_linflexuart.c b/drivers/serial/serial_linflexuart.c new file mode 100644 index 0000000..3c619ce --- /dev/null +++ b/drivers/serial/serial_linflexuart.c @@ -0,0 +1,147 @@ +/* + * (C) Copyright 2013-2016 Freescale Semiconductor, Inc. + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#include <common.h> +#include <watchdog.h> +#include <asm/io.h> +#include <serial.h> +#include <linux/compiler.h> +#include <asm/arch/imx-regs.h> +#include <asm/arch/clock.h> + +#define US1_TDRE (1 << 7) +#define US1_RDRF (1 << 5) +#define UC2_TE (1 << 3) +#define LINCR1_INIT (1 << 0) +#define LINCR1_MME (1 << 4) +#define LINCR1_BF (1 << 7) +#define LINSR_LINS_INITMODE (0x00001000) +#define LINSR_LINS_MASK (0x0000F000) +#define UARTCR_UART (1 << 0) +#define UARTCR_WL0 (1 << 1) +#define UARTCR_PCE (1 << 2) +#define UARTCR_PC0 (1 << 3) +#define UARTCR_TXEN (1 << 4) +#define UARTCR_RXEN (1 << 5) +#define UARTCR_PC1 (1 << 6) +#define UARTSR_DTF (1 << 1) +#define UARTSR_DRF (1 << 2) +#define UARTSR_RMB (1 << 9) + +DECLARE_GLOBAL_DATA_PTR; + +struct linflex_fsl *base = (struct linflex_fsl *)LINFLEXUART_BASE; + +static void linflex_serial_setbrg(void) +{ + u32 clk = mxc_get_clock(MXC_UART_CLK); + u32 ibr, fbr; + + if (!gd->baudrate) + gd->baudrate = CONFIG_BAUDRATE; + + ibr = (u32) (clk / (16 * gd->baudrate)); + fbr = (u32) (clk % (16 * gd->baudrate)) * 16; + + __raw_writel(ibr, &base->linibrr); + __raw_writel(fbr, &base->linfbrr); +} + +static int linflex_serial_getc(void) +{ + char c; + + /* waiting for data reception complete - TODO: add a timeout */ + while ((__raw_readb(&base->uartsr) & UARTSR_DRF) != UARTSR_DRF); + + /* waiting for data buffer to be ready - TODO: add a timeout */ + + while ((__raw_readl(&base->uartsr) & UARTSR_RMB) != UARTSR_RMB); + + c = __raw_readl(&base->bdrm); + __raw_writeb((__raw_readb(&base->uartsr) | (UARTSR_DRF | UARTSR_RMB)), + &base->uartsr); + return c; +} + +static void linflex_serial_putc(const char c) +{ + if (c == '\n') + serial_putc('\r'); + + __raw_writeb(c, &base->bdrl); + + /* waiting for data transmission completed - TODO: add a timeout */ + while ((__raw_readb(&base->uartsr) & UARTSR_DTF) != UARTSR_DTF); + + __raw_writeb((__raw_readb(&base->uartsr) | UARTSR_DTF), &base->uartsr); +} + +/* + * Test whether a character is in the RX buffer + */ +static int linflex_serial_tstc(void) +{ + return 0; +} + +/* + * Initialise the serial port with the given baudrate. The settings + * are always 8 data bits, no parity, 1 stop bit, no start bits. + */ +static int linflex_serial_init(void) +{ + volatile u32 ctrl; + + /* set the Linflex in master mode amd activate by-pass filter */ + ctrl = LINCR1_BF | LINCR1_MME; + __raw_writel(ctrl, &base->lincr1); + + /* init mode */ + ctrl |= LINCR1_INIT; + __raw_writel(ctrl, &base->lincr1); + + /* waiting for init mode entry - TODO: add a timeout */ + while ((__raw_readl(&base->linsr) & LINSR_LINS_MASK) != + LINSR_LINS_INITMODE); + + /* set UART bit to allow writing other bits */ + __raw_writel(UARTCR_UART, &base->uartcr); + + /* provide data bits, parity, stop bit, etc */ + serial_setbrg(); + + /* 8 bit data, no parity, Tx and Rx enabled, UART mode */ + __raw_writel(UARTCR_PC1 | UARTCR_RXEN | UARTCR_TXEN | UARTCR_PC0 + | UARTCR_WL0 | UARTCR_UART, &base->uartcr); + + ctrl = __raw_readl(&base->lincr1); + ctrl &= ~LINCR1_INIT; + __raw_writel(ctrl, &base->lincr1); /* end init mode */ + + return 0; +} + +static struct serial_device linflex_serial_drv = { + .name = "linflex_serial", + .start = linflex_serial_init, + .stop = NULL, + .setbrg = linflex_serial_setbrg, + .putc = linflex_serial_putc, + .puts = default_serial_puts, + .getc = linflex_serial_getc, + .tstc = linflex_serial_tstc, +}; + +void linflex_serial_initialize(void) +{ + serial_register(&linflex_serial_drv); +} + +__weak struct serial_device *default_serial_console(void) +{ + return &linflex_serial_drv; +} -- 2.1.4

6 39

[U-Boot] [PATCH v2] SPL ext: cosmetic: correct error message in spl_load_image_ext()
by Petr Kulhavy 19 Jun '16

19 Jun '16

Correct the error message in spl_load_image_ext() when image parsing fails. Instead of "ext4fs_read failed" print "failed to parse image header". Signed-off-by: Petr Kulhavy <brain(a)jikos.cz> CC: Guillaume GARDET <guillaume.gardet(a)free.fr> CC: Tom Rini <trini(a)konsulko.com> --- common/spl/spl_ext.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/spl/spl_ext.c b/common/spl/spl_ext.c index ade5496..11931d3 100644 --- a/common/spl/spl_ext.c +++ b/common/spl/spl_ext.c @@ -50,7 +50,7 @@ int spl_load_image_ext(struct blk_desc *block_dev, err = spl_parse_image_header(header); if (err < 0) { - puts("spl: ext4fs_read failed\n"); + puts("spl: ext: failed to parse image header\n"); goto end; } -- 2.5.0

2 1

[U-Boot] [PATCH] fs: cbfs: Fix build of fs/cbfs/cbfs.c when building u-boot sandbox on x86 32-bit
by Guillaume GARDET 19 Jun '16

19 Jun '16

Fix the following build errors when building sandbox on x86 32-bit: In file included from fs/cbfs/cbfs.c:8:0: include/malloc.h:364:7: error: conflicting types for 'memset' void* memset(void*, int, size_t); ^ In file included from include/compiler.h:123:0, from include/cbfs.h:10, from fs/cbfs/cbfs.c:7: include/linux/string.h:78:15: note: previous declaration of 'memset' was here extern void * memset(void *,int,__kernel_size_t); ^ In file included from fs/cbfs/cbfs.c:8:0: include/malloc.h:365:7: error: conflicting types for 'memcpy' void* memcpy(void*, const void*, size_t); ^ In file included from include/compiler.h:123:0, from include/cbfs.h:10, from fs/cbfs/cbfs.c:7: include/linux/string.h:81:15: note: previous declaration of 'memcpy' was here extern void * memcpy(void *,const void *,__kernel_size_t); ^ scripts/Makefile.build:280: recipe for target 'fs/cbfs/cbfs.o' failed Signed-off-by: Guillaume GARDET <guillaume.gardet(a)free.fr> Cc: Tom Rini <trini(a)konsulko.com> Cc: Simon Glass <sjg(a)chromium.org> --- fs/cbfs/cbfs.c | 1 + 1 file changed, 1 insertion(+) diff --git a/fs/cbfs/cbfs.c b/fs/cbfs/cbfs.c index c81b611..95a48a4 100644 --- a/fs/cbfs/cbfs.c +++ b/fs/cbfs/cbfs.c @@ -4,6 +4,7 @@ * SPDX-License-Identifier: GPL-2.0+ */ +#include <common.h> #include <cbfs.h> #include <malloc.h> #include <asm/byteorder.h> -- 1.8.4.5

3 2

[U-Boot] [PATCH] test/py: fix printenv signon message disable code
by Stephen Warren 19 Jun '16

19 Jun '16

From: Stephen Warren <swarren(a)nvidia.com> CONFIG_VERSION_VARIABLE isn't always defined, so we can't simply look up its value directly, or an exception will occur if it isn't defined. Instead, we must use .get() to supply a default value if the variable isn't defined. Fixes: da37f006e7c5 ("tests: py: disable main_signon check for printenv cmd") Cc: Heiko Schocher <hs(a)denx.de> Signed-off-by: Stephen Warren <swarren(a)nvidia.com> --- test/py/tests/test_env.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/py/tests/test_env.py b/test/py/tests/test_env.py index 22a22d1d538b..035dbf5cac4c 100644 --- a/test/py/tests/test_env.py +++ b/test/py/tests/test_env.py @@ -39,7 +39,8 @@ class StateTestEnv(object): Nothing. """ - if self.u_boot_console.config.buildconfig['config_version_variable'] == 'y': + if self.u_boot_console.config.buildconfig.get( + 'config_version_variable', 'n') == 'y': with self.u_boot_console.disable_check('main_signon'): response = self.u_boot_console.run_command('printenv') else: -- 2.9.0

3 3