May 2018 - U-Boot

[U-Boot] Please pull u-boot-marvell/master (v2)
by Stefan Roese 17 May '18

17 May '18

Hi Tom, please pull the Kirkwood DT patches from Chris. This time with PHYLIB disabled for some boards (as was before). Thanks, Stefan The following changes since commit f2d0f5e7ab3b8a7b4bf6e2ac499b4867c701d52d: ARM: re-enable MVGBE for edminiv2 (2018-05-16 11:38:08 -0400) are available in the Git repository at: git://www.denx.de/git/u-boot-marvell.git for you to fetch changes up to f6e62ee04c37bb8d1726848c7fa9bcafb270e0f6: net: MVGBE don't automatically select PHYLIB (2018-05-17 17:38:31 +0200) ---------------------------------------------------------------- Chris Packham (12): ARM: add devicetree files for kirkwood SoC ARM: kirkwood: Add device-tree for dns325 ARM: kirkwood: Add device-tree for dockstar ARM: kirkwood: Add device-tree for goflexhome ARM: kirkwood: Add device-tree for guruplug ARM: kirkwood: Add device-tree for ib62x0 ARM: kirkwood: Add device-tree for iconnect ARM: kirkwood: Add device-tree for nas220 ARM: kirkwood: Add device-tree for openrd ARM: kirkwood: Add device-tree for pogo_e02 ARM: kirkwood: Add device-tree for sheevaplug net: MVGBE don't automatically select PHYLIB arch/arm/dts/kirkwood-6192.dtsi | 88 ++++++ arch/arm/dts/kirkwood-6281.dtsi | 90 ++++++ arch/arm/dts/kirkwood-98dx4122.dtsi | 53 ++++ arch/arm/dts/kirkwood-blackarmor-nas220.dts | 172 +++++++++++ arch/arm/dts/kirkwood-dns325.dts | 63 ++++ arch/arm/dts/kirkwood-dnskw.dtsi | 235 +++++++++++++++ arch/arm/dts/kirkwood-dockstar.dts | 110 +++++++ arch/arm/dts/kirkwood-goflexnet.dts | 190 ++++++++++++ arch/arm/dts/kirkwood-guruplug-server-plus.dts | 133 +++++++++ arch/arm/dts/kirkwood-ib62x0.dts | 146 +++++++++ arch/arm/dts/kirkwood-iconnect.dts | 195 ++++++++++++ arch/arm/dts/kirkwood-openrd-base.dts | 39 +++ arch/arm/dts/kirkwood-openrd-client.dts | 73 +++++ arch/arm/dts/kirkwood-openrd-ultimate.dts | 55 ++++ arch/arm/dts/kirkwood-openrd.dtsi | 122 ++++++++ arch/arm/dts/kirkwood-pogo_e02.dts | 132 +++++++++ arch/arm/dts/kirkwood-sheevaplug-common.dtsi | 104 +++++++ arch/arm/dts/kirkwood-sheevaplug.dts | 42 +++ arch/arm/dts/kirkwood.dtsi | 393 +++++++++++++++++++++++++ configs/dns325_defconfig | 3 +- configs/dockstar_defconfig | 3 +- configs/goflexhome_defconfig | 3 +- configs/guruplug_defconfig | 3 +- configs/ib62x0_defconfig | 3 +- configs/iconnect_defconfig | 3 +- configs/nas220_defconfig | 3 +- configs/openrd_base_defconfig | 3 +- configs/openrd_client_defconfig | 3 +- configs/openrd_ultimate_defconfig | 3 +- configs/pogo_e02_defconfig | 3 +- configs/sheevaplug_defconfig | 3 +- drivers/net/Kconfig | 1 - 32 files changed, 2459 insertions(+), 13 deletions(-) create mode 100644 arch/arm/dts/kirkwood-6192.dtsi create mode 100644 arch/arm/dts/kirkwood-6281.dtsi create mode 100644 arch/arm/dts/kirkwood-98dx4122.dtsi create mode 100644 arch/arm/dts/kirkwood-blackarmor-nas220.dts create mode 100644 arch/arm/dts/kirkwood-dns325.dts create mode 100644 arch/arm/dts/kirkwood-dnskw.dtsi create mode 100644 arch/arm/dts/kirkwood-dockstar.dts create mode 100644 arch/arm/dts/kirkwood-goflexnet.dts create mode 100644 arch/arm/dts/kirkwood-guruplug-server-plus.dts create mode 100644 arch/arm/dts/kirkwood-ib62x0.dts create mode 100644 arch/arm/dts/kirkwood-iconnect.dts create mode 100644 arch/arm/dts/kirkwood-openrd-base.dts create mode 100644 arch/arm/dts/kirkwood-openrd-client.dts create mode 100644 arch/arm/dts/kirkwood-openrd-ultimate.dts create mode 100644 arch/arm/dts/kirkwood-openrd.dtsi create mode 100644 arch/arm/dts/kirkwood-pogo_e02.dts create mode 100644 arch/arm/dts/kirkwood-sheevaplug-common.dtsi create mode 100644 arch/arm/dts/kirkwood-sheevaplug.dts create mode 100644 arch/arm/dts/kirkwood.dtsi

