diff mbox series

malta: Refresh kernel configuration

Message ID 20200809161214.8271-1-hauke@hauke-m.de
State Accepted
Delegated to: Hauke Mehrtens
Headers show
Series malta: Refresh kernel configuration | expand

Commit Message

Hauke Mehrtens Aug. 9, 2020, 4:12 p.m. UTC
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 <hauke@hauke-m.de>
---
 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(-)

Comments

Yousong Zhou Aug. 10, 2020, 3:06 a.m. UTC | #1
On Mon, 10 Aug 2020 at 00:17, Hauke Mehrtens <hauke@hauke-m.de> wrote:
>
> 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.

malta/be boots fine with this applied, so I guess this line is about mips64.

>
> Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

Tested-By: Yousong Zhou <yszhou4tech@gmail.com>
Acked-By: Yousong Zhou <yszhou4tech@gmail.com>

Regards,
                yousong

> ---
>  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
> --
> 2.20.1
>
>
> _______________________________________________
> openwrt-devel mailing list
> openwrt-devel@lists.openwrt.org
> https://lists.openwrt.org/mailman/listinfo/openwrt-devel
diff mbox series

Patch

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