pomfi/balena-allwinner
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix merge conflicts

Browse source
This commit is contained in:
Shaun Mulligan 2017-12-10 13:45:11 +01:00
commit 7431b8cd2d
6 changed files with 5 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitmodules vendored
View file

@ -3,7 +3,7 @@
url = https://github.com/resin-os/resin-yocto-scripts.git url = https://github.com/resin-os/resin-yocto-scripts.git
[submodule "layers/poky"] [submodule "layers/poky"]
path = layers/poky path = layers/poky
url = http://git.yoctoproject.org/cgit/cgit.cgi/poky url = https://git.yoctoproject.org/git/poky
[submodule "layers/meta-openembedded"] [submodule "layers/meta-openembedded"]
path = layers/meta-openembedded path = layers/meta-openembedded
url = https://github.com/openembedded/meta-openembedded url = https://github.com/openembedded/meta-openembedded

1
layers/meta-resin-allwinner/conf/samples/conf-notes.txt
View file

@ -13,4 +13,3 @@ Resin specific targets are:
Nanopi Neo Air (EXPERIMENTAL) : $ MACHINE=nanopi-neo-air bitbake resin-image Nanopi Neo Air (EXPERIMENTAL) : $ MACHINE=nanopi-neo-air bitbake resin-image
Orange Pi Lite (EXPERIMENTAL) : $ MACHINE=orange-pi-lite bitbake resin-image Orange Pi Lite (EXPERIMENTAL) : $ MACHINE=orange-pi-lite bitbake resin-image

3
layers/meta-resin-allwinner/conf/samples/local.conf.sample
View file

@ -42,9 +42,6 @@ DISTRO ?= "resin-systemd"
# Remove the old image before the new one is generated to save disk space when RM_OLD_IMAGE is set to 1, this is an easy way to keep the DEPLOY_DIR_IMAGE clean. # Remove the old image before the new one is generated to save disk space when RM_OLD_IMAGE is set to 1, this is an easy way to keep the DEPLOY_DIR_IMAGE clean.
RM_OLD_IMAGE = "1" RM_OLD_IMAGE = "1"
# Package Management configuration
PACKAGE_CLASSES ?= "package_rpm"
# Additional image features # Additional image features
USER_CLASSES ?= "buildstats image-mklibs image-prelink" USER_CLASSES ?= "buildstats image-mklibs image-prelink"

6
layers/meta-resin-allwinner/recipes-bsp/u-boot/u-boot/enable-DT-overlays-support.patch
View file

@ -1,11 +1,11 @@
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 0ed36cded..822ebb812 100644 index d7a9b11..388d19b 100644
--- a/arch/arm/Kconfig --- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig +++ b/arch/arm/Kconfig
@@ -578,6 +578,7 @@ config ARCH_SUNXI @@ -562,6 +562,7 @@ config ARCH_SUNXI
select CMD_GPIO select CMD_GPIO
select CMD_MMC if MMC select CMD_MMC if MMC
select CMD_USB if DISTRO_DEFAULTS select CMD_USB
+ select OF_LIBFDT_OVERLAY + select OF_LIBFDT_OVERLAY
select DM select DM
select DM_ETH select DM_ETH

13
layers/meta-resin-allwinner/recipes-bsp/u-boot/u-boot/h3-adjust-dram-frequency.patch
View file

@ -50,16 +50,3 @@ index f2ed941..e8219bb 100644
CONFIG_DRAM_ZQ=3881979 CONFIG_DRAM_ZQ=3881979
CONFIG_DRAM_ODT_EN=y CONFIG_DRAM_ODT_EN=y
CONFIG_MMC_SUNXI_SLOT_EXTRA=2 CONFIG_MMC_SUNXI_SLOT_EXTRA=2
diff --git a/configs/orangepi_zero_defconfig b/configs/orangepi_zero_defconfig
index ac44937..0e761b6 100644
--- a/configs/orangepi_zero_defconfig
+++ b/configs/orangepi_zero_defconfig
@@ -2,7 +2,7 @@ CONFIG_ARM=y
CONFIG_ARCH_SUNXI=y
CONFIG_SPL_SPI_FLASH_SUPPORT=y
CONFIG_MACH_SUN8I_H3=y
-CONFIG_DRAM_CLK=672
+CONFIG_DRAM_CLK=408
CONFIG_DRAM_ZQ=3881979
CONFIG_DRAM_ODT_EN=y
CONFIG_DEFAULT_DEVICE_TREE="sun8i-h2-plus-orangepi-zero"

2
layers/meta-resin-allwinner/recipes-kernel/linux/linux_4.11%.bbappend
View file

@ -26,8 +26,6 @@ SRC_URI_append = " \
file://scripts-dtc-import-updates.patch \ file://scripts-dtc-import-updates.patch \
file://spidev-remove-warnings.patch \ file://spidev-remove-warnings.patch \
file://spi-sun6i-allow-large-transfers.patch \ file://spi-sun6i-allow-large-transfers.patch \
file://defconfig \
"
SRC_URI_append_orange-pi-lite = " \ SRC_URI_append_orange-pi-lite = " \
file://add-realtek-8189fs-driver.patch \ file://add-realtek-8189fs-driver.patch \