Merge pull request #6 from willnewton/random-fixes

Random fixes

.gitignore

@@ -0,0 +1,15 @@
+# Ignore build directory
+build*/
+
+# Ignore shared directories
+shared-*/
+
+# Some log files from scripts
+*.log
+
+# device type manifest stuff
+/node_modules
+*.json
+
+# dynamically created by the build script
+conf-notes.txt

.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

@@ -1 +1 @@
-Subproject commit 7192cd27fe72ced1d26f9f6763502370c6087236
+Subproject commit 17259277403b435724166fe11d5173661fae3c6a

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

@@ -11,6 +11,6 @@
 Resin specific targets are:
 	resin-image
 
-Nanopi Neo (EXPERIMENTAL)           : $ MACHINE=nanopi-neo bitbake resin-image
+Orange Pi Lite (EXPERIMENTAL)       : $ MACHINE=orange-pi-lite bitbake resin-image
 orange pi one (EXPERIMENTAL)        : $ MACHINE=orange-pi-one bitbake resin-image
 

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

@@ -41,9 +41,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"
 
@@ -59,4 +56,4 @@ BB_DISKMON_DIRS = "\
     ABORT,${DL_DIR},100M,1K \
     ABORT,${SSTATE_DIR},100M,1K"
 
-CONF_VERSION = "1"
+CONF_VERSION = "1"

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_%.bbappend

@@ -5,7 +5,7 @@ SRC_URI_remove = "git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.g
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
 PV = "4.11.0+git${SRCPV}"
-SRCREV_pn-${PN} = "22521549cdcd4d701cf3079c3a822bda5324df9c"
+SRCREV_pn-${PN} = "e2f9fc4795ca9bf740822cad9e0e54ea33a060fb"
 SRC_URI_append = "git://github.com/megous/linux.git;protocol=git;branch=orange-pi-4.11 \
     file://411-fix-i2c2-reg-property.patch \
     file://411-add-thermal-otg-wireless-opi-lite.patch \
@@ -144,4 +144,4 @@ RESIN_CONFIGS[audio] ?= " \
     CONFIG_SND_SIMPLE_CARD_UTILS=m \
     CONFIG_SND_SIMPLE_CARD=m \
     CONFIG_SND_SIMPLE_SCU_CARD=m \
-    "
+    "

layers/meta-sunxi

@@ -1 +1 @@
-Subproject commit a84d6a40c1c786c64824e8e13b289fccc0b32b92
+Subproject commit 318c872680fb095910a4d1c81a596152605c365e