From a46e291d4616305bcc0c8eda700bceb621a82083 Mon Sep 17 00:00:00 2001 From: Will Newton Date: Tue, 12 Sep 2017 16:15:27 +0200 Subject: [PATCH 1/8] .gitignore: New file Signed-off-by: Will Newton --- .gitignore | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..89c0ed1 --- /dev/null +++ b/.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 From c6ed28b1850e3a35406b621b78d319748ef783b2 Mon Sep 17 00:00:00 2001 From: Will Newton Date: Tue, 12 Sep 2017 16:15:52 +0200 Subject: [PATCH 2/8] .gitmodules: Update poky git URL Use git directly rather than point at cgit. Signed-off-by: Will Newton --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index eb27e5f..5ae1dc7 100644 --- a/.gitmodules +++ b/.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 From dfa63e9c919e14d59d7c23c2b12503ad23b28d7d Mon Sep 17 00:00:00 2001 From: Will Newton Date: Tue, 12 Sep 2017 16:17:02 +0200 Subject: [PATCH 3/8] layers/meta-resin: Update to v2.5.0 Signed-off-by: Will Newton --- layers/meta-resin | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/layers/meta-resin b/layers/meta-resin index 7192cd2..1725927 160000 --- a/layers/meta-resin +++ b/layers/meta-resin @@ -1 +1 @@ -Subproject commit 7192cd27fe72ced1d26f9f6763502370c6087236 +Subproject commit 17259277403b435724166fe11d5173661fae3c6a From 62ef369f80aef1096b3e661be83115a15b1862a3 Mon Sep 17 00:00:00 2001 From: Will Newton Date: Tue, 12 Sep 2017 16:17:28 +0200 Subject: [PATCH 4/8] layers/meta-sunxi: Update to latest morty version Signed-off-by: Will Newton --- layers/meta-sunxi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/layers/meta-sunxi b/layers/meta-sunxi index a84d6a4..318c872 160000 --- a/layers/meta-sunxi +++ b/layers/meta-sunxi @@ -1 +1 @@ -Subproject commit a84d6a40c1c786c64824e8e13b289fccc0b32b92 +Subproject commit 318c872680fb095910a4d1c81a596152605c365e From 01a6af92d1cd73f1e7eac6f06d3020f021ddf2b8 Mon Sep 17 00:00:00 2001 From: Will Newton Date: Tue, 12 Sep 2017 16:18:19 +0200 Subject: [PATCH 5/8] local.conf.sample: Disable RPM packages ResinOS now relies on IPK packages being built. Signed-off-by: Will Newton --- layers/meta-resin-allwinner/conf/samples/local.conf.sample | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/layers/meta-resin-allwinner/conf/samples/local.conf.sample b/layers/meta-resin-allwinner/conf/samples/local.conf.sample index ec6001e..e9a999c 100644 --- a/layers/meta-resin-allwinner/conf/samples/local.conf.sample +++ b/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" \ No newline at end of file +CONF_VERSION = "1" From 8d131e69748b2433440a80ed762f1345c81e01b1 Mon Sep 17 00:00:00 2001 From: Will Newton Date: Tue, 12 Sep 2017 16:19:14 +0200 Subject: [PATCH 6/8] linux: Update Orange Pi kernel commit The previous commit hash seemed to have gone missing. Signed-off-by: Will Newton --- .../recipes-kernel/linux/linux_%.bbappend | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/layers/meta-resin-allwinner/recipes-kernel/linux/linux_%.bbappend b/layers/meta-resin-allwinner/recipes-kernel/linux/linux_%.bbappend index 517579d..c5d9bcb 100644 --- a/layers/meta-resin-allwinner/recipes-kernel/linux/linux_%.bbappend +++ b/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 \ - " \ No newline at end of file + " From 871b7524cc8a3c396784df7d3a1731ef38f09c82 Mon Sep 17 00:00:00 2001 From: Will Newton Date: Tue, 12 Sep 2017 16:20:04 +0200 Subject: [PATCH 7/8] u-boot: Fix up patches for latest u-boot Minor changes to patches to make them apply. Signed-off-by: Will Newton --- .../u-boot/u-boot/enable-DT-overlays-support.patch | 6 +++--- .../u-boot/u-boot/h3-adjust-dram-frequency.patch | 13 ------------- 2 files changed, 3 insertions(+), 16 deletions(-) diff --git a/layers/meta-resin-allwinner/recipes-bsp/u-boot/u-boot/enable-DT-overlays-support.patch b/layers/meta-resin-allwinner/recipes-bsp/u-boot/u-boot/enable-DT-overlays-support.patch index e31df42..32c8dbf 100644 --- a/layers/meta-resin-allwinner/recipes-bsp/u-boot/u-boot/enable-DT-overlays-support.patch +++ b/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 diff --git a/layers/meta-resin-allwinner/recipes-bsp/u-boot/u-boot/h3-adjust-dram-frequency.patch b/layers/meta-resin-allwinner/recipes-bsp/u-boot/u-boot/h3-adjust-dram-frequency.patch index 22f1378..1dacb2c 100644 --- a/layers/meta-resin-allwinner/recipes-bsp/u-boot/u-boot/h3-adjust-dram-frequency.patch +++ b/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" \ No newline at end of file From bcfe059edfa64c96abdbf2aec2c201ece1c26267 Mon Sep 17 00:00:00 2001 From: Will Newton Date: Tue, 12 Sep 2017 16:20:49 +0200 Subject: [PATCH 8/8] conf-notes.txt: Update list of boards Signed-off-by: Will Newton --- layers/meta-resin-allwinner/conf/samples/conf-notes.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/layers/meta-resin-allwinner/conf/samples/conf-notes.txt b/layers/meta-resin-allwinner/conf/samples/conf-notes.txt index bdd24cd..cda69bc 100644 --- a/layers/meta-resin-allwinner/conf/samples/conf-notes.txt +++ b/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