From 596586b7522256bcd664d28d1a7072a6f8831b4d Mon Sep 17 00:00:00 2001
From: David Phillips <david@yeah.nah.nz>
Date: Sun, 24 Nov 2019 14:27:12 +1300
Subject: Tweaks for zeus upgrade
---
conf/layer.conf | 1 +
conf/machine/include/de10-nano-common.inc | 8 ++++----
recipes-images/angstrom/de10-nano-image.bb | 2 --
recipes-kernel/linux/linux-yocto_5%.bbappend | 7 +++++++
recipes-misc/de10-nano-fpga-init/de10-nano-fpga-init.bb | 2 +-
recipes-misc/de10-nano-fpga-leds/de10-nano-fpga-leds.bb | 2 +-
recipes-misc/de10-nano-usb-gadget/de10-nano-usb-gadget.bb | 2 +-
7 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/conf/layer.conf b/conf/layer.conf
index 22a745e..ab55aa1 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -9,6 +9,7 @@ BBFILE_PATTERN_meta-de10-nano := "^${LAYERDIR}/"
# increase the number
BBFILE_PRIORITY_meta-de10-nano = "9"
LAYERDEPENDS_meta-de10-nano = "meta-altera"
+LAYERSERIES_COMPAT_meta-de10-nano = "zeus"
# this is just for release builds
META_DE10_NANO_BASE := '${LAYERDIR}'
diff --git a/conf/machine/include/de10-nano-common.inc b/conf/machine/include/de10-nano-common.inc
index 307cd12..a64fa3f 100644
--- a/conf/machine/include/de10-nano-common.inc
+++ b/conf/machine/include/de10-nano-common.inc
@@ -32,10 +32,11 @@ INHERIT += " rootfs_ipk "
BAD_RECOMMENDATIONS = " libavahi-core avahi-utils avahi-daemon avahi-autoipd libnss-mdns cpufrequtils fbset consolekit wireless-tools "
RDEPENDS_pulseaudio-module-console-kit_remove = "consolekit"
-DISTRO_FEATURES_remove = "opengl"
-DISTRO_FEATURES_remove = "opencl"
-DISTRO_FEATURES_remove = "wayland"
+DISTRO_FEATURES_remove = "opengl"
+DISTRO_FEATURES_remove = "opencl"
+DISTRO_FEATURES_remove = "wayland"
DISTRO_FEATURES_remove = "zeroconf"
+DISTRO_FEATURES += "systemd"
# remove wireless-tools as it is unmaintained
VIRTUAL-RUNTIME_wireless-tools = "iw"
@@ -44,7 +45,6 @@ VIRTUAL-RUNTIME_wireless-tools = "iw"
INHERIT += " extrausers "
EXTRA_USERS_PARAMS = "usermod -p U6aMy0wojraho root;"
-require conf/distro/include/security_flags.inc
# with security flags, some packages fail
SECURITY_CFLAGS_pn-libvncserver = ""
diff --git a/recipes-images/angstrom/de10-nano-image.bb b/recipes-images/angstrom/de10-nano-image.bb
index 454db09..828bd28 100644
--- a/recipes-images/angstrom/de10-nano-image.bb
+++ b/recipes-images/angstrom/de10-nano-image.bb
@@ -18,8 +18,6 @@ IMAGE_INSTALL += " \
kernel-dev \
linux-firmware \
systemd \
- gcc \
- gdb gdbserver \
lighttpd \
lighttpd-module-cgi \
bash gcc i2c-tools ethtool \
diff --git a/recipes-kernel/linux/linux-yocto_5%.bbappend b/recipes-kernel/linux/linux-yocto_5%.bbappend
index a67ffc4..33f4a97 100644
--- a/recipes-kernel/linux/linux-yocto_5%.bbappend
+++ b/recipes-kernel/linux/linux-yocto_5%.bbappend
@@ -22,6 +22,9 @@ SRC_URI_append_de0-nano += " \
file://socfpga-4.1-ltsi/cfg/bluetooth.cfg \
file://socfpga-4.1-ltsi/cfg/wireless.cfg \
file://socfpga-4.1-ltsi/patches/0001-Add-DE10-Nano-devicetree.patch \
+ file://socfpga-4.1-ltsi/patches/0001-ARM-dts-socfpga-update-more-missing-reset-properties.patch \
+ file://socfpga-4.1-ltsi/patches/0001-ARM-dts-socfpga-add-missing-reset-names-for-dma.patch \
+ file://socfpga-4.1-ltsi/patches/0001-ARM-8906-1-drivers-amba-add-reset-control-to-amba-bu.patch \
"
SRC_URI_append_de10-nano += " \
file://socfpga-4.1-ltsi/cfg/configfs.cfg \
@@ -35,4 +38,8 @@ SRC_URI_append_de10-nano += " \
file://socfpga-4.1-ltsi/cfg/bluetooth.cfg \
file://socfpga-4.1-ltsi/cfg/wireless.cfg \
file://socfpga-4.1-ltsi/patches/0001-Add-DE10-Nano-devicetree.patch \
+ file://socfpga-4.1-ltsi/patches/0001-ARM-dts-socfpga-add-missing-reset-names-for-dma.patch \
+ file://socfpga-4.1-ltsi/patches/0001-ARM-8906-1-drivers-amba-add-reset-control-to-amba-bu.patch \
"
+
+# file://socfpga-4.1-ltsi/patches/0001-ARM-dts-socfpga-update-more-missing-reset-properties.patch
diff --git a/recipes-misc/de10-nano-fpga-init/de10-nano-fpga-init.bb b/recipes-misc/de10-nano-fpga-init/de10-nano-fpga-init.bb
index d7fad4d..fd8f2f8 100644
--- a/recipes-misc/de10-nano-fpga-init/de10-nano-fpga-init.bb
+++ b/recipes-misc/de10-nano-fpga-init/de10-nano-fpga-init.bb
@@ -8,7 +8,7 @@ PR = "r0"
inherit systemd
LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d690"
+LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
PACKAGE_ARCH = "${MACHINE_ARCH}"
PV = "1.0${PR}"
diff --git a/recipes-misc/de10-nano-fpga-leds/de10-nano-fpga-leds.bb b/recipes-misc/de10-nano-fpga-leds/de10-nano-fpga-leds.bb
index e38a2fa..9b03017 100644
--- a/recipes-misc/de10-nano-fpga-leds/de10-nano-fpga-leds.bb
+++ b/recipes-misc/de10-nano-fpga-leds/de10-nano-fpga-leds.bb
@@ -8,7 +8,7 @@ PR = "r0"
inherit systemd
LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d690"
+LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
PACKAGE_ARCH = "${MACHINE_ARCH}"
diff --git a/recipes-misc/de10-nano-usb-gadget/de10-nano-usb-gadget.bb b/recipes-misc/de10-nano-usb-gadget/de10-nano-usb-gadget.bb
index 9c09c00..3aaebae 100644
--- a/recipes-misc/de10-nano-usb-gadget/de10-nano-usb-gadget.bb
+++ b/recipes-misc/de10-nano-usb-gadget/de10-nano-usb-gadget.bb
@@ -9,7 +9,7 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
inherit systemd
LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d690"
+LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
PACKAGE_ARCH = "${MACHINE_ARCH}"
SRCREV = "e191339d28d6d26ea5a9a5aedf3c04047cc04963"
--
cgit v1.1