2 1

[U-Boot] Please pull u-boot-dm
by Simon Glass 17 May '18

17 May '18

Hi Tom, The following changes since commit 0315d6959fdd9d2a4d89016c311e9c8c8d239a10: ARM: mvebu: a38x: Add missing SPDX license identfier (2018-05-15 09:08:00 -0400) are available in the Git repository at: git://git.denx.de/u-boot-dm.git for you to fetch changes up to f717b4c8e7fc871573755a05be96c8ef857eabce: pinctrl: do not set_state for device without valid ofnode (2018-05-16 00:25:19 -0600) ---------------------------------------------------------------- Kever Yang (1): pinctrl: do not set_state for device without valid ofnode Lothar Waßmann (1): tools: buildman: Don't use the working dir as build dir drivers/pinctrl/pinctrl-uclass.c | 6 ++++++ tools/buildman/builderthread.py | 4 ++++ tools/buildman/control.py | 28 +++++++++++++++++++++++++--- tools/buildman/func_test.py | 9 +++++++++ 4 files changed, 44 insertions(+), 3 deletions(-) Regards, Simon

2 1

[U-Boot] [RFC PATCH v2 2/2] fastboot: Update fastboot documentation
by Alex Kiernan 17 May '18

17 May '18

Update fastboot documentation to reflect merged USB/UDP implementation. Bring in current Android fastboot protocol document. Signed-off-by: Alex Kiernan <alex.kiernan(a)gmail.com> --- Changes in v2: - new doc/README.android-fastboot | 80 +++++++++++++++++++++++++++++++-------------- 1 file changed, 55 insertions(+), 25 deletions(-) diff --git a/doc/README.android-fastboot b/doc/README.android-fastboot index 2c3ee78..ff6518e 100644 --- a/doc/README.android-fastboot +++ b/doc/README.android-fastboot @@ -1,35 +1,45 @@ +================ Android Fastboot -~~~~~~~~~~~~~~~~ +================ Overview ======== -The protocol that is used over USB is described in -README.android-fastboot-protocol in same directory. +The protocol that is used over USB and UDP is described in the +README.android-fastboot-protocol file in the same directory. -The current implementation is a minimal support of the erase command,the -"oem format" command and flash command;it only supports eMMC devices. +The current implementation supports the following standard commands: + +- boot +- continue +- download +- erase (if enabled) +- flash (if enabled) +- getvar +- reboot +- reboot-bootloader +- set_active (only a stub implementation which always succeeds) + +The following OEM commands are supported (if enabled): + +- oem format - this executes 'gpt write mmc %x $partitions' + +Support for both eMMC and NAND devices is included. Client installation =================== -The counterpart to this gadget is the fastboot client which can -be found in Android's platform/system/core repository in the fastboot -folder. It runs on Windows, Linux and even OSX. Linux user are lucky since -they only need libusb. -Windows users need to bring some time until they have Android SDK (currently -http://dl.google.com/android/installer_r12-windows.exe) installed. You -need to install ADB package which contains the required glue libraries for -accessing USB. Also you need "Google USB driver package" and "SDK platform -tools". Once installed the usb driver is placed in your SDK folder under -extras\google\usb_driver. The android_winusb.inf needs a line like - - %SingleBootLoaderInterface% = USB_Install, USB\VID_0451&PID_D022 - -either in the [Google.NTx86] section for 32bit Windows or [Google.NTamd64] -for 64bit Windows. VID and PID should match whatever the fastboot is -advertising. + +The counterpart to this is the fastboot client which can be found in +Android's platform/system/core repository in the fastboot folder. It runs on +Windows, Linux and even OSX. The fastboot client is part of the Android +SDK Platform-Tools and can be downloaded from: + +https://developer.android.com/studio/releases/platform-tools Board specific ============== + +USB configuration +----------------- The fastboot gadget relies on the USB download gadget, so the following options must be configured: @@ -42,14 +52,19 @@ NOTE: The CONFIG_USB_GADGET_VENDOR_NUM must be one of the numbers supported by the fastboot client. The list of vendor IDs supported can be found in the fastboot client source code (fastboot.c) mentioned above. -The fastboot function is enabled by defining CONFIG_USB_FUNCTION_FASTBOOT, -CONFIG_CMD_FASTBOOT and CONFIG_ANDROID_BOOT_IMAGE. - +General configuration +--------------------- The fastboot protocol requires a large memory buffer for downloads. This buffer should be as large as possible for a platform. The location of the buffer and size are set with CONFIG_FASTBOOT_BUF_ADDR and -CONFIG_FASTBOOT_BUF_SIZE. +CONFIG_FASTBOOT_BUF_SIZE. These may be overridden on the fastboot command +line using -l and -s. + +Fastboot environment variables +============================== +Partition aliases +----------------- Fastboot partition aliases can also be defined for devices where GPT limitations prevent user-friendly partition names such as "boot", "system" and "cache". Or, where the actual partition name doesn't match a standard @@ -59,6 +74,21 @@ To define a partition alias add an environment variable similar to: fastboot_partition_alias_<alias partition name>=<actual partition name> Example: fastboot_partition_alias_boot=LNX +Variable overrides +------------------ +Variables retrived through getvar can be overridden by defining environment +variables of the form "fastboot.<variable>". These are looked up first so +can be used to override values which would otherwise be returned. Using this +mechanism you can also return types for NAND filesystems, as the fully +parameterised variable is looked up, e.g. + +fastboot.partition-type:boot=jffs2 + +Boot command +------------ +When executing the fastboot 'boot' command, if fastboot_bootcmd is set then +that will be executed in place of bootm <CONFIG_FASTBOOT_BUF_ADDR>. + Partition Names =============== The Fastboot implementation in U-boot allows to write images into disk -- 2.7.4

