summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'migrate-various-PHY-options'WIP/28Apr2020Tom Rini2020-04-28564-191/+1974
|\ | | | | | | | | - Finish migration of CONFIG_PHYLIB and a number of related symbols to defconfig files.
| * Convert CONFIG_PHYLIB et al to KconfigTom Rini2020-04-28562-191/+1970
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This converts the following to Kconfig: CONFIG_PHYLIB CONFIG_BITBANGMII CONFIG_MV88E6352_SWITCH CONFIG_MV88E61XX_SWITCH CONFIG_PHYLIB_10G CONFIG_PHY_AQUANTIA CONFIG_PHY_ATHEROS CONFIG_PHY_BROADCOM CONFIG_PHY_CORTINA CONFIG_PHY_DAVICOM CONFIG_PHY_ET1011C CONFIG_PHY_LXT CONFIG_PHY_MARVELL CONFIG_PHY_MICREL CONFIG_PHY_NATSEMI CONFIG_PHY_REALTEK CONFIG_RTL8211X_PHY_FORCE_MASTER CONFIG_PHY_SMSC CONFIG_PHY_TERANETICS CONFIG_PHY_TI CONFIG_PHY_VITESSE CONFIG_PHY_XILINX Signed-off-by: Tom Rini <trini@konsulko.com>
| * sunxi: Fix PHY regression on A20-OLinuXino-Lime2 and A20-Olimex-SOM-EVBTom Rini2020-04-282-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | When moving the PHYLIB PHY drivers around in Kconfig we did not at the same time perform a careful migration of the related drivers and sub-options. This lead to the case where previously Kconfig-enabled driver choices were now disabled on some platforms. Correct this by enabling both the PHY driver and sub-option on the above referenced platforms. Fixes: af2cbfd6b982 ("drivers: net: Provide Kconfig menu for PHYLIB") Fixes: 8728c97eff5b ("configs: Re-sync") Reported-by: Dario <dario86@tutamail.com> Signed-off-by: Tom Rini <trini@konsulko.com>
* | configs: Resync with savedefconfigTom Rini2020-04-28658-985/+901
|/ | | | | | Rsync all defconfig files using moveconfig.py Signed-off-by: Tom Rini <trini@konsulko.com>
* Prepare v2020.07-rc1v2020.07-rc1Tom Rini2020-04-281-2/+2
| | | | Signed-off-by: Tom Rini <trini@konsulko.com>
* kbuild: SPL/TPL: generate separate asm-offsets.h for SPL and TPLMasahiro Yamada2020-04-282-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently generic-asm-offsets.h and asm-offsets.h are generated based on U-Boot proper config options. The same asm-offsets headers are used for building U-Boot SPL/TPL, which causes potential offset mismatch if U-Boot proper has different config options from U-Boot SPL/TPL. This commit adds: spl/include/generated/(generic-)asm-offsets.h tpl/include/generated/(generic-)asm-offsets.h spl/include/generated/(generic-)asm-offsets.h is generated if CONFIG_SPL=y, and included when building SPL. tpl/include/generated/(generic-)asm-offsets.h is generated if CONFIG_TPL=y, and included when building TPL. They are created before Kbuild descends into SPL/TPL object directories and builds $(obj)/dts/dt-platdata.o because $(obj)/dts/dt-platdata.c includes a bunch of headers. Prepend -I$(obj)/include to $(UBOOTINCLUDE) so (generic-)asm-offsets.h is searched in {spl,tpl}/include/generated/. Requested-by: Bin Meng <bmeng.cn@gmail.com> Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> Tested-by: Bin Meng <bmeng.cn@gmail.com>
* Merge tag 'u-boot-amlogic-20200428' of ↵Tom Rini2020-04-2830-101/+633
|\ | | | | | | | | | | | | | | | | https://gitlab.denx.de/u-boot/custodians/u-boot-amlogic - fix sd-emmc controller A init on G12A/G12B/SM1 SoCs - add GXBB USB PHY driver - enable access to SPI NOR Flash on VIM2 and VIM3/VIM3L boards - fix USB PHYs Power-Up on on VIM3/VIM3L boards
| * usb: dwc3-meson-g12a: add power-on/off of the PHYsNeil Armstrong2020-04-281-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Power on/off the PHYs to enable power to the USB ports, fixing USB support on Khadas VIM3/VIM3L boards. The G12A USB complex has at least 2 USB2 PHYs, but one is muxed between the DWC2 and DWC3 controller and the other one directly connected to the DWC3 controller. The USB3+PCIe combo PHY is muxed between the DWC3 controller and a DW-PCIE controller. All PHYs are optional, but it's type (usb2/usb3) and position are important to determine it's capabilities, thus they are stored in a fixed size array and the phy-name determines it's position, it's position determining it's type and functionnalities. This is why we need to loop over the array to power on all the DT provided PHYs. Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> Reviewed-by: Marek Vasut <marex@denx.de>
| * configs: khadas-vim3: enable support for SPI NOR flashNeil Armstrong2020-04-282-0/+18
| | | | | | | | | | | | Enable the necessary configs to make usage of the SPI NOR Flash. Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
| * arm: dts: meson-khadas-vim3: enable SPI NOR flashNeil Armstrong2020-04-283-0/+35
| | | | | | | | | | | | | | Enable the SPI flash controller and reduce the usable eMMC data pins to 4 to permit using the on-board SPI NOR Flash. Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
| * configs: khadas-vim2: enable support for SPI NOR flashNeil Armstrong2020-04-281-0/+8
| | | | | | | | | | | | Add the necessary configs to use the SPI NOR flash. Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
| * arm: dts: meson-gxm-khadas-vim2-u-boot: enable SPI NOR flashNeil Armstrong2020-04-281-0/+15
| | | | | | | | | | | | | | Activate the on-board SPI NOR Flash by enabling the SPI controller and disabling the DS eMMC pin in the VIM2 u-boot.dtsi file. Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
| * arm64: dts: meson: sync dt and bindings from v5.7-rc1Neil Armstrong2020-04-2818-101/+295
| | | | | | | | | | | | | | Sync the device tree and dt-bindings from Linux v5.7-rc1 8f3d9f354286 ("Linux 5.7-rc1"). Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
| * phy: meson: add GXBB PHY driverBeniamino Galvani2020-04-283-0/+244
| | | | | | | | | | | | | | | | This adds support for the USB PHY found on Amlogic GXBB SoCs. Signed-off-by: Beniamino Galvani <b.galvani@gmail.com> Reviewed-by: Neil Armstrong <narmstrong@baylibre.com> Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
| * clk: meson: g12a: add missing SD_EMMC_A controller gatesNeil Armstrong2020-04-281-0/+2
| | | | | | | | | | | | | | | | Add missing SD_EMMC_A controller gates needed for probe of the A controller, otherwise leading to a freeze of the SoC after b3d69aa596. Fixes: b3d69aa596 ("clk: meson: reset mmc clock on probe") Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
* | Merge branch 'master' of git://git.denx.de/u-boot-usbTom Rini2020-04-285-23/+193
|\ \ | | | | | | | | | | | | - DWC2/DWC3 improvements - Assorted bugfixes
| * | usb: host: dwc3-sti-glue: Use UCLASS_NOP instead of UCLASS_MISCPatrice Chotard2020-04-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | dwc3-sti-glue has been broken since MISC uclass has been modified to scan DT sub-nodes after bind. Fixing it by a using the no-op uclass. Signed-off-by: Patrice Chotard <patrice.chotard@st.com>
| * | usb: host: dwc2: add trace to have clean usb startPatrick Delaunay2020-04-281-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Solve issue for the display of "usb start" command on stm32mp1 because one carriage return is missing in DWC2 probe. Before the patch: STM32MP> usb start starting USB... Bus usb-otg@49000000: Bus usbh-ehci@5800d000: USB EHCI 1.00 after the patch: STM32MP> usb start starting USB... Bus usb-otg@49000000: USB DWC2 Bus usbh-ehci@5800d000: USB EHCI 1.00 Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com>
| * | usb: host: dwc2: force reset assertPatrick Delaunay2020-04-281-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Assert reset before deassert in dwc2_reset; this patch solve issues when the DWC2 registers are already initialized with value incompatible with host mode. Force a hardware reset of the IP reset all the DWC2 registers at default value, the host driver start with a clean state (Core Soft reset doen in dwc_otg_core_reset is not enought to reset all register). The error can occurs in U-Boot when DWC2 device gadget driver force device mode (called by ums or dfu command, before to execute the usb start command). Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com>
| * | usb: host: dwc2: add clk supportPatrick Delaunay2020-04-281-1/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for clock with driver model. This patch don't added dependency because when CONFIG_CLK is not activated the clk function are stubbed. Reviewed-by: Simon Goldschmidt <simon.k.r.goldschmidt@gmail.com> Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com>
| * | usb: host: dwc2: add phy supportPatrick Delaunay2020-04-281-0/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use generic phy to initialize the PHY associated to the DWC2 device and available in the device tree. This patch don't added dependency because when CONFIG_PHY is not activated, the generic PHY function are stubbed. Reviewed-by: Simon Goldschmidt <simon.k.r.goldschmidt@gmail.com> Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com>
| * | dm: clk: add stub when CONFIG_CLK is deactivatedPatrick Delaunay2020-04-281-13/+89
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add stub for functions clk_...() when CONFIG_CLK is deactivated. This patch avoids compilation issues for driver using these API without protection (#if CONFIG_IS_ENABLED(CLK)) For example, before this patch we have undefined reference to `clk_disable_bulk') for code: clk_disable_bulk(&priv->clks); clk_release_bulk(&priv->clks); Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com>
| * | usb: ether: avoid NULL check before free()Heinrich Schuchardt2020-04-281-2/+1
| | | | | | | | | | | | | | | | | | free() checks if its argument is NULL. Do not duplicate this check. Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
| * | usb: avoid NULL check before freeHeinrich Schuchardt2020-04-281-6/+3
| |/ | | | | | | | | | | | | The free() function checks if the argument is NULL. Do not duplicate this check. Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
* | Merge branch 'master' of git://git.denx.de/u-boot-socfpgaTom Rini2020-04-282-1/+5
|\ \
| * | arm: socfpga: stratix10: Fix incorrect CLKMGR_S10_PERPLL_BYPASS offsetLey Foon Tan2020-04-271-1/+1
| | | | | | | | | | | | | | | | | | | | | Offset value for CLKMGR_S10_PERPLL_BYPASS should be 0xb0, fix it. Reported-by: Chee Hong Ang <chee.hong.ang@intel.com> Signed-off-by: Ley Foon Tan <ley.foon.tan@intel.com>
| * | configs: socfpga: arria10: Enable USB supportLey Foon Tan2020-04-271-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable configs to support USB in Arria 10. CONFIG_CMD_USB=y CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_DWC2=y Signed-off-by: Ley Foon Tan <ley.foon.tan@intel.com>
* | | Merge tag 'dm-pull-27apr20' of git://git.denx.de/u-boot-dmTom Rini2020-04-28121-1805/+896
|\ \ \ | | | | | | | | | | | | | | | | | | | | Move Python tools to use absolute paths Minor buildman fixes for new features Make libfdt code more similar to upsteam
| * | | log: remove useless castHeinrich Schuchardt2020-04-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | There is no need to cast from (void *) before assigning to a pointer. Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de> Reviewed-by: Simon Glass <sjg@chromium.org>
| * | | patman: Tidy up sys.path changesSimon Glass2020-04-269-14/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now that we are using absolute paths we can remove some of the sys.path mangling that appears in the tools. We only need to add the path to 'tools/' so that everything can find modules relative to that directory. The special paths for finding pylibfdt remain. Signed-off-by: Simon Glass <sjg@chromium.org>
| * | | patman: Move to absolute importsSimon Glass2020-04-2658-149/+154
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | At present patman sets the python path on startup so that it can access the libraries it needs. If we convert to use absolute imports this is not necessary. Move patman to use absolute imports. This requires changes in tools which use the patman libraries (which is most of them). Signed-off-by: Simon Glass <sjg@chromium.org>
| * | | binman: Move to absolute importsSimon Glass2020-04-2670-213/+198
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | At present binman sets the python path on startup so that it can access the libraries it needs. If we convert to use absolute imports this is not necessary. Move binman to use absolute imports. This enables removable of the path adjusting in Entry also. Signed-off-by: Simon Glass <sjg@chromium.org>
| * | | buildman: Move to absolute importsSimon Glass2020-04-267-33/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | At present buildman sets the python path on startup so that it can access the libraries it needs. If we convert to use absolute imports this is not necessary. Move buildman to use absolute imports. Also adjust moveconfig.py too since it uses some buildman modules and cannot work without this. Signed-off-by: Simon Glass <sjg@chromium.org>
| * | | patman: Move test running/reporting to test_utilSimon Glass2020-04-262-70/+108
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This code is useful in other tools. Move it into a common file so it can be shared. Signed-off-by: Simon Glass <sjg@chromium.org>
| * | | patman: Drop the python2 code in test coverageSimon Glass2020-04-261-7/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | We don't need to run test coverage with Python 2 now. Drop the special-case code. Signed-off-by: Simon Glass <sjg@chromium.org>
| * | | Add a 'make tcheck' option to test toolsSimon Glass2020-04-262-11/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Running all the unit tests takes a while and is not useful when you are just modifying the tools. Add an option to run only the tools tests. Signed-off-by: Simon Glass <sjg@chromium.org>
| * | | binman: Rename the main moduleSimon Glass2020-04-264-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Python does not like the module name being the same as the module directory. To allow buildman modules to be used from other tools, rename it. Signed-off-by: Simon Glass <sjg@chromium.org>
| * | | dtoc: Rename the main moduleSimon Glass2020-04-262-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Python does not like the module name being the same as the module directory. To allow dtoc modules to be used from other tools, rename it. Signed-off-by: Simon Glass <sjg@chromium.org>
| * | | buildman: Rename the main moduleSimon Glass2020-04-262-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Python does not like the module name being the same as the module directory. To allow buildman modules to be used from other tools, rename it. Signed-off-by: Simon Glass <sjg@chromium.org>
| * | | patman: Drop Python 2 StringIO codeSimon Glass2020-04-263-12/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | We can rely on Python 3 now, so drop the workaround for importing StringIO. Signed-off-by: Simon Glass <sjg@chromium.org>
| * | | patman: Drop references to __future__Simon Glass2020-04-2620-40/+0
| | | | | | | | | | | | | | | | | | | | | | | | We don't need these now that the tools using Python 3. Drop them. Signed-off-by: Simon Glass <sjg@chromium.org>
| * | | rmboard: Move to Python 3Simon Glass2020-04-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This script already works with Python 3. Make it use that by default so that it can import the patman libraries. Signed-off-by: Simon Glass <sjg@chromium.org>
| * | | patman: Rename the main moduleSimon Glass2020-04-262-14/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Python does not like the module name being the same as the module directory. To allow patman modules to be used from other tools, rename it. Signed-off-by: Simon Glass <sjg@chromium.org>
| * | | buildman: Write output files when using -wSimon Glass2020-04-263-14/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | At present buildman does not write its own output files (err, done, the environment) when using -w. However this is useful for when the build is run with -s to check it. In fact ProduceResultSummary() reads the result from those files rather than using the 'result' info directly. So ProcessResult() does not work with -w at present. It does not print any output. Fix this by writing output files even when -w is used. Signed-off-by: Simon Glass <sjg@chromium.org>
| * | | buildman: Use out-env for environment outputSimon Glass2020-04-262-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | At present the environment used by U-Boot is written to the 'env' directory. This is fine when the output directory is not the same as the source directory, but when it is (as with -w) it conflicts with the source directory of the same name. Rename 'env' to 'out-env' to fix this. Signed-off-by: Simon Glass <sjg@chromium.org>
| * | | buildman: Make sure that -o is given with -wSimon Glass2020-04-264-3/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is a bad idea to use the default output directory ('..') with -w since it does a build in that directory and writes various files these. Require that -o is given to avoid this problem. Signed-off-by: Simon Glass <sjg@chromium.org>
| * | | buildman: Correct operation of -A flagSimon Glass2020-04-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This was broken when -a was removed and unfortunately there are no tests for this. Fix it. Signed-off-by: Simon Glass <sjg@chromium.org>
| * | | buildman: Fix test for new 9.2 kernelSimon Glass2020-04-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The naming is slightly different on kernel.org now. Update the regex so that the test still passes. Signed-off-by: Simon Glass <sjg@chromium.org>
| * | | libfdt: split fdt_region declarations out to <fdt_region.h>Masahiro Yamada2020-04-266-299/+964
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fdt_region APIs are not part of libfdt. They are U-Boot extension for the verified boot. Split the declarations related to fdt_region out of <fdt_region.h>. This allows <linux/libfdt.h> to become a simple wrapper file, like Linux does. Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
| * | | fdt_region: move fdt_region.c to common/ from lib/libfdt/Masahiro Yamada2020-04-264-667/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | My goal is to sync lib/libfdt/ with scripts/dtc/libfdt/, that is, make lib/libfdt/ contain only wrapper files. fdt_region.c was written only for U-Boot to implement the verified boot. So, this belongs to the same group as common/fdt_support.c, which is a collection of U-Boot own fdt helpers. Move lib/libfdt/fdt_region.c to common/fdt_region.c . This is necessary only when CONFIG_(SPL_TPL_)_FIT_SIGNATURE is enabled. Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>