mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-24 07:46:48 +00:00
octeon: Remove kernel 4.14 support
This target was switched to kernel 4.19 more than 6 months ago in commit
f342ffd300 ("treewide: kernel: bump some targets to 4.19") and now
with kernel 5.4 support being added it gets harder to support kernel
4.14 in addition to kernel 4.19 and 5.4.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
This commit is contained in:
Hauke Mehrtens
parent
aae8bdbf89
commit
0a2682a204
@ -1,304 +0,0 @@
|
|||||||
CONFIG_64BIT=y
|
|
||||||
CONFIG_ARCH_BINFMT_ELF_STATE=y
|
|
||||||
CONFIG_ARCH_CLOCKSOURCE_DATA=y
|
|
||||||
CONFIG_ARCH_DISCARD_MEMBLOCK=y
|
|
||||||
CONFIG_ARCH_DMA_ADDR_T_64BIT=y
|
|
||||||
CONFIG_ARCH_HAS_ELF_RANDOMIZE=y
|
|
||||||
# CONFIG_ARCH_HAS_GCOV_PROFILE_ALL is not set
|
|
||||||
# CONFIG_ARCH_HAS_SG_CHAIN is not set
|
|
||||||
# CONFIG_ARCH_HAS_STRICT_KERNEL_RWX is not set
|
|
||||||
# CONFIG_ARCH_HAS_STRICT_MODULE_RWX is not set
|
|
||||||
CONFIG_ARCH_HIBERNATION_POSSIBLE=y
|
|
||||||
CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y
|
|
||||||
CONFIG_ARCH_MIGHT_HAVE_PC_SERIO=y
|
|
||||||
CONFIG_ARCH_MMAP_RND_BITS=12
|
|
||||||
CONFIG_ARCH_MMAP_RND_BITS_MAX=18
|
|
||||||
CONFIG_ARCH_MMAP_RND_BITS_MIN=12
|
|
||||||
CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MAX=15
|
|
||||||
# CONFIG_ARCH_OPTIONAL_KERNEL_RWX is not set
|
|
||||||
# CONFIG_ARCH_OPTIONAL_KERNEL_RWX_DEFAULT is not set
|
|
||||||
CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
|
|
||||||
CONFIG_ARCH_SPARSEMEM_ENABLE=y
|
|
||||||
CONFIG_ARCH_SUPPORTS_UPROBES=y
|
|
||||||
CONFIG_ARCH_SUSPEND_POSSIBLE=y
|
|
||||||
CONFIG_ARCH_USE_BUILTIN_BSWAP=y
|
|
||||||
CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
|
|
||||||
CONFIG_ARCH_USE_QUEUED_RWLOCKS=y
|
|
||||||
CONFIG_ARCH_USE_QUEUED_SPINLOCKS=y
|
|
||||||
CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
|
|
||||||
CONFIG_BLK_DEV_LOOP=y
|
|
||||||
CONFIG_BLK_DEV_SD=y
|
|
||||||
CONFIG_BLK_MQ_PCI=y
|
|
||||||
CONFIG_BLK_SCSI_REQUEST=y
|
|
||||||
# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
|
|
||||||
CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
|
|
||||||
CONFIG_BUILTIN_DTB=y
|
|
||||||
CONFIG_CAVIUM_CN63XXP1=y
|
|
||||||
CONFIG_CAVIUM_OCTEON_CVMSEG_SIZE=2
|
|
||||||
CONFIG_CAVIUM_OCTEON_LOCK_L2=y
|
|
||||||
CONFIG_CAVIUM_OCTEON_LOCK_L2_EXCEPTION=y
|
|
||||||
CONFIG_CAVIUM_OCTEON_LOCK_L2_INTERRUPT=y
|
|
||||||
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
|
|
||||||
CONFIG_CEVT_R4K=y
|
|
||||||
CONFIG_CLONE_BACKWARDS=y
|
|
||||||
CONFIG_CPU_BIG_ENDIAN=y
|
|
||||||
CONFIG_CPU_CAVIUM_OCTEON=y
|
|
||||||
CONFIG_CPU_GENERIC_DUMP_TLB=y
|
|
||||||
CONFIG_CPU_HAS_PREFETCH=y
|
|
||||||
CONFIG_CPU_HAS_RIXI=y
|
|
||||||
CONFIG_CPU_HAS_SYNC=y
|
|
||||||
# CONFIG_CPU_LITTLE_ENDIAN is not set
|
|
||||||
CONFIG_CPU_MIPSR2=y
|
|
||||||
CONFIG_CPU_NEEDS_NO_SMARTMIPS_OR_MICROMIPS=y
|
|
||||||
CONFIG_CPU_R4K_FPU=y
|
|
||||||
CONFIG_CPU_RMAP=y
|
|
||||||
CONFIG_CPU_SUPPORTS_64BIT_KERNEL=y
|
|
||||||
CONFIG_CPU_SUPPORTS_HIGHMEM=y
|
|
||||||
CONFIG_CPU_SUPPORTS_HUGEPAGES=y
|
|
||||||
CONFIG_CRAMFS=y
|
|
||||||
CONFIG_CRASH_CORE=y
|
|
||||||
CONFIG_CRC16=y
|
|
||||||
CONFIG_CRYPTO_AEAD=y
|
|
||||||
CONFIG_CRYPTO_AEAD2=y
|
|
||||||
CONFIG_CRYPTO_CRC32=y
|
|
||||||
CONFIG_CRYPTO_CRC32C=y
|
|
||||||
CONFIG_CRYPTO_HASH=y
|
|
||||||
CONFIG_CRYPTO_HASH2=y
|
|
||||||
CONFIG_CRYPTO_MANAGER=y
|
|
||||||
CONFIG_CRYPTO_MANAGER2=y
|
|
||||||
# CONFIG_CRYPTO_MD5_OCTEON is not set
|
|
||||||
CONFIG_CRYPTO_NULL2=y
|
|
||||||
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
|
|
||||||
CONFIG_CRYPTO_WORKQUEUE=y
|
|
||||||
CONFIG_DEBUG_INFO=y
|
|
||||||
CONFIG_DEBUG_SPINLOCK=y
|
|
||||||
CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
|
|
||||||
CONFIG_DETECT_HUNG_TASK=y
|
|
||||||
CONFIG_DMA_COHERENT=y
|
|
||||||
CONFIG_DNOTIFY=y
|
|
||||||
CONFIG_DTC=y
|
|
||||||
CONFIG_EARLY_PRINTK=y
|
|
||||||
CONFIG_EDAC_ATOMIC_SCRUB=y
|
|
||||||
CONFIG_EDAC_SUPPORT=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_FAT_FS=y
|
|
||||||
CONFIG_FIXED_PHY=y
|
|
||||||
CONFIG_FRAME_WARN=2048
|
|
||||||
CONFIG_FS_MBCACHE=y
|
|
||||||
CONFIG_GENERIC_CLOCKEVENTS=y
|
|
||||||
CONFIG_GENERIC_CMOS_UPDATE=y
|
|
||||||
CONFIG_GENERIC_CPU_AUTOPROBE=y
|
|
||||||
CONFIG_GENERIC_IO=y
|
|
||||||
CONFIG_GENERIC_IRQ_SHOW=y
|
|
||||||
CONFIG_GENERIC_PCI_IOMAP=y
|
|
||||||
CONFIG_GENERIC_SMP_IDLE_THREAD=y
|
|
||||||
CONFIG_GENERIC_TIME_VSYSCALL=y
|
|
||||||
CONFIG_GPIOLIB=y
|
|
||||||
CONFIG_GPIO_OCTEON=y
|
|
||||||
CONFIG_GPIO_SYSFS=y
|
|
||||||
# CONFIG_GRO_CELLS is not set
|
|
||||||
CONFIG_HANDLE_DOMAIN_IRQ=y
|
|
||||||
CONFIG_HARDWARE_WATCHPOINTS=y
|
|
||||||
CONFIG_HAS_DMA=y
|
|
||||||
CONFIG_HAS_IOMEM=y
|
|
||||||
CONFIG_HAS_IOPORT_MAP=y
|
|
||||||
CONFIG_HAVE_64BIT_ALIGNED_ACCESS=y
|
|
||||||
# CONFIG_HAVE_ARCH_BITREVERSE is not set
|
|
||||||
CONFIG_HAVE_ARCH_COMPILER_H=y
|
|
||||||
CONFIG_HAVE_ARCH_JUMP_LABEL=y
|
|
||||||
CONFIG_HAVE_ARCH_KGDB=y
|
|
||||||
CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
|
|
||||||
CONFIG_HAVE_ARCH_TRACEHOOK=y
|
|
||||||
CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y
|
|
||||||
# CONFIG_HAVE_BOOTMEM_INFO_NODE is not set
|
|
||||||
CONFIG_HAVE_CC_STACKPROTECTOR=y
|
|
||||||
CONFIG_HAVE_CONTEXT_TRACKING=y
|
|
||||||
CONFIG_HAVE_COPY_THREAD_TLS=y
|
|
||||||
CONFIG_HAVE_C_RECORDMCOUNT=y
|
|
||||||
CONFIG_HAVE_DEBUG_KMEMLEAK=y
|
|
||||||
CONFIG_HAVE_DEBUG_STACKOVERFLOW=y
|
|
||||||
CONFIG_HAVE_DMA_API_DEBUG=y
|
|
||||||
CONFIG_HAVE_DMA_CONTIGUOUS=y
|
|
||||||
CONFIG_HAVE_DYNAMIC_FTRACE=y
|
|
||||||
CONFIG_HAVE_EBPF_JIT=y
|
|
||||||
CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
|
|
||||||
CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
|
|
||||||
CONFIG_HAVE_FUNCTION_TRACER=y
|
|
||||||
CONFIG_HAVE_GENERIC_DMA_COHERENT=y
|
|
||||||
CONFIG_HAVE_IDE=y
|
|
||||||
CONFIG_HAVE_IRQ_EXIT_ON_IRQ_STACK=y
|
|
||||||
CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
|
|
||||||
CONFIG_HAVE_KVM=y
|
|
||||||
CONFIG_HAVE_LATENCYTOP_SUPPORT=y
|
|
||||||
CONFIG_HAVE_MEMBLOCK=y
|
|
||||||
CONFIG_HAVE_MEMBLOCK_NODE_MAP=y
|
|
||||||
CONFIG_HAVE_MEMORY_PRESENT=y
|
|
||||||
CONFIG_HAVE_MOD_ARCH_SPECIFIC=y
|
|
||||||
CONFIG_HAVE_NET_DSA=y
|
|
||||||
CONFIG_HAVE_OPROFILE=y
|
|
||||||
CONFIG_HAVE_PERF_EVENTS=y
|
|
||||||
CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
|
|
||||||
CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
|
|
||||||
CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y
|
|
||||||
CONFIG_HOLES_IN_ZONE=y
|
|
||||||
# CONFIG_HUGETLBFS is not set
|
|
||||||
CONFIG_HW_HAS_PCI=y
|
|
||||||
CONFIG_HW_RANDOM=y
|
|
||||||
CONFIG_HW_RANDOM_OCTEON=y
|
|
||||||
CONFIG_HZ=250
|
|
||||||
# CONFIG_HZ_100 is not set
|
|
||||||
CONFIG_HZ_250=y
|
|
||||||
CONFIG_HZ_PERIODIC=y
|
|
||||||
CONFIG_IMAGE_CMDLINE_HACK=y
|
|
||||||
CONFIG_INITRAMFS_SOURCE=""
|
|
||||||
CONFIG_IOMMU_HELPER=y
|
|
||||||
CONFIG_IRQCHIP=y
|
|
||||||
CONFIG_IRQ_DOMAIN=y
|
|
||||||
CONFIG_IRQ_FORCED_THREADING=y
|
|
||||||
CONFIG_IRQ_WORK=y
|
|
||||||
CONFIG_JBD2=y
|
|
||||||
CONFIG_KALLSYMS=y
|
|
||||||
CONFIG_KEXEC=y
|
|
||||||
CONFIG_KEXEC_CORE=y
|
|
||||||
CONFIG_LIBFDT=y
|
|
||||||
CONFIG_MDIO_BUS=y
|
|
||||||
CONFIG_MDIO_CAVIUM=y
|
|
||||||
CONFIG_MDIO_DEVICE=y
|
|
||||||
CONFIG_MDIO_OCTEON=y
|
|
||||||
CONFIG_MIGRATION=y
|
|
||||||
CONFIG_MIPS=y
|
|
||||||
# CONFIG_MIPS32_N32 is not set
|
|
||||||
# CONFIG_MIPS32_O32 is not set
|
|
||||||
CONFIG_MIPS_ASID_BITS=8
|
|
||||||
CONFIG_MIPS_ASID_SHIFT=0
|
|
||||||
# CONFIG_MIPS_CLOCK_VSYSCALL is not set
|
|
||||||
# CONFIG_MIPS_CMDLINE_DTB_EXTEND is not set
|
|
||||||
CONFIG_MIPS_CMDLINE_FROM_BOOTLOADER=y
|
|
||||||
# CONFIG_MIPS_CMDLINE_FROM_DTB is not set
|
|
||||||
CONFIG_MIPS_EBPF_JIT=y
|
|
||||||
# CONFIG_MIPS_ELF_APPENDED_DTB is not set
|
|
||||||
# CONFIG_MIPS_HUGE_TLB_SUPPORT is not set
|
|
||||||
CONFIG_MIPS_L1_CACHE_SHIFT=7
|
|
||||||
CONFIG_MIPS_L1_CACHE_SHIFT_7=y
|
|
||||||
# CONFIG_MIPS_MACHINE is not set
|
|
||||||
# CONFIG_MIPS_NO_APPENDED_DTB is not set
|
|
||||||
CONFIG_MIPS_PGD_C0_CONTEXT=y
|
|
||||||
CONFIG_MIPS_RAW_APPENDED_DTB=y
|
|
||||||
CONFIG_MIPS_SPRAM=y
|
|
||||||
# CONFIG_MIPS_VA_BITS_48 is not set
|
|
||||||
CONFIG_MMC=y
|
|
||||||
CONFIG_MMC_BLOCK=y
|
|
||||||
CONFIG_MMC_CAVIUM_OCTEON=y
|
|
||||||
# CONFIG_MMC_TIFM_SD is not set
|
|
||||||
CONFIG_MODULES_USE_ELF_REL=y
|
|
||||||
CONFIG_MODULES_USE_ELF_RELA=y
|
|
||||||
# CONFIG_MTD_CFI_INTELEXT is not set
|
|
||||||
CONFIG_MTD_CMDLINE_PARTS=y
|
|
||||||
CONFIG_MTD_PHYSMAP=y
|
|
||||||
CONFIG_NEED_SG_DMA_LENGTH=y
|
|
||||||
CONFIG_NET_FLOW_LIMIT=y
|
|
||||||
CONFIG_NLS=y
|
|
||||||
CONFIG_NLS_CODEPAGE_437=y
|
|
||||||
CONFIG_NLS_ISO8859_1=y
|
|
||||||
CONFIG_NO_GENERIC_PCI_IOPORT_MAP=y
|
|
||||||
# CONFIG_NO_IOPORT_MAP is not set
|
|
||||||
CONFIG_NR_CPUS=16
|
|
||||||
CONFIG_NR_CPUS_DEFAULT_16=y
|
|
||||||
CONFIG_OCTEON_ETHERNET=y
|
|
||||||
# CONFIG_OCTEON_ILM is not set
|
|
||||||
CONFIG_OCTEON_MGMT_ETHERNET=y
|
|
||||||
CONFIG_OCTEON_USB=y
|
|
||||||
CONFIG_OCTEON_WDT=y
|
|
||||||
CONFIG_OF=y
|
|
||||||
CONFIG_OF_ADDRESS=y
|
|
||||||
CONFIG_OF_ADDRESS_PCI=y
|
|
||||||
CONFIG_OF_EARLY_FLATTREE=y
|
|
||||||
CONFIG_OF_FLATTREE=y
|
|
||||||
CONFIG_OF_GPIO=y
|
|
||||||
CONFIG_OF_IRQ=y
|
|
||||||
CONFIG_OF_MDIO=y
|
|
||||||
CONFIG_OF_NET=y
|
|
||||||
CONFIG_OF_PCI=y
|
|
||||||
CONFIG_OF_PCI_IRQ=y
|
|
||||||
CONFIG_PADATA=y
|
|
||||||
# CONFIG_PARTITION_ADVANCED is not set
|
|
||||||
CONFIG_PCI=y
|
|
||||||
CONFIG_PCI_BUS_ADDR_T_64BIT=y
|
|
||||||
CONFIG_PCI_DOMAINS=y
|
|
||||||
CONFIG_PCI_DRIVERS_LEGACY=y
|
|
||||||
CONFIG_PERF_USE_VMALLOC=y
|
|
||||||
CONFIG_PGTABLE_LEVELS=3
|
|
||||||
CONFIG_PHYLIB=y
|
|
||||||
CONFIG_PHYS_ADDR_T_64BIT=y
|
|
||||||
CONFIG_POSIX_MQUEUE=y
|
|
||||||
CONFIG_POSIX_MQUEUE_SYSCTL=y
|
|
||||||
CONFIG_QUEUED_RWLOCKS=y
|
|
||||||
CONFIG_QUEUED_SPINLOCKS=y
|
|
||||||
CONFIG_RCU_NEED_SEGCBLIST=y
|
|
||||||
CONFIG_RCU_STALL_COMMON=y
|
|
||||||
CONFIG_RELAY=y
|
|
||||||
CONFIG_RFS_ACCEL=y
|
|
||||||
CONFIG_RPS=y
|
|
||||||
CONFIG_SCHED_DEBUG=y
|
|
||||||
# CONFIG_SCHED_INFO is not set
|
|
||||||
CONFIG_SCSI=y
|
|
||||||
CONFIG_SECCOMP=y
|
|
||||||
CONFIG_SECCOMP_FILTER=y
|
|
||||||
CONFIG_SERIAL_8250_DW=y
|
|
||||||
# CONFIG_SERIAL_8250_FSL is not set
|
|
||||||
CONFIG_SG_POOL=y
|
|
||||||
CONFIG_SMP=y
|
|
||||||
CONFIG_SPARSEMEM=y
|
|
||||||
CONFIG_SPARSEMEM_STATIC=y
|
|
||||||
CONFIG_SRCU=y
|
|
||||||
CONFIG_SWIOTLB=y
|
|
||||||
CONFIG_SWPHY=y
|
|
||||||
CONFIG_SYSCTL_EXCEPTION_TRACE=y
|
|
||||||
CONFIG_SYSFS_DEPRECATED=y
|
|
||||||
CONFIG_SYSFS_DEPRECATED_V2=y
|
|
||||||
CONFIG_SYS_HAS_CPU_CAVIUM_OCTEON=y
|
|
||||||
CONFIG_SYS_HAS_EARLY_PRINTK=y
|
|
||||||
CONFIG_SYS_SUPPORTS_64BIT_KERNEL=y
|
|
||||||
CONFIG_SYS_SUPPORTS_ARBIT_HZ=y
|
|
||||||
CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y
|
|
||||||
CONFIG_SYS_SUPPORTS_HOTPLUG_CPU=y
|
|
||||||
CONFIG_SYS_SUPPORTS_HUGETLBFS=y
|
|
||||||
CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y
|
|
||||||
CONFIG_SYS_SUPPORTS_RELOCATABLE=y
|
|
||||||
CONFIG_SYS_SUPPORTS_SMP=y
|
|
||||||
CONFIG_TICK_CPU_ACCOUNTING=y
|
|
||||||
CONFIG_TREE_RCU=y
|
|
||||||
CONFIG_TREE_SRCU=y
|
|
||||||
CONFIG_UNINLINE_SPIN_UNLOCK=y
|
|
||||||
CONFIG_USB=y
|
|
||||||
CONFIG_USB_COMMON=y
|
|
||||||
CONFIG_USB_EHCI_BIG_ENDIAN_MMIO=y
|
|
||||||
CONFIG_USB_EHCI_HCD=y
|
|
||||||
CONFIG_USB_EHCI_HCD_PLATFORM=y
|
|
||||||
CONFIG_USB_OCTEON_EHCI=y
|
|
||||||
CONFIG_USB_OCTEON_OHCI=y
|
|
||||||
CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y
|
|
||||||
CONFIG_USB_OHCI_HCD=y
|
|
||||||
CONFIG_USB_OHCI_HCD_PLATFORM=y
|
|
||||||
CONFIG_USB_STORAGE=y
|
|
||||||
CONFIG_USB_SUPPORT=y
|
|
||||||
CONFIG_USE_OF=y
|
|
||||||
CONFIG_VFAT_FS=y
|
|
||||||
CONFIG_VM_EVENT_COUNTERS=y
|
|
||||||
CONFIG_WATCHDOG_CORE=y
|
|
||||||
CONFIG_WEAK_ORDERING=y
|
|
||||||
CONFIG_XPS=y
|
|
||||||
CONFIG_ZLIB_INFLATE=y
|
|
||||||
CONFIG_ZONE_DMA32=y
|
|
||||||
@ -1,31 +0,0 @@
|
|||||||
--- a/arch/mips/include/asm/octeon/cvmx-bootinfo.h
|
|
||||||
+++ b/arch/mips/include/asm/octeon/cvmx-bootinfo.h
|
|
||||||
@@ -295,6 +295,8 @@ enum cvmx_board_types_enum {
|
|
||||||
*/
|
|
||||||
CVMX_BOARD_TYPE_CUST_PRIVATE_MIN = 20001,
|
|
||||||
CVMX_BOARD_TYPE_UBNT_E100 = 20002,
|
|
||||||
+ CVMX_BOARD_TYPE_UBNT_E200 = 20003,
|
|
||||||
+ CVMX_BOARD_TYPE_UBNT_E220 = 20005,
|
|
||||||
CVMX_BOARD_TYPE_CUST_DSR1000N = 20006,
|
|
||||||
CVMX_BOARD_TYPE_KONTRON_S1901 = 21901,
|
|
||||||
CVMX_BOARD_TYPE_CUST_PRIVATE_MAX = 30000,
|
|
||||||
@@ -396,6 +398,8 @@ static inline const char *cvmx_board_typ
|
|
||||||
/* Customer private range */
|
|
||||||
ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_CUST_PRIVATE_MIN)
|
|
||||||
ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_UBNT_E100)
|
|
||||||
+ ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_UBNT_E200)
|
|
||||||
+ ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_UBNT_E220)
|
|
||||||
ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_CUST_DSR1000N)
|
|
||||||
ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_KONTRON_S1901)
|
|
||||||
ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_CUST_PRIVATE_MAX)
|
|
||||||
--- a/arch/mips/cavium-octeon/executive/cvmx-helper-board.c
|
|
||||||
+++ b/arch/mips/cavium-octeon/executive/cvmx-helper-board.c
|
|
||||||
@@ -173,6 +173,8 @@ int cvmx_helper_board_get_mii_address(in
|
|
||||||
return 7 - ipd_port;
|
|
||||||
else
|
|
||||||
return -1;
|
|
||||||
+ case CVMX_BOARD_TYPE_UBNT_E200:
|
|
||||||
+ return -1;
|
|
||||||
case CVMX_BOARD_TYPE_KONTRON_S1901:
|
|
||||||
if (ipd_port == CVMX_HELPER_BOARD_MGMT_IPD_PORT)
|
|
||||||
return 1;
|
|
||||||
@ -1,34 +0,0 @@
|
|||||||
--- a/drivers/staging/octeon/ethernet.c
|
|
||||||
+++ b/drivers/staging/octeon/ethernet.c
|
|
||||||
@@ -673,6 +673,7 @@ static int cvm_oct_probe(struct platform
|
|
||||||
int interface;
|
|
||||||
int fau = FAU_NUM_PACKET_BUFFERS_TO_FREE;
|
|
||||||
int qos;
|
|
||||||
+ int i;
|
|
||||||
struct device_node *pip;
|
|
||||||
int mtu_overhead = ETH_HLEN + ETH_FCS_LEN;
|
|
||||||
|
|
||||||
@@ -796,13 +797,19 @@ static int cvm_oct_probe(struct platform
|
|
||||||
}
|
|
||||||
|
|
||||||
num_interfaces = cvmx_helper_get_number_of_interfaces();
|
|
||||||
- for (interface = 0; interface < num_interfaces; interface++) {
|
|
||||||
- cvmx_helper_interface_mode_t imode =
|
|
||||||
- cvmx_helper_interface_get_mode(interface);
|
|
||||||
- int num_ports = cvmx_helper_ports_on_interface(interface);
|
|
||||||
+ for (i = 0; i < num_interfaces; i++) {
|
|
||||||
+ cvmx_helper_interface_mode_t imode;
|
|
||||||
+ int interface;
|
|
||||||
+ int num_ports;
|
|
||||||
int port;
|
|
||||||
int port_index;
|
|
||||||
|
|
||||||
+ interface = i;
|
|
||||||
+ if (cvmx_sysinfo_get()->board_type == CVMX_BOARD_TYPE_UBNT_E200)
|
|
||||||
+ interface = num_interfaces - (i + 1);
|
|
||||||
+
|
|
||||||
+ num_ports = cvmx_helper_ports_on_interface(interface);
|
|
||||||
+ imode = cvmx_helper_interface_get_mode(interface);
|
|
||||||
for (port_index = 0,
|
|
||||||
port = cvmx_helper_get_ipd_port(interface, 0);
|
|
||||||
port < cvmx_helper_get_ipd_port(interface, num_ports);
|
|
||||||
@ -1,47 +0,0 @@
|
|||||||
--- a/arch/mips/cavium-octeon/setup.c
|
|
||||||
+++ b/arch/mips/cavium-octeon/setup.c
|
|
||||||
@@ -650,6 +650,35 @@ void octeon_user_io_init(void)
|
|
||||||
write_c0_derraddr1(0);
|
|
||||||
}
|
|
||||||
|
|
||||||
+#ifdef CONFIG_IMAGE_CMDLINE_HACK
|
|
||||||
+extern char __image_cmdline[];
|
|
||||||
+
|
|
||||||
+static int __init octeon_use_image_cmdline(void)
|
|
||||||
+{
|
|
||||||
+ char *p = __image_cmdline;
|
|
||||||
+ int replace = 0;
|
|
||||||
+
|
|
||||||
+ if (*p == '-') {
|
|
||||||
+ replace = 1;
|
|
||||||
+ p++;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ if (*p == '\0')
|
|
||||||
+ return 0;
|
|
||||||
+
|
|
||||||
+ if (replace) {
|
|
||||||
+ strlcpy(arcs_cmdline, p, sizeof(arcs_cmdline));
|
|
||||||
+ } else {
|
|
||||||
+ strlcat(arcs_cmdline, " ", sizeof(arcs_cmdline));
|
|
||||||
+ strlcat(arcs_cmdline, p, sizeof(arcs_cmdline));
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ return 1;
|
|
||||||
+}
|
|
||||||
+#else
|
|
||||||
+static inline int octeon_use_image_cmdline(void) { return 0; }
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
/**
|
|
||||||
* Early entry point for arch setup
|
|
||||||
*/
|
|
||||||
@@ -894,6 +923,8 @@ void __init prom_init(void)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
+ octeon_use_image_cmdline();
|
|
||||||
+
|
|
||||||
if (strstr(arcs_cmdline, "console=") == NULL) {
|
|
||||||
if (octeon_uart == 1)
|
|
||||||
strcat(arcs_cmdline, " console=ttyS1,115200");
|
|
||||||
@ -1,31 +0,0 @@
|
|||||||
From patchwork Wed Jun 8 13:49:26 2016
|
|
||||||
Content-Type: text/plain; charset="utf-8"
|
|
||||||
MIME-Version: 1.0
|
|
||||||
Content-Transfer-Encoding: 8bit
|
|
||||||
Subject: [LEDE-DEV] cavium: Ignore MEM boot param when too small
|
|
||||||
From: =?utf-8?q?Micha=C5=82_Osowiecki?= <michal.osowiecki@gmail.com>
|
|
||||||
X-Patchwork-Id: 632273
|
|
||||||
Message-Id: <57582266.8020105@gmail.com>
|
|
||||||
To: lede-dev@lists.infradead.org
|
|
||||||
Date: Wed, 8 Jun 2016 15:49:26 +0200
|
|
||||||
|
|
||||||
Cisco RV0XX u-boot sets MEM=2048 as boot param. We assume that at least
|
|
||||||
4MB (mem_alloc_size) of ram is needed to run linux on cavium boards, so
|
|
||||||
if mem < 4M - ignore it and set default value
|
|
||||||
|
|
||||||
|
|
||||||
Signed-off-by: Michał Osowiecki <michal.osowiecki@gmail.com>
|
|
||||||
|
|
||||||
--- a/arch/mips/cavium-octeon/setup.c
|
|
||||||
+++ b/arch/mips/cavium-octeon/setup.c
|
|
||||||
@@ -1018,6 +1018,10 @@ void __init plat_mem_setup(void)
|
|
||||||
if (mem_alloc_size > max_memory)
|
|
||||||
mem_alloc_size = max_memory;
|
|
||||||
|
|
||||||
+ /* Ignore bootarg MEM <= 4MB - cisco uses a b0rked uboot env on their products */
|
|
||||||
+ if (max_memory <= mem_alloc_size)
|
|
||||||
+ max_memory = 512ull << 20;
|
|
||||||
+
|
|
||||||
/* Crashkernel ignores bootmem list. It relies on mem=X@Y option */
|
|
||||||
#ifdef CONFIG_CRASH_DUMP
|
|
||||||
add_memory_region(reserve_low_mem, max_memory, BOOT_MEM_RAM);
|
|
||||||
Loading…
Reference in New Issue
Block a user