From 80ec3fd47043ff8f6f02ab30614f884645214aff Mon Sep 17 00:00:00 2001 From: Christian Svensson Date: Sat, 10 Aug 2024 21:22:18 +0200 Subject: [PATCH] sonix: clean up merge conflict --- target/linux/octeon/config-6.1 | 57 ---------------------------------- 1 file changed, 57 deletions(-) diff --git a/target/linux/octeon/config-6.1 b/target/linux/octeon/config-6.1 index 3c63b8acad..86b89bc406 100644 --- a/target/linux/octeon/config-6.1 +++ b/target/linux/octeon/config-6.1 @@ -23,24 +23,16 @@ CONFIG_CAVIUM_OCTEON_LOCK_L2_LOW_LEVEL_INTERRUPT=y CONFIG_CAVIUM_OCTEON_LOCK_L2_MEMCPY=y CONFIG_CAVIUM_OCTEON_LOCK_L2_TLB=y CONFIG_CAVIUM_OCTEON_SOC=y -<<<<<<< HEAD -======= CONFIG_CAVIUM_RESERVE32=0 CONFIG_CC_IMPLICIT_FALLTHROUGH="-Wimplicit-fallthrough=5" CONFIG_CC_NO_ARRAY_BOUNDS=y ->>>>>>> upstream/main CONFIG_CEVT_R4K=y -# CONFIG_CISCO_N821_CPLD is not set CONFIG_CLONE_BACKWARDS=y # CONFIG_COMMON_CLK is not set -<<<<<<< HEAD -CONFIG_COMPAT_32BIT_TIME=y -======= CONFIG_COMPACT_UNEVICTABLE_DEFAULT=1 CONFIG_COMPAT_32BIT_TIME=y CONFIG_CONTEXT_TRACKING=y CONFIG_CONTEXT_TRACKING_IDLE=y ->>>>>>> upstream/main CONFIG_CPU_BIG_ENDIAN=y CONFIG_CPU_CAVIUM_OCTEON=y CONFIG_CPU_GENERIC_DUMP_TLB=y @@ -62,22 +54,16 @@ CONFIG_CRYPTO_CRC32=y CONFIG_CRYPTO_CRC32C=y CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y CONFIG_CRYPTO_LIB_POLY1305_RSIZE=2 -<<<<<<< HEAD -======= CONFIG_CRYPTO_LIB_SHA1=y CONFIG_CRYPTO_LIB_UTILS=y ->>>>>>> upstream/main # CONFIG_CRYPTO_MD5_OCTEON is not set CONFIG_CRYPTO_RNG2=y # CONFIG_CRYPTO_SHA1_OCTEON is not set # CONFIG_CRYPTO_SHA256_OCTEON is not set # CONFIG_CRYPTO_SHA512_OCTEON is not set -<<<<<<< HEAD -======= # CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT is not set CONFIG_DEBUG_INFO_NONE=y CONFIG_DEPRECATED_IRQ_CPU_ONOFFLINE=y ->>>>>>> upstream/main CONFIG_DNOTIFY=y CONFIG_DTC=y CONFIG_EARLY_PRINTK=y @@ -91,10 +77,7 @@ CONFIG_EDAC_OCTEON_PC=y CONFIG_EDAC_OCTEON_PCI=y CONFIG_EDAC_SUPPORT=y CONFIG_EEPROM_AT24=y -<<<<<<< HEAD -======= CONFIG_EXCLUSIVE_SYSTEM_RAM=y ->>>>>>> upstream/main CONFIG_EXT4_FS=y CONFIG_F2FS_FS=y CONFIG_FAT_FS=y @@ -103,19 +86,12 @@ CONFIG_FS_IOMAP=y CONFIG_FS_MBCACHE=y CONFIG_FWNODE_MDIO=y CONFIG_FW_LOADER_PAGED_BUF=y -<<<<<<< HEAD -======= CONFIG_FW_LOADER_SYSFS=y CONFIG_GCC11_NO_ARRAY_BOUNDS=y ->>>>>>> upstream/main CONFIG_GENERIC_ALLOCATOR=y CONFIG_GENERIC_CLOCKEVENTS=y CONFIG_GENERIC_CMOS_UPDATE=y CONFIG_GENERIC_CPU_AUTOPROBE=y -<<<<<<< HEAD -CONFIG_GENERIC_FIND_FIRST_BIT=y -======= ->>>>>>> upstream/main CONFIG_GENERIC_GETTIMEOFDAY=y CONFIG_GENERIC_IOMAP=y CONFIG_GENERIC_IRQ_SHOW=y @@ -131,10 +107,6 @@ CONFIG_GLOB=y CONFIG_GPIO_CDEV=y CONFIG_GPIO_OCTEON=y CONFIG_GRO_CELLS=y -<<<<<<< HEAD -CONFIG_HANDLE_DOMAIN_IRQ=y -======= ->>>>>>> upstream/main CONFIG_HARDWARE_WATCHPOINTS=y CONFIG_HAS_DMA=y CONFIG_HAS_IOMEM=y @@ -168,10 +140,6 @@ CONFIG_MIPS=y CONFIG_MIPS_ASID_BITS=8 CONFIG_MIPS_ASID_SHIFT=0 CONFIG_MIPS_CMDLINE_FROM_BOOTLOADER=y -<<<<<<< HEAD -CONFIG_MIPS_EBPF_JIT=y -======= ->>>>>>> upstream/main CONFIG_MIPS_ELF_APPENDED_DTB=y CONFIG_MIPS_FP_SUPPORT=y CONFIG_MIPS_L1_CACHE_SHIFT=7 @@ -209,10 +177,6 @@ CONFIG_NVMEM_SYSFS=y CONFIG_OCTEON_ETHERNET=y CONFIG_OCTEON_ILM=y CONFIG_OCTEON_MGMT_ETHERNET=y -<<<<<<< HEAD -CONFIG_OCTEON_USB=y -======= ->>>>>>> upstream/main CONFIG_OCTEON_WDT=y CONFIG_OF=y CONFIG_OF_ADDRESS=y @@ -223,12 +187,9 @@ CONFIG_OF_IRQ=y CONFIG_OF_KOBJ=y CONFIG_OF_MDIO=y CONFIG_PADATA=y -<<<<<<< HEAD -======= CONFIG_PAGE_POOL=y CONFIG_PAGE_SIZE_LESS_THAN_256KB=y CONFIG_PAGE_SIZE_LESS_THAN_64KB=y ->>>>>>> upstream/main # CONFIG_PARTITION_ADVANCED is not set CONFIG_PATA_OCTEON_CF=y CONFIG_PATA_TIMINGS=y @@ -244,17 +205,11 @@ CONFIG_PHYLINK=y CONFIG_PHYS_ADDR_T_64BIT=y CONFIG_POSIX_MQUEUE=y CONFIG_POSIX_MQUEUE_SYSCTL=y -<<<<<<< HEAD -CONFIG_PTP_1588_CLOCK_OPTIONAL=y -CONFIG_QUEUED_RWLOCKS=y -CONFIG_QUEUED_SPINLOCKS=y -======= CONFIG_PREEMPT_NONE_BUILD=y CONFIG_PTP_1588_CLOCK_OPTIONAL=y CONFIG_QUEUED_RWLOCKS=y CONFIG_QUEUED_SPINLOCKS=y CONFIG_RANDSTRUCT_NONE=y ->>>>>>> upstream/main CONFIG_RAS=y CONFIG_REGMAP=y CONFIG_REGMAP_I2C=y @@ -276,11 +231,7 @@ CONFIG_SG_POOL=y CONFIG_SMP=y CONFIG_SOCK_RX_QUEUE_MAPPING=y CONFIG_SPARSEMEM=y -<<<<<<< HEAD -CONFIG_SPARSEMEM_STATIC=y -======= CONFIG_SPARSEMEM_EXTREME=y ->>>>>>> upstream/main CONFIG_SPI=y CONFIG_SPI_MASTER=y CONFIG_SPI_MEM=y @@ -308,10 +259,7 @@ CONFIG_USB_EHCI_BIG_ENDIAN_MMIO=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI_HCD_PLATFORM=y # CONFIG_USB_OCTEON_EHCI is not set -<<<<<<< HEAD -======= CONFIG_USB_OCTEON_HCD=y ->>>>>>> upstream/main # CONFIG_USB_OCTEON_OHCI is not set CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y CONFIG_USB_OHCI_HCD=y @@ -329,8 +277,3 @@ CONFIG_WEAK_ORDERING=y CONFIG_XPS=y CONFIG_ZLIB_INFLATE=y CONFIG_ZONE_DMA32=y -<<<<<<< HEAD -CONFIG_CAVIUM_RESERVE32=0 -CONFIG_USB_OCTEON_HCD=y -======= ->>>>>>> upstream/main