1 0

[U-Boot] [PATCH 1/1] Makefile: clean should delete *.efi
by Heinrich Schuchardt 17 May '18

17 May '18

Files *.efi are generated files. So the clean target should delete them. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 714ac9e1183..96c53250484 100644 --- a/Makefile +++ b/Makefile @@ -1611,7 +1611,8 @@ clean: $(clean-dirs) -o -name '*.symtypes' -o -name 'modules.order' \ -o -name modules.builtin -o -name '.tmp_*.o.*' \ -o -name 'dsdt.aml' -o -name 'dsdt.asl.tmp' -o -name 'dsdt.c' \ - -o -name '*.gcno' \) -type f -print | xargs rm -f + -o -name '*.efi' -o -name '*.gcno' \) \ + -type f -print | xargs rm -f # mrproper - Delete all generated files, including .config # -- 2.14.2

1 0

[U-Boot] [PATCH 1/1] efi_selftest: do not call efi_init_obj_list() twice
by Heinrich Schuchardt 17 May '18

17 May '18

Remove a superfluous call to efi_init_obj_list() invoked by 'bootefi selftest'. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- cmd/bootefi.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/cmd/bootefi.c b/cmd/bootefi.c index fe50bac1c50..806339823ff 100644 --- a/cmd/bootefi.c +++ b/cmd/bootefi.c @@ -441,8 +441,6 @@ static int do_bootefi(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) * callback entry */ efi_save_gd(); - /* Initialize and populate EFI object list */ - efi_init_obj_list(); /* Transfer environment variable efi_selftest as load options */ set_load_options(&loaded_image_info, "efi_selftest"); /* Execute the test */ -- 2.14.2

