February 2018 - U-Boot

[U-Boot] [PATCH 7/8] Integrate AT91 bootcount driver
by Alex Kiernan 11 Feb '18

11 Feb '18

Integrate Boot counter for Atmel AT91SAM9XE into Kconfig Signed-off-by: Alex Kiernan <alex.kiernan(a)gmail.com> --- drivers/bootcount/Kconfig | 5 +++++ drivers/bootcount/Makefile | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/bootcount/Kconfig b/drivers/bootcount/Kconfig index 8c19ae6..e0d1fc2 100644 --- a/drivers/bootcount/Kconfig +++ b/drivers/bootcount/Kconfig @@ -13,6 +13,7 @@ if BOOTCOUNT_LIMIT choice prompt "Boot count device" default BOOTCOUNT_AM33XX if AM33XX || SOC_DA8XX + default BOOTCOUNT_AT91 if AT91SAM9XE config BOOTCOUNT_EXT bool "Boot counter on EXT filesystem" @@ -55,6 +56,10 @@ config BOOTCOUNT_I2C the bootcounter. CONFIG_BOOTCOUNT_ALEN = address len +config BOOTCOUNT_AT91 + bool "Boot counter for Atmel AT91SAM9XE" + depends on AT91SAM9XE + endchoice config SYS_BOOTCOUNT_SINGLEWORD diff --git a/drivers/bootcount/Makefile b/drivers/bootcount/Makefile index 62bf55e..a3658c1 100644 --- a/drivers/bootcount/Makefile +++ b/drivers/bootcount/Makefile @@ -3,7 +3,7 @@ # obj-y += bootcount.o -obj-$(CONFIG_AT91SAM9XE) += bootcount_at91.o +obj-$(CONFIG_BOOTCOUNT_AT91) += bootcount_at91.o obj-$(CONFIG_BOOTCOUNT_AM33XX) += bootcount_davinci.o obj-$(CONFIG_BOOTCOUNT_RAM) += bootcount_ram.o obj-$(CONFIG_BOOTCOUNT_ENV) += bootcount_env.o -- 2.7.4

2 1

[U-Boot] [PATCH 6/8] Convert CONFIG_BOOTCOUNT_I2C to Kconfig
by Alex Kiernan 11 Feb '18

11 Feb '18

This converts the following to Kconfig: CONFIG_BOOTCOUNT_I2C Signed-off-by: Alex Kiernan <alex.kiernan(a)gmail.com> --- README | 6 ------ configs/ids8313_defconfig | 1 + drivers/bootcount/Kconfig | 9 +++++++++ include/configs/ids8313.h | 1 - scripts/config_whitelist.txt | 1 - 5 files changed, 10 insertions(+), 8 deletions(-) diff --git a/README b/README index 20637e0..a7b0890 100644 --- a/README +++ b/README @@ -2321,12 +2321,6 @@ The following options need to be configured: enable special bootcounter support on at91sam9xe based boards. CONFIG_SOC_DA8XX enable special bootcounter support on da850 based boards. - CONFIG_BOOTCOUNT_I2C - enable support for the bootcounter on an i2c (like RTC) device. - CONFIG_SYS_I2C_RTC_ADDR = i2c chip address - CONFIG_SYS_BOOTCOUNT_ADDR = i2c addr which is used for - the bootcounter. - CONFIG_BOOTCOUNT_ALEN = address len CONFIG_BOOTCOUNT_EXT enable support for the bootcounter in EXT filesystem CONFIG_SYS_BOOTCOUNT_ADDR = RAM address used for read diff --git a/configs/ids8313_defconfig b/configs/ids8313_defconfig index 3e67c55..eb931ce 100644 --- a/configs/ids8313_defconfig +++ b/configs/ids8313_defconfig @@ -30,6 +30,7 @@ CONFIG_MTDIDS_DEFAULT="nor0=ff800000.flash,nand0=e1000000.flash" CONFIG_MTDPARTS_DEFAULT="mtdparts=ff800000.flash:7m(dum),768k(BOOT-BIN),128k(BOOT-ENV),128k(BOOT-REDENV);e1000000.flash:-(ubi)" CONFIG_CMD_UBI=y CONFIG_BOOTCOUNT_LIMIT=y +CONFIG_BOOTCOUNT_I2C=y # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y CONFIG_PHYLIB=y diff --git a/drivers/bootcount/Kconfig b/drivers/bootcount/Kconfig index eabfd13..8c19ae6 100644 --- a/drivers/bootcount/Kconfig +++ b/drivers/bootcount/Kconfig @@ -46,6 +46,15 @@ config BOOTCOUNT_RAM Store the bootcount in DRAM protected against against bit errors due to short power loss or holding a system in RESET. +config BOOTCOUNT_I2C + bool "Boot counter on I2C device" + help + Enable support for the bootcounter on an i2c (like RTC) device. + CONFIG_SYS_I2C_RTC_ADDR = i2c chip address + CONFIG_SYS_BOOTCOUNT_ADDR = i2c addr which is used for + the bootcounter. + CONFIG_BOOTCOUNT_ALEN = address len + endchoice config SYS_BOOTCOUNT_SINGLEWORD diff --git a/include/configs/ids8313.h b/include/configs/ids8313.h index 529cbf1..fe39221 100644 --- a/include/configs/ids8313.h +++ b/include/configs/ids8313.h @@ -516,7 +516,6 @@ #define CONFIG_MTD_PARTITIONS /* bootcount support */ -#define CONFIG_BOOTCOUNT_I2C #define CONFIG_BOOTCOUNT_ALEN 1 #define CONFIG_SYS_BOOTCOUNT_ADDR 0x9 diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 487c790..aa1d51f 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -148,7 +148,6 @@ CONFIG_BOOGER CONFIG_BOOM CONFIG_BOOTBLOCK CONFIG_BOOTCOUNT_ALEN -CONFIG_BOOTCOUNT_I2C CONFIG_BOOTCOUNT_LIMIT CONFIG_BOOTFILE CONFIG_BOOTMAPSZ -- 2.7.4

2 1

[U-Boot] [PATCH 5/8] Convert CONFIG_BOOTCOUNT_RAM to Kconfig
by Alex Kiernan 11 Feb '18

