February 2018 - U-Boot

[U-Boot] Pull request: u-boot-ubi/master
by Heiko Schocher 07 Feb '18

07 Feb '18

Hello Tom, please pull from u-boot-ubi master The following changes since commit a43aebee89acf57b4e22018f401cffc9fef4fd85: usb: ulpi: kconfig: Remove meaningless choice default (2018-02-05 20:58:12 -0500) are available in the Git repository at: git://git.denx.de/u-boot-ubi.git master for you to fetch changes up to 2d2d306f79e5ae090790fd380662f5407ccace11: ubi: Ensure no fastmap flush after uif_close (2018-02-06 07:05:57 +0100) ---------------------------------------------------------------- Martin Townsend (1): ubi: Ensure no fastmap flush after uif_close drivers/mtd/ubi/fastmap-wl.c | 5 ----- 1 file changed, 5 deletions(-) Travis build shows no errors: https://travis-ci.org/hsdenx/u-boot-test/builds/337877045 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] Please pull from u-boot-i2c
by Heiko Schocher 07 Feb '18

07 Feb '18

Hello Tom, please pull from u-boot-i2c master The following changes since commit a43aebee89acf57b4e22018f401cffc9fef4fd85: usb: ulpi: kconfig: Remove meaningless choice default (2018-02-05 20:58:12 -0500) are available in the Git repository at: git://git.denx.de/u-boot-i2c.git master for you to fetch changes up to 8bcf12ccce89ef9c77d9322930445b4f4ca3b822: i2c: mvtwsi.c: Avoid NULL dereference (2018-02-06 07:02:32 +0100) ---------------------------------------------------------------- Heinrich Schuchardt (1): i2c: mvtwsi.c: Avoid NULL dereference Mario Six (6): i2c: fsl_i2c: Fix style violations i2c: fsl_i2c: Remove inline declarations i2c: fsl_i2c: Make live-tree compatible i2c: ihs_i2c: Prepare DM conversion i2c: ihs_i2c: Make DM compatible i2c: ihs_i2c: Factor out send_buffer method drivers/i2c/Kconfig | 6 +++ drivers/i2c/fsl_i2c.c | 127 +++++++++++++++++++++++++++++------------------------------ drivers/i2c/ihs_i2c.c | 279 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------ drivers/i2c/mvtwsi.c | 3 +- 4 files changed, 311 insertions(+), 104 deletions(-) No warnings on travis: https://travis-ci.org/hsdenx/u-boot-i2c/builds/337874954 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] CONFIG_RANDOM_UUID and CONFIG_CMD_UUID unused?
by Adam Ford 07 Feb '18

07 Feb '18

config_fallbacks.h both check to see if CONFIG_RANDOM_UUID or CONFIG_CMD_UUID are defined, but I don't ever see either of these options defined. Can this go away: #if (defined(CONFIG_RANDOM_UUID) || \ defined(CONFIG_CMD_UUID)) && \ (!defined(CONFIG_LIB_RAND) && \ !defined(CONFIG_LIB_HW_RAND)) #define CONFIG_LIB_RAND #endif

2 1

[U-Boot] CONFIG_CMD_KGDB unused?
by Adam Ford 07 Feb '18

07 Feb '18

I see lots of places where the check for CONFIG_CMD_KGDB is done, but I see no place where it is ever defined and I don't see a description in README. Is this still needed? adam

2 1

[U-Boot] [PATCH v2 1/1] efi_loader: add missing EFI_RESET_PLATFORM_SPECIFIC
by Heinrich Schuchardt 06 Feb '18

06 Feb '18