1 0

[U-Boot] [PULL] Please pull u-boot-imx
by Stefano Babic 17 May '18

17 May '18

Hi Tom, please pull from u-boot-imx, thanks ! The following changes since commit f2d0f5e7ab3b8a7b4bf6e2ac499b4867c701d52d: ARM: re-enable MVGBE for edminiv2 (2018-05-16 11:38:08 -0400) are available in the git repository at: git://www.denx.de/git/u-boot-imx.git master for you to fetch changes up to 2f5988533d5c447d7bda79b0d9719f84db9e1835: imx6: sabrelite: update defconfig to use distro defaults (2018-05-17 17:47:17 +0200) ---------------------------------------------------------------- Guillaume GARDET (2): imx6: Convert sabrelite and nitrogen6x boards to distro boot support imx6: sabrelite: update defconfig to use distro defaults Ian Ray (6): board: ge: bx50v3: add winbond SPI NOR support board: ge: bx50v3: rename detect_baseboard function board: ge: bx50v3: fix display support for b{46}50v3 board: ge: bx50v3: use VPD instead of compile-time checks board: ge: bx50v3: configure video arguments using VPD board: ge: bx50v3: remove redundant targets Lukasz Majewski (8): dts: imx53: Add gpio and i2c nodes to imx53.dtsi file dts: pinctrl: Provide IMX_PAD_SION definition for imx53 pinctrl pmic: fsl: Provide some more definitions for MC34708 PMIC pmic: fsl: Define number of bytes sent at once by MC34708 PMIC pmic: dm: Provide *trans_len() callback for pmic-uclass pmic: dm: Rewrite pmic_reg_{read|write} and pmic_clrsetbits to support transmissions larger than 1 byte pmic: dm: Add support for MC34708 for PMIC DM arm: imx53: Add support for imx53 boards from K+P Magnus Lilja (2): mx31pdk: Convert CONFIG_MX31 flag to use Kconfig. mx31: Convert MX31_HCLK_FREQ and MX31_CLK32 to Kconfig. Nandor Han (2): board: ge: bx50v3: unify two switch statements board: ge: bx50v3: detect the monitor type by reading VPD earlier Peter Robinson (4): mx6 common: remove dangling comment mx7: remove empty ifndef statement mx6: Select CONFIG_MP with MX6_SMP mx6: remove duplicated BOUNCE_BUFFER defines Sebastian Reichel (1): ge: ppd: move CONFIG_ENV_IS_IN_MMC to defconfig arch/arm/Kconfig | 14 +++---- arch/arm/dts/imx53-kp.dts | 135 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ arch/arm/dts/imx53-pinfunc.h | 1 + arch/arm/dts/imx53.dtsi | 101 +++++++++++++++++++++++++++++++++++++++++++++++- arch/arm/include/asm/arch-mx31/clock.h | 8 ---- arch/arm/mach-imx/mx3/Kconfig | 34 +++++++++++++++++ arch/arm/mach-imx/mx5/Kconfig | 12 ++++++ arch/arm/mach-imx/mx6/Kconfig | 15 ++------ board/ge/bx50v3/Kconfig | 2 +- board/ge/bx50v3/bx50v3.c | 71 ++++++++++++++++++++++------------ board/k+p/kp_imx53/Kconfig | 15 ++++++++ board/k+p/kp_imx53/MAINTAINERS | 6 +++ board/k+p/kp_imx53/Makefile | 8 ++++ board/k+p/kp_imx53/kp_id_rev.c | 121 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ board/k+p/kp_imx53/kp_id_rev.h | 28 ++++++++++++++ board/k+p/kp_imx53/kp_imx53.c | 212 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ configs/ge_b650v3_defconfig | 43 --------------------- configs/ge_b850v3_defconfig | 43 --------------------- configs/{ge_b450v3_defconfig => ge_bx50v3_defconfig} | 4 +- configs/kp_imx53_defconfig | 40 +++++++++++++++++++ configs/mx31pdk_defconfig | 3 +- configs/mx53ppd_defconfig | 1 + configs/mx6qsabrelite_defconfig | 15 +++----- drivers/power/pmic/Kconfig | 7 ++++ drivers/power/pmic/Makefile | 1 + drivers/power/pmic/mc34708.c | 103 +++++++++++++++++++++++++++++++++++++++++++++++++ drivers/power/pmic/pmic-uclass.c | 48 +++++++++++++++++------ include/configs/advantech_dms-ba16.h | 1 - include/configs/apalis_imx6.h | 1 - include/configs/colibri_imx6.h | 1 - include/configs/dh_imx6.h | 1 - include/configs/ge_bx50v3.h | 17 +-------- include/configs/kp_imx53.h | 113 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ include/configs/kp_imx6q_tpc.h | 2 - include/configs/mx31pdk.h | 2 - include/configs/mx53ppd.h | 1 - include/configs/mx6_common.h | 3 -- include/configs/mx7_common.h | 3 -- include/configs/nitrogen6x.h | 179 +++++++++++++++++++++---------------------------------------------------------------- include/fsl_pmic.h | 41 ++++++++++++++++++++ include/power/pmic.h | 2 + 41 files changed, 1126 insertions(+), 332 deletions(-) create mode 100644 arch/arm/dts/imx53-kp.dts create mode 100644 arch/arm/mach-imx/mx3/Kconfig create mode 100644 board/k+p/kp_imx53/Kconfig create mode 100644 board/k+p/kp_imx53/MAINTAINERS create mode 100644 board/k+p/kp_imx53/Makefile create mode 100644 board/k+p/kp_imx53/kp_id_rev.c create mode 100644 board/k+p/kp_imx53/kp_id_rev.h create mode 100644 board/k+p/kp_imx53/kp_imx53.c delete mode 100644 configs/ge_b650v3_defconfig delete mode 100644 configs/ge_b850v3_defconfig rename configs/{ge_b450v3_defconfig => ge_bx50v3_defconfig} (93%) create mode 100644 configs/kp_imx53_defconfig create mode 100644 drivers/power/pmic/mc34708.c create mode 100644 include/configs/kp_imx53.h -- ===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic(a)denx.de =====================================================================