11 Feb '18

This converts the following to Kconfig: CONFIG_BOOTCOUNT_RAM Signed-off-by: Alex Kiernan <alex.kiernan(a)gmail.com> --- README | 2 -- configs/km_kirkwood_128m16_defconfig | 1 + configs/km_kirkwood_defconfig | 1 + configs/km_kirkwood_pci_defconfig | 1 + configs/kmcoge5un_defconfig | 1 + configs/kmnusa_defconfig | 1 + configs/kmsugp1_defconfig | 1 + configs/kmsuv31_defconfig | 1 + configs/mgcoge3un_defconfig | 1 + configs/portl2_defconfig | 1 + configs/theadorable_debug_defconfig | 1 + drivers/bootcount/Kconfig | 6 ++++++ include/configs/km/km_arm.h | 2 -- include/configs/theadorable.h | 1 - scripts/config_whitelist.txt | 1 - 15 files changed, 16 insertions(+), 6 deletions(-) diff --git a/README b/README index 0581b58..20637e0 100644 --- a/README +++ b/README @@ -2321,8 +2321,6 @@ The following options need to be configured: enable special bootcounter support on at91sam9xe based boards. CONFIG_SOC_DA8XX enable special bootcounter support on da850 based boards. - CONFIG_BOOTCOUNT_RAM - enable support for the bootcounter in RAM CONFIG_BOOTCOUNT_I2C enable support for the bootcounter on an i2c (like RTC) device. CONFIG_SYS_I2C_RTC_ADDR = i2c chip address diff --git a/configs/km_kirkwood_128m16_defconfig b/configs/km_kirkwood_128m16_defconfig index 075b4b3..a257275 100644 --- a/configs/km_kirkwood_128m16_defconfig +++ b/configs/km_kirkwood_128m16_defconfig @@ -26,6 +26,7 @@ CONFIG_CMD_UBI=y # CONFIG_CMD_UBIFS is not set CONFIG_ENV_IS_IN_EEPROM=y CONFIG_BOOTCOUNT_LIMIT=y +CONFIG_BOOTCOUNT_RAM=y # CONFIG_MMC is not set CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y diff --git a/configs/km_kirkwood_defconfig b/configs/km_kirkwood_defconfig index 4ed097d..0d8c642 100644 --- a/configs/km_kirkwood_defconfig +++ b/configs/km_kirkwood_defconfig @@ -26,6 +26,7 @@ CONFIG_CMD_UBI=y # CONFIG_CMD_UBIFS is not set CONFIG_ENV_IS_IN_EEPROM=y CONFIG_BOOTCOUNT_LIMIT=y +CONFIG_BOOTCOUNT_RAM=y # CONFIG_MMC is not set CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y diff --git a/configs/km_kirkwood_pci_defconfig b/configs/km_kirkwood_pci_defconfig index b47c1ad..112344d 100644 --- a/configs/km_kirkwood_pci_defconfig +++ b/configs/km_kirkwood_pci_defconfig @@ -26,6 +26,7 @@ CONFIG_CMD_UBI=y # CONFIG_CMD_UBIFS is not set CONFIG_ENV_IS_IN_EEPROM=y CONFIG_BOOTCOUNT_LIMIT=y +CONFIG_BOOTCOUNT_RAM=y # CONFIG_MMC is not set CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y diff --git a/configs/kmcoge5un_defconfig b/configs/kmcoge5un_defconfig index 96c4ad0..3db48bc 100644 --- a/configs/kmcoge5un_defconfig +++ b/configs/kmcoge5un_defconfig @@ -26,6 +26,7 @@ CONFIG_CMD_UBI=y # CONFIG_CMD_UBIFS is not set CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_BOOTCOUNT_LIMIT=y +CONFIG_BOOTCOUNT_RAM=y # CONFIG_MMC is not set CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y diff --git a/configs/kmnusa_defconfig b/configs/kmnusa_defconfig index fec4017..b602932 100644 --- a/configs/kmnusa_defconfig +++ b/configs/kmnusa_defconfig @@ -26,6 +26,7 @@ CONFIG_CMD_UBI=y # CONFIG_CMD_UBIFS is not set CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_BOOTCOUNT_LIMIT=y +CONFIG_BOOTCOUNT_RAM=y # CONFIG_MMC is not set CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y diff --git a/configs/kmsugp1_defconfig b/configs/kmsugp1_defconfig index d1f1900..91bed21 100644 --- a/configs/kmsugp1_defconfig +++ b/configs/kmsugp1_defconfig @@ -26,6 +26,7 @@ CONFIG_CMD_UBI=y # CONFIG_CMD_UBIFS is not set CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_BOOTCOUNT_LIMIT=y +CONFIG_BOOTCOUNT_RAM=y # CONFIG_MMC is not set CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y diff --git a/configs/kmsuv31_defconfig b/configs/kmsuv31_defconfig index 9d4fbfe..a920664 100644 --- a/configs/kmsuv31_defconfig +++ b/configs/kmsuv31_defconfig @@ -26,6 +26,7 @@ CONFIG_CMD_UBI=y # CONFIG_CMD_UBIFS is not set CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_BOOTCOUNT_LIMIT=y +CONFIG_BOOTCOUNT_RAM=y # CONFIG_MMC is not set CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y diff --git a/configs/mgcoge3un_defconfig b/configs/mgcoge3un_defconfig index 250513d..6dff78b 100644 --- a/configs/mgcoge3un_defconfig +++ b/configs/mgcoge3un_defconfig @@ -26,6 +26,7 @@ CONFIG_CMD_UBI=y # CONFIG_CMD_UBIFS is not set CONFIG_ENV_IS_IN_EEPROM=y CONFIG_BOOTCOUNT_LIMIT=y +CONFIG_BOOTCOUNT_RAM=y # CONFIG_MMC is not set CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y diff --git a/configs/portl2_defconfig b/configs/portl2_defconfig index 857dec1..4ca0094 100644 --- a/configs/portl2_defconfig +++ b/configs/portl2_defconfig @@ -26,6 +26,7 @@ CONFIG_CMD_UBI=y # CONFIG_CMD_UBIFS is not set CONFIG_ENV_IS_IN_EEPROM=y CONFIG_BOOTCOUNT_LIMIT=y +CONFIG_BOOTCOUNT_RAM=y # CONFIG_MMC is not set CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y diff --git a/configs/theadorable_debug_defconfig b/configs/theadorable_debug_defconfig index b62645e..43c6e2c 100644 --- a/configs/theadorable_debug_defconfig +++ b/configs/theadorable_debug_defconfig @@ -44,6 +44,7 @@ CONFIG_NET_RANDOM_ETHADDR=y CONFIG_SPL_OF_TRANSLATE=y CONFIG_SATA_MV=y CONFIG_BOOTCOUNT_LIMIT=y +CONFIG_BOOTCOUNT_RAM=y CONFIG_FPGA_ALTERA=y CONFIG_DM_GPIO=y # CONFIG_MMC is not set diff --git a/drivers/bootcount/Kconfig b/drivers/bootcount/Kconfig index 40a0755..eabfd13 100644 --- a/drivers/bootcount/Kconfig +++ b/drivers/bootcount/Kconfig @@ -40,6 +40,12 @@ config BOOTCOUNT_ENV So the Userspace Application must set the "upgrade_available" and "bootcount" variable to 0, if a boot was successfully. +config BOOTCOUNT_RAM + bool "Boot counter in RAM" + help + Store the bootcount in DRAM protected against against bit errors + due to short power loss or holding a system in RESET. + endchoice config SYS_BOOTCOUNT_SINGLEWORD diff --git a/include/configs/km/km_arm.h b/include/configs/km/km_arm.h index ed58d1e..ca23952 100644 --- a/include/configs/km/km_arm.h +++ b/include/configs/km/km_arm.h @@ -277,8 +277,6 @@ int get_scl(void); #define CONFIG_KM_RESERVED_PRAM 0x801000 /* address for the bootcount (taken from end of RAM) */ #define BOOTCOUNT_ADDR (CONFIG_KM_RESERVED_PRAM) -/* Use generic bootcount RAM driver */ -#define CONFIG_BOOTCOUNT_RAM /* enable POST tests */ #define CONFIG_POST (CONFIG_SYS_POST_MEM_REGIONS) diff --git a/include/configs/theadorable.h b/include/configs/theadorable.h index ec9dc2e..a3b5c87 100644 --- a/include/configs/theadorable.h +++ b/include/configs/theadorable.h @@ -83,7 +83,6 @@ /* * Bootcounter */ -#define CONFIG_BOOTCOUNT_RAM /* Max size of RAM minus BOOTCOUNT_ADDR is the bootcounter address */ #define BOOTCOUNT_ADDR 0x1000 diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 0fd4ad6..487c790 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -150,7 +150,6 @@ CONFIG_BOOTBLOCK CONFIG_BOOTCOUNT_ALEN CONFIG_BOOTCOUNT_I2C CONFIG_BOOTCOUNT_LIMIT -CONFIG_BOOTCOUNT_RAM CONFIG_BOOTFILE CONFIG_BOOTMAPSZ CONFIG_BOOTMODE -- 2.7.4

