diff options
| author | Tom Rini <trini@konsulko.com> | 2022-05-24 23:29:00 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-05-24 23:29:00 -0400 |
| commit | 7e0edcadb09d55d5319fdc862041fd1b874476f5 (patch) | |
| tree | 3c5b591fea0c39989c580df0cdc78c6731a317eb /configs | |
| parent | 1b04a961c6bcb9768f517198890cac680ee532e8 (diff) | |
| parent | 7495051219b64ec0e8fac8930586dc10666530da (diff) | |
| download | u-boot-7e0edcadb09d55d5319fdc862041fd1b874476f5.zip u-boot-7e0edcadb09d55d5319fdc862041fd1b874476f5.tar.gz u-boot-7e0edcadb09d55d5319fdc862041fd1b874476f5.tar.bz2 | |
Merge branch 'master' of https://source.denx.de/u-boot/custodians/u-boot-sunxiWIP/24May2022
The bulk of it is (finally!) some DT sync from the kernel. We refrained
from syncing one incompatible change, as this would spoil booting Linux
kernels before v5.13 with U-Boot's DT (via UEFI, for instance).
I test booted Linux v5.18 and v5.4 with that new DT on some boards, and
the headless peripherals (MMC, USB, Ethernet) seemed to work.
The rest are fixes:
- silencing missing clock warnings due to the new pinctrl driver
- fixing "UART0 on PortF", allowing UART access through the SD card pins
- add an F1C100s clock driver, to enable MMC support (SPI comes later)
- some cleanups for CONS_INDEX_n in Kconfig
Tested on BananaPi-M1, Pine64-LTS, Pine-H64, X96-Mate (H616) and
OrangePi-Zero.
Diffstat (limited to 'configs')
| -rw-r--r-- | configs/Nintendo_NES_Classic_Edition_defconfig | 2 | ||||
| -rw-r--r-- | configs/licheepi_nano_defconfig | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/configs/Nintendo_NES_Classic_Edition_defconfig b/configs/Nintendo_NES_Classic_Edition_defconfig index 72e9725..b660234 100644 --- a/configs/Nintendo_NES_Classic_Edition_defconfig +++ b/configs/Nintendo_NES_Classic_Edition_defconfig @@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_SUNXI=y -CONFIG_DEFAULT_DEVICE_TREE="sun8i-r16-nintendo-nes-classic-edition" +CONFIG_DEFAULT_DEVICE_TREE="sun8i-r16-nintendo-nes-classic" CONFIG_SPL=y CONFIG_MACH_SUN8I_A33=y CONFIG_DRAM_CLK=600 diff --git a/configs/licheepi_nano_defconfig b/configs/licheepi_nano_defconfig index 67b7b85..9fd1dcc 100644 --- a/configs/licheepi_nano_defconfig +++ b/configs/licheepi_nano_defconfig @@ -10,4 +10,3 @@ CONFIG_DRAM_CLK=156 CONFIG_DRAM_ZQ=0 # CONFIG_VIDEO_SUNXI is not set CONFIG_SPL_SPI_SUNXI=y -# CONFIG_SYSRESET is not set |