1 0

[U-Boot] [PATCH] imx: nitrogen6x: Convert Sabrelite to distro boot support
by Guillaume GARDET 17 May '18

17 May '18

Boot tested with boot.scr script and EFI/Grub2 on mmc0 and mmc1 slots. Signed-off-by: Guillaume GARDET <guillaume.gardet(a)free.fr> Cc: Troy Kisky <troy.kisky(a)boundarydevices.com> Cc: Stefano Babic <sbabic(a)denx.de> Cc: Fabio Estevam <fabio.estevam(a)nxp.com> --- include/configs/nitrogen6x.h | 86 ++++++++++---------------------------------- 1 file changed, 18 insertions(+), 68 deletions(-) diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h index c73cfb7f7e..2e2c499cb6 100644 --- a/include/configs/nitrogen6x.h +++ b/include/configs/nitrogen6x.h @@ -102,82 +102,32 @@ #define CONFIG_UMSDEVS CONFIG_DRIVE_SATA CONFIG_DRIVE_MMC #if defined(CONFIG_SABRELITE) +#define BOOT_TARGET_DEVICES(func) \ + func(MMC, mmc, 0) \ + func(MMC, mmc, 1) \ + func(SATA, sata, 0) \ + func(USB, usb, 0) \ + func(PXE, pxe, na) \ + func(DHCP, dhcp, na) + +#include <config_distro_bootcmd.h> + #define CONFIG_EXTRA_ENV_SETTINGS \ - "script=boot.scr\0" \ - "uimage=uImage\0" \ "console=ttymxc1\0" \ "fdt_high=0xffffffff\0" \ "initrd_high=0xffffffff\0" \ - "fdt_file=imx6q-sabrelite.dtb\0" \ + "fdtfile=imx6q-sabrelite.dtb\0" \ "fdt_addr=0x18000000\0" \ - "boot_fdt=try\0" \ + "fdt_addr_r=0x18000000\0" \ + "kernel_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \ + "pxefile_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \ + "scriptaddr=" __stringify(CONFIG_LOADADDR) "\0" \ + "ramdisk_addr_r=0x13000000\0" \ + "ramdiskaddr=0x13000000\0" \ "ip_dyn=yes\0" \ "usb_pgood_delay=2000\0" \ - "mmcdevs=0 1\0" \ - "mmcpart=1\0" \ - "mmcroot=/dev/mmcblk0p2 rootwait rw\0" \ - "mmcargs=setenv bootargs console=${console},${baudrate} " \ - "root=${mmcroot}\0" \ - "loadbootscript=" \ - "load mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \ - "bootscript=echo Running bootscript from mmc ...; " \ - "source\0" \ - "loaduimage=load mmc ${mmcdev}:${mmcpart} ${loadaddr} ${uimage}\0" \ - "loadfdt=load mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \ - "mmcboot=echo Booting from mmc ...; " \ - "run mmcargs; " \ - "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \ - "if run loadfdt; then " \ - "bootm ${loadaddr} - ${fdt_addr}; " \ - "else " \ - "if test ${boot_fdt} = try; then " \ - "bootm; " \ - "else " \ - "echo WARN: Cannot load the DT; " \ - "fi; " \ - "fi; " \ - "else " \ - "bootm; " \ - "fi;\0" \ - "netargs=setenv bootargs console=${console},${baudrate} " \ - "root=/dev/nfs " \ - "ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp\0" \ - "netboot=echo Booting from net ...; " \ - "run netargs; " \ - "if test ${ip_dyn} = yes; then " \ - "setenv get_cmd dhcp; " \ - "else " \ - "setenv get_cmd tftp; " \ - "fi; " \ - "${get_cmd} ${uimage}; " \ - "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \ - "if ${get_cmd} ${fdt_addr} ${fdt_file}; then " \ - "bootm ${loadaddr} - ${fdt_addr}; " \ - "else " \ - "if test ${boot_fdt} = try; then " \ - "bootm; " \ - "else " \ - "echo WARN: Cannot load the DT; " \ - "fi; " \ - "fi; " \ - "else " \ - "bootm; " \ - "fi;\0" + BOOTENV -#define CONFIG_BOOTCOMMAND \ - "for mmcdev in ${mmcdevs}; do " \ - "mmc dev ${mmcdev}; " \ - "if mmc rescan; then " \ - "if run loadbootscript; then " \ - "run bootscript; " \ - "else " \ - "if run loaduimage; then " \ - "run mmcboot; " \ - "fi; " \ - "fi; " \ - "fi; " \ - "done; " \ - "run netboot; " #else #define CONFIG_EXTRA_ENV_SETTINGS \ "bootdevs=" CONFIG_DRIVE_TYPES "\0" \ -- 2.13.6