2 1

[U-Boot] [PATCH 0/8] Convert bootcount drivers to Kconfig
by Alex Kiernan 11 Feb '18

11 Feb '18

This patch set converts bootcount drivers to Kconfig, it also merges CONFIG_BOOTCOUNT and CONFIG_BOOTCOUNT_LIMIT. Green Travis build: https://travis-ci.org/akiernan/u-boot/builds/340059775 This patch has been applied on top of u-boot/master: SHA1: 1811a928c6c7604d6d05a84b4d552a7c31b4994e This patch series shall be applied on top of: [U-Boot,1/2] Convert CONFIG_BOOTCOUNT_LIMIT to Kconfig http://patchwork.ozlabs.org/patch/871585/ [U-Boot,2/2] Convert CONFIG_SYS_BOOTCOUNT_SINGLEWORD to Kconfig http://patchwork.ozlabs.org/patch/871586/ Alex Kiernan (8): Merge CONFIG_BOOTCOUNT and CONFIG_BOOTCOUNT_LIMIT Prepare for multiple bootcount drivers Convert CONFIG_BOOTCOUNT_AM33XX to Kconfig Convert CONFIG_BOOTCOUNT_ENV to Kconfig Convert CONFIG_BOOTCOUNT_RAM to Kconfig Convert CONFIG_BOOTCOUNT_I2C to Kconfig Integrate AT91 bootcount driver Migrate generic bootcount to Kconfig README | 19 -------- configs/draco_defconfig | 1 + configs/etamin_defconfig | 1 + configs/ids8313_defconfig | 1 + configs/km_kirkwood_128m16_defconfig | 1 + configs/km_kirkwood_defconfig | 1 + configs/km_kirkwood_pci_defconfig | 1 + configs/kmcoge5un_defconfig | 1 + configs/kmnusa_defconfig | 1 + configs/kmsugp1_defconfig | 1 + configs/kmsuv31_defconfig | 1 + configs/mgcoge3un_defconfig | 1 + configs/mx53ppd_defconfig | 1 - configs/portl2_defconfig | 1 + configs/pxm2_defconfig | 1 + configs/rastaban_defconfig | 1 + configs/rut_defconfig | 1 + configs/theadorable_debug_defconfig | 1 + configs/thuban_defconfig | 1 + drivers/bootcount/Kconfig | 82 +++++++++++++++++++++++++--------- drivers/bootcount/Makefile | 5 +-- include/configs/am335x_evm.h | 1 - include/configs/am335x_sl50.h | 1 - include/configs/baltos.h | 2 - include/configs/bav335x.h | 1 - include/configs/brppt1.h | 1 - include/configs/chiliboard.h | 1 - include/configs/ids8313.h | 1 - include/configs/km/km_arm.h | 2 - include/configs/siemens-am33x-common.h | 2 - include/configs/theadorable.h | 1 - scripts/config_whitelist.txt | 4 -- 32 files changed, 81 insertions(+), 60 deletions(-) -- 2.7.4

1 0