EFI_RESET_PLATFORM_SPECIFIC is one of the values that can be used for the EFI service ResetSystem. The missing definition is added. The value has to handled in efi_reset_system(). Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- arch/arm/cpu/armv8/fsl-layerscape/cpu.c | 1 + arch/arm/cpu/armv8/fwcall.c | 1 + arch/arm/mach-bcm283x/reset.c | 1 + include/efi_api.h | 3 ++- lib/efi_loader/efi_runtime.c | 1 + 5 files changed, 6 insertions(+), 1 deletion(-) diff --git a/arch/arm/cpu/armv8/fsl-layerscape/cpu.c b/arch/arm/cpu/armv8/fsl-layerscape/cpu.c index 70a6070935..ba4c4bbbc9 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/cpu.c +++ b/arch/arm/cpu/armv8/fsl-layerscape/cpu.c @@ -644,6 +644,7 @@ void __efi_runtime EFIAPI efi_reset_system( switch (reset_type) { case EFI_RESET_COLD: case EFI_RESET_WARM: + case EFI_RESET_PLATFORM_SPECIFIC: reset_cpu(0); break; case EFI_RESET_SHUTDOWN: diff --git a/arch/arm/cpu/armv8/fwcall.c b/arch/arm/cpu/armv8/fwcall.c index c220267536..ff0712bf65 100644 --- a/arch/arm/cpu/armv8/fwcall.c +++ b/arch/arm/cpu/armv8/fwcall.c @@ -146,6 +146,7 @@ void __efi_runtime EFIAPI efi_reset_system( switch (reset_type) { case EFI_RESET_COLD: case EFI_RESET_WARM: + case EFI_RESET_PLATFORM_SPECIFIC: psci_system_reset(); break; case EFI_RESET_SHUTDOWN: diff --git a/arch/arm/mach-bcm283x/reset.c b/arch/arm/mach-bcm283x/reset.c index b62cb8a51e..88ca165773 100644 --- a/arch/arm/mach-bcm283x/reset.c +++ b/arch/arm/mach-bcm283x/reset.c @@ -63,6 +63,7 @@ void __efi_runtime EFIAPI efi_reset_system( switch (reset_type) { case EFI_RESET_COLD: case EFI_RESET_WARM: + case EFI_RESET_PLATFORM_SPECIFIC: reset_cpu(0); break; case EFI_RESET_SHUTDOWN: diff --git a/include/efi_api.h b/include/efi_api.h index 3ba650e57e..abab3a8b3a 100644 --- a/include/efi_api.h +++ b/include/efi_api.h @@ -180,7 +180,8 @@ struct efi_boot_services { enum efi_reset_type { EFI_RESET_COLD = 0, EFI_RESET_WARM = 1, - EFI_RESET_SHUTDOWN = 2 + EFI_RESET_SHUTDOWN = 2, + EFI_RESET_PLATFORM_SPECIFIC = 3, }; /* EFI Runtime Services table */ diff --git a/lib/efi_loader/efi_runtime.c b/lib/efi_loader/efi_runtime.c index efe2ba4814..d7c2c1e430 100644 --- a/lib/efi_loader/efi_runtime.c +++ b/lib/efi_loader/efi_runtime.c @@ -80,6 +80,7 @@ static void EFIAPI efi_reset_system_boottime( switch (reset_type) { case EFI_RESET_COLD: case EFI_RESET_WARM: + case EFI_RESET_PLATFORM_SPECIFIC: do_reset(NULL, 0, 0, NULL); break; case EFI_RESET_SHUTDOWN: -- 2.11.0

1 0

[U-Boot] [PATCH v2 0/3] Add set_env_soc_name() for STM32 SoCs
by patrice.chotard＠st.com 06 Feb '18

06 Feb '18

From: Patrice Chotard <patrice.chotard(a)st.com> This series allows to create and set the environment variable "soc_name" corresponding to the current STM32 SoCs name. We will add STM32 SoCs support in buildroot environment Our objective is to propose a flexible solution to boot linux kernel from sdcard. As for STM32F4, STM32F7 and STM32H7 linux defconfig is slightly different (specific CONFIG_DRAM_BASE and CONFIG_DRAM_SIZE) we can't use the same zImage for all these SoCs. To simplify, we will embed all dtb/zImage in the sdcard and using the soc_name environment variable to select the correct zImage. v2: _ Remove get_cpu_id() function and use directly CONFIG_STM32xx flag to identify the STM32 SoC family. Patrice Chotard (8): mach-stm32: Add get_cpu_id support mach-stm32: Move BOARD_LATE_INIT flag to mach-stm32 Kconfig board: stm32: Add set_env_soc_name() in board_late_init() arch/arm/include/asm/arch-stm32f4/stm32.h | 1 + arch/arm/include/asm/arch-stm32f7/stm32.h | 1 + arch/arm/include/asm/arch-stm32h7/stm32.h | 3 +++ arch/arm/mach-stm32/Kconfig | 3 +++ arch/arm/mach-stm32/soc.c | 15 +++++++++++++++ board/st/stm32f429-discovery/stm32f429-discovery.c | 7 +++++++ board/st/stm32f429-evaluation/stm32f429-evaluation.c | 7 +++++++ board/st/stm32f469-discovery/stm32f469-discovery.c | 7 +++++++ board/st/stm32f746-disco/stm32f746-disco.c | 2 ++ board/st/stm32h743-disco/stm32h743-disco.c | 4 ++++ board/st/stm32h743-eval/stm32h743-eval.c | 4 ++++ include/configs/stm32f746-disco.h | 1 - include/configs/stm32h743-disco.h | 1 - include/configs/stm32h743-eval.h | 1 - 14 files changed, 54 insertions(+), 3 deletions(-) -- 1.9.1

4 9

[U-Boot] [PATCH v3 00/30] musb: sunxi: Add OTG-Peripheral support for Allwineer H3/H5/A64
by Jagan Teki 06 Feb '18

06 Feb '18

This is rework of previous A64 musb[1] and H3 musb series with OTG Peripheral support for Allwineer H3/H5/A64. Will submit another series on host support since A64 need AXP PMIC. Series start with Jun Nie H3 musb changes followed by H5 and A64 musb changes. All changes available at u-boot-sunxi/otg-peripheral branch. [1] https://patchwork.ozlabs.org/cover/847375/ thanks! Jagan. Chen-Yu Tsai (2): sunxi: Fix USB PHY index for H3/H5/A64 sunxi: usb_phy: setup USB PHY passby for USB0 on H3/H5/A64 Jagan Teki (23): sunxi: usb_phy: Clear PHYCTL register before writing ARM: dts: sun8i-h3: bananapi-m2-plus: Sync usb otg nodes from Linux configs: bananapi-m2-plus: Enable USB OTG peripheral mode configs: sun50i: Drop CONFIG_USB_MAX_CONTROLLER_COUNT msub: sunxi: Update proper fifo config for H5 configs: sun50i: Set proper USB PHY count for H5 sunxi: usb_phy: Fix phy_config to handle all SOC's musb: sunxi: Add phy0 dual route support arm64: allwinner: h5: orangepi-pc2: Order nodes in alphabetic sunxi: arm64: Increase u-boot size on MMC environment sunxi: Add uENV partition on gpt partition table 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 sunxi: clock: Fix clock gating for A64 configs: sun50i: Set proper USB PHY count for A64 musb: sunxi: Add support for A64 sunxi: usb_phy: Clear SIDDP for A64 arm64: allwinner: a64: bananapi-m64: Sync usb_otg node from Linux configs: bananapi-m64: Enable USB OTG peripheral mode arm64: allwinner: a64: olinuxino: Sync usb_otg from Linux configs: a64-olinuxino: Enable USB OTG peripheral mode Jun Nie (5): sunxi: h3: Sync OTG and HCI nodes from Linux DT sunxi: musb: Add fifo config for H3 sunxi: musb: Hack dynamic fifo support for H3 OTG sunxi: musb: Enable OTG device clock for H3 sunxi: H3: set different otg base address per mode arch/arm/dts/sun50i-a64-bananapi-m64.dts | 10 ++++ arch/arm/dts/sun50i-a64-olinuxino.dts | 5 ++ arch/arm/dts/sun50i-h5-orangepi-pc2.dts | 54 +++++++++++++-------- arch/arm/dts/sun50i-h5-orangepi-prime.dts | 13 +++++ 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 | 37 ++++++++------- arch/arm/include/asm/arch-sunxi/cpu_sun4i.h | 4 ++ arch/arm/include/asm/arch-sunxi/usb_phy.h | 1 + arch/arm/mach-sunxi/usb_phy.c | 68 ++++++++++++++++++--------- configs/Sinovoip_BPI_M2_Plus_defconfig | 1 + configs/a64-olinuxino_defconfig | 1 + configs/bananapi_m64_defconfig | 1 + configs/orangepi_pc2_defconfig | 1 + configs/orangepi_prime_defconfig | 1 + drivers/usb/host/ehci-sunxi.c | 9 +++- drivers/usb/host/ohci-sunxi.c | 9 +++- drivers/usb/musb-new/musb_regs.h | 3 +- drivers/usb/musb-new/sunxi.c | 47 ++++++++++++++++++ env/Kconfig | 3 +- include/configs/sun50i.h | 7 ++- include/configs/sunxi-common.h | 3 +- 22 files changed, 258 insertions(+), 65 deletions(-) -- 2.7.4

4 55

[U-Boot] Unused CONFIG_SYS_MAXARGS?
by Adam Ford 06 Feb '18

06 Feb '18

I am curious to know if CONFIG_SYS_MAXARGS actually does something. I see it defined in many places, I see it #undef'd and I see it used #ifndef, but I don't see any actual source use it. Can this be removed or I am missing something? adam

1 0

[U-Boot] [PATCH V2] Convert CONFIG_APBH_DMA et al to Kconfig
by Adam Ford 06 Feb '18

06 Feb '18

This converts the following to Kconfig: CONFIG_APBH_DMA CONFIG_APBH_DMA_BURST CONFIG_APBH_DMA_BURST8 Signed-off-by: Adam Ford <aford173(a)gmail.com> --- Changes in V2: Rebase on [U-Boot,v2,1/6] Convert CONFIG_NAND_MXS to Kconfig Make the NAND controller in MX6 MX7 autoselect the DMA options configs/bg0900_defconfig | 1 + configs/mx23_olinuxino_defconfig | 1 + configs/mx23evk_defconfig | 1 + configs/mx28evk_auart_console_defconfig | 3 +-- configs/mx28evk_defconfig | 3 +-- configs/mx28evk_spi_defconfig | 3 +-- configs/sansa_fuze_plus_defconfig | 1 + configs/sc_sps_1_defconfig | 1 + configs/ts4600_defconfig | 1 + configs/xfi3_defconfig | 1 + drivers/dma/Kconfig | 14 ++++++++++++++ drivers/mtd/nand/Kconfig | 3 +++ include/configs/aristainetos-common.h | 3 --- include/configs/cm_fx6.h | 3 --- include/configs/colibri_imx7.h | 3 --- include/configs/gw_ventana.h | 3 --- include/configs/imx6-engicam.h | 4 ---- include/configs/imx6_logic.h | 3 --- include/configs/mx6sabreauto.h | 3 --- include/configs/mx6sxsabreauto.h | 3 --- include/configs/mx7dsabresd.h | 3 --- include/configs/mxs.h | 1 - include/configs/pcm058.h | 3 --- include/configs/pfla02.h | 3 --- include/configs/platinum.h | 3 --- include/configs/titanium.h | 3 --- scripts/config_whitelist.txt | 3 --- 27 files changed, 27 insertions(+), 50 deletions(-) diff --git a/configs/bg0900_defconfig b/configs/bg0900_defconfig index 72616ae..7314eff 100644 --- a/configs/bg0900_defconfig +++ b/configs/bg0900_defconfig @@ -25,6 +25,7 @@ CONFIG_CMD_MII=y CONFIG_CMD_PING=y CONFIG_CMD_CACHE=y CONFIG_DOS_PARTITION=y +CONFIG_APBH_DMA=y # CONFIG_MMC is not set CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_BAR=y diff --git a/configs/mx23_olinuxino_defconfig b/configs/mx23_olinuxino_defconfig index 628c11d..2c80c3b 100644 --- a/configs/mx23_olinuxino_defconfig +++ b/configs/mx23_olinuxino_defconfig @@ -20,6 +20,7 @@ CONFIG_CMD_CACHE=y CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y CONFIG_ENV_IS_IN_MMC=y +CONFIG_APBH_DMA=y CONFIG_LED_STATUS=y CONFIG_LED_STATUS_GPIO=y CONFIG_LED_STATUS0=y diff --git a/configs/mx23evk_defconfig b/configs/mx23evk_defconfig index 6ad7f2c..09f3611 100644 --- a/configs/mx23evk_defconfig +++ b/configs/mx23evk_defconfig @@ -24,6 +24,7 @@ CONFIG_CMD_CACHE=y CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y CONFIG_ENV_IS_IN_MMC=y +CONFIG_APBH_DMA=y CONFIG_MMC_MXS=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y diff --git a/configs/mx28evk_auart_console_defconfig b/configs/mx28evk_auart_console_defconfig index 0927333..7bdb905 100644 --- a/configs/mx28evk_auart_console_defconfig +++ b/configs/mx28evk_auart_console_defconfig @@ -16,7 +16,6 @@ CONFIG_CMD_BOOTZ=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_GPIO=y CONFIG_CMD_MMC=y -CONFIG_CMD_NAND_TRIMFFS=y CONFIG_CMD_SF=y CONFIG_CMD_SPI=y CONFIG_CMD_USB=y @@ -34,9 +33,9 @@ CONFIG_MTDIDS_DEFAULT="nand0=gpmi-nand" CONFIG_MTDPARTS_DEFAULT="mtdparts=gpmi-nand:3m(bootloader)ro,512k(environment),512k(redundant-environment),4m(kernel),512k(fdt),8m(ramdisk),-(filesystem)" CONFIG_CMD_UBI=y CONFIG_ENV_IS_IN_MMC=y +CONFIG_APBH_DMA=y CONFIG_MMC_MXS=y CONFIG_NAND=y -CONFIG_NAND_MXS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_SST=y CONFIG_USB=y diff --git a/configs/mx28evk_defconfig b/configs/mx28evk_defconfig index 21d01bc..d36ad0e 100644 --- a/configs/mx28evk_defconfig +++ b/configs/mx28evk_defconfig @@ -16,7 +16,6 @@ CONFIG_CMD_BOOTZ=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_GPIO=y CONFIG_CMD_MMC=y -CONFIG_CMD_NAND_TRIMFFS=y CONFIG_CMD_SF=y CONFIG_CMD_SPI=y CONFIG_CMD_USB=y @@ -34,9 +33,9 @@ CONFIG_MTDIDS_DEFAULT="nand0=gpmi-nand" CONFIG_MTDPARTS_DEFAULT="mtdparts=gpmi-nand:3m(bootloader)ro,512k(environment),512k(redundant-environment),4m(kernel),512k(fdt),8m(ramdisk),-(filesystem)" CONFIG_CMD_UBI=y CONFIG_ENV_IS_IN_MMC=y +CONFIG_APBH_DMA=y CONFIG_MMC_MXS=y CONFIG_NAND=y -CONFIG_NAND_MXS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_SST=y CONFIG_USB=y diff --git a/configs/mx28evk_spi_defconfig b/configs/mx28evk_spi_defconfig index dab5394..7bf1d6e 100644 --- a/configs/mx28evk_spi_defconfig +++ b/configs/mx28evk_spi_defconfig @@ -15,7 +15,6 @@ CONFIG_CMD_BOOTZ=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_GPIO=y CONFIG_CMD_MMC=y -CONFIG_CMD_NAND_TRIMFFS=y CONFIG_CMD_SF=y CONFIG_CMD_SPI=y CONFIG_CMD_USB=y @@ -33,9 +32,9 @@ CONFIG_MTDIDS_DEFAULT="nand0=gpmi-nand" CONFIG_MTDPARTS_DEFAULT="mtdparts=gpmi-nand:3m(bootloader)ro,512k(environment),512k(redundant-environment),4m(kernel),512k(fdt),8m(ramdisk),-(filesystem)" CONFIG_CMD_UBI=y CONFIG_ENV_IS_IN_SPI_FLASH=y +CONFIG_APBH_DMA=y CONFIG_MMC_MXS=y CONFIG_NAND=y -CONFIG_NAND_MXS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_SST=y CONFIG_USB=y diff --git a/configs/sansa_fuze_plus_defconfig b/configs/sansa_fuze_plus_defconfig index f2e61c7..d7ec119 100644 --- a/configs/sansa_fuze_plus_defconfig +++ b/configs/sansa_fuze_plus_defconfig @@ -25,6 +25,7 @@ CONFIG_CMD_PING=y CONFIG_CMD_CACHE=y CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y +CONFIG_APBH_DMA=y CONFIG_MMC_MXS=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y diff --git a/configs/sc_sps_1_defconfig b/configs/sc_sps_1_defconfig index faebc04..792d39d 100644 --- a/configs/sc_sps_1_defconfig +++ b/configs/sc_sps_1_defconfig @@ -24,6 +24,7 @@ CONFIG_CMD_CACHE=y CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y CONFIG_ENV_IS_IN_MMC=y +CONFIG_APBH_DMA=y CONFIG_MMC_MXS=y CONFIG_PHYLIB=y CONFIG_USB=y diff --git a/configs/ts4600_defconfig b/configs/ts4600_defconfig index aab0737..45b872b 100644 --- a/configs/ts4600_defconfig +++ b/configs/ts4600_defconfig @@ -17,5 +17,6 @@ CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_ENV_IS_IN_MMC=y +CONFIG_APBH_DMA=y CONFIG_MMC_MXS=y CONFIG_OF_LIBFDT=y diff --git a/configs/xfi3_defconfig b/configs/xfi3_defconfig index 6cdea5e..e335407 100644 --- a/configs/xfi3_defconfig +++ b/configs/xfi3_defconfig @@ -24,6 +24,7 @@ CONFIG_CMD_PING=y CONFIG_CMD_CACHE=y CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y +CONFIG_APBH_DMA=y CONFIG_MMC_MXS=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig index 1b92c77..a95d4ce 100644 --- a/drivers/dma/Kconfig +++ b/drivers/dma/Kconfig @@ -19,4 +19,18 @@ config TI_EDMA3 This driver support data transfer between memory regions. +config APBH_DMA + bool "Support APBH DMA" + help + Enable APBH DMA driver. + +if APBH_DMA +config APBH_DMA_BURST + bool "Enable DMA BURST" + +config APBH_DMA_BURST8 + bool "Enable DMA BURST8" + +endif + endmenu # menu "DMA Support" diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig index 97ec6cf..4453688 100644 --- a/drivers/mtd/nand/Kconfig +++ b/drivers/mtd/nand/Kconfig @@ -142,6 +142,9 @@ config NAND_MXS bool "MXS NAND support" depends on MX6 || MX7 imply CMD_NAND + select APBH_DMA + select APBH_DMA_BURST if ARCH_MX6 || ARCH_MX7 + select APBH_DMA_BURST8 if ARCH_MX6 || ARCH_MX7 help This enables NAND driver for the NAND flash controller on the MXS processors. diff --git a/include/configs/aristainetos-common.h b/include/configs/aristainetos-common.h index 9b1a39d..69de44a 100644 --- a/include/configs/aristainetos-common.h +++ b/include/configs/aristainetos-common.h @@ -182,9 +182,6 @@ #define CONFIG_SYS_NAND_ONFI_DETECTION /* DMA stuff, needed for GPMI/MXS NAND support */ -#define CONFIG_APBH_DMA -#define CONFIG_APBH_DMA_BURST -#define CONFIG_APBH_DMA_BURST8 /* RTC */ #define CONFIG_SYS_I2C_RTC_ADDR 0x68 diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h index 90cf024..39d166a 100644 --- a/include/configs/cm_fx6.h +++ b/include/configs/cm_fx6.h @@ -184,9 +184,6 @@ #define CONFIG_SYS_MAX_NAND_DEVICE 1 #define CONFIG_SYS_NAND_ONFI_DETECTION /* APBH DMA is required for NAND support */ -#define CONFIG_APBH_DMA -#define CONFIG_APBH_DMA_BURST -#define CONFIG_APBH_DMA_BURST8 #endif /* Ethernet */ diff --git a/include/configs/colibri_imx7.h b/include/configs/colibri_imx7.h index d4aaff6..5d9b212 100644 --- a/include/configs/colibri_imx7.h +++ b/include/configs/colibri_imx7.h @@ -170,9 +170,6 @@ #define CONFIG_MTD_DEVICE /* needed for mtdparts commands */ /* DMA stuff, needed for GPMI/MXS NAND support */ -#define CONFIG_APBH_DMA -#define CONFIG_APBH_DMA_BURST -#define CONFIG_APBH_DMA_BURST8 /* USB Configs */ #define CONFIG_EHCI_HCD_INIT_AFTER_RESET diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h index 517ad08..6e994b5 100644 --- a/include/configs/gw_ventana.h +++ b/include/configs/gw_ventana.h @@ -73,9 +73,6 @@ #define CONFIG_SYS_NAND_ONFI_DETECTION /* DMA stuff, needed for GPMI/MXS NAND support */ - #define CONFIG_APBH_DMA - #define CONFIG_APBH_DMA_BURST - #define CONFIG_APBH_DMA_BURST8 #endif #endif /* CONFIG_SPI_FLASH */ diff --git a/include/configs/imx6-engicam.h b/include/configs/imx6-engicam.h index 5f43dfb..246a636 100644 --- a/include/configs/imx6-engicam.h +++ b/include/configs/imx6-engicam.h @@ -161,10 +161,6 @@ /* MTD device */ # define CONFIG_MTD_DEVICE # define CONFIG_MTD_PARTITIONS - -# define CONFIG_APBH_DMA -# define CONFIG_APBH_DMA_BURST -# define CONFIG_APBH_DMA_BURST8 #endif /* Ethernet */ diff --git a/include/configs/imx6_logic.h b/include/configs/imx6_logic.h index f0ff5b2..8b91a53 100644 --- a/include/configs/imx6_logic.h +++ b/include/configs/imx6_logic.h @@ -156,9 +156,6 @@ # define CONFIG_MTD_PARTITIONS /* DMA stuff, needed for GPMI/MXS NAND support */ -#define CONFIG_APBH_DMA -#define CONFIG_APBH_DMA_BURST -#define CONFIG_APBH_DMA_BURST8 /* EEPROM contains serial no, MAC addr and other Logic PD info */ #define CONFIG_I2C_EEPROM diff --git a/include/configs/mx6sabreauto.h b/include/configs/mx6sabreauto.h index 9982685..bba15a7 100644 --- a/include/configs/mx6sabreauto.h +++ b/include/configs/mx6sabreauto.h @@ -72,9 +72,6 @@ #define CONFIG_SYS_NAND_ONFI_DETECTION /* DMA stuff, needed for GPMI/MXS NAND support */ -#define CONFIG_APBH_DMA -#define CONFIG_APBH_DMA_BURST -#define CONFIG_APBH_DMA_BURST8 /* PMIC */ #define CONFIG_POWER diff --git a/include/configs/mx6sxsabreauto.h b/include/configs/mx6sxsabreauto.h index 02d6acf..06e416b 100644 --- a/include/configs/mx6sxsabreauto.h +++ b/include/configs/mx6sxsabreauto.h @@ -125,9 +125,6 @@ #define CONFIG_SYS_NAND_ONFI_DETECTION /* DMA stuff, needed for GPMI/MXS NAND support */ -#define CONFIG_APBH_DMA -#define CONFIG_APBH_DMA_BURST -#define CONFIG_APBH_DMA_BURST8 /* Network */ diff --git a/include/configs/mx7dsabresd.h b/include/configs/mx7dsabresd.h index fd39f22..3a9eaf9 100644 --- a/include/configs/mx7dsabresd.h +++ b/include/configs/mx7dsabresd.h @@ -197,9 +197,6 @@ #define CONFIG_SYS_NAND_ONFI_DETECTION /* DMA stuff, needed for GPMI/MXS NAND support */ -#define CONFIG_APBH_DMA -#define CONFIG_APBH_DMA_BURST -#define CONFIG_APBH_DMA_BURST8 #endif #define CONFIG_ENV_OFFSET (12 * SZ_64K) diff --git a/include/configs/mxs.h b/include/configs/mxs.h index 21e51fc..c3e3f59 100644 --- a/include/configs/mxs.h +++ b/include/configs/mxs.h @@ -99,7 +99,6 @@ */ /* APBH DMA */ -#define CONFIG_APBH_DMA /* GPIO */ #define CONFIG_MXS_GPIO diff --git a/include/configs/pcm058.h b/include/configs/pcm058.h index 6c0902a..ec74ed7 100644 --- a/include/configs/pcm058.h +++ b/include/configs/pcm058.h @@ -65,9 +65,6 @@ #endif /* DMA stuff, needed for GPMI/MXS NAND support */ -#define CONFIG_APBH_DMA -#define CONFIG_APBH_DMA_BURST -#define CONFIG_APBH_DMA_BURST8 /* Filesystem support */ #define CONFIG_MTD_PARTITIONS diff --git a/include/configs/pfla02.h b/include/configs/pfla02.h index 83198a1..2001d5d 100644 --- a/include/configs/pfla02.h +++ b/include/configs/pfla02.h @@ -64,9 +64,6 @@ #endif /* DMA stuff, needed for GPMI/MXS NAND support */ -#define CONFIG_APBH_DMA -#define CONFIG_APBH_DMA_BURST -#define CONFIG_APBH_DMA_BURST8 /* Filesystem support */ #define CONFIG_MTD_PARTITIONS diff --git a/include/configs/platinum.h b/include/configs/platinum.h index 24c8de9..339ff91 100644 --- a/include/configs/platinum.h +++ b/include/configs/platinum.h @@ -75,9 +75,6 @@ #define CONFIG_SYS_NAND_ONFI_DETECTION /* DMA config, needed for GPMI/MXS NAND support */ -#define CONFIG_APBH_DMA -#define CONFIG_APBH_DMA_BURST -#define CONFIG_APBH_DMA_BURST8 /* Environment in NAND */ #define CONFIG_ENV_OFFSET (16 << 20) diff --git a/include/configs/titanium.h b/include/configs/titanium.h index ea18cb6..0fe40ee 100644 --- a/include/configs/titanium.h +++ b/include/configs/titanium.h @@ -148,9 +148,6 @@ #define CONFIG_SYS_NAND_ONFI_DETECTION /* DMA stuff, needed for GPMI/MXS NAND support */ -#define CONFIG_APBH_DMA -#define CONFIG_APBH_DMA_BURST -#define CONFIG_APBH_DMA_BURST8 /* Environment in NAND */ #define CONFIG_ENV_OFFSET (16 << 20) diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index ef83c00..bc097db 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -31,9 +31,6 @@ CONFIG_AM335X_USB1_MODE CONFIG_AM437X_USB2PHY2_HOST CONFIG_ANDES_PCU CONFIG_ANDES_PCU_BASE -CONFIG_APBH_DMA -CONFIG_APBH_DMA_BURST -CONFIG_APBH_DMA_BURST8 CONFIG_APER_0_BASE CONFIG_APER_1_BASE CONFIG_APER_SIZE -- 2.7.4

2 3

[U-Boot] [PATCH v2] ubi: Ensure no fastmap flush after uif_close
by Martin Townsend 06 Feb '18

06 Feb '18

On detach UBI attempts to update fastmap after closing user interfaces but at this point UBI volumes have already been free()'ed and fastmap can no longer access these data structures. Signed-off-by: Martin Townsend <mtownsend1973(a)gmail.com> Cc: hs(a)denx.de Cc: kmpark(a)infradead.org Cc: richard(a)sigma-star.at --- Changes for v2: - Fix by removing update to fastmap from ubi_fastmap_close instead of reordering uif_close and ubi_wl_close in ubi_detach_mtd_dev drivers/mtd/ubi/fastmap-wl.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/drivers/mtd/ubi/fastmap-wl.c b/drivers/mtd/ubi/fastmap-wl.c index a33d406..b7876a8 100644 --- a/drivers/mtd/ubi/fastmap-wl.c +++ b/drivers/mtd/ubi/fastmap-wl.c @@ -337,11 +337,6 @@ static void ubi_fastmap_close(struct ubi_device *ubi) { int i; -#ifndef __UBOOT__ - flush_work(&ubi->fm_work); -#else - update_fastmap_work_fn(ubi); -#endif return_unused_pool_pebs(ubi, &ubi->fm_pool); return_unused_pool_pebs(ubi, &ubi->fm_wl_pool); -- 2.7.4

2 1