diff options
| author | Tom Rini <trini@konsulko.com> | 2019-07-16 11:19:31 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-07-16 11:19:31 -0400 |
| commit | 0e80dda32c8d724c2a98dbbfb2f1e59762788f15 (patch) | |
| tree | a569b9b170c85a3bcae895c21c72def941ca9af9 /configs/orangepi_r1_defconfig | |
| parent | 9c94e0a64490b90d48995a8230499167c0bdca68 (diff) | |
| parent | f96238e253661b43168352010a2628957940bd4b (diff) | |
Merge branch 'master' of https://gitlab.denx.de/u-boot/custodians/u-boot-sunxi
- Beelink-x2 STB support (Marcus)
- H6 DDR3, LPDDR3 changes (Andre, Jernej)
- H6 pin controller, USB PHY (Andre)
Diffstat (limited to 'configs/orangepi_r1_defconfig')
| -rw-r--r-- | configs/orangepi_r1_defconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/configs/orangepi_r1_defconfig b/configs/orangepi_r1_defconfig index 2b2d6f2f8e..d80d83a5db 100644 --- a/configs/orangepi_r1_defconfig +++ b/configs/orangepi_r1_defconfig @@ -8,7 +8,6 @@ CONFIG_DRAM_CLK=624 CONFIG_SPL_SPI_SUNXI=y # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set CONFIG_CONSOLE_MUX=y -CONFIG_SPL_TEXT_BASE=0x60 # CONFIG_CMD_FLASH is not set CONFIG_DEFAULT_DEVICE_TREE="sun8i-h2-plus-orangepi-r1" CONFIG_SUN8I_EMAC=y |