[U-Boot] [PATCH v4 00/34] phy: sunxi: Add Allwinner sun4i USB PHY
by Jagan Teki 11 Feb '18

11 Feb '18

This series rework of previous version[1] where it removes legacy usb phy handling and added phy driver on generic-phy framework. Current implementation phy driver is unable to get pinctrl, clock and reset details from DT since the dm code on these will add it future. For ARM64 Allwinner platforms it is increasing size nearly ~64K due to enabling musb, phy, and dts sync. Currently build is failing due to BOARD_SIZE_LIMIT patch 1, simplify sunxi ccm reg base code on host and musb-new patch 2-3, simplify musb-new/sunxi.c code patch 4, add fifo config on musb-new/sunxi.c patch 5-7, fixes clock gating for H3/H5/A64 patch 8, musb support for H3/H5/A64 patch 9, add Allwinner A64 USB PHY driver patch 10, add id_detect and vbus_detect code patch 11-17, add phy support for H3/H5/V3S/A83T/A10/A13/A20/A31/A33/A23 platforms patch 18, binding code patch 19, use generic-phy for board_usb_cable_connected patch 20, phy squelch-detect support patch 21, switch to generic-phy code in host and musb-new patch 22, drop legacy arch/arm/mach-sunxi/usb_phy.c and related code patch 23-30, for adding usb_otg, usbphy dts and musb gadget enablement for H3/H5/A64. Changes for v4: - Rework of previous series - Add Allwinner sun4i USB PHY driver - Drop legacy arch/arm/mach-sunxi/usb_phy.c and related code All changes available at u-boot-sunxi/usb branch. [1] https://patchwork.ozlabs.org/cover/866847/ Chen-Yu Tsai (1): sunxi: clock: Fix OHCI clock gating for H3/H5 Jagan Teki (32): usb: sunxi: Simplify ccm reg base code musb: sunxi: Add proper macros instead of numericals musb: sunxi: Use simple way to fill musb_hdrc pdata musb: sunxi: Add fifo config sunxi: clock: Fix clock gating for H3/H5/A64 musb: sunxi: Add OTG device clkgate and reset for H3/H5 musb: sunxi: Add support for H3/H5A64 phy: Add Allwinner A64 USB PHY driver phy: sun4i-usb: Add id_detect and vbus_detect ops phy: sun4i-usb: Add H3/H5 PHY config phy: sun4i-usb: Add V3S PHY config phy: sun4i-usb: Add A83T USB PHY config phy: sun4i-usb: Add A10/A13/A20 PHY config phy: sun4i-usb: Add A31 PHY config phy: sun4i-usb: Add A33 USB PHY config phy: sun4i-usb: Add A23 USB PHY config device-tree-bindings: phy: Sync sun4i-usb-phy bindings board: sunxi: Use generic-phy for board_usb_cable_connected phy: sun4i-usb: Add a sunxi specific function for setting squelch-detect usb: sunxi: Switch to use generic-phy sunxi: Drop legacy usb_phy.c arm64: allwinner: a64: bananapi-m64: Sync usb_otg node from Linux configs: bananapi-m64: Enable USB OTG peripheral mode ARM: dts: sun8i: a83t: Sync usbphy node from Linux arm64: allwinner: a64: bananapi-m64: Sync usb host nodes from Linux ARM: dts: sun8i-h3: bananapi-m2-plus: Sync usb otg nodes from Linux configs: bananapi-m2-plus: Enable USB OTG peripheral mode arm64: allwinner: h5: orangepi-pc2: Order nodes in alphabetic arm64: allwinner: h5: orangepi-pc2: Sync usb otg nodes from Linux configs: orangepi-pc2: Enable USB OTG peripheral mode arm64: allwinner: h5: orangepi-prime: Sync usb otg nodes from Linux configs: orangepi-prime: Enable USB OTG peripheral mode Jun Nie (1): sunxi: h3: Sync OTG and HCI nodes from Linux DT arch/arm/dts/sun50i-a64-bananapi-m64.dts | 26 ++ arch/arm/dts/sun50i-h5-orangepi-pc2.dts | 54 ++- arch/arm/dts/sun50i-h5-orangepi-prime.dts | 13 + arch/arm/dts/sun8i-a83t.dtsi | 20 + arch/arm/dts/sun8i-h3-bananapi-m2-plus.dts | 13 + arch/arm/dts/sun8i-h3.dtsi | 32 ++ arch/arm/include/asm/arch-sunxi/clock_sun6i.h | 24 +- arch/arm/include/asm/arch-sunxi/usb_phy.h | 21 - arch/arm/mach-sunxi/Kconfig | 9 + arch/arm/mach-sunxi/Makefile | 3 - arch/arm/mach-sunxi/usb_phy.c | 407 ----------------- board/sunxi/board.c | 40 +- c | 0 configs/Sinovoip_BPI_M2_Plus_defconfig | 1 + configs/bananapi_m64_defconfig | 1 + configs/orangepi_pc2_defconfig | 1 + configs/orangepi_prime_defconfig | 1 + doc/device-tree-bindings/phy/sun4i-usb-phy.txt | 65 +++ drivers/Kconfig | 2 + drivers/Makefile | 1 + drivers/phy/allwinner/Kconfig | 13 + drivers/phy/allwinner/Makefile | 6 + drivers/phy/allwinner/phy-sun4i-usb.c | 575 +++++++++++++++++++++++++ drivers/usb/host/ehci-sunxi.c | 67 ++- drivers/usb/host/ohci-sunxi.c | 73 +++- drivers/usb/musb-new/musb_core.h | 4 + drivers/usb/musb-new/musb_regs.h | 3 +- drivers/usb/musb-new/musb_uboot.c | 22 +- drivers/usb/musb-new/sunxi.c | 184 ++++++-- include/phy-sun4i-usb.h | 34 ++ 30 files changed, 1158 insertions(+), 557 deletions(-) delete mode 100644 arch/arm/include/asm/arch-sunxi/usb_phy.h delete mode 100644 arch/arm/mach-sunxi/usb_phy.c create mode 100644 c create mode 100644 doc/device-tree-bindings/phy/sun4i-usb-phy.txt create mode 100644 drivers/phy/allwinner/Kconfig create mode 100644 drivers/phy/allwinner/Makefile create mode 100644 drivers/phy/allwinner/phy-sun4i-usb.c create mode 100644 include/phy-sun4i-usb.h -- 2.7.4

