diff options
| author | Tom Rini <trini@konsulko.com> | 2019-05-20 13:53:51 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-05-20 13:53:51 -0400 |
| commit | 79764b5081d276596dc9294dece73354f81a6801 (patch) | |
| tree | 35b590b7fa99f65de5b44efa9e208af58dfa028d /configs | |
| parent | 956520cd7012dfa871bfd06b5f9defd148b4572c (diff) | |
| parent | c598c4837d782f6d9481f4be07ae5d679c6df976 (diff) | |
| download | u-boot-79764b5081d276596dc9294dece73354f81a6801.zip u-boot-79764b5081d276596dc9294dece73354f81a6801.tar.gz u-boot-79764b5081d276596dc9294dece73354f81a6801.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-sunxi
- H6 WDT reset fix (Clément)
- H6 SPL_TEXT_BASE fixes (Clément, Jonas)
- NPI-M1+ emac enablment (Emmanuel)
Diffstat (limited to 'configs')
| -rw-r--r-- | configs/beelink_gs1_defconfig | 1 | ||||
| -rw-r--r-- | configs/nanopi_m1_plus_defconfig | 2 | ||||
| -rw-r--r-- | configs/teres_i_defconfig | 1 |
3 files changed, 4 insertions, 0 deletions
diff --git a/configs/beelink_gs1_defconfig b/configs/beelink_gs1_defconfig index ef4dd29..437e2d9 100644 --- a/configs/beelink_gs1_defconfig +++ b/configs/beelink_gs1_defconfig @@ -7,6 +7,7 @@ CONFIG_MMC_SUNXI_SLOT_EXTRA=2 # CONFIG_PSCI_RESET is not set CONFIG_NR_DRAM_BANKS=1 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set +CONFIG_SPL_TEXT_BASE=0x20060 # CONFIG_CMD_FLASH is not set # CONFIG_SPL_DOS_PARTITION is not set # CONFIG_SPL_EFI_PARTITION is not set diff --git a/configs/nanopi_m1_plus_defconfig b/configs/nanopi_m1_plus_defconfig index ad94d58..90edbd9 100644 --- a/configs/nanopi_m1_plus_defconfig +++ b/configs/nanopi_m1_plus_defconfig @@ -4,6 +4,7 @@ CONFIG_NR_DRAM_BANKS=1 CONFIG_SPL=y CONFIG_MACH_SUN8I_H3=y CONFIG_DRAM_CLK=408 +CONFIG_MACPWR="PD6" CONFIG_MMC0_CD_PIN="PH13" CONFIG_MMC_SUNXI_SLOT_EXTRA=2 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set @@ -12,6 +13,7 @@ CONFIG_SPL_TEXT_BASE=0x60 # CONFIG_SPL_DOS_PARTITION is not set # CONFIG_SPL_EFI_PARTITION is not set CONFIG_DEFAULT_DEVICE_TREE="sun8i-h3-nanopi-m1-plus" +CONFIG_SUN8I_EMAC=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_OHCI_HCD=y CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y diff --git a/configs/teres_i_defconfig b/configs/teres_i_defconfig index 421a8d3..1b57a48 100644 --- a/configs/teres_i_defconfig +++ b/configs/teres_i_defconfig @@ -7,6 +7,7 @@ CONFIG_DRAM_ZQ=3881949 CONFIG_MMC_SUNXI_SLOT_EXTRA=2 CONFIG_USB1_VBUS_PIN="PL7" CONFIG_I2C0_ENABLE=y +CONFIG_SPL_TEXT_BASE=0x10060 # CONFIG_CMD_FLASH is not set # CONFIG_SPL_DOS_PARTITION is not set # CONFIG_SPL_EFI_PARTITION is not set |