fix merge conflicts

.gitmodules

@@ -3,7 +3,7 @@
 	url = https://github.com/resin-os/resin-yocto-scripts.git
 [submodule "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"]
 	path = layers/meta-openembedded
 	url = https://github.com/openembedded/meta-openembedded

layers/meta-resin-allwinner/conf/samples/conf-notes.txt

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

layers/meta-resin-allwinner/conf/samples/local.conf.sample

@@ -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.
 RM_OLD_IMAGE = "1"
 
-# Package Management configuration
-PACKAGE_CLASSES ?= "package_rpm"
-
 # Additional image features
 USER_CLASSES ?= "buildstats image-mklibs image-prelink"
 

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

@@ -1,11 +1,11 @@
 diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
-index 0ed36cded..822ebb812 100644
+index d7a9b11..388d19b 100644
 --- a/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_MMC if MMC
- 	select CMD_USB if DISTRO_DEFAULTS
+ 	select CMD_USB
 +	select OF_LIBFDT_OVERLAY
  	select DM
  	select DM_ETH

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

@@ -50,16 +50,3 @@ index f2ed941..e8219bb 100644
  CONFIG_DRAM_ZQ=3881979
  CONFIG_DRAM_ODT_EN=y
  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"

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

@@ -26,8 +26,6 @@ SRC_URI_append = " \
     file://scripts-dtc-import-updates.patch \
     file://spidev-remove-warnings.patch \
     file://spi-sun6i-allow-large-transfers.patch \
-    file://defconfig \
-"
 
 SRC_URI_append_orange-pi-lite = " \
     file://add-realtek-8189fs-driver.patch \
@@ -158,4 +156,4 @@ RESIN_CONFIGS[audio] ?= " \
     CONFIG_SND_SIMPLE_CARD_UTILS=m \
     CONFIG_SND_SIMPLE_CARD=m \
     CONFIG_SND_SIMPLE_SCU_CARD=m \
-    "
+    "