diff options
| author | Tom Rini <[email protected]> | 2022-07-19 10:52:15 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2022-07-19 10:52:15 -0400 |
| commit | fc97ff2695d6d7fbea7d5fda7b080f405d6ee744 (patch) | |
| tree | 609c80bfc0804e0704f08990f474bba2173d59d2 /arch | |
| parent | 905e779b9e0bd29255ebc6244f017690fdc10fc4 (diff) | |
| parent | 25ba5be1c2b6324917254f0c22df1ad9d3d3c9e7 (diff) | |
Merge https://source.denx.de/u-boot/custodians/u-boot-sunxi
To quote Andre:
One prominent feature is the restructering of the clock driver, which
allows to end up with one actual driver for all variants, although we
still only compile in support for one SoC.
Also contained are some initial SPI fixes, which should fix some
problems, and enable SPI flash support for the F1C100s SoC. Those
patches revealed more problems, I will queue fixes later on, but for
now it should at least still work.
Apart from some smaller fixes (for instance for NAND operation), there
is also preparation for the upcoming Allwinner D1 support, in form of
the USB PHY driver. There are more driver support patches to come.
The gitlab CI completed successfully, including the build test for all
160 sunxi boards. I also boot tested on a few boards, but didn't have
time for more elaborate tests this time.
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-sunxi/Kconfig | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/arch/arm/mach-sunxi/Kconfig b/arch/arm/mach-sunxi/Kconfig index 71a7f8dcee0..57125761844 100644 --- a/arch/arm/mach-sunxi/Kconfig +++ b/arch/arm/mach-sunxi/Kconfig @@ -679,15 +679,6 @@ config MMC_SUNXI_SLOT_EXTRA slot or emmc on mmc1 - mmc3. Setting this to 1, 2 or 3 will enable support for this. -config INITIAL_USB_SCAN_DELAY - int "delay initial usb scan by x ms to allow builtin devices to init" - default 0 - ---help--- - Some boards have on board usb devices which need longer than the - USB spec's 1 second to connect from board powerup. Set this config - option to a non 0 value to add an extra delay before the first usb - bus scan. - config USB0_VBUS_PIN string "Vbus enable pin for usb0 (otg)" default "" @@ -850,8 +841,9 @@ config VIDEO_LCD_DCLK_PHASE int "LCD panel display clock phase" depends on VIDEO_SUNXI || DM_VIDEO default 1 + range 0 3 ---help--- - Select LCD panel display clock phase shift, range 0-3. + Select LCD panel display clock phase shift config VIDEO_LCD_POWER string "LCD panel power enable pin" |