8 41

[U-Boot] [PATCH v2] net: MVGBE don't automatically select PHYLIB
by Chris Packham 17 May '18

17 May '18

When Kconfig support was added for MVGBE it included automatically selected PHYLIB support. But MVGBE does not need PHYLIB it will build fine without it. Commit ed52ea507f12 ("net: add Kconfig for MVGBE") should have been a no-op in terms of build size but because of the selecting PHYLIB the openrd configs increased in size. Remove the automatic selection of PHYLIB, boards that need it will have already enabled it in their config header file. Fixes: commit ed52ea507f12 ("net: add Kconfig for MVGBE") Signed-off-by: Chris Packham <judge.packham(a)gmail.com> --- Changes in v2: - reword commit message to make the intent a bit clearer drivers/net/Kconfig | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index c962d7a72c0c..f2cc75f494e8 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -181,7 +181,6 @@ config FTMAC100 config MVGBE bool "Marvell Orion5x/Kirkwood network interface support" depends on KIRKWOOD || ORION5X - select PHYLIB help This driver supports the network interface units in the Marvell Orion5x and Kirkwood SoCs -- 2.17.0

4 3

[U-Boot] [PATCH] arm64: zynqmp: Show reset reason
by Michal Simek 17 May '18

17 May '18

Read reset reason reg and show it in log and also save it as variable. reset_reasons table is setting up priorities for variable. Signed-off-by: Michal Simek <michal.simek(a)xilinx.com> --- arch/arm/include/asm/arch-zynqmp/hardware.h | 12 +++++- board/xilinx/zynqmp/zynqmp.c | 43 +++++++++++++++++++++ 2 files changed, 54 insertions(+), 1 deletion(-) diff --git a/arch/arm/include/asm/arch-zynqmp/hardware.h b/arch/arm/include/asm/arch-zynqmp/hardware.h index 3f1f9498e356..7961a247e196 100644 --- a/arch/arm/include/asm/arch-zynqmp/hardware.h +++ b/arch/arm/include/asm/arch-zynqmp/hardware.h @@ -33,6 +33,14 @@ #define PS_MODE2 BIT(2) #define PS_MODE3 BIT(3) +#define RESET_REASON_DEBUG_SYS BIT(6) +#define RESET_REASON_SOFT BIT(5) +#define RESET_REASON_SRST BIT(4) +#define RESET_REASON_PSONLY BIT(3) +#define RESET_REASON_PMU BIT(2) +#define RESET_REASON_INTERNAL BIT(1) +#define RESET_REASON_EXTERNAL BIT(0) + struct crlapb_regs { u32 reserved0[36]; u32 cpu_r5_ctrl; /* 0x90 */ @@ -40,7 +48,9 @@ struct crlapb_regs { u32 timestamp_ref_ctrl; /* 0x128 */ u32 reserved2[53]; u32 boot_mode; /* 0x200 */ - u32 reserved3[14]; + u32 reserved3_0[7]; + u32 reset_reason; /* 0x220 */ + u32 reserved3_1[6]; u32 rst_lpd_top; /* 0x23C */ u32 reserved4[4]; u32 boot_pin_ctrl; /* 0x250 */ diff --git a/board/xilinx/zynqmp/zynqmp.c b/board/xilinx/zynqmp/zynqmp.c index 551921b888a0..4d886a914fa9 100644 --- a/board/xilinx/zynqmp/zynqmp.c +++ b/board/xilinx/zynqmp/zynqmp.c @@ -476,6 +476,47 @@ static int create_mmc_boot_commands(void) return 0; } +static const struct { + u32 bit; + const char *name; +} reset_reasons[] = { + { RESET_REASON_EXTERNAL, "EXTERNAL" }, + { RESET_REASON_INTERNAL, "INTERNAL" }, + { RESET_REASON_SOFT, "SOFT" }, + { RESET_REASON_PSONLY, "PS-ONLY" }, + { RESET_REASON_SRST, "SRST" }, + { RESET_REASON_PMU, "PMU" }, + { RESET_REASON_DEBUG_SYS, "DEBUG" }, + {} +}; + +static u32 reset_reason(bool print) +{ + u32 ret; + int i; + const char *reason = NULL; + + ret = readl(&crlapb_base->reset_reason); + + if (print) + puts("Reset reason:\t"); + + for (i = 0; i < ARRAY_SIZE(reset_reasons); i++) { + if (ret & reset_reasons[i].bit) { + reason = reset_reasons[i].name; + if (print) + printf("%s ", reset_reasons[i].name); + } + } + + if (print) + puts("\n"); + + env_set("reset_reason", reason); + + return ret; +} + int board_late_init(void) { u32 reg = 0; @@ -593,6 +634,8 @@ int board_late_init(void) env_set("boot_targets", new_targets); + reset_reason(true); + return 0; } -- 2.17.0

1 1

[U-Boot] [PATCH] net: MVGBE don't automatically select PHYLIB
by Chris Packham 17 May '18

17 May '18

Not all users of MVGBE need PHYLIB and it increases the size of the openrd images too much. Fixes: commit ed52ea507f12 ("net: add Kconfig for MVGBE") Signed-off-by: Chris Packham <judge.packham(a)gmail.com> Cc: Tom Rini <trini(a)konsulko.com> Cc: Stefan Roese <sr(a)denx.de> --- drivers/net/Kconfig | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index c962d7a72c0c..f2cc75f494e8 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -181,7 +181,6 @@ config FTMAC100 config MVGBE bool "Marvell Orion5x/Kirkwood network interface support" depends on KIRKWOOD || ORION5X - select PHYLIB help This driver supports the network interface units in the Marvell Orion5x and Kirkwood SoCs -- 2.17.0

3 7