4 49

[U-Boot] [PULL] efi v2018.03 patch queue 2018-02-10
by Alexander Graf 11 Feb '18

11 Feb '18

Hi Tom, This is my current patch queue for efi against v2018.03. Please pull. Alex The following changes since commit 1811a928c6c7604d6d05a84b4d552a7c31b4994e: Move most CONFIG_HAVE_BLOCK_DEVICE to Kconfig (2018-02-08 19:09:03 -0500) are available in the git repository at: git://github.com/agraf/u-boot.git tags/signed-efi-v2018.03 for you to fetch changes up to df9cf561b04dd3fc5a94f7a2c2500948ae8ba56b: efi_loader: correct efi_disk_register (2018-02-10 00:25:49 +0100) ---------------------------------------------------------------- Patch queue for efi in 2018.03 - 2018-02-10 This time we have a few important bug fixes. Most noticable are: - Fix OpenBSD loader with CONFIG_BLK=n - Fix builds on various circumstances - Add missing stubs so callers don't call NULL - Bump UEFI revision to 2.7 ---------------------------------------------------------------- Heinrich Schuchardt (9): efi_loader: fix building crt0 on arm efi_loader: fix the online help for bootefi bootmgr efi_selftest: use correct compiler flags for miniapps efi_loader: create stub for CreateEventEx efi_loader: do not use 2.0.5 as UEFI revision number efi_driver: return type of efi_driver_init() efi_loader: split README.efi into two separate documents efi_loader: add missing runtime services stubs efi_loader: correct efi_disk_register MAINTAINERS | 3 + arch/arm/lib/crt0_aarch64_efi.S | 4 +- arch/arm/lib/crt0_arm_efi.S | 4 +- cmd/bootefi.c | 2 +- doc/README.efi | 275 ++------------------------------------ doc/README.u-boot_on_efi | 259 +++++++++++++++++++++++++++++++++++ include/asm-generic/pe.h | 21 +++ include/efi_api.h | 37 ++++- include/efi_loader.h | 4 +- include/pe.h | 8 +- lib/efi_driver/efi_uclass.c | 6 +- lib/efi_loader/efi_boottime.c | 35 ++++- lib/efi_loader/efi_disk.c | 71 ++++++---- lib/efi_loader/efi_image_loader.c | 2 +- lib/efi_loader/efi_runtime.c | 29 ++++ lib/efi_selftest/Makefile | 6 +- 16 files changed, 453 insertions(+), 313 deletions(-) create mode 100644 doc/README.u-boot_on_efi create mode 100644 include/asm-generic/pe.h

2 1

[U-Boot] [PATCH 1/3] ubifs: Reintroduce using CONFIG_UBIFS_SILENCE_MSG
by Petr Vorel 10 Feb '18

10 Feb '18

Use of CONFIG_UBIFS_SILENCE_MSG was added in 147162dac6 ("ubi: ubifs: Turn off verbose prints") Then it was removed in ff94bc40af ("mtd, ubi, ubifs: resync with Linux-3.14") Cc: Joe Hershberger <joe.hershberger(a)ni.com> Cc: Heiko Schocher <hs(a)denx.de> Signed-off-by: Petr Vorel <petr.vorel(a)gmail.com> --- Note, not sure whether we need to keep this workaround. If not, it might be better to get rid of both CONFIG_UBI_SILENCE_MSG and CONFIG_UBIFS_SILENCE_MSG. Petr --- fs/ubifs/ubifs.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/fs/ubifs/ubifs.h b/fs/ubifs/ubifs.h index 1d89465205..b4ce706a8e 100644 --- a/fs/ubifs/ubifs.h +++ b/fs/ubifs/ubifs.h @@ -618,9 +618,13 @@ static inline ino_t parent_ino(struct dentry *dentry) #define UBIFS_VERSION 1 /* Normal UBIFS messages */ +#ifdef CONFIG_UBIFS_SILENCE_MSG +#define ubifs_msg(c, fmt, ...) +#else #define ubifs_msg(c, fmt, ...) \ pr_notice("UBIFS (ubi%d:%d): " fmt "\n", \ (c)->vi.ubi_num, (c)->vi.vol_id, ##__VA_ARGS__) +#endif /* UBIFS error messages */ #ifndef __UBOOT__ #define ubifs_err(c, fmt, ...) \ -- 2.16.1

1 2

[U-Boot] [PATCH v2] spl: eMMC/SD: Provide one __weak spl_boot_mode() function
by Lukasz Majewski 10 Feb '18

10 Feb '18

