From 73dda90587f11bf9a65649fc03857d092f2c927e Mon Sep 17 00:00:00 2001 From: Vicentiu Galanopulo Date: Fri, 11 Oct 2019 10:49:05 +0200 Subject: [PATCH] recipes-kernel/linux: Remove linux-mainline-4.17.3 The linux-mainline-4.17.3 kernel is not built anymore by any of the supported Balena machines. Changelog-entry: Remove linux-mainline-4.17.3 recipe Signed-off-by: Vicentiu Galanopulo --- ...-Enable-i2c0-on-OrangePi-Plus2-board.patch | 26 --- ...01-Revert-random-fix-crng_ready-test.patch | 75 --------- .../linux/linux-mainline-4.17.3/defconfig | 153 ------------------ .../don-t-default-activate-regdb.patch | 33 ---- .../linux/linux-mainline_4.17.3.bb | 27 ---- 5 files changed, 314 deletions(-) delete mode 100644 layers/meta-balena-allwinner/recipes-kernel/linux/linux-mainline-4.17.3/0001-Enable-i2c0-on-OrangePi-Plus2-board.patch delete mode 100644 layers/meta-balena-allwinner/recipes-kernel/linux/linux-mainline-4.17.3/0001-Revert-random-fix-crng_ready-test.patch delete mode 100644 layers/meta-balena-allwinner/recipes-kernel/linux/linux-mainline-4.17.3/defconfig delete mode 100644 layers/meta-balena-allwinner/recipes-kernel/linux/linux-mainline-4.17.3/don-t-default-activate-regdb.patch delete mode 100644 layers/meta-balena-allwinner/recipes-kernel/linux/linux-mainline_4.17.3.bb diff --git a/layers/meta-balena-allwinner/recipes-kernel/linux/linux-mainline-4.17.3/0001-Enable-i2c0-on-OrangePi-Plus2-board.patch b/layers/meta-balena-allwinner/recipes-kernel/linux/linux-mainline-4.17.3/0001-Enable-i2c0-on-OrangePi-Plus2-board.patch deleted file mode 100644 index 011064f..0000000 --- a/layers/meta-balena-allwinner/recipes-kernel/linux/linux-mainline-4.17.3/0001-Enable-i2c0-on-OrangePi-Plus2-board.patch +++ /dev/null @@ -1,26 +0,0 @@ -From cef44d8fd32cf32dc3760ba2cf520467df7585d6 Mon Sep 17 00:00:00 2001 -From: Sebastian Panceac -Date: Wed, 20 Jun 2018 11:15:30 +0200 -Subject: [PATCH] Enable i2c0 on OrangePi Plus2 board - -Upstream-Status: Inappropriate [configuration] -Signed-off-by: Sebastian Panceac ---- - arch/arm/boot/dts/sun8i-h3-orangepi-plus.dts | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/arch/arm/boot/dts/sun8i-h3-orangepi-plus.dts b/arch/arm/boot/dts/sun8i-h3-orangepi-plus.dts -index b403e5d..781b6c4 100644 ---- a/arch/arm/boot/dts/sun8i-h3-orangepi-plus.dts -+++ b/arch/arm/boot/dts/sun8i-h3-orangepi-plus.dts -@@ -122,3 +122,7 @@ - &usbphy { - usb3_vbus-supply = <®_usb3_vbus>; - }; -+ -+&i2c0 { -+ status = "okay"; -+}; --- -2.7.4 - diff --git a/layers/meta-balena-allwinner/recipes-kernel/linux/linux-mainline-4.17.3/0001-Revert-random-fix-crng_ready-test.patch b/layers/meta-balena-allwinner/recipes-kernel/linux/linux-mainline-4.17.3/0001-Revert-random-fix-crng_ready-test.patch deleted file mode 100644 index e09f066..0000000 --- a/layers/meta-balena-allwinner/recipes-kernel/linux/linux-mainline-4.17.3/0001-Revert-random-fix-crng_ready-test.patch +++ /dev/null @@ -1,75 +0,0 @@ -From 454598f8cef2fc2dead0e139e6844d7b5da624e8 Mon Sep 17 00:00:00 2001 -From: Sebastian Panceac -Date: Fri, 13 Jul 2018 15:49:58 +0300 -Subject: [PATCH] Revert "random: fix crng_ready() test" - -This reverts commit 43838a23a05fbd13e47d750d3dfd77001536dd33. - -The reason for reverting this commit is that entropy gets acquired very -hard on Orange Pi Plus2. - -The hardware crypto module is not supported yet for H3 SoC in this kernel version. -It is expected to be included in 4.18 kernel. - -As NetworkManager is depending on randomness to succesfully set its connections, if we don't revert -this commit, the board can get blocked for minutes until it succesfully connects to a network. - -This patch should be reverted immediately when upgrading to a kernel where hw crypto is supported. - -Upstream-Status: Inappropriate [configuration] -Signed-off-by: Sebastian Panceac ---- - drivers/char/random.c | 9 +++++---- - 1 file changed, 5 insertions(+), 4 deletions(-) - -diff --git a/drivers/char/random.c b/drivers/char/random.c -index cd888d4..02fa271 100644 ---- a/drivers/char/random.c -+++ b/drivers/char/random.c -@@ -428,7 +428,7 @@ struct crng_state primary_crng = { - * its value (from 0->1->2). - */ - static int crng_init = 0; --#define crng_ready() (likely(crng_init > 1)) -+#define crng_ready() (likely(crng_init > 0)) - static int crng_init_cnt = 0; - static unsigned long crng_global_init_time = 0; - #define CRNG_INIT_CNT_THRESH (2*CHACHA20_KEY_SIZE) -@@ -843,7 +843,7 @@ static int crng_fast_load(const char *cp, size_t len) - - if (!spin_trylock_irqsave(&primary_crng.lock, flags)) - return 0; -- if (crng_init != 0) { -+ if (crng_ready()) { - spin_unlock_irqrestore(&primary_crng.lock, flags); - return 0; - } -@@ -966,6 +966,7 @@ static void _extract_crng(struct crng_state *crng, - if (crng_ready() && - (time_after(crng_global_init_time, crng->init_time) || - time_after(jiffies, crng->init_time + CRNG_RESEED_INTERVAL))) -+ - crng_reseed(crng, crng == &primary_crng ? &input_pool : NULL); - spin_lock_irqsave(&crng->lock, flags); - if (arch_get_random_long(&v)) -@@ -1245,7 +1246,7 @@ void add_interrupt_randomness(int irq, int irq_flags) - fast_mix(fast_pool); - add_interrupt_bench(cycles); - -- if (unlikely(crng_init == 0)) { -+ if (!crng_ready()) { - if ((fast_pool->count >= 64) && - crng_fast_load((char *) fast_pool->pool, - sizeof(fast_pool->pool))) { -@@ -2314,7 +2315,7 @@ void add_hwgenerator_randomness(const char *buffer, size_t count, - { - struct entropy_store *poolp = &input_pool; - -- if (unlikely(crng_init == 0)) { -+ if (!crng_ready()) { - crng_fast_load(buffer, count); - return; - } --- -2.7.4 - diff --git a/layers/meta-balena-allwinner/recipes-kernel/linux/linux-mainline-4.17.3/defconfig b/layers/meta-balena-allwinner/recipes-kernel/linux/linux-mainline-4.17.3/defconfig deleted file mode 100644 index df433ab..0000000 --- a/layers/meta-balena-allwinner/recipes-kernel/linux/linux-mainline-4.17.3/defconfig +++ /dev/null @@ -1,153 +0,0 @@ -CONFIG_NO_HZ=y -CONFIG_HIGH_RES_TIMERS=y -CONFIG_CGROUPS=y -CONFIG_BLK_DEV_INITRD=y -CONFIG_PERF_EVENTS=y -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -CONFIG_ARCH_SUNXI=y -CONFIG_SMP=y -CONFIG_NR_CPUS=8 -CONFIG_AEABI=y -CONFIG_HIGHMEM=y -CONFIG_CMA=y -CONFIG_ARM_APPENDED_DTB=y -CONFIG_ARM_ATAG_DTB_COMPAT=y -CONFIG_CPU_FREQ=y -CONFIG_CPUFREQ_DT=y -CONFIG_VFP=y -CONFIG_NEON=y -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_INET=y -CONFIG_IP_PNP=y -CONFIG_IP_PNP_DHCP=y -CONFIG_IP_PNP_BOOTP=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set -# CONFIG_INET_DIAG is not set -# CONFIG_IPV6 is not set -CONFIG_CAN=y -CONFIG_CAN_SUN4I=y -# CONFIG_WIRELESS is not set -CONFIG_DEVTMPFS=y -CONFIG_DEVTMPFS_MOUNT=y -CONFIG_DMA_CMA=y -CONFIG_BLK_DEV_SD=y -CONFIG_ATA=y -CONFIG_AHCI_SUNXI=y -CONFIG_NETDEVICES=y -CONFIG_SUN4I_EMAC=y -# CONFIG_NET_VENDOR_ARC is not set -# CONFIG_NET_CADENCE is not set -# CONFIG_NET_VENDOR_BROADCOM is not set -# CONFIG_NET_VENDOR_CIRRUS is not set -# CONFIG_NET_VENDOR_FARADAY is not set -# CONFIG_NET_VENDOR_INTEL is not set -# CONFIG_NET_VENDOR_MARVELL is not set -# CONFIG_NET_VENDOR_MICREL is not set -# CONFIG_NET_VENDOR_MICROCHIP is not set -# CONFIG_NET_VENDOR_NATSEMI is not set -# CONFIG_NET_VENDOR_SAMSUNG is not set -# CONFIG_NET_VENDOR_SEEQ is not set -# CONFIG_NET_VENDOR_SMSC is not set -CONFIG_STMMAC_ETH=y -# CONFIG_NET_VENDOR_VIA is not set -# CONFIG_NET_VENDOR_WIZNET is not set -# CONFIG_WLAN is not set -CONFIG_INPUT_EVDEV=y -CONFIG_KEYBOARD_SUN4I_LRADC=y -# CONFIG_INPUT_MOUSE is not set -CONFIG_INPUT_TOUCHSCREEN=y -CONFIG_TOUCHSCREEN_SUN4I=y -CONFIG_INPUT_MISC=y -CONFIG_INPUT_AXP20X_PEK=y -CONFIG_SERIAL_8250=y -CONFIG_SERIAL_8250_CONSOLE=y -CONFIG_SERIAL_8250_NR_UARTS=8 -CONFIG_SERIAL_8250_RUNTIME_UARTS=8 -CONFIG_SERIAL_8250_DW=y -CONFIG_SERIAL_OF_PLATFORM=y -# CONFIG_HW_RANDOM is not set -CONFIG_I2C_CHARDEV=y -CONFIG_I2C_MV64XXX=y -CONFIG_I2C_SUN6I_P2WI=y -CONFIG_SPI=y -CONFIG_SPI_SUN4I=y -CONFIG_SPI_SUN6I=y -CONFIG_GPIO_SYSFS=y -CONFIG_POWER_SUPPLY=y -CONFIG_CHARGER_AXP20X=y -CONFIG_BATTERY_AXP20X=y -CONFIG_AXP20X_POWER=y -CONFIG_THERMAL=y -CONFIG_CPU_THERMAL=y -CONFIG_WATCHDOG=y -CONFIG_SUNXI_WATCHDOG=y -CONFIG_MFD_AC100=y -CONFIG_MFD_AXP20X_I2C=y -CONFIG_MFD_AXP20X_RSB=y -CONFIG_REGULATOR=y -CONFIG_REGULATOR_FIXED_VOLTAGE=y -CONFIG_REGULATOR_AXP20X=y -CONFIG_REGULATOR_GPIO=y -CONFIG_MEDIA_SUPPORT=y -CONFIG_RC_CORE=y -CONFIG_RC_DEVICES=y -CONFIG_IR_SUNXI=y -CONFIG_DRM=y -CONFIG_DRM_SUN4I=y -CONFIG_DRM_DUMB_VGA_DAC=y -CONFIG_FB_SIMPLE=y -CONFIG_SOUND=y -CONFIG_SND=y -CONFIG_SND_SOC=y -CONFIG_SND_SUN4I_CODEC=y -CONFIG_USB=y -CONFIG_USB_EHCI_HCD=y -CONFIG_USB_EHCI_HCD_PLATFORM=y -CONFIG_USB_OHCI_HCD=y -CONFIG_USB_OHCI_HCD_PLATFORM=y -CONFIG_USB_MUSB_HDRC=y -CONFIG_USB_MUSB_SUNXI=y -CONFIG_NOP_USB_XCEIV=y -CONFIG_USB_GADGET=y -CONFIG_MMC=y -CONFIG_MMC_SUNXI=y -CONFIG_NEW_LEDS=y -CONFIG_LEDS_CLASS=y -CONFIG_LEDS_GPIO=y -CONFIG_LEDS_TRIGGERS=y -CONFIG_LEDS_TRIGGER_HEARTBEAT=y -CONFIG_LEDS_TRIGGER_DEFAULT_ON=y -CONFIG_RTC_CLASS=y -# CONFIG_RTC_INTF_SYSFS is not set -# CONFIG_RTC_INTF_PROC is not set -CONFIG_RTC_DRV_AC100=y -CONFIG_RTC_DRV_SUNXI=y -CONFIG_DMADEVICES=y -CONFIG_DMA_SUN6I=y -# CONFIG_IOMMU_SUPPORT is not set -CONFIG_EXTCON=y -CONFIG_IIO=y -CONFIG_AXP20X_ADC=y -CONFIG_PWM=y -CONFIG_PWM_SUN4I=y -CONFIG_PHY_SUN4I_USB=y -CONFIG_PHY_SUN9I_USB=y -CONFIG_NVMEM=y -CONFIG_NVMEM_SUNXI_SID=y -CONFIG_EXT4_FS=y -CONFIG_VFAT_FS=y -CONFIG_TMPFS=y -CONFIG_NFS_FS=y -CONFIG_NFS_V3_ACL=y -CONFIG_NFS_V4=y -CONFIG_ROOT_NFS=y -CONFIG_NLS_CODEPAGE_437=y -CONFIG_NLS_ISO8859_1=y -CONFIG_PRINTK_TIME=y -CONFIG_DEBUG_FS=y -CONFIG_CRYPTO_DEV_SUN4I_SS=y diff --git a/layers/meta-balena-allwinner/recipes-kernel/linux/linux-mainline-4.17.3/don-t-default-activate-regdb.patch b/layers/meta-balena-allwinner/recipes-kernel/linux/linux-mainline-4.17.3/don-t-default-activate-regdb.patch deleted file mode 100644 index 773ab9e..0000000 --- a/layers/meta-balena-allwinner/recipes-kernel/linux/linux-mainline-4.17.3/don-t-default-activate-regdb.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 1752aabbc60776b8ff887fe6049f0eaab8e57bff Mon Sep 17 00:00:00 2001 -From: Sebastian Panceac -Date: Fri, 4 May 2018 11:48:13 +0200 -Subject: [PATCH] Don't activate by default CFG80211_REQUIRE_SIGNED_REGDB - -This kernel configuartion option gets enabled by default when enabling CFG80211 and pulls many other unwanted -configs. -Because it cannot be deactivated through usual means, we make it's activation dependent to its parent config: CFG80211_CERTIFICATION_ONUS. - -Inspired by: https://patchwork.kernel.org/patch/10172165/ - -Upstream-Status: Pending -Signed-off-by: Sebastian Panceac ---- - net/wireless/Kconfig | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/net/wireless/Kconfig b/net/wireless/Kconfig -index 1abcc4f..11f270a 100644 ---- a/net/wireless/Kconfig -+++ b/net/wireless/Kconfig -@@ -89,7 +89,7 @@ config CFG80211_CERTIFICATION_ONUS - - config CFG80211_REQUIRE_SIGNED_REGDB - bool "require regdb signature" if CFG80211_CERTIFICATION_ONUS -- default y -+ default CFG80211_CERTIFICATION_ONUS - select SYSTEM_DATA_VERIFICATION - help - Require that in addition to the "regulatory.db" file a --- -2.7.4 - diff --git a/layers/meta-balena-allwinner/recipes-kernel/linux/linux-mainline_4.17.3.bb b/layers/meta-balena-allwinner/recipes-kernel/linux/linux-mainline_4.17.3.bb deleted file mode 100644 index 15da81d..0000000 --- a/layers/meta-balena-allwinner/recipes-kernel/linux/linux-mainline_4.17.3.bb +++ /dev/null @@ -1,27 +0,0 @@ -SECTION = "kernel" -DESCRIPTION = "Mainline Linux kernel" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" -COMPATIBLE_MACHINE = "(sun4i|sun5i|sun7i|sun8i|sun50i)" - -inherit kernel - -# Since we're not using git, this doesn't make a difference, but we need to fill -# in something or kernel-yocto.bbclass will fail. -KBRANCH ?= "master" - -# Pull in the devicetree files into the rootfs -RDEPENDS_${KERNEL_PACKAGE_NAME}-base += "kernel-devicetree" - -KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}" - -S = "${WORKDIR}/linux-${PV}" - -SRC_URI[md5sum] = "a5899b46a3d146c65bc2ba724db2f4ca" - -SRC_URI = "https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${PV}.tar.xz \ - file://defconfig \ - file://don-t-default-activate-regdb.patch \ - file://0001-Enable-i2c0-on-OrangePi-Plus2-board.patch \ - file://0001-Revert-random-fix-crng_ready-test.patch \ -"