Skip to content

Commit

Permalink
malta: Refresh kernel configuration
Browse files Browse the repository at this point in the history
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.

Tested-By: Yousong Zhou <yszhou4tech@gmail.com>
Acked-By: Yousong Zhou <yszhou4tech@gmail.com>
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
  • Loading branch information
hauke committed Aug 10, 2020
1 parent 0a864f2 commit eafdd1a
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 18 deletions.
8 changes: 8 additions & 0 deletions 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
7 changes: 1 addition & 6 deletions target/linux/malta/be64/config-default
Expand Up @@ -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
Expand Down
9 changes: 5 additions & 4 deletions target/linux/malta/config-5.4
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
9 changes: 8 additions & 1 deletion 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
8 changes: 1 addition & 7 deletions target/linux/malta/le64/config-default
Expand Up @@ -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
Expand Down

0 comments on commit eafdd1a

Please sign in to comment.