diff options
author | Tom Rini <trini@konsulko.com> | 2018-08-04 19:41:30 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2018-08-04 19:41:30 -0400 |
commit | 0cba6e906a5a94b68dc4b42dc5e9bca8e77798f7 (patch) | |
tree | f5160ba496f6e75862800726c989a616f5551547 /configs | |
parent | d64caaf77dec2f0a576d0d1f7c7f4f463ebc7de8 (diff) | |
parent | 89a897fc4d78e31332e5899e977d8bf3c82abafa (diff) | |
download | u-boot-0cba6e906a5a94b68dc4b42dc5e9bca8e77798f7.tar.gz |
Merge branch 'master' of git://git.denx.de/u-boot-sunxi
Diffstat (limited to 'configs')
-rw-r--r-- | configs/bananapi_m2_berry_defconfig | 3 | ||||
-rw-r--r-- | configs/orangepi_one_plus_defconfig | 14 | ||||
-rw-r--r-- | configs/pine_h64_defconfig | 15 |
3 files changed, 32 insertions, 0 deletions
diff --git a/configs/bananapi_m2_berry_defconfig b/configs/bananapi_m2_berry_defconfig index 9d75108d04..313e09a764 100644 --- a/configs/bananapi_m2_berry_defconfig +++ b/configs/bananapi_m2_berry_defconfig @@ -7,8 +7,11 @@ CONFIG_DRAM_ZQ=3881979 CONFIG_DRAM_ODT_EN=y CONFIG_MMC0_CD_PIN="PH13" CONFIG_DEFAULT_DEVICE_TREE="sun8i-v40-bananapi-m2-berry" +CONFIG_AHCI=y # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set CONFIG_SPL_I2C_SUPPORT=y # CONFIG_CMD_FLASH is not set +CONFIG_SCSI_AHCI=y CONFIG_AXP_DLDO4_VOLT=2500 CONFIG_AXP_ELDO3_VOLT=1200 +CONFIG_SCSI=y diff --git a/configs/orangepi_one_plus_defconfig b/configs/orangepi_one_plus_defconfig new file mode 100644 index 0000000000..48bc6e54ee --- /dev/null +++ b/configs/orangepi_one_plus_defconfig @@ -0,0 +1,14 @@ +CONFIG_ARM=y +CONFIG_ARCH_SUNXI=y +CONFIG_MACH_SUN50I_H6=y +CONFIG_DRAM_ODT_EN=y +CONFIG_MMC0_CD_PIN="PF6" +# CONFIG_PSCI_RESET is not set +CONFIG_DEFAULT_DEVICE_TREE="sun50i-h6-orangepi-one-plus" +# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set +CONFIG_SPL=y +# CONFIG_CMD_FLASH is not set +# CONFIG_CMD_FPGA is not set +# CONFIG_SPL_DOS_PARTITION is not set +# CONFIG_SPL_ISO_PARTITION is not set +# CONFIG_SPL_EFI_PARTITION is not set diff --git a/configs/pine_h64_defconfig b/configs/pine_h64_defconfig new file mode 100644 index 0000000000..e9596c0284 --- /dev/null +++ b/configs/pine_h64_defconfig @@ -0,0 +1,15 @@ +CONFIG_ARM=y +CONFIG_ARCH_SUNXI=y +CONFIG_MACH_SUN50I_H6=y +CONFIG_DRAM_ODT_EN=y +CONFIG_MMC0_CD_PIN="PF6" +CONFIG_MMC_SUNXI_SLOT_EXTRA=2 +# CONFIG_PSCI_RESET is not set +CONFIG_DEFAULT_DEVICE_TREE="sun50i-h6-pine-h64" +# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set +CONFIG_SPL=y +# CONFIG_CMD_FLASH is not set +# CONFIG_CMD_FPGA is not set +# CONFIG_SPL_DOS_PARTITION is not set +# CONFIG_SPL_ISO_PARTITION is not set +# CONFIG_SPL_EFI_PARTITION is not set |