diff options
| author | Tom Rini <trini@konsulko.com> | 2016-07-26 18:33:04 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-07-26 18:33:04 -0400 |
| commit | 0b6699ad8ea95803d7ce40d1dc1caea902a6d22c (patch) | |
| tree | 56dff240daa78cd0bb10233d4863691be3590504 /configs | |
| parent | 4fd92db8dbf6d9275a921e8e9f2b6aeeba7e5002 (diff) | |
| parent | 2eb1ff3b5b61352dcf43ca48f2b6470ec312b8d7 (diff) | |
| download | u-boot-imx-0b6699ad8ea95803d7ce40d1dc1caea902a6d22c.zip u-boot-imx-0b6699ad8ea95803d7ce40d1dc1caea902a6d22c.tar.gz u-boot-imx-0b6699ad8ea95803d7ce40d1dc1caea902a6d22c.tar.bz2 | |
Merge branch 'master' of http://git.denx.de/u-boot-sunxi
Diffstat (limited to 'configs')
| -rw-r--r-- | configs/orangepi_pc_defconfig | 2 | ||||
| -rw-r--r-- | configs/orangepi_pc_plus_defconfig | 17 | ||||
| -rw-r--r-- | configs/pine64_plus_defconfig | 1 |
3 files changed, 17 insertions, 3 deletions
diff --git a/configs/orangepi_pc_defconfig b/configs/orangepi_pc_defconfig index 43ec927..366fa08 100644 --- a/configs/orangepi_pc_defconfig +++ b/configs/orangepi_pc_defconfig @@ -5,7 +5,6 @@ CONFIG_DRAM_CLK=624 CONFIG_DRAM_ZQ=3881979 CONFIG_DRAM_ODT_EN=y CONFIG_MMC0_CD_PIN="PF6" -CONFIG_MMC_SUNXI_SLOT_EXTRA=2 # CONFIG_VIDEO is not set CONFIG_DEFAULT_DEVICE_TREE="sun8i-h3-orangepi-pc" # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set @@ -15,4 +14,3 @@ CONFIG_SPL=y # CONFIG_CMD_FPGA is not set CONFIG_SY8106A_POWER=y CONFIG_USB_EHCI_HCD=y -CONFIG_SUN8I_EMAC=y diff --git a/configs/orangepi_pc_plus_defconfig b/configs/orangepi_pc_plus_defconfig new file mode 100644 index 0000000..c78aec3 --- /dev/null +++ b/configs/orangepi_pc_plus_defconfig @@ -0,0 +1,17 @@ +CONFIG_ARM=y +CONFIG_ARCH_SUNXI=y +CONFIG_MACH_SUN8I_H3=y +CONFIG_DRAM_CLK=624 +CONFIG_DRAM_ZQ=3881979 +CONFIG_DRAM_ODT_EN=y +CONFIG_MMC0_CD_PIN="PF6" +CONFIG_MMC_SUNXI_SLOT_EXTRA=2 +# CONFIG_VIDEO is not set +CONFIG_DEFAULT_DEVICE_TREE="sun8i-h3-orangepi-pc-plus" +# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set +CONFIG_SPL=y +# CONFIG_CMD_IMLS is not set +# CONFIG_CMD_FLASH is not set +# CONFIG_CMD_FPGA is not set +CONFIG_SY8106A_POWER=y +CONFIG_USB_EHCI_HCD=y diff --git a/configs/pine64_plus_defconfig b/configs/pine64_plus_defconfig index 5c97de1..0bf79bf 100644 --- a/configs/pine64_plus_defconfig +++ b/configs/pine64_plus_defconfig @@ -10,4 +10,3 @@ CONFIG_DEFAULT_DEVICE_TREE="sun50i-a64-pine64-plus" # CONFIG_CMD_FLASH is not set # CONFIG_CMD_FPGA is not set CONFIG_ENABLE_ARM_SOC_BOOT0_HOOK=y -CONFIG_SUN8I_EMAC=y |