The goal of this patch is to clean up the code related to choosing SPL MMC boot mode. The spl_boot_mode() now is called only in spl_mmc_load_image() function, which is only compiled in if CONFIG_SPL_MMC_SUPPORT is enabled. To achieve the goal, all per mach/arch implementations eligible for unification has been replaced with one __weak implementation. Signed-off-by: Lukasz Majewski <lukma(a)denx.de> Reviewed-by: Marek Vasut <marex(a)denx.de> Reviewed-by: Stefano Babic <sbabic(a)denx.de> Acked-by: Michal Simek <michal.simek(a)xilinx.com> (For ZynqMP) --- Changes in v2: - Update the code to be applied on top of newest master: SHA1: b2153075f42c2d46d310778e226bcb11f0af47f5 Travis-Ci: https://travis-ci.org/lmajewski/u-boot-dfu/builds/336770052 arch/arm/cpu/arm1136/mx35/generic.c | 21 --------------------- arch/arm/cpu/armv7/ls102xa/spl.c | 17 ----------------- arch/arm/cpu/armv8/fsl-layerscape/spl.c | 17 ----------------- arch/arm/cpu/armv8/zynqmp/spl.c | 14 -------------- arch/arm/mach-at91/spl.c | 15 --------------- arch/arm/mach-davinci/spl.c | 5 ----- arch/arm/mach-imx/spl.c | 23 ----------------------- arch/arm/mach-mvebu/spl.c | 7 ------- arch/arm/mach-rockchip/rk3188-board-spl.c | 5 ----- arch/arm/mach-rockchip/rk3288-board-spl.c | 5 ----- arch/arm/mach-rockchip/rk3368-board-spl.c | 5 ----- arch/arm/mach-rockchip/rk3399-board-spl.c | 5 ----- arch/arm/mach-socfpga/spl.c | 11 ----------- arch/arm/mach-sunxi/board.c | 6 ------ arch/arm/mach-zynq/spl.c | 7 ------- common/spl/spl_mmc.c | 11 +++++++++++ 16 files changed, 11 insertions(+), 163 deletions(-) diff --git a/arch/arm/cpu/arm1136/mx35/generic.c b/arch/arm/cpu/arm1136/mx35/generic.c index 5297d62d00..4dcfc72656 100644 --- a/arch/arm/cpu/arm1136/mx35/generic.c +++ b/arch/arm/cpu/arm1136/mx35/generic.c @@ -524,24 +524,3 @@ u32 spl_boot_device(void) return BOOT_DEVICE_NONE; } - -#ifdef CONFIG_SPL_BUILD -u32 spl_boot_mode(const u32 boot_device) -{ - switch (spl_boot_device()) { - case BOOT_DEVICE_MMC1: -#ifdef CONFIG_SPL_FAT_SUPPORT - return MMCSD_MODE_FS; -#else - return MMCSD_MODE_RAW; -#endif - break; - case BOOT_DEVICE_NAND: - return 0; - break; - default: - puts("spl: ERROR: unsupported device\n"); - hang(); - } -} -#endif diff --git a/arch/arm/cpu/armv7/ls102xa/spl.c b/arch/arm/cpu/armv7/ls102xa/spl.c index 1246eed2ca..1e4a1641cb 100644 --- a/arch/arm/cpu/armv7/ls102xa/spl.c +++ b/arch/arm/cpu/armv7/ls102xa/spl.c @@ -14,20 +14,3 @@ u32 spl_boot_device(void) #endif return BOOT_DEVICE_NAND; } - -u32 spl_boot_mode(const u32 boot_device) -{ - switch (spl_boot_device()) { - case BOOT_DEVICE_MMC1: -#ifdef CONFIG_SPL_FAT_SUPPORT - return MMCSD_MODE_FS; -#else - return MMCSD_MODE_RAW; -#endif - case BOOT_DEVICE_NAND: - return 0; - default: - puts("spl: error: unsupported device\n"); - hang(); - } -} diff --git a/arch/arm/cpu/armv8/fsl-layerscape/spl.c b/arch/arm/cpu/armv8/fsl-layerscape/spl.c index 4093d15e56..3a74040b97 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/spl.c +++ b/arch/arm/cpu/armv8/fsl-layerscape/spl.c @@ -26,23 +26,6 @@ u32 spl_boot_device(void) return 0; } -u32 spl_boot_mode(const u32 boot_device) -{ - switch (spl_boot_device()) { - case BOOT_DEVICE_MMC1: -#ifdef CONFIG_SPL_FAT_SUPPORT - return MMCSD_MODE_FS; -#else - return MMCSD_MODE_RAW; -#endif - case BOOT_DEVICE_NAND: - return 0; - default: - puts("spl: error: unsupported device\n"); - hang(); - } -} - #ifdef CONFIG_SPL_BUILD void spl_board_init(void) diff --git a/arch/arm/cpu/armv8/zynqmp/spl.c b/arch/arm/cpu/armv8/zynqmp/spl.c index bc7313a88b..0bfa5c1c4d 100644 --- a/arch/arm/cpu/armv8/zynqmp/spl.c +++ b/arch/arm/cpu/armv8/zynqmp/spl.c @@ -115,20 +115,6 @@ u32 spl_boot_device(void) return 0; } -u32 spl_boot_mode(const u32 boot_device) -{ - switch (boot_device) { - case BOOT_DEVICE_RAM: - return 0; - case BOOT_DEVICE_MMC1: - case BOOT_DEVICE_MMC2: - return MMCSD_MODE_FS; - default: - puts("spl: error: unsupported device\n"); - hang(); - } -} - #ifdef CONFIG_SPL_OS_BOOT int spl_start_uboot(void) { diff --git a/arch/arm/mach-at91/spl.c b/arch/arm/mach-at91/spl.c index 7e7e24bbe6..91add921c6 100644 --- a/arch/arm/mach-at91/spl.c +++ b/arch/arm/mach-at91/spl.c @@ -87,18 +87,3 @@ u32 spl_boot_device(void) return BOOT_DEVICE_NONE; } #endif - -u32 spl_boot_mode(const u32 boot_device) -{ - switch (boot_device) { -#if defined(CONFIG_SYS_USE_MMC) || defined(CONFIG_SD_BOOT) - case BOOT_DEVICE_MMC1: - case BOOT_DEVICE_MMC2: - return MMCSD_MODE_FS; - break; -#endif - case BOOT_DEVICE_NONE: - default: - hang(); - } -} diff --git a/arch/arm/mach-davinci/spl.c b/arch/arm/mach-davinci/spl.c index 564c2008e0..4c74db9ed0 100644 --- a/arch/arm/mach-davinci/spl.c +++ b/arch/arm/mach-davinci/spl.c @@ -45,11 +45,6 @@ void spl_board_init(void) preloader_console_init(); } -u32 spl_boot_mode(const u32 boot_device) -{ - return MMCSD_MODE_RAW; -} - u32 spl_boot_device(void) { switch (davinci_syscfg_regs->bootcfg) { diff --git a/arch/arm/mach-imx/spl.c b/arch/arm/mach-imx/spl.c index 6c16872f59..08a7e0071f 100644 --- a/arch/arm/mach-imx/spl.c +++ b/arch/arm/mach-imx/spl.c @@ -130,29 +130,6 @@ int g_dnl_bind_fixup(struct usb_device_descriptor *dev, const char *name) } #endif -#if defined(CONFIG_SPL_MMC_SUPPORT) -/* called from spl_mmc to see type of boot mode for storage (RAW or FAT) */ -u32 spl_boot_mode(const u32 boot_device) -{ - switch (spl_boot_device()) { - /* for MMC return either RAW or FAT mode */ - case BOOT_DEVICE_MMC1: - case BOOT_DEVICE_MMC2: -#if defined(CONFIG_SPL_FAT_SUPPORT) - return MMCSD_MODE_FS; -#elif defined(CONFIG_SUPPORT_EMMC_BOOT) - return MMCSD_MODE_EMMCBOOT; -#else - return MMCSD_MODE_RAW; -#endif - break; - default: - puts("spl: ERROR: unsupported device\n"); - hang(); - } -} -#endif - #if defined(CONFIG_SECURE_BOOT) /* diff --git a/arch/arm/mach-mvebu/spl.c b/arch/arm/mach-mvebu/spl.c index d16a62d2dd..a5086f16fb 100644 --- a/arch/arm/mach-mvebu/spl.c +++ b/arch/arm/mach-mvebu/spl.c @@ -70,13 +70,6 @@ u32 spl_boot_device(void) return get_boot_device(); } -#ifdef CONFIG_SPL_MMC_SUPPORT -u32 spl_boot_mode(const u32 boot_device) -{ - return MMCSD_MODE_RAW; -} -#endif - void board_init_f(ulong dummy) { int ret; diff --git a/arch/arm/mach-rockchip/rk3188-board-spl.c b/arch/arm/mach-rockchip/rk3188-board-spl.c index 8e3b8ae3ba..74771d3a0b 100644 --- a/arch/arm/mach-rockchip/rk3188-board-spl.c +++ b/arch/arm/mach-rockchip/rk3188-board-spl.c @@ -72,11 +72,6 @@ fallback: return BOOT_DEVICE_MMC1; } -u32 spl_boot_mode(const u32 boot_device) -{ - return MMCSD_MODE_RAW; -} - static int setup_arm_clock(void) { struct udevice *dev; diff --git a/arch/arm/mach-rockchip/rk3288-board-spl.c b/arch/arm/mach-rockchip/rk3288-board-spl.c index f64a54843f..f3ea624277 100644 --- a/arch/arm/mach-rockchip/rk3288-board-spl.c +++ b/arch/arm/mach-rockchip/rk3288-board-spl.c @@ -78,11 +78,6 @@ fallback: return BOOT_DEVICE_MMC1; } -u32 spl_boot_mode(const u32 boot_device) -{ - return MMCSD_MODE_RAW; -} - #ifdef CONFIG_SPL_MMC_SUPPORT static int configure_emmc(struct udevice *pinctrl) { diff --git a/arch/arm/mach-rockchip/rk3368-board-spl.c b/arch/arm/mach-rockchip/rk3368-board-spl.c index 72d2c97d36..8055ae538f 100644 --- a/arch/arm/mach-rockchip/rk3368-board-spl.c +++ b/arch/arm/mach-rockchip/rk3368-board-spl.c @@ -57,11 +57,6 @@ void board_init_f(ulong dummy) } } -u32 spl_boot_mode(const u32 boot_device) -{ - return MMCSD_MODE_RAW; -} - u32 spl_boot_device(void) { return BOOT_DEVICE_MMC1; diff --git a/arch/arm/mach-rockchip/rk3399-board-spl.c b/arch/arm/mach-rockchip/rk3399-board-spl.c index b96903e70f..d35990efd6 100644 --- a/arch/arm/mach-rockchip/rk3399-board-spl.c +++ b/arch/arm/mach-rockchip/rk3399-board-spl.c @@ -60,11 +60,6 @@ u32 spl_boot_device(void) return boot_device; } -u32 spl_boot_mode(const u32 boot_device) -{ - return MMCSD_MODE_RAW; -} - #define TIMER_CHN10_BASE 0xff8680a0 #define TIMER_END_COUNT_L 0x00 #define TIMER_END_COUNT_H 0x04 diff --git a/arch/arm/mach-socfpga/spl.c b/arch/arm/mach-socfpga/spl.c index 71bae827a1..9bf3b9a446 100644 --- a/arch/arm/mach-socfpga/spl.c +++ b/arch/arm/mach-socfpga/spl.c @@ -66,17 +66,6 @@ u32 spl_boot_device(void) } } -#ifdef CONFIG_SPL_MMC_SUPPORT -u32 spl_boot_mode(const u32 boot_device) -{ -#if defined(CONFIG_SPL_FAT_SUPPORT) || defined(CONFIG_SPL_EXT_SUPPORT) - return MMCSD_MODE_FS; -#else - return MMCSD_MODE_RAW; -#endif -} -#endif - #if defined(CONFIG_TARGET_SOCFPGA_GEN5) static void socfpga_nic301_slave_ns(void) { diff --git a/arch/arm/mach-sunxi/board.c b/arch/arm/mach-sunxi/board.c index 0c60ee04da..1753faec1d 100644 --- a/arch/arm/mach-sunxi/board.c +++ b/arch/arm/mach-sunxi/board.c @@ -260,12 +260,6 @@ u32 spl_boot_device(void) return sunxi_get_boot_device(); } -/* No confirmation data available in SPL yet. Hardcode bootmode */ -u32 spl_boot_mode(const u32 boot_device) -{ - return MMCSD_MODE_RAW; -} - void board_init_f(ulong dummy) { spl_init(); diff --git a/arch/arm/mach-zynq/spl.c b/arch/arm/mach-zynq/spl.c index b7e6d98f08..0a303f41eb 100644 --- a/arch/arm/mach-zynq/spl.c +++ b/arch/arm/mach-zynq/spl.c @@ -69,13 +69,6 @@ u32 spl_boot_device(void) return mode; } -#ifdef CONFIG_SPL_MMC_SUPPORT -u32 spl_boot_mode(const u32 boot_device) -{ - return MMCSD_MODE_FS; -} -#endif - #ifdef CONFIG_SPL_OS_BOOT int spl_start_uboot(void) { diff --git a/common/spl/spl_mmc.c b/common/spl/spl_mmc.c index b57e0b04e4..351f4edd41 100644 --- a/common/spl/spl_mmc.c +++ b/common/spl/spl_mmc.c @@ -281,6 +281,17 @@ static int spl_mmc_do_fs_boot(struct spl_image_info *spl_image, struct mmc *mmc) } #endif +u32 __weak spl_boot_mode(const u32 boot_device) +{ +#if defined(CONFIG_SPL_FAT_SUPPORT) || defined(CONFIG_SPL_EXT_SUPPORT) + return MMCSD_MODE_FS; +#elif defined(CONFIG_SUPPORT_EMMC_BOOT) + return MMCSD_MODE_EMMCBOOT; +#else + return MMCSD_MODE_RAW; +#endif +} + int spl_mmc_load_image(struct spl_image_info *spl_image, struct spl_boot_device *bootdev) { -- 2.11.0

5 11

[U-Boot] [PATCH] buildman: support newer gcc versions from kernel.org
by Daniel Schwierzeck 10 Feb '18

10 Feb '18

Add support for gcc versions 7.3.0, 6.4.0 and 4.9.4. Also use a regex for matching the tarball names. Some gcc versions use '-ARCH-' instead of '_ARCH-'. Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck(a)gmail.com> --- tools/buildman/toolchain.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/buildman/toolchain.py b/tools/buildman/toolchain.py index 2076323d5d..76dcb67614 100644 --- a/tools/buildman/toolchain.py +++ b/tools/buildman/toolchain.py @@ -33,7 +33,7 @@ class MyHTMLParser(HTMLParser): HTMLParser.__init__(self) self.arch_link = None self.links = [] - self._match = '_%s-' % arch + self.re_arch = re.compile('[-_]%s-' % arch) def handle_starttag(self, tag, attrs): if tag == 'a': @@ -41,7 +41,7 @@ class MyHTMLParser(HTMLParser): if tag == 'href': if value and value.endswith('.xz'): self.links.append(value) - if self._match in value: + if self.re_arch.search(value): self.arch_link = value @@ -431,7 +431,7 @@ class Toolchains: """ arch = command.OutputOneLine('uname', '-m') base = 'https://www.kernel.org/pub/tools/crosstool/files/bin' - versions = ['4.9.0', '4.6.3', '4.6.2', '4.5.1', '4.2.4'] + versions = ['7.3.0', '6.4.0', '5.5.0', '4.9.4', '4.9.0', '4.6.3', '4.6.2', '4.5.1', '4.2.4'] links = [] for version in versions: url = '%s/%s/%s/' % (base, arch, version) -- 2.16.1

2 3

[U-Boot] [PATCH v3 0/2] Rpi: Add support for second sd host controller
by Alexander Graf 10 Feb '18

10 Feb '18

The Raspberry Pi (bcm283x SoC) family contains 2 IP blocks to drive SD peripherals: A pretty standard SDHCI one called iProc and a home grown one called "sdhost". When driving U-Boot by the same device tree that we use for Linux, we end up in situations where only the "sdhost" device is available for use. In those situations, current U-Boot can simply not drive the SD card, because the device tree disables the SDHCI device. This patch set also adds a full pinctrl driver for pinmuxing the SD devices properly to their respective pins. This is necessary because the RPi firmware doesn't mux the SD pins according to the device tree but instead expects the payload (usually Linux, U-Boot for us) to do that. With this patch set, I can successfully use U-Boot on a RPi3 Compute Module with CONFIG_OF_BOARD=y and a device tree generated by the RPi firmware (plus a few overlays in config.txt for vc4, serial, etc). v1 -> v2: - Introduce real pinctrl driver - Checkpatch fixes - Remove hand written pinctrl support v2 -> v3: - Use SPDX license identifier - Sort headers - Remove useless comments - Comment style fixes - Add magic constant defines (SDHSTS_CLEAR_MASK, SDEDM_FIFO_FILL*, edm_fifo_fill, SDHST_TIMEOUT_MAX_USEC) - Add comments in bcm2835_reset_internal() - Replace "r" with "ret" - Remove one useless while() indirection in bcm2835_transfer_block_pio() - Add comments what each loop does in bcm2835_transfer_block_pio() - Remove max_ms parameter in bcm2835_read_wait_sdcmd() - Only read once with full timeout in bcm2835_read_wait_sdcmd() - Check unsupported response type early in bcm2835_send_command() - Return -EBUSY on incomplete command in bcm2835_send_command() - Combine SDHSTS_REW_TIME_OUT and SDHSTS_CMD_TIME_OUT cases in bcm2835_check_cmd_error() - Unfold irq_* check/set in bcm2835_threaded_irq() - Declare bcm2835_add_host() as void - use dev_read - add comment on why GPIO failure is non-fatal Alexander Graf (2): bcm283x: Add pinctrl driver mmc: Add bcm2835 sdhost controller MAINTAINERS | 2 + arch/arm/mach-bcm283x/include/mach/gpio.h | 2 - board/raspberrypi/rpi/rpi.c | 5 +- configs/rpi_0_w_defconfig | 4 + configs/rpi_2_defconfig | 4 + configs/rpi_3_32b_defconfig | 4 + configs/rpi_3_defconfig | 4 + configs/rpi_defconfig | 4 + drivers/gpio/bcm2835_gpio.c | 29 +- drivers/mmc/Kconfig | 14 + drivers/mmc/Makefile | 1 + drivers/mmc/bcm2835_sdhost.c | 979 +++++++++++++++++++++++++++++ drivers/pinctrl/Kconfig | 1 + drivers/pinctrl/Makefile | 1 + drivers/pinctrl/broadcom/Kconfig | 7 + drivers/pinctrl/broadcom/Makefile | 7 + drivers/pinctrl/broadcom/pinctrl-bcm283x.c | 152 +++++ 17 files changed, 1197 insertions(+), 23 deletions(-) create mode 100644 drivers/mmc/bcm2835_sdhost.c create mode 100644 drivers/pinctrl/broadcom/Kconfig create mode 100644 drivers/pinctrl/broadcom/Makefile create mode 100644 drivers/pinctrl/broadcom/pinctrl-bcm283x.c -- 2.12.3

5 21