April 2019 - U-Boot

[U-Boot] [PATCH 1/1] efi_loader: update virtual address in efi_mem_carve_out
by Heinrich Schuchardt 11 Apr '19

11 Apr '19

Handle virtual address in efi_mem_carve_out() function when a new region is created to avoid issue in EFI memory map. Signed-off-by: Patrick Delaunay <patrick.delaunay(a)st.com> At boottime physical and virtual addressed have to be the same. This allowed to simplify the proposed logic. Reviewed-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- lib/efi_loader/efi_memory.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/efi_loader/efi_memory.c b/lib/efi_loader/efi_memory.c index dbe29b8960..46681dc208 100644 --- a/lib/efi_loader/efi_memory.c +++ b/lib/efi_loader/efi_memory.c @@ -193,6 +193,7 @@ static s64 efi_mem_carve_out(struct efi_mem_list *map, free(map); } else { map->desc.physical_start = carve_end; + map->desc.virtual_start = carve_end; map->desc.num_pages = (map_end - carve_end) >> EFI_PAGE_SHIFT; } @@ -211,6 +212,7 @@ static s64 efi_mem_carve_out(struct efi_mem_list *map, newmap = calloc(1, sizeof(*newmap)); newmap->desc = map->desc; newmap->desc.physical_start = carve_start; + newmap->desc.virtual_start = carve_start; newmap->desc.num_pages = (map_end - carve_start) >> EFI_PAGE_SHIFT; /* Insert before current entry (descending address order) */ list_add_tail(&newmap->link, &map->link); -- 2.20.1

1 0

[U-Boot] [PATCH 1/3] efi: fix issue for 32bit targets with ram_top at 4G
by Patrick Delaunay 11 Apr '19

11 Apr '19

Avoid ram_end = 0 on 32bit targets with ram_end at 4G. Signed-off-by: Patrick Delaunay <patrick.delaunay(a)st.com> --- example of issue in stm32mp1 board ev1: ram_start = c0000000 size = 40000000 ram_end = 100000000 ram_end &= ~EFI_PAGE_MASK => result is 0 lib/efi_loader/efi_memory.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/efi_loader/efi_memory.c b/lib/efi_loader/efi_memory.c index 55622d2..81dc5fc 100644 --- a/lib/efi_loader/efi_memory.c +++ b/lib/efi_loader/efi_memory.c @@ -574,6 +574,10 @@ __weak void efi_add_known_memory(void) /* Remove partial pages */ ram_end &= ~EFI_PAGE_MASK; + /* Fix for 32bit targets with ram_top at 4G */ + if (!ram_end) + ram_end = 0x100000000ULL; + ram_start = (ram_start + EFI_PAGE_MASK) & ~EFI_PAGE_MASK; if (ram_end <= ram_start) { -- 2.7.4

4 8

[U-Boot] [PATCH] spl: add size check including devicetree
by Simon Goldschmidt 11 Apr '19

11 Apr '19

Current linker based size checks do not account for the devicetree, as this is added after linker stage. This patch moves the logic behind U-Boot proper BOARD_SIZE_CHECK into a common function that is called for SPL, too. For SPL, CONFIG_SPL_MAX_SIZE is used to check u-boot-spl-dtb.bin. This is RFC for two reasons: - scripts/Kbuild.include might not be the perfect place for this new function but was the only place I found included by both /Makefile and /scripts/Makefile.spl - CONFIG_SPL_MAX_SIZE at least for some boards defines the size of the initially available SRAM. However, this check checks the SPL binary only. Initial SRAM must hold gd, heap and stack in addition to that. Signed-off-by: Simon Goldschmidt <simon.k.r.goldschmidt(a)gmail.com> --- Makefile | 11 +---------- scripts/Kbuild.include | 16 ++++++++++++++++ scripts/Makefile.spl | 6 ++++++ 3 files changed, 23 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index 75a5c7d171..7e1241cf9f 100644 --- a/Makefile +++ b/Makefile @@ -771,16 +771,7 @@ LDPPFLAGS += \ ######################################################################### ifneq ($(CONFIG_BOARD_SIZE_LIMIT),) -BOARD_SIZE_CHECK = \ - @actual=`wc -c $@ | awk '{print $$1}'`; \ - limit=`printf "%d" $(CONFIG_BOARD_SIZE_LIMIT)`; \ - if test $$actual -gt $$limit; then \ - echo "$@ exceeds file size limit:" >&2 ; \ - echo " limit: $$limit bytes" >&2 ; \ - echo " actual: $$actual bytes" >&2 ; \ - echo " excess: $$((actual - limit)) bytes" >&2; \ - exit 1; \ - fi +BOARD_SIZE_CHECK = $(call board_size_check,$(CONFIG_BOARD_SIZE_LIMIT)) else BOARD_SIZE_CHECK = endif diff --git a/scripts/Kbuild.include b/scripts/Kbuild.include index b8969e2a75..e3e0aead3f 100644 --- a/scripts/Kbuild.include +++ b/scripts/Kbuild.include @@ -332,3 +332,19 @@ else SPL_ := SPL_TPL_ := endif + +# added for U-Boot +# board size check +# --------------------------------------------------------------------------- +# This checks binaries created in makefiles ($@) for size constraints ($(1)). +define board_size_check + @actual=`wc -c $@ | awk '{print $$1}'`; \ + limit=`printf "%d" $(1)`; \ + if test $$actual -gt $$limit; then \ + echo "$@ exceeds file size limit:" >&2 ; \ + echo " limit: $$limit bytes" >&2 ; \ + echo " actual: $$actual bytes" >&2 ; \ + echo " excess: $$((actual - limit)) bytes" >&2; \ + exit 1; \ + fi +endef diff --git a/scripts/Makefile.spl b/scripts/Makefile.spl index 9d5921606e..31339ab9e6 100644 --- a/scripts/Makefile.spl +++ b/scripts/Makefile.spl @@ -253,12 +253,18 @@ else FINAL_DTB_CONTAINER = $(obj)/$(SPL_BIN).multidtb.fit endif +ifneq ($(CONFIG_SPL_MAX_SIZE),) +SPL_BOARD_SIZE_CHECK = $(call board_size_check,$(CONFIG_SPL_MAX_SIZE)) +else +SPL_BOARD_SIZE_CHECK = +endif ifeq ($(CONFIG_$(SPL_TPL_)OF_CONTROL)$(CONFIG_OF_SEPARATE)$(CONFIG_$(SPL_TPL_)OF_PLATDATA),yy) $(obj)/$(SPL_BIN)-dtb.bin: $(obj)/$(SPL_BIN)-nodtb.bin \ $(if $(CONFIG_SPL_SEPARATE_BSS),,$(obj)/$(SPL_BIN)-pad.bin) \ $(FINAL_DTB_CONTAINER) FORCE $(call if_changed,cat) + $(SPL_BOARD_SIZE_CHECK) $(obj)/$(SPL_BIN).bin: $(obj)/$(SPL_BIN)-dtb.bin FORCE $(call if_changed,copy) -- 2.17.1

2 7

[U-Boot] Pull request: u-boot-ubi/master
by Heiko Schocher 11 Apr '19

11 Apr '19

Hello Tom, please pull from u-boot-ubi-git master The following changes since commit 3c99166441bf3ea325af2da83cfe65430b49c066: Prepare v2019.04 (2019-04-08 21:40:40 -0400) are available in the Git repository at: git://git.denx.de/u-boot-ubi.git master for you to fetch changes up to 734b080e78805edbb3430a52c8c5b1aeee02bd9f: mtd: ubi, ubifs debug: Use pr_debug instead of pr_crit (2019-04-09 07:46:42 +0200) ---------------------------------------------------------------- Eran Matityahu (2): mtd: ubi debug: Remove the pid print from ubi_assert mtd: ubi, ubifs debug: Use pr_debug instead of pr_crit drivers/mtd/ubi/debug.h | 10 ++++++++++ fs/ubifs/debug.h | 4 ++-- 2 files changed, 12 insertions(+), 2 deletions(-) Travis builds fine: https://travis-ci.org/hsdenx/u-boot-ubi/builds/517623576 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 u-boot] Please pull u-boot-amlogic-20190411
by Neil Armstrong 11 Apr '19

11 Apr '19

Hi Tom, This PR adds support for 3 more Amlogic boards, support printing SoC revision information, add AXG family support for I2C and Reset, then fixup the AXG pinctrl defintions. Thanks, Neil The following changes since commit 48ff1bc4f0a97c3291d0c87c2717fc1d79da5ef5: Merge branch '2019-04-09-master-imports-fs' (2019-04-10 08:18:18 -0400) are available in the Git repository at: git://git.denx.de/u-boot-amlogic.git tags/u-boot-amlogic-20190411 for you to fetch changes up to 2c4e3cf21257f962e69264fe91ff2cc23cbd041a: pinctrl: meson: axg: Fix PIN and BANK offsets (2019-04-10 16:54:59 +0200) ---------------------------------------------------------------- - Add support for Amlogic p200 & p201 Reference Designs - Add Amlogic SoC information display - Add support for the Libretech-AC AML-S805X-AC board - Add Amlogic AXG reset compatible - Add I2C support for Amlogic AXG - Fix AXG PIN and BANK pinctrl definitions ---------------------------------------------------------------- Guillaume La Roque (2): i2c: meson: add configurable divider factors pinctrl: meson: axg: Fix PIN and BANK offsets Julien Masson (1): ARM: meson: display Amlogic SoC Information Mohammad Rasim (5): ARM: board: meson: rename odroid-c2 to p200 ARM: dts: meson: add p200 and p201 boards ARM: dts: meson: add u-boot.dtsi for p200 and p201 ARM: board: meson: add p200 board ARM: board: meson: add p201 board Neil Armstrong (3): ARM: dts: Import libretech-ac DT from Linux 5.0 boards: Amlogic: Add support for Libretech-AC reset-meson: Add AXG reset compatible arch/arm/dts/Makefile | 3 + arch/arm/dts/meson-gxbb-p200-u-boot.dtsi | 7 + arch/arm/dts/meson-gxbb-p200.dts | 99 ++++++ arch/arm/dts/meson-gxbb-p201-u-boot.dtsi | 7 + arch/arm/dts/meson-gxbb-p201.dts | 26 ++ arch/arm/dts/meson-gxbb-p20x.dtsi | 247 ++++++++++++++ arch/arm/dts/meson-gxl-s805x-libretech-ac.dts | 248 ++++++++++++++ arch/arm/dts/meson-gxl.dtsi | 70 +++- arch/arm/mach-meson/Kconfig | 2 +- arch/arm/mach-meson/Makefile | 2 +- arch/arm/mach-meson/board-info.c | 166 ++++++++++ board/amlogic/{odroid-c2 => p200}/MAINTAINERS | 6 +- board/amlogic/{odroid-c2 => p200}/Makefile | 2 +- board/amlogic/{odroid-c2 => p200}/README.nanopi-k2 | 0 board/amlogic/{odroid-c2 => p200}/README.odroid-c2 | 0 board/amlogic/p200/README.p200 | 103 ++++++ .../amlogic/{odroid-c2/odroid-c2.c => p200/p200.c} | 0 board/amlogic/p201/MAINTAINERS | 5 + board/amlogic/p201/Makefile | 5 + board/amlogic/p201/README.p201 | 103 ++++++ board/amlogic/p201/p201.c | 43 +++ board/amlogic/p212/MAINTAINERS | 1 + board/amlogic/p212/README.libretech-ac | 103 ++++++ configs/khadas-vim2_defconfig | 2 +- configs/khadas-vim_defconfig | 2 +- configs/libretech-ac_defconfig | 74 +++++ configs/libretech-cc_defconfig | 2 +- configs/nanopi-k2_defconfig | 2 +- configs/odroid-c2_defconfig | 2 +- configs/p200_defconfig | 41 +++ configs/p201_defconfig | 41 +++ configs/p212_defconfig | 2 +- configs/s400_defconfig | 2 +- drivers/i2c/meson_i2c.c | 30 +- drivers/pinctrl/meson/pinctrl-meson-axg.c | 358 ++++++++++----------- drivers/reset/reset-meson.c | 1 + include/configs/libretech-ac.h | 24 ++ 37 files changed, 1625 insertions(+), 206 deletions(-) create mode 100644 arch/arm/dts/meson-gxbb-p200-u-boot.dtsi create mode 100644 arch/arm/dts/meson-gxbb-p200.dts create mode 100644 arch/arm/dts/meson-gxbb-p201-u-boot.dtsi create mode 100644 arch/arm/dts/meson-gxbb-p201.dts create mode 100644 arch/arm/dts/meson-gxbb-p20x.dtsi create mode 100644 arch/arm/dts/meson-gxl-s805x-libretech-ac.dts create mode 100644 arch/arm/mach-meson/board-info.c rename board/amlogic/{odroid-c2 => p200}/MAINTAINERS (70%) rename board/amlogic/{odroid-c2 => p200}/Makefile (82%) rename board/amlogic/{odroid-c2 => p200}/README.nanopi-k2 (100%) rename board/amlogic/{odroid-c2 => p200}/README.odroid-c2 (100%) create mode 100644 board/amlogic/p200/README.p200 rename board/amlogic/{odroid-c2/odroid-c2.c => p200/p200.c} (100%) create mode 100644 board/amlogic/p201/MAINTAINERS create mode 100644 board/amlogic/p201/Makefile create mode 100644 board/amlogic/p201/README.p201 create mode 100644 board/amlogic/p201/p201.c create mode 100644 board/amlogic/p212/README.libretech-ac create mode 100644 configs/libretech-ac_defconfig create mode 100644 configs/p200_defconfig create mode 100644 configs/p201_defconfig create mode 100644 include/configs/libretech-ac.h

2 2

[U-Boot] Please pull u-boot-marvell/master
by Stefan Roese 11 Apr '19

11 Apr '19

Hi Tom, please pull the following Marvell related patches: ---------------------------------------------------------------- - Misc dts files sync'ed with Linux version (Chris) - Orion watchdog fix (Chris) - kwbimage changed to also support Marvell bin_hdr binary (Chris) - Add DM support to enable CONFIG_BLK for sata_mv (Stefan) - Enable BLK on multiple platforms (Stefan) - Misc minor fixes to AXP theadorable board (Stefan) - Correct logic for DM_SCSI + unconverted drivers check (stefan) - Add Kirkwood db-88f6281-bp board (Chris) - Misc changes to kirkwood to enable DM_USB here (Chris) - Change ahci_mvebu to enable usage on A38x (Baruch) - Update the kirkwood entry in git-mailrc (Baruch) - Misc minor improvements (turris, documentation) (Baruch) - Enhance sata_mv to support Kirkwood as well (Michael) - Add wdt command (Michael) - Add Marvell integrated CPUs (MSYS) support with DB-XC3-24G4XG board support (Chris) ---------------------------------------------------------------- Thanks, Stefan The following changes since commit 7e9d5d4167921802d0e956f803392a2437f92bf5: test.py: Disable fsck for FAT tests for now (2019-04-11 08:41:16 +0200) are available in the Git repository at: git://www.denx.de/git/u-boot-marvell.git for you to fetch changes up to ea755051738cfc46721351935a09036500e86053: ARM: kirkwood: remove obsolete call to icache_enable (2019-04-11 13:42:13 +0200) ---------------------------------------------------------------- Baruch Siach (6): ARM: mvebu: define board_ahci_enable() for A38x ata: ahci_mvebu: add support for Armada 38x git-mailrc: update the kirkwood entry arm: mvebu: clearfog: document eMMC installation mvebu: drop dangling SPI flash comments and #ifdefs arm: mvebu: turris_omnia: select Kconfig SPI_FLASH_SPANSION Chris Packham (20): arm: sync armada-xp dts files from Linux 5.0 watchdog: orion_wdt: support SPL usage watchdog: orion_wdt: take timeout value in ms arm: mvebu: x530: Enable watchdog in SPL and U-Boot tools: kwbimage: don't adjust for image_header for Armada MSYS ARM: kirkwood: add db-88f6281-bp board ARM: kirkwood: rename KW_CPU_WIN_BASE to MVEBU_CPU_WIN_BASE ARM: kirkwood: remove KW_DEFADR_PCI_IO_REMAP ARM: kirkwood: switch to using mvebu mbus ARM: kirkwood: remove kw_config_adr_windows ARM: kirkwood: enable CONFIG_DM_USB on db-88f6281-bp ARM: kirkwood: enable CONFIG_DM_USB for {dream, guru, sheeva}plug ARM: kirkwood: enable CONFIG_DM_USB for dns325 ARM: kirkwood: enable CONFIG_DM_USB for ds109 ARM: kirkwood: enable CONFIG_DM_USB for goflexhome ARM: kirkwood: enable CONFIG_DM_USB for lschlv2 and lsxhl ARM: kirkwood: enable CONFIG_DM_USB for nas220 arm: mvebu: Add Marvell's integrated CPUs arm: mvebu: NAND clock support for MSYS devices arm: mvebu: Add DB-XC3-24G4XG board Leigh Brown (1): ARM: kirkwood: remove obsolete call to icache_enable Michael Walle (5): sata: sata_mv: use correct format specifier in debug() sata: sata_mv: support kirkwood architecture sata: sata_mv: add orion-sata compatible string arm: kirkwood: lsxl: enable DM for SATA cmd: add wdt command Stefan Roese (8): sata: sata_mv: Add DM support to enable CONFIG_BLK usage arm: mvebu: theadorable_debug_defconfig: Enable CONFIG_BLK arm: mvebu: db-mv784mp-gp_defconfig: Enable CONFIG_BLK arm: mvebu: theadorable: Add test for ctrl-c in PCIe PEX switch test Makefile: Correct logic for DM_SCSI + unconverted drivers check arm: mvebu: ds412: Enable CONFIG_BLK arm: mvebu: AXP: Enhance PCIe port capability configuration arm: mvebu: Fix Kconfig dependency warnings Makefile | 19 +- arch/arm/dts/Makefile | 5 +- arch/arm/dts/armada-370-xp.dtsi | 133 ++++---- arch/arm/dts/armada-385-atl-x530-u-boot.dtsi | 4 + arch/arm/dts/armada-xp-98dx3236.dtsi | 343 ++++++++++++++++++++ arch/arm/dts/armada-xp-98dx3336.dtsi | 39 +++ arch/arm/dts/armada-xp-98dx4251.dtsi | 54 ++++ arch/arm/dts/armada-xp-db-xc3-24g4xg-u-boot.dtsi | 24 ++ arch/arm/dts/armada-xp-db-xc3-24g4xg.dts | 110 +++++++ arch/arm/dts/armada-xp-gp.dts | 167 +++++----- arch/arm/dts/armada-xp-maxbcm.dts | 24 +- arch/arm/dts/armada-xp-mv78230.dtsi | 55 +--- arch/arm/dts/armada-xp-mv78260.dtsi | 58 +--- arch/arm/dts/armada-xp-mv78460.dtsi | 58 +--- arch/arm/dts/armada-xp-synology-ds414.dts | 199 ++++++------ arch/arm/dts/armada-xp-theadorable.dts | 69 ++-- arch/arm/dts/armada-xp.dtsi | 214 +++++++------ arch/arm/dts/kirkwood-db-88f6281-spi.dts | 48 +++ arch/arm/dts/kirkwood-db-88f6281.dts | 26 ++ arch/arm/dts/kirkwood-db.dtsi | 94 ++++++ arch/arm/mach-kirkwood/Kconfig | 4 + arch/arm/mach-kirkwood/cpu.c | 74 ++--- arch/arm/mach-kirkwood/include/mach/cpu.h | 13 +- arch/arm/mach-kirkwood/include/mach/soc.h | 2 +- arch/arm/mach-mvebu/Kconfig | 34 +- arch/arm/mach-mvebu/Makefile | 2 + arch/arm/mach-mvebu/cpu.c | 46 ++- arch/arm/mach-mvebu/include/mach/config.h | 2 +- arch/arm/mach-mvebu/include/mach/cpu.h | 3 + arch/arm/mach-mvebu/include/mach/soc.h | 31 ++ arch/arm/mach-mvebu/mbus.c | 9 + .../arm/mach-mvebu/serdes/axp/high_speed_env_lib.c | 8 +- board/CZ.NIC/turris_omnia/turris_omnia.c | 2 +- board/Marvell/db-88f6281-bp/Kconfig | 12 + board/Marvell/db-88f6281-bp/MAINTAINERS | 10 + board/Marvell/db-88f6281-bp/Makefile | 12 + board/Marvell/db-88f6281-bp/db-88f6281-bp.c | 103 ++++++ board/Marvell/db-88f6281-bp/kwbimage.cfg.in | 36 +++ board/Marvell/db-xc3-24g4xg/.gitignore | 1 + board/Marvell/db-xc3-24g4xg/MAINTAINERS | 7 + board/Marvell/db-xc3-24g4xg/Makefile | 14 + board/Marvell/db-xc3-24g4xg/README | 4 + board/Marvell/db-xc3-24g4xg/binary.0 | 11 + board/Marvell/db-xc3-24g4xg/db-xc3-24g4xg.c | 68 ++++ board/Marvell/db-xc3-24g4xg/kwbimage.cfg.in | 12 + board/Synology/ds414/ds414.c | 4 +- board/alliedtelesis/x530/x530.c | 48 +++ board/maxbcm/maxbcm.c | 2 +- board/solidrun/clearfog/README | 23 ++ board/theadorable/theadorable.c | 38 ++- cmd/Kconfig | 6 + cmd/Makefile | 1 + cmd/wdt.c | 174 ++++++++++ configs/db-88f6281-bp-nand_defconfig | 54 ++++ configs/db-88f6281-bp-spi_defconfig | 56 ++++ configs/db-mv784mp-gp_defconfig | 1 + configs/db-xc3-24g4xg_defconfig | 55 ++++ configs/dns325_defconfig | 2 + configs/dreamplug_defconfig | 2 + configs/ds109_defconfig | 2 + configs/ds414_defconfig | 1 + configs/goflexhome_defconfig | 2 + configs/guruplug_defconfig | 2 + configs/lschlv2_defconfig | 6 +- configs/lsxhl_defconfig | 6 +- configs/nas220_defconfig | 2 + configs/sheevaplug_defconfig | 1 + configs/theadorable_debug_defconfig | 1 + configs/turris_omnia_defconfig | 1 + configs/x530_defconfig | 5 + doc/git-mailrc | 4 +- drivers/ata/Kconfig | 2 + drivers/ata/ahci_mvebu.c | 1 + drivers/ata/sata_mv.c | 354 ++++++++++++--------- drivers/ddr/marvell/axp/xor_regs.h | 4 + drivers/watchdog/Kconfig | 1 + drivers/watchdog/orion_wdt.c | 27 +- include/configs/clearfog.h | 2 - include/configs/db-88f6281-bp.h | 99 ++++++ include/configs/db-88f6720.h | 2 - include/configs/db-88f6820-amc.h | 2 - include/configs/db-88f6820-gp.h | 6 - include/configs/db-mv784mp-gp.h | 2 - include/configs/db-xc3-24g4xg.h | 41 +++ include/configs/ds414.h | 2 - include/configs/helios4.h | 2 - include/configs/lsxl.h | 23 +- include/configs/mvebu_armada-8k.h | 4 - include/configs/theadorable.h | 2 - include/configs/turris_mox.h | 4 - include/configs/turris_omnia.h | 3 - tools/kwbimage.c | 7 + 92 files changed, 2510 insertions(+), 842 deletions(-) create mode 100644 arch/arm/dts/armada-xp-98dx3236.dtsi create mode 100644 arch/arm/dts/armada-xp-98dx3336.dtsi create mode 100644 arch/arm/dts/armada-xp-98dx4251.dtsi create mode 100644 arch/arm/dts/armada-xp-db-xc3-24g4xg-u-boot.dtsi create mode 100644 arch/arm/dts/armada-xp-db-xc3-24g4xg.dts create mode 100644 arch/arm/dts/kirkwood-db-88f6281-spi.dts create mode 100644 arch/arm/dts/kirkwood-db-88f6281.dts create mode 100644 arch/arm/dts/kirkwood-db.dtsi create mode 100644 board/Marvell/db-88f6281-bp/Kconfig create mode 100644 board/Marvell/db-88f6281-bp/MAINTAINERS create mode 100644 board/Marvell/db-88f6281-bp/Makefile create mode 100644 board/Marvell/db-88f6281-bp/db-88f6281-bp.c create mode 100644 board/Marvell/db-88f6281-bp/kwbimage.cfg.in create mode 100644 board/Marvell/db-xc3-24g4xg/.gitignore create mode 100644 board/Marvell/db-xc3-24g4xg/MAINTAINERS create mode 100644 board/Marvell/db-xc3-24g4xg/Makefile create mode 100644 board/Marvell/db-xc3-24g4xg/README create mode 100644 board/Marvell/db-xc3-24g4xg/binary.0 create mode 100644 board/Marvell/db-xc3-24g4xg/db-xc3-24g4xg.c create mode 100644 board/Marvell/db-xc3-24g4xg/kwbimage.cfg.in create mode 100644 cmd/wdt.c create mode 100644 configs/db-88f6281-bp-nand_defconfig create mode 100644 configs/db-88f6281-bp-spi_defconfig create mode 100644 configs/db-xc3-24g4xg_defconfig create mode 100644 include/configs/db-88f6281-bp.h create mode 100644 include/configs/db-xc3-24g4xg.h

2 3

[U-Boot] [PATCH] i2c: mvtwsi: fix hang on SPL bind
by Baruch Siach 11 Apr '19

11 Apr '19

The mvebu specific debug register is not accessible when the bind code runs in SPL. Skip it. Signed-off-by: Baruch Siach <baruch(a)tkos.co.il> --- drivers/i2c/mvtwsi.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/i2c/mvtwsi.c b/drivers/i2c/mvtwsi.c index 74ac0a4aa789..05560e112729 100644 --- a/drivers/i2c/mvtwsi.c +++ b/drivers/i2c/mvtwsi.c @@ -801,6 +801,10 @@ static int mvtwsi_i2c_ofdata_to_platdata(struct udevice *bus) static void twsi_disable_i2c_slave(struct mvtwsi_registers *twsi) { + /* The debug register is not accessible in early boot */ + if (IS_ENABLED(CONFIG_SPL_BUILD)) + return; + clrbits_le32(&twsi->debug, BIT(18)); } -- 2.20.1

4 7

[U-Boot] [PATCH] MMC HW partition switching must also invalidate the cache
by Jan Sedivy 11 Apr '19

11 Apr '19

Signed-off-by: Jan Šedivý <jans(a)zhinst.com> --- drivers/mmc/mmc.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c index 456c1b4..3d9a68e 100644 --- a/drivers/mmc/mmc.c +++ b/drivers/mmc/mmc.c @@ -954,8 +954,13 @@ int mmc_switch_part(struct mmc *mmc, unsigned int part_num) * to return to representing the raw device. */ if ((ret == 0) || ((ret == -ENODEV) && (part_num == 0))) { + struct blk_desc *desc = mmc_get_blk_desc(mmc); + ret = mmc_set_capacity(mmc, part_num); - mmc_get_blk_desc(mmc)->hwpart = part_num; + if (desc && desc->hwpart != part_num) { + desc->hwpart = part_num; + blkcache_invalidate(desc->if_type, desc->devnum); + } } return ret; @@ -2673,7 +2678,12 @@ retry: return err; /* The internal partition reset to user partition(0) at every CMD0*/ - mmc_get_blk_desc(mmc)->hwpart = 0; + struct blk_desc *desc = mmc_get_blk_desc(mmc); + + if (desc && desc->hwpart != 0) { + desc->hwpart = 0; + blkcache_invalidate(desc->if_type, desc->devnum); + } /* Test for SD version 2 */ err = mmc_send_if_cond(mmc); -- 1.7.9.5

1 0

[U-Boot] [PATCH] arm: kirkwood: lsxl: add note about sata in README
by Michael Walle 11 Apr '19

11 Apr '19

From: Michael Walle <michael.walle(a)kontron.com> The boot commands have changed in the environment. Add a note about the incompatible change and how resolve the issue in the board's README. Signed-off-by: Michael Walle <michael.walle(a)kontron.com> --- Hi Stefan, now that the patches are in the marvell tree and I guess they'll make it into the next release. Could you apply the following patch, too? Thanks, michael board/buffalo/lsxl/README | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/board/buffalo/lsxl/README b/board/buffalo/lsxl/README index ef5ed42880..fffb1ce8ec 100644 --- a/board/buffalo/lsxl/README +++ b/board/buffalo/lsxl/README @@ -8,6 +8,16 @@ the LS-XHL PCB has two SDRAM chips. Both have a Kirkwood CPU (Marvell bootloader and its environment. The linux kernel and the initial ramdisk are loaded from the hard disk. +Important! Changes since v2019.07 +--------------------------------- +In u-boot v2019.07 the driver for the SATA port was changed to a new +one. This means that the old "ide" command and block interface is not +supported anymore. More important, the boot commands have changed. You have +to overwrite the boot commands in your envionment with the new ones: + + env default -f bootcmd_legacy + env default -f bootcmd_hdd + saveenv Rescue Mode ----------- -- 2.11.0

2 1

[U-Boot] [PATCH 1/2] ARM: mvebu: rename armada-385-amc.dts to armada-385-db-88f6820-amc.dts
by Chris Packham 11 Apr '19

11 Apr '19

This board was added to u-boot first but the Linux maintainers requested a more descriptive name. Rename the file to match the Linux usage and update the board defconfig. Signed-off-by: Chris Packham <judge.packham(a)gmail.com> --- arch/arm/dts/Makefile | 2 +- .../dts/{armada-385-amc.dts => armada-385-db-88f6820-amc.dts} | 0 configs/db-88f6820-amc_defconfig | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename arch/arm/dts/{armada-385-amc.dts => armada-385-db-88f6820-amc.dts} (100%) diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index 2a040b20a539..9fa5c98a8240 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -101,7 +101,7 @@ dtb-$(CONFIG_ARCH_MVEBU) += \ armada-388-clearfog.dtb \ armada-388-gp.dtb \ armada-388-helios4.dtb \ - armada-385-amc.dtb \ + armada-385-db-88f6820-amc.dtb \ armada-7040-db.dtb \ armada-7040-db-nand.dtb \ armada-8040-db.dtb \ diff --git a/arch/arm/dts/armada-385-amc.dts b/arch/arm/dts/armada-385-db-88f6820-amc.dts similarity index 100% rename from arch/arm/dts/armada-385-amc.dts rename to arch/arm/dts/armada-385-db-88f6820-amc.dts diff --git a/configs/db-88f6820-amc_defconfig b/configs/db-88f6820-amc_defconfig index 319d9dbd9c3f..1f983af1b648 100644 --- a/configs/db-88f6820-amc_defconfig +++ b/configs/db-88f6820-amc_defconfig @@ -41,7 +41,7 @@ CONFIG_CMD_FS_GENERIC=y CONFIG_EFI_PARTITION=y # CONFIG_PARTITION_UUIDS is not set # CONFIG_SPL_PARTITION_UUIDS is not set -CONFIG_DEFAULT_DEVICE_TREE="armada-385-amc" +CONFIG_DEFAULT_DEVICE_TREE="armada-385-db-88f6820-amc" CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_SPL_OF_TRANSLATE=y CONFIG_BLK=y -- 2.21.0

2 2