diff options
author | Tom Rini <trini@konsulko.com> | 2022-04-05 08:33:32 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2022-04-05 08:33:32 -0400 |
commit | 4de720e98d552dfda9278516bf788c4a73b3e56f (patch) | |
tree | 063af389b20d9b742486a1a834978676d1f42e87 /configs | |
parent | 01f1ab67f38882dc7665a0a6eca4bbeba6d84f81 (diff) | |
parent | 69a0ea007826bf27584943591e61ee087683fdca (diff) | |
download | u-boot-4de720e98d552dfda9278516bf788c4a73b3e56f.zip u-boot-4de720e98d552dfda9278516bf788c4a73b3e56f.tar.gz u-boot-4de720e98d552dfda9278516bf788c4a73b3e56f.tar.bz2 |
Merge branch 'master' of https://source.denx.de/u-boot/custodians/u-boot-sunxi
A big part is the DM pinctrl driver, which allows us to get rid of quite
some custom pinmux code and make the whole port much more robust. Many
thanks to Samuel for that nice contribution! There are some more or less
cosmetic warnings about missing clocks right now, I will send the trivial
fixes for that later.
Another big chunk is the mkimage upgrade, which adds RISC-V and TOC0
(secure images) support. Both features are unused at the moment, but I
have an always-secure board that will use that once the DT lands in the
kernel.
On top of those big things we have some smaller fixes, improving the
I2C DM support, fixing some H6/H616 early clock setup and improving the
eMMC boot partition support.
The gitlab CI completed successfully, including the build test for all
161 sunxi boards. I also boot tested on a A64, A20, H3, H6, and F1C100
board. USB, SD card, eMMC, and Ethernet all work there (where applicable).
Diffstat (limited to 'configs')
-rw-r--r-- | configs/bananapi_m64_defconfig | 1 | ||||
-rw-r--r-- | configs/emlid_neutis_n5_devboard_defconfig | 1 | ||||
-rw-r--r-- | configs/pine64-lts_defconfig | 1 | ||||
-rw-r--r-- | configs/pine_h64_defconfig | 1 | ||||
-rw-r--r-- | configs/sopine_baseboard_defconfig | 1 |
5 files changed, 5 insertions, 0 deletions
diff --git a/configs/bananapi_m64_defconfig b/configs/bananapi_m64_defconfig index 292044d..5463b04 100644 --- a/configs/bananapi_m64_defconfig +++ b/configs/bananapi_m64_defconfig @@ -7,6 +7,7 @@ CONFIG_RESERVE_ALLWINNER_BOOT0_HEADER=y CONFIG_MMC0_CD_PIN="PH13" CONFIG_MMC_SUNXI_SLOT_EXTRA=2 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set +CONFIG_SUPPORT_EMMC_BOOT=y CONFIG_SUN8I_EMAC=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_OHCI_HCD=y diff --git a/configs/emlid_neutis_n5_devboard_defconfig b/configs/emlid_neutis_n5_devboard_defconfig index e2d3b13..a3b43df 100644 --- a/configs/emlid_neutis_n5_devboard_defconfig +++ b/configs/emlid_neutis_n5_devboard_defconfig @@ -8,3 +8,4 @@ CONFIG_DRAM_ZQ=3881977 # CONFIG_DRAM_ODT_EN is not set CONFIG_MMC_SUNXI_SLOT_EXTRA=2 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set +CONFIG_SUPPORT_EMMC_BOOT=y diff --git a/configs/pine64-lts_defconfig b/configs/pine64-lts_defconfig index 45a9e77..7e7c2d7 100644 --- a/configs/pine64-lts_defconfig +++ b/configs/pine64-lts_defconfig @@ -10,6 +10,7 @@ CONFIG_MMC0_CD_PIN="" CONFIG_MMC_SUNXI_SLOT_EXTRA=2 CONFIG_SPL_SPI_SUNXI=y # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set +CONFIG_SUPPORT_EMMC_BOOT=y CONFIG_SPI_FLASH_WINBOND=y CONFIG_SUN8I_EMAC=y CONFIG_SPI=y diff --git a/configs/pine_h64_defconfig b/configs/pine_h64_defconfig index 1e730dd..09a4275 100644 --- a/configs/pine_h64_defconfig +++ b/configs/pine_h64_defconfig @@ -11,6 +11,7 @@ CONFIG_USB3_VBUS_PIN="PL5" CONFIG_SPL_SPI_SUNXI=y # CONFIG_PSCI_RESET is not set # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set +CONFIG_SUPPORT_EMMC_BOOT=y CONFIG_SPI_FLASH_WINBOND=y CONFIG_SUN8I_EMAC=y CONFIG_PHY_SUN50I_USB3=y diff --git a/configs/sopine_baseboard_defconfig b/configs/sopine_baseboard_defconfig index 982f7b0..fbbef7a 100644 --- a/configs/sopine_baseboard_defconfig +++ b/configs/sopine_baseboard_defconfig @@ -11,6 +11,7 @@ CONFIG_MMC0_CD_PIN="" CONFIG_MMC_SUNXI_SLOT_EXTRA=2 CONFIG_SPL_SPI_SUNXI=y # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set +CONFIG_SUPPORT_EMMC_BOOT=y CONFIG_SPI_FLASH_WINBOND=y CONFIG_SUN8I_EMAC=y CONFIG_SPI=y |