diff options
author | Tom Rini <trini@konsulko.com> | 2017-04-06 12:28:03 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2017-04-06 20:40:24 -0400 |
commit | d53ecad92f06d2e38a5cbc13af7473867c7fa277 (patch) | |
tree | cd46314f18a4e1b538a7973f1b74935f4ca2b096 /configs | |
parent | 891f7ae63318293cd5807fb611f86f545080b1f6 (diff) | |
parent | e7bd15ea156f2a65d6aba167b9b7cd711caae2e6 (diff) |
Merge branch 'master' of git://git.denx.de/u-boot-sunxi
trini: Disable CONFIG_SPL_USE_ARCH_MEMSET on orangepi_2
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'configs')
-rw-r--r-- | configs/orangepi_2_defconfig | 1 | ||||
-rw-r--r-- | configs/orangepi_pc2_defconfig | 19 |
2 files changed, 20 insertions, 0 deletions
diff --git a/configs/orangepi_2_defconfig b/configs/orangepi_2_defconfig index e14cb9d80e..201771ee8f 100644 --- a/configs/orangepi_2_defconfig +++ b/configs/orangepi_2_defconfig @@ -1,4 +1,5 @@ CONFIG_ARM=y +# CONFIG_SPL_USE_ARCH_MEMSET is not set CONFIG_ARCH_SUNXI=y CONFIG_MACH_SUN8I_H3=y CONFIG_DRAM_CLK=672 diff --git a/configs/orangepi_pc2_defconfig b/configs/orangepi_pc2_defconfig new file mode 100644 index 0000000000..19a5c2b882 --- /dev/null +++ b/configs/orangepi_pc2_defconfig @@ -0,0 +1,19 @@ +CONFIG_ARM=y +CONFIG_ARCH_SUNXI=y +CONFIG_MACH_SUN50I_H5=y +CONFIG_SPL=y +CONFIG_DRAM_CLK=672 +CONFIG_DRAM_ZQ=3881977 +CONFIG_DEFAULT_DEVICE_TREE="sun50i-h5-orangepi-pc2" +# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set +CONFIG_CONSOLE_MUX=y +# CONFIG_CMD_IMLS is not set +# 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 +CONFIG_SUN8I_EMAC=y +CONFIG_USB_EHCI_HCD=y +CONFIG_SPL_SPI_SUNXI=y +CONFIG_SPL_SPI_FLASH_SUPPORT=y |