January 2019 - U-Boot

[U-Boot] Please pull from u-boot-i2c
by Heiko Schocher 16 Jan '19

16 Jan '19

Hello Tom, please pull from u-boot-i2c.git master The following changes since commit d3689267f92c5956e09cc7d1baa4700141662bff: Prepare v2019.01 (2019-01-14 17:02:36 -0500) are available in the Git repository at: git://git.denx.de/u-boot-i2c.git master for you to fetch changes up to 1d7b6a5c4f879dd36ac07ad76ec31eb4fcd2b65b: i2c: Reflect correct dependency for !DM cadence driver (2019-01-15 09:06:46 +0100) ---------------------------------------------------------------- Marek Vasut (1): i2c: xiic: Add Xilinx AXI I2C driver Michal Simek (2): i2c: mux: Covert to livetree functions i2c: Reflect correct dependency for !DM cadence driver Tomasz Gorochowik (1): i2c: i2c-cdns: Use proper input frequency drivers/i2c/Kconfig | 7 +++ drivers/i2c/Makefile | 1 + drivers/i2c/i2c-cdns.c | 9 +++- drivers/i2c/muxes/i2c-mux-uclass.c | 4 +- drivers/i2c/muxes/pca954x.c | 2 +- drivers/i2c/xilinx_xiic.c | 340 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 358 insertions(+), 5 deletions(-) create mode 100644 drivers/i2c/xilinx_xiic.c Travis build shows no errors: https://travis-ci.org/hsdenx/u-boot-i2c/builds/479764750 bye, Heiko -- DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-52 Fax: +49-8142-66989-80 Email: hs(a)denx.de

2 1

[U-Boot] Pull request: u-boot-riscv/master
by uboot＠andestech.com 16 Jan '19

16 Jan '19

Hi Tom, Please pull some riscv updates: 1. Improve cache implementation. 2. Fix and improve standalone applications https://travis-ci.org/rickchen36/u-boot-riscv/builds/479684449 Thanks Rick The following changes since commit d3689267f92c5956e09cc7d1baa4700141662bff: Prepare v2019.01 (2019-01-14 17:02:36 -0500) are available in the Git repository at: git://git.denx.de/u-boot-riscv.git for you to fetch changes up to 91882c472d8c0aef4db699d3f2de55bf43d4ae4b: riscv: qemu: define standalone load address (2019-01-15 09:36:31 +0800) ---------------------------------------------------------------- Lukas Auer (7): riscv: clarify error message on undefined exceptions riscv: move the AX25-specific implementation of flush_dcache_all riscv: use invalidate/flush_*cache_range functions in cache.c riscv: remove RISC-V standalone linker script riscv: replace use of callee-saved register in standalone riscv: support standalone applications on RV64I systems riscv: qemu: define standalone load address arch/riscv/config.mk | 3 +-- arch/riscv/cpu/ax25/cache.c | 22 ++++++++++++++++++++++ arch/riscv/lib/cache.c | 14 ++++++-------- arch/riscv/lib/interrupts.c | 3 ++- examples/standalone/riscv.lds | 40 ---------------------------------------- examples/standalone/stubs.c | 21 ++++++++++++++++----- include/configs/qemu-riscv.h | 2 ++ 7 files changed, 49 insertions(+), 56 deletions(-) delete mode 100644 examples/standalone/riscv.lds

2 1

[U-Boot] [PATCH] common: Kconfig: miscellaneous spelling fixes
by Chris Packham 16 Jan '19

16 Jan '19

Signed-off-by: Chris Packham <judge.packham(a)gmail.com> --- common/Kconfig | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/common/Kconfig b/common/Kconfig index 57bd16d9623c..2c017df4087c 100644 --- a/common/Kconfig +++ b/common/Kconfig @@ -308,7 +308,7 @@ config SILENT_CONSOLE help This option allows the console to be silenced, meaning that no output will appear on the console devices. This is controlled by - setting the environment vaariable 'silent' to a non-empty value. + setting the environment variable 'silent' to a non-empty value. Note this also silences the console when booting Linux. When the console is set up, the variable is checked, and the @@ -430,7 +430,7 @@ config SYS_CONSOLE_INFO_QUIET help Normally U-Boot displays the current settings for stdout, stdin and stderr on boot when the post-relocation console is set up. - Enable this option to supress this output. It can be obtained by + Enable this option to suppress this output. It can be obtained by calling stdio_print_current_devices() from board code. config SYS_STDIO_DEREGISTER @@ -565,14 +565,14 @@ config LOG_TEST This enables a 'log test' command to test logging. It is normally executed from a pytest and simply outputs logging information in various different ways to test that the logging system works - correctly with varoius settings. + correctly with various settings. config LOG_ERROR_RETURN bool "Log all functions which return an error" depends on LOG help When an error is returned in U-Boot it is sometimes difficult to - figure out the root cause. For eaxmple, reading from SPI flash may + figure out the root cause. For example, reading from SPI flash may fail due to a problem in the SPI controller or due to the flash part not returning the expected information. This option changes log_ret() to log any errors it sees. With this option disabled, @@ -661,7 +661,7 @@ config ARCH_MISC_INIT With this option U-Boot will call arch_misc_init() after relocation to allow miscellaneous arch-dependent initialisation to be performed. This function should be defined by the board - and will be called after the console is set up, after relocaiton. + and will be called after the console is set up, after relocation. config BOARD_EARLY_INIT_F bool "Call board-specific init before relocation" -- 2.20.1

3 2

[U-Boot] [PATCH] Makefile: run CONFIG_BOARD_SIZE_LIMIT against .img
by Simon Goldschmidt 16 Jan '19

16 Jan '19

With the current Makefile, CONFIG_BOARD_SIZE_LIMIT is used to check the U-Boot binary without devicetree only. This produces wrong results when OF_SEPARATE is used. To fix this, run the CONFIG_BOARD_SIZE_LIMIT check on all .img binaries as well. Signed-off-by: Simon Goldschmidt <simon.k.r.goldschmidt(a)gmail.com> --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index 99cb9e434d..56236c64cd 100644 --- a/Makefile +++ b/Makefile @@ -1198,6 +1198,7 @@ MKIMAGEFLAGS_u-boot.pbl = -n $(srctree)/$(CONFIG_SYS_FSL_PBL_RCW:"%"=%) \ u-boot-dtb.img u-boot.img u-boot.kwb u-boot.pbl u-boot-ivt.img: \ $(if $(CONFIG_SPL_LOAD_FIT),u-boot-nodtb.bin dts/dt.dtb,u-boot.bin) FORCE $(call if_changed,mkimage) + $(BOARD_SIZE_CHECK) u-boot.itb: u-boot-nodtb.bin dts/dt.dtb $(U_BOOT_ITS) FORCE $(call if_changed,mkfitimage) -- 2.17.1

3 2

[U-Boot] [PATCH 1/2] kbuild: add .DELETE_ON_ERROR special target
by Masahiro Yamada 16 Jan '19

16 Jan '19

Linux commit 9c2af1c7377a8a6ef86e5cabf80978f3dbbb25c0 If Make gets a fatal signal while a shell is executing, it may delete the target file that the recipe was supposed to update. This is needed to make sure that it is remade from scratch when Make is next run; if Make is interrupted after the recipe has begun to write the target file, it results in an incomplete file whose time stamp is newer than that of the prerequisites files. Make automatically deletes the incomplete file on interrupt unless the target is marked .PRECIOUS. The situation is just the same as when the shell fails for some reasons. Usually when a recipe line fails, if it has changed the target file at all, the file is corrupted, or at least it is not completely updated. Yet the file’s time stamp says that it is now up to date, so the next time Make runs, it will not try to update that file. However, Make does not cater to delete the incomplete target file in this case. We need to add .DELETE_ON_ERROR somewhere in the Makefile to request it. scripts/Kbuild.include seems a suitable place to add it because it is included from almost all sub-makes. Signed-off-by: Masahiro Yamada <yamada.masahiro(a)socionext.com> --- scripts/Kbuild.include | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/Kbuild.include b/scripts/Kbuild.include index 13ebddd..460acd6 100644 --- a/scripts/Kbuild.include +++ b/scripts/Kbuild.include @@ -315,6 +315,9 @@ why = \ echo-why = $(call escsq, $(strip $(why))) endif +# delete partially updated (i.e. corrupted) files on error +.DELETE_ON_ERROR: + ifdef CONFIG_SPL_BUILD SPL_ := SPL_ ifeq ($(CONFIG_TPL_BUILD),y) -- 2.7.4

2 3

[U-Boot] [PATCH] serial: ns16550: fix debug uart putc called before init
by Simon Goldschmidt 16 Jan '19

16 Jan '19

If _debug_uart_putc() is called before _debug_uart_init(), the ns16550 debug uart driver hangs in a tight loop waiting for the tx FIFO to get empty. As this can happen via a printf sneaking in before the port calls debug_uart_init(), introduce a config option to ignore characters before the debug uart is initialized. This is done by reading the baudrate divisor and aborting if is zero. The Kconfig option is required as reading the baudrate divisor does not seem to work for all ns16500 compatibles (which is why the last attempt on this has been reverted in 1a67969a99). Tested on socfpga_cyclone5_socrates. Signed-off-by: Simon Goldschmidt <simon.k.r.goldschmidt(a)gmail.com> --- drivers/serial/Kconfig | 12 ++++++++++++ drivers/serial/ns16550.c | 20 ++++++++++++++++++-- 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig index b7ff2960ab..8709bf69c0 100644 --- a/drivers/serial/Kconfig +++ b/drivers/serial/Kconfig @@ -446,6 +446,18 @@ config DEBUG_UART_SKIP_INIT Select this if the UART you want to use for debug output is already initialized by the time U-Boot starts its execution. +config DEBUG_UART_NS16550_CHECK_ENABLED + bool "Check if UART is enabled on output" + depends on DEBUG_UART + depends on DEBUG_UART_NS16550 + help + Select this if puts()/putc() might be called before the debug UART + has been initialized. If this is disabled, putc() might sit in a + tight loop if it is called before debug_uart_init() has been called. + + Note that this does not work for every ns16550-compatible UART and + so has to be enabled carefully or you might notice lost characters. + config ALTERA_JTAG_UART bool "Altera JTAG UART support" depends on DM_SERIAL diff --git a/drivers/serial/ns16550.c b/drivers/serial/ns16550.c index 560ca2ae34..6cf2be8f2b 100644 --- a/drivers/serial/ns16550.c +++ b/drivers/serial/ns16550.c @@ -272,12 +272,28 @@ static inline void _debug_uart_init(void) serial_dout(&com_port->lcr, UART_LCRVAL); } +static inline int NS16550_read_baud_divisor(struct NS16550 *com_port) +{ + int ret; + + serial_dout(&com_port->lcr, UART_LCR_BKSE | UART_LCRVAL); + ret = serial_din(&com_port->dll) & 0xff; + ret |= (serial_din(&com_port->dlm) & 0xff) << 8; + serial_dout(&com_port->lcr, UART_LCRVAL); + + return ret; +} + static inline void _debug_uart_putc(int ch) { struct NS16550 *com_port = (struct NS16550 *)CONFIG_DEBUG_UART_BASE; - while (!(serial_din(&com_port->lsr) & UART_LSR_THRE)) - ; + while (!(serial_din(&com_port->lsr) & UART_LSR_THRE)) { +#ifdef CONFIG_DEBUG_UART_NS16550_CHECK_ENABLED + if (!NS16550_read_baud_divisor(com_port)) + return; +#endif + } serial_dout(&com_port->thr, ch); } -- 2.17.1

3 4

[U-Boot] [PATCH v2] ARC: Move ENV_SIZE and ENV_OFFSET to Kconfig
by Alexey Brodkin 16 Jan '19

16 Jan '19

Join the party of some ARM boards and drop more items from include/configs/xxx.h. Signed-off-by: Alexey Brodkin <abrodkin(a)synopsys.com> Cc: Michal Simek <michal.simek(a)xilinx.com> Cc: Simon Glass <sjg(a)chromium.org> Cc: Tom Rini <trini(a)konsulko.com> --- Changes in v2: * Default ENV_OFFSET defined specially for ARC but not all configs/emsdp_defconfig | 1 + configs/iot_devkit_defconfig | 1 + configs/tb100_defconfig | 1 + env/Kconfig | 4 +++- include/configs/axs10x.h | 1 - include/configs/emsdp.h | 1 - include/configs/hsdk.h | 2 -- include/configs/iot_devkit.h | 1 - include/configs/nsim.h | 6 ------ include/configs/tb100.h | 6 ------ 10 files changed, 6 insertions(+), 18 deletions(-) diff --git a/configs/emsdp_defconfig b/configs/emsdp_defconfig index 273334b05d..64281d0529 100644 --- a/configs/emsdp_defconfig +++ b/configs/emsdp_defconfig @@ -3,6 +3,7 @@ CONFIG_ISA_ARCV2=y CONFIG_CPU_ARCEM6=y CONFIG_TARGET_EMSDP=y CONFIG_SYS_TEXT_BASE=0x00000000 +CONFIG_ENV_SIZE=0x1000 CONFIG_SYS_CLK_FREQ=40000000 # CONFIG_ARCH_FIXUP_FDT_MEMORY is not set CONFIG_VERSION_VARIABLE=y diff --git a/configs/iot_devkit_defconfig b/configs/iot_devkit_defconfig index 1b6dd9e55a..24bbe3fc5d 100644 --- a/configs/iot_devkit_defconfig +++ b/configs/iot_devkit_defconfig @@ -5,6 +5,7 @@ CONFIG_SYS_ICACHE_OFF=y CONFIG_SYS_DCACHE_OFF=y CONFIG_TARGET_IOT_DEVKIT=y CONFIG_SYS_TEXT_BASE=0x00000000 +CONFIG_ENV_SIZE=0x1000 CONFIG_SYS_CLK_FREQ=16000000 CONFIG_LOCALVERSION="-iotdk-1.0" # CONFIG_ARCH_FIXUP_FDT_MEMORY is not set diff --git a/configs/tb100_defconfig b/configs/tb100_defconfig index f30053d4de..e3837d92e7 100644 --- a/configs/tb100_defconfig +++ b/configs/tb100_defconfig @@ -1,6 +1,7 @@ CONFIG_ARC=y CONFIG_TARGET_TB100=y CONFIG_SYS_TEXT_BASE=0x84000000 +CONFIG_ENV_SIZE=0x800 CONFIG_SYS_CLK_FREQ=500000000 CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTARGS=y diff --git a/env/Kconfig b/env/Kconfig index 9011109b47..c22cbbdadc 100644 --- a/env/Kconfig +++ b/env/Kconfig @@ -431,7 +431,7 @@ config ENV_EXT4_FILE It's a string of the EXT4 file name. This file use to store the environment (explicit path to the file) -if ARCH_ROCKCHIP || ARCH_SUNXI || ARCH_ZYNQ || ARCH_ZYNQMP || ARCH_VERSAL +if ARCH_ROCKCHIP || ARCH_SUNXI || ARCH_ZYNQ || ARCH_ZYNQMP || ARCH_VERSAL || ARC config ENV_OFFSET hex "Environment Offset" @@ -441,6 +441,7 @@ config ENV_OFFSET default 0x88000 if ARCH_SUNXI default 0xE0000 if ARCH_ZYNQ default 0x1E00000 if ARCH_ZYNQMP + default 0 if ARC help Offset from the start of the device (or partition) @@ -449,6 +450,7 @@ config ENV_SIZE default 0x40000 if ENV_IS_IN_SPI_FLASH && ARCH_ZYNQMP default 0x20000 if ARCH_SUNXI || ARCH_ZYNQ default 0x8000 if ARCH_ROCKCHIP || ARCH_ZYNQMP || ARCH_VERSAL + default 0x4000 if ARC help Size of the environment storage area diff --git a/include/configs/axs10x.h b/include/configs/axs10x.h index 9452b06771..24afbc8fe5 100644 --- a/include/configs/axs10x.h +++ b/include/configs/axs10x.h @@ -62,7 +62,6 @@ /* * Environment settings */ -#define CONFIG_ENV_SIZE SZ_16K #define CONFIG_EXTRA_ENV_SETTINGS \ "upgrade=if mmc rescan && " \ "fatload mmc 0:1 ${loadaddr} u-boot-update.img && " \ diff --git a/include/configs/emsdp.h b/include/configs/emsdp.h index 9a205edc7c..44614138f8 100644 --- a/include/configs/emsdp.h +++ b/include/configs/emsdp.h @@ -24,7 +24,6 @@ /* * Environment */ -#define CONFIG_ENV_SIZE SZ_4K #define CONFIG_BOOTFILE "app.bin" #define CONFIG_LOADADDR CONFIG_SYS_LOAD_ADDR diff --git a/include/configs/hsdk.h b/include/configs/hsdk.h index 94c88b29f1..4755567a2d 100644 --- a/include/configs/hsdk.h +++ b/include/configs/hsdk.h @@ -57,8 +57,6 @@ /* * Environment settings */ -#define CONFIG_ENV_SIZE SZ_16K - #define CONFIG_EXTRA_ENV_SETTINGS \ "upgrade=if mmc rescan && " \ "fatload mmc 0:1 ${loadaddr} u-boot-update.scr && " \ diff --git a/include/configs/iot_devkit.h b/include/configs/iot_devkit.h index 4ffe1141d9..4b110bb9d8 100644 --- a/include/configs/iot_devkit.h +++ b/include/configs/iot_devkit.h @@ -77,7 +77,6 @@ /* * Environment */ -#define CONFIG_ENV_SIZE SZ_4K #define CONFIG_BOOTFILE "app.bin" #define CONFIG_LOADADDR CONFIG_SYS_LOAD_ADDR diff --git a/include/configs/nsim.h b/include/configs/nsim.h index c3f34a91e4..61217bbe79 100644 --- a/include/configs/nsim.h +++ b/include/configs/nsim.h @@ -24,12 +24,6 @@ #define CONFIG_SYS_BOOTM_LEN SZ_32M #define CONFIG_SYS_LOAD_ADDR 0x82000000 -/* - * Environment settings - */ -#define CONFIG_ENV_SIZE SZ_512 -#define CONFIG_ENV_OFFSET 0 - /* * Environment configuration */ diff --git a/include/configs/tb100.h b/include/configs/tb100.h index 96e5b6315c..a761c37335 100644 --- a/include/configs/tb100.h +++ b/include/configs/tb100.h @@ -52,12 +52,6 @@ * Command line configuration */ -/* - * Environment settings - */ -#define CONFIG_ENV_SIZE SZ_2K -#define CONFIG_ENV_OFFSET 0 - /* * Environment configuration */ -- 2.16.2

2 1

[U-Boot] [PATCH] ARC: Move ENV_SIZE and ENV_OFFSET to Kconfig
by Alexey Brodkin 16 Jan '19

16 Jan '19

Join the party of some ARM boards and drop more items from include/configs/xxx.h. Signed-off-by: Alexey Brodkin <abrodkin(a)synopsys.com> Cc: Michal Simek <michal.simek(a)xilinx.com> Cc: Simon Glass <sjg(a)chromium.org> Cc: Tom Rini <trini(a)konsulko.com> --- configs/emsdp_defconfig | 1 + configs/iot_devkit_defconfig | 1 + configs/tb100_defconfig | 1 + env/Kconfig | 4 +++- include/configs/axs10x.h | 1 - include/configs/emsdp.h | 1 - include/configs/hsdk.h | 2 -- include/configs/iot_devkit.h | 1 - include/configs/nsim.h | 6 ------ include/configs/tb100.h | 6 ------ 10 files changed, 6 insertions(+), 18 deletions(-) diff --git a/configs/emsdp_defconfig b/configs/emsdp_defconfig index 273334b05d..64281d0529 100644 --- a/configs/emsdp_defconfig +++ b/configs/emsdp_defconfig @@ -3,6 +3,7 @@ CONFIG_ISA_ARCV2=y CONFIG_CPU_ARCEM6=y CONFIG_TARGET_EMSDP=y CONFIG_SYS_TEXT_BASE=0x00000000 +CONFIG_ENV_SIZE=0x1000 CONFIG_SYS_CLK_FREQ=40000000 # CONFIG_ARCH_FIXUP_FDT_MEMORY is not set CONFIG_VERSION_VARIABLE=y diff --git a/configs/iot_devkit_defconfig b/configs/iot_devkit_defconfig index 1b6dd9e55a..24bbe3fc5d 100644 --- a/configs/iot_devkit_defconfig +++ b/configs/iot_devkit_defconfig @@ -5,6 +5,7 @@ CONFIG_SYS_ICACHE_OFF=y CONFIG_SYS_DCACHE_OFF=y CONFIG_TARGET_IOT_DEVKIT=y CONFIG_SYS_TEXT_BASE=0x00000000 +CONFIG_ENV_SIZE=0x1000 CONFIG_SYS_CLK_FREQ=16000000 CONFIG_LOCALVERSION="-iotdk-1.0" # CONFIG_ARCH_FIXUP_FDT_MEMORY is not set diff --git a/configs/tb100_defconfig b/configs/tb100_defconfig index f30053d4de..e3837d92e7 100644 --- a/configs/tb100_defconfig +++ b/configs/tb100_defconfig @@ -1,6 +1,7 @@ CONFIG_ARC=y CONFIG_TARGET_TB100=y CONFIG_SYS_TEXT_BASE=0x84000000 +CONFIG_ENV_SIZE=0x800 CONFIG_SYS_CLK_FREQ=500000000 CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTARGS=y diff --git a/env/Kconfig b/env/Kconfig index 9011109b47..8beaa7249a 100644 --- a/env/Kconfig +++ b/env/Kconfig @@ -431,7 +431,7 @@ config ENV_EXT4_FILE It's a string of the EXT4 file name. This file use to store the environment (explicit path to the file) -if ARCH_ROCKCHIP || ARCH_SUNXI || ARCH_ZYNQ || ARCH_ZYNQMP || ARCH_VERSAL +if ARCH_ROCKCHIP || ARCH_SUNXI || ARCH_ZYNQ || ARCH_ZYNQMP || ARCH_VERSAL || ARC config ENV_OFFSET hex "Environment Offset" @@ -441,6 +441,7 @@ config ENV_OFFSET default 0x88000 if ARCH_SUNXI default 0xE0000 if ARCH_ZYNQ default 0x1E00000 if ARCH_ZYNQMP + default 0 help Offset from the start of the device (or partition) @@ -449,6 +450,7 @@ config ENV_SIZE default 0x40000 if ENV_IS_IN_SPI_FLASH && ARCH_ZYNQMP default 0x20000 if ARCH_SUNXI || ARCH_ZYNQ default 0x8000 if ARCH_ROCKCHIP || ARCH_ZYNQMP || ARCH_VERSAL + default 0x4000 if ARC help Size of the environment storage area diff --git a/include/configs/axs10x.h b/include/configs/axs10x.h index 9452b06771..24afbc8fe5 100644 --- a/include/configs/axs10x.h +++ b/include/configs/axs10x.h @@ -62,7 +62,6 @@ /* * Environment settings */ -#define CONFIG_ENV_SIZE SZ_16K #define CONFIG_EXTRA_ENV_SETTINGS \ "upgrade=if mmc rescan && " \ "fatload mmc 0:1 ${loadaddr} u-boot-update.img && " \ diff --git a/include/configs/emsdp.h b/include/configs/emsdp.h index 9a205edc7c..44614138f8 100644 --- a/include/configs/emsdp.h +++ b/include/configs/emsdp.h @@ -24,7 +24,6 @@ /* * Environment */ -#define CONFIG_ENV_SIZE SZ_4K #define CONFIG_BOOTFILE "app.bin" #define CONFIG_LOADADDR CONFIG_SYS_LOAD_ADDR diff --git a/include/configs/hsdk.h b/include/configs/hsdk.h index 94c88b29f1..4755567a2d 100644 --- a/include/configs/hsdk.h +++ b/include/configs/hsdk.h @@ -57,8 +57,6 @@ /* * Environment settings */ -#define CONFIG_ENV_SIZE SZ_16K - #define CONFIG_EXTRA_ENV_SETTINGS \ "upgrade=if mmc rescan && " \ "fatload mmc 0:1 ${loadaddr} u-boot-update.scr && " \ diff --git a/include/configs/iot_devkit.h b/include/configs/iot_devkit.h index 4ffe1141d9..4b110bb9d8 100644 --- a/include/configs/iot_devkit.h +++ b/include/configs/iot_devkit.h @@ -77,7 +77,6 @@ /* * Environment */ -#define CONFIG_ENV_SIZE SZ_4K #define CONFIG_BOOTFILE "app.bin" #define CONFIG_LOADADDR CONFIG_SYS_LOAD_ADDR diff --git a/include/configs/nsim.h b/include/configs/nsim.h index c3f34a91e4..61217bbe79 100644 --- a/include/configs/nsim.h +++ b/include/configs/nsim.h @@ -24,12 +24,6 @@ #define CONFIG_SYS_BOOTM_LEN SZ_32M #define CONFIG_SYS_LOAD_ADDR 0x82000000 -/* - * Environment settings - */ -#define CONFIG_ENV_SIZE SZ_512 -#define CONFIG_ENV_OFFSET 0 - /* * Environment configuration */ diff --git a/include/configs/tb100.h b/include/configs/tb100.h index 96e5b6315c..a761c37335 100644 --- a/include/configs/tb100.h +++ b/include/configs/tb100.h @@ -52,12 +52,6 @@ * Command line configuration */ -/* - * Environment settings - */ -#define CONFIG_ENV_SIZE SZ_2K -#define CONFIG_ENV_OFFSET 0 - /* * Environment configuration */ -- 2.16.2

2 4

[U-Boot] [PATCH v2 0/4] Add network support for Ocelots SoCs
by Gregory CLEMENT 16 Jan '19

16 Jan '19

Hello, this the second version of a series allowing to use the switch component of the Ocelots SoC as a network interface. The binding used is exactly the same of the one already used by Linux. There is also a patch adding a workaround needed on the Ocelot based boards: indeed the pin connected to the DDR reset is part of the switch subsystem. So we need ensure that the DDR is not reset during the switch reset. Gregory Changelog: v1 -> v2: - Use wait_for_bit_le32() (suggested by Stefan Roese) - Use debug() instead of printf() for the debug messages in mscc_switch_reset. Gregory CLEMENT (4): MIPS: mscc: ocelot: Add ethernet nodes for Ocelot net: add MSCC Ocelot switch support MIPS: mscc: ocelot: add switch reset support configs: mscc_ocelot: add network support MAINTAINERS | 1 + arch/mips/dts/mscc,ocelot.dtsi | 97 ++++ arch/mips/dts/ocelot_pcb123.dts | 20 + board/mscc/ocelot/ocelot.c | 26 + configs/mscc_ocelot_defconfig | 1 + drivers/net/Kconfig | 7 + drivers/net/Makefile | 1 + drivers/net/ocelot_switch.c | 837 ++++++++++++++++++++++++++++++++ 8 files changed, 990 insertions(+) create mode 100644 drivers/net/ocelot_switch.c -- 2.20.1

2 10

[U-Boot] [PATCH 0/2] MSCC: Add sysreset driver for MSCC SoCs
by Horatiu Vultur 16 Jan '19

16 Jan '19

This patch series adds sysreset drivers for MSCC SoCs. There are 3 drivers: sysreset_jr2, sysreset_ocelot and sysreset_luton. This is based off the u-boot-mips/next repository. Horatiu Vultur (2): MSCC: Add sysreset drivers for MSCC Socs MSCC: Remove reset.c MAINTAINERS | 1 + arch/mips/dts/mscc,jr2.dtsi | 7 +- arch/mips/dts/mscc,luton.dtsi | 10 +++ arch/mips/dts/mscc,ocelot.dtsi | 5 ++ arch/mips/mach-mscc/Makefile | 2 +- arch/mips/mach-mscc/include/mach/ddr.h | 18 +++- arch/mips/mach-mscc/reset.c | 47 ---------- board/mscc/ocelot/ocelot.c | 20 +++++ configs/mscc_jr2_defconfig | 2 + configs/mscc_luton_defconfig | 2 + configs/mscc_ocelot_defconfig | 2 + drivers/sysreset/Kconfig | 6 ++ drivers/sysreset/Makefile | 1 + drivers/sysreset/sysreset_mscc.c | 157 +++++++++++++++++++++++++++++++++ 14 files changed, 230 insertions(+), 50 deletions(-) delete mode 100644 arch/mips/mach-mscc/reset.c create mode 100644 drivers/sysreset/sysreset_mscc.c -- 2.7.4

2 6