From patchwork Sun Aug 9 16:12:14 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hauke Mehrtens X-Patchwork-Id: 1342654 X-Patchwork-Delegate: hauke@hauke-m.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.openwrt.org (client-ip=2001:8b0:10b:1231::1; helo=merlin.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=hauke-m.de Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=merlin.20170209 header.b=kzPGwgw2; dkim-atps=neutral Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:8b0:10b:1231::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4BPkgK5GQpz9sTF for ; Mon, 10 Aug 2020 02:14:05 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:To:From: Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender :Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=2/UZ7sccSvqeHZTyTy+xmO6SCjfunuj3XZYDQ9yKD2E=; b=kzPGwgw28tJk55u2Ctd4+IX0Wi eMf2q1fJT7mMno8an63pdWSEphoBZB2z03yjYq7bAbDsZUXMWT8DSDjjaM/E/e28RJz0Aqbnj4J/g QifCYh/TzptJSJQ5m8PGyQxP5KpfV64vyjBNRYjr2KlBlTov+PjYF0ivGK82/g2J+x3u/0tkzUWXR q0vBq6GUAfUvj2Q1/6MGvK+yhVNhomCSRcBs49qyAn3ZYcALYcF161wbfjNZbCIXjmrJfi+VvVTC1 X8p3mY5Cs55ToXEUhy+D5fObooXyErUaT2IgSFErO9dIya81UHy/1oXqwHlgBbUmYdduILstzRl/t slB0D+gg==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1k4nvy-0000n6-DZ; Sun, 09 Aug 2020 16:12:30 +0000 Received: from mout-p-102.mailbox.org ([2001:67c:2050::465:102]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1k4nvt-0000mY-CN for openwrt-devel@lists.openwrt.org; Sun, 09 Aug 2020 16:12:29 +0000 Received: from smtp2.mailbox.org (smtp2.mailbox.org [IPv6:2001:67c:2050:105:465:1:2:0]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by mout-p-102.mailbox.org (Postfix) with ESMTPS id 4BPkdL1CjbzKmj4; Sun, 9 Aug 2020 18:12:22 +0200 (CEST) X-Virus-Scanned: amavisd-new at heinlein-support.de Received: from smtp2.mailbox.org ([80.241.60.241]) by spamfilter05.heinlein-hosting.de (spamfilter05.heinlein-hosting.de [80.241.56.123]) (amavisd-new, port 10030) with ESMTP id ciPqdCLBkMD7; Sun, 9 Aug 2020 18:12:19 +0200 (CEST) From: Hauke Mehrtens To: openwrt-devel@lists.openwrt.org Subject: [PATCH] malta: Refresh kernel configuration Date: Sun, 9 Aug 2020 18:12:14 +0200 Message-Id: <20200809161214.8271-1-hauke@hauke-m.de> MIME-Version: 1.0 X-MBO-SPAM-Probability: X-Rspamd-Score: -5.69 / 15.00 / 15.00 X-Rspamd-Queue-Id: 4793017A7 X-Rspamd-UID: 291009 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200809_121228_252739_E58A0D5C X-CRM114-Status: GOOD ( 13.65 ) X-Spam-Score: 0.8 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (0.8 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2001:67c:2050:0:0:0:465:102 listed in] [list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 0.8 UPPERCASE_50_75 message body is 50-75% uppercase X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Hauke Mehrtens Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org This refreshes the kernel configuration on top of kernel 5.4. It now builds without asking to select some kernel options on all 4 subtargets. It still does not boot up, there is a different problem. Signed-off-by: Hauke Mehrtens Tested-By: Yousong Zhou Acked-By: Yousong Zhou --- target/linux/malta/be/config-default | 8 ++++++++ target/linux/malta/be64/config-default | 7 +------ target/linux/malta/config-5.4 | 9 +++++---- target/linux/malta/le/config-default | 9 ++++++++- target/linux/malta/le64/config-default | 8 +------- 5 files changed, 23 insertions(+), 18 deletions(-) diff --git a/target/linux/malta/be/config-default b/target/linux/malta/be/config-default index 5586be6b7c46..735296f5b3f3 100644 --- a/target/linux/malta/be/config-default +++ b/target/linux/malta/be/config-default @@ -1,4 +1,12 @@ CONFIG_CPU_BIG_ENDIAN=y +CONFIG_CPU_HAS_RIXI=y # CONFIG_CPU_LITTLE_ENDIAN is not set CONFIG_CPU_MIPS32_R2=y +CONFIG_CPU_MIPSR2=y +CONFIG_CPU_SUPPORTS_MSA=y +CONFIG_HAVE_CBPF_JIT=y +CONFIG_HAVE_KVM=y CONFIG_HIGHMEM=y +CONFIG_MIPS_CBPF_JIT=y +CONFIG_MIPS_SPRAM=y +CONFIG_TARGET_ISA_REV=2 diff --git a/target/linux/malta/be64/config-default b/target/linux/malta/be64/config-default index 3792b7fce831..8edef1a8579e 100644 --- a/target/linux/malta/be64/config-default +++ b/target/linux/malta/be64/config-default @@ -9,20 +9,15 @@ CONFIG_CPU_BIG_ENDIAN=y # CONFIG_CPU_LITTLE_ENDIAN is not set CONFIG_CPU_MIPS64=y CONFIG_CPU_MIPS64_R1=y -CONFIG_CPU_MIPSR1=y CONFIG_CPU_SUPPORTS_64BIT_KERNEL=y CONFIG_CPU_SUPPORTS_HUGEPAGES=y -CONFIG_HAVE_64BIT_ALIGNED_ACCESS=y CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y -CONFIG_HAVE_EBPF_JIT=y CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y -# CONFIG_HUGETLBFS is not set +# CONFIG_IONIC is not set # CONFIG_MIPS32_N32 is not set # CONFIG_MIPS32_O32 is not set -CONFIG_MIPS_EBPF_JIT=y # CONFIG_MIPS_VA_BITS_48 is not set CONFIG_MODULES_USE_ELF_RELA=y -CONFIG_PCI_BUS_ADDR_T_64BIT=y CONFIG_PGTABLE_LEVELS=3 CONFIG_PHYS_ADDR_T_64BIT=y CONFIG_SYS_SUPPORTS_HUGETLBFS=y diff --git a/target/linux/malta/config-5.4 b/target/linux/malta/config-5.4 index 865be850cbd6..10ad79548056 100644 --- a/target/linux/malta/config-5.4 +++ b/target/linux/malta/config-5.4 @@ -43,6 +43,7 @@ CONFIG_BOUNCE=y CONFIG_BUILTIN_DTB=y CONFIG_CDROM=y CONFIG_CEVT_R4K=y +# CONFIG_CGROUPS is not set CONFIG_CLKBLD_I8253=y CONFIG_CLKDEV_LOOKUP=y CONFIG_CLKEVT_I8253=y @@ -61,7 +62,7 @@ CONFIG_CPU_HAS_SYNC=y # CONFIG_CPU_MICROMIPS is not set CONFIG_CPU_MIPS32=y # CONFIG_CPU_MIPS32_3_5_FEATURES is not set -CONFIG_CPU_MIPS32_R1=y +# CONFIG_CPU_MIPS32_R1 is not set # CONFIG_CPU_MIPS32_R2 is not set # CONFIG_CPU_MIPS32_R6 is not set # CONFIG_CPU_MIPS64_R1 is not set @@ -99,9 +100,7 @@ CONFIG_DUMMY_CONSOLE=y CONFIG_EFI_EARLYCON=y CONFIG_ENABLE_MUST_CHECK=y CONFIG_EXT4_FS=y -# CONFIG_F2FS_CHECK_FS is not set CONFIG_F2FS_FS=y -# CONFIG_F2FS_FS_SECURITY is not set CONFIG_F2FS_FS_XATTR=y CONFIG_F2FS_STAT_FS=y CONFIG_FONT_8x16=y @@ -173,6 +172,8 @@ CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y CONFIG_HAVE_RSEQ=y CONFIG_HAVE_SYSCALL_TRACEPOINTS=y CONFIG_HW_CONSOLE=y +CONFIG_HZ=250 +CONFIG_HZ_250=y CONFIG_I8253=y CONFIG_I8253_LOCK=y CONFIG_I8259=y @@ -243,7 +244,6 @@ CONFIG_NO_HZ_COMMON=y CONFIG_NO_HZ_IDLE=y CONFIG_NR_CPUS=2 CONFIG_NVMEM=y -# CONFIG_NVMEM_REBOOT_MODE is not set CONFIG_OF=y CONFIG_OF_ADDRESS=y CONFIG_OF_EARLY_FLATTREE=y @@ -285,6 +285,7 @@ CONFIG_RFS_ACCEL=y CONFIG_RPS=y CONFIG_RTC_CLASS=y # CONFIG_RTC_DRV_JZ4740 is not set +CONFIG_RTC_MC146818_LIB=y CONFIG_SCSI=y CONFIG_SECCOMP=y CONFIG_SECCOMP_FILTER=y diff --git a/target/linux/malta/le/config-default b/target/linux/malta/le/config-default index 2b42a6b5b2bf..2c6148195e10 100644 --- a/target/linux/malta/le/config-default +++ b/target/linux/malta/le/config-default @@ -1,4 +1,11 @@ -# CONFIG_CPU_BIG_ENDIAN is not set +CONFIG_CPU_HAS_RIXI=y CONFIG_CPU_LITTLE_ENDIAN=y CONFIG_CPU_MIPS32_R2=y +CONFIG_CPU_MIPSR2=y +CONFIG_CPU_SUPPORTS_MSA=y +CONFIG_HAVE_CBPF_JIT=y +CONFIG_HAVE_KVM=y CONFIG_HIGHMEM=y +CONFIG_MIPS_CBPF_JIT=y +CONFIG_MIPS_SPRAM=y +CONFIG_TARGET_ISA_REV=2 diff --git a/target/linux/malta/le64/config-default b/target/linux/malta/le64/config-default index ff4496382dd1..fd4019c7b38f 100644 --- a/target/linux/malta/le64/config-default +++ b/target/linux/malta/le64/config-default @@ -5,24 +5,18 @@ CONFIG_ARCH_MMAP_RND_BITS=12 CONFIG_ARCH_MMAP_RND_BITS_MAX=18 CONFIG_ARCH_MMAP_RND_BITS_MIN=12 CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y -# CONFIG_CPU_BIG_ENDIAN is not set CONFIG_CPU_LITTLE_ENDIAN=y CONFIG_CPU_MIPS64=y CONFIG_CPU_MIPS64_R1=y -CONFIG_CPU_MIPSR1=y CONFIG_CPU_SUPPORTS_64BIT_KERNEL=y CONFIG_CPU_SUPPORTS_HUGEPAGES=y -CONFIG_HAVE_64BIT_ALIGNED_ACCESS=y CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y -CONFIG_HAVE_EBPF_JIT=y CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y -# CONFIG_HUGETLBFS is not set +# CONFIG_IONIC is not set # CONFIG_MIPS32_N32 is not set # CONFIG_MIPS32_O32 is not set -CONFIG_MIPS_EBPF_JIT=y # CONFIG_MIPS_VA_BITS_48 is not set CONFIG_MODULES_USE_ELF_RELA=y -CONFIG_PCI_BUS_ADDR_T_64BIT=y CONFIG_PGTABLE_LEVELS=3 CONFIG_PHYS_ADDR_T_64BIT=y CONFIG_SYS_SUPPORTS_HUGETLBFS=y