Changeset 14705


Ignorieren:
Zeitstempel:
02.06.2018 18:52:20 (vor 3 Monaten)
Autor:
er13
Nachricht:

7490, Fritz!OS-07.0x: integrate kernel sources from [1]

refs #2952

[1] http://osp.avm.de/fritzbox/fritzbox-7490/source-files-FRITZ.Box_7490_Labor-06.98-55294.tar.gz

Ort:
trunk
Dateien:
2 hinzugefügt
5 bearbeitet
11 kopiert

Legende:

Unverändert
Hinzugefügt
Entfernt
  • trunk/config/avm/kernel.in

    r14665 r14705  
    9696        (FREETZ_TYPE_7412 && FREETZ_AVM_VERSION_06_5X_MIN) || \ 
    9797        (FREETZ_TYPE_7430 && FREETZ_AVM_VERSION_06_5X_MIN) || \ 
    98         (FREETZ_TYPE_7490 && FREETZ_AVM_VERSION_06_5X_MIN) 
     98        (FREETZ_TYPE_7490 && FREETZ_AVM_VERSION_06_9X_MAX) 
     99    default n 
     100 
     101config FREETZ_KERNEL_VERSION_3_10_107 
     102    bool 
     103    default y if \ 
     104        (FREETZ_TYPE_7490 && FREETZ_AVM_VERSION_07_0X_MIN) 
    99105    default n 
    100106 
    101107config FREETZ_KERNEL_VERSION_3_10 
    102108    bool 
    103     default y if FREETZ_KERNEL_VERSION_3_10_12 || FREETZ_KERNEL_VERSION_3_10_73 
     109    default y if \ 
     110        FREETZ_KERNEL_VERSION_3_10_12  || \ 
     111        FREETZ_KERNEL_VERSION_3_10_73  || \ 
     112        FREETZ_KERNEL_VERSION_3_10_107 
    104113    default n 
    105114 
     
    213222    default "3.10.12"       if FREETZ_KERNEL_VERSION_3_10_12 
    214223    default "3.10.73"       if FREETZ_KERNEL_VERSION_3_10_73 
     224    default "3.10.107"      if FREETZ_KERNEL_VERSION_3_10_107 
    215225 
    216226config FREETZ_KERNEL_PATCHES 
  • trunk/config/avm/source.in

    r14699 r14705  
    9393    bool 
    9494config FREETZ_AVM_SOURCE_7490_06_93 
     95    bool 
     96config FREETZ_AVM_SOURCE_7490_06_98 
    9597    bool 
    9698 
     
    145147    default "7490_06.83"    if FREETZ_AVM_SOURCE_7490_06_83 
    146148    default "7490_06.93"    if FREETZ_AVM_SOURCE_7490_06_93 
     149    default "7490_06.98"    if FREETZ_AVM_SOURCE_7490_06_98 
    147150 
    148151# 
     
    252255    select FREETZ_AVM_SOURCE_7490_06_93 if FREETZ_AVM_VERSION_06_9X 
    253256    # 07.0X 
    254     select FREETZ_AVM_SOURCE_7490_06_93 if FREETZ_AVM_VERSION_07_0X 
    255     bool 
     257    select FREETZ_AVM_SOURCE_7490_06_98 if FREETZ_AVM_VERSION_07_0X 
     258    bool 
  • trunk/config/mod/download.in

    r14703 r14705  
    112112        # 
    113113        #default "XXXX_XX.XX_SUFFIX"               if FREETZ_AVM_SOURCE_XXXX_XX_XX 
     114        default "7490_06.98.55294"                 if FREETZ_AVM_SOURCE_7490_06_98 
    114115        # 
    115116        default FREETZ_AVM_SOURCE_ID 
     
    146147        default "d2bc6b4ea5f067e232fc5b9c04ff0ff4"  if FREETZ_AVM_SOURCE_7490_06_83 
    147148        default "fa236f0b43aa2a7b903173bc0e726848"  if FREETZ_AVM_SOURCE_7490_06_93 
     149        default "ee728571848bda02c91085a958755f0f"  if FREETZ_AVM_SOURCE_7490_06_98 
    148150        default "35ed17f95d709de7a2509f56976b47e5"  if FREETZ_AVM_SOURCE_7580_06_53 
    149151        default "350317ac647aae7ad39645353581aff2"  if FREETZ_AVM_SOURCE_7580_06_81 
  • trunk/make/linux/configs/freetz/config-vr9-7490_06.98

    r14703 r14705  
    11# 
    22# Automatically generated file; DO NOT EDIT. 
    3 # Linux/mips 3.10.73 Kernel Configuration 
     3# Linux/mips 3.10.107 Kernel Configuration 
    44# 
    55CONFIG_MIPS=y 
     
    144144# CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED is not set 
    145145# CONFIG_MIPS_MT_DISABLED is not set 
    146 # CONFIG_MIPS_MT_SMP is not set 
    147 CONFIG_MIPS_MT_SMTC=y 
    148 # CONFIG_MIPS_MT_SMTC_IPI_DEBUG is not set 
    149 CONFIG_MIPS_MT_TC_LIMIT=2 
     146CONFIG_MIPS_MT_SMP=y 
     147# CONFIG_MIPS_MT_SMTC is not set 
    150148CONFIG_MIPS_MT=y 
    151149CONFIG_SCHED_SMT=y 
     
    165163# CONFIG_PERFCTRS is not set 
    166164CONFIG_MTSCHED=y 
    167 CONFIG_MIPS_MT_SMTC_IM_BACKSTOP=y 
    168 # CONFIG_MIPS_MT_SMTC_IRQAFF is not set 
    169165# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set 
    170166CONFIG_CPU_MIPSR2_IRQ_VI=y 
     
    173169CONFIG_CPU_SUPPORTS_HIGHMEM=y 
    174170CONFIG_ARCH_FLATMEM_ENABLE=y 
     171CONFIG_HW_PERF_EVENTS=y 
    175172CONFIG_FLATMEM=y 
    176173CONFIG_FLAT_NODE_MEM_MAP=y 
     
    195192CONFIG_SYS_SUPPORTS_SMP=y 
    196193CONFIG_NR_CPUS_DEFAULT_2=y 
    197 CONFIG_NR_CPUS_DEFAULT_8=y 
    198194CONFIG_NR_CPUS=2 
     195CONFIG_MIPS_PERF_SHARED_TC_COUNTERS=y 
    199196CONFIG_HZ_100=y 
    200197# CONFIG_HZ_250 is not set 
     
    321318# Kernel Performance Events And Counters 
    322319# 
    323 # CONFIG_PERF_EVENTS is not set 
     320CONFIG_PERF_EVENTS=y 
     321# CONFIG_DEBUG_PERF_USE_VMALLOC is not set 
    324322CONFIG_VM_EVENT_COUNTERS=y 
    325323CONFIG_COMPAT_BRK=y 
     
    509507# 
    510508CONFIG_AVM_PA=y 
     509CONFIG_AVM_PA_RPS=y 
     510CONFIG_AVM_PA_RPS_QUEUES=4 
    511511CONFIG_AVM_PA_MAX_PID=32 
    512512CONFIG_AVM_PA_MAX_VPID=32 
     
    675675# CONFIG_NET_SCH_QFQ is not set 
    676676# CONFIG_NET_SCH_CODEL is not set 
    677 # CONFIG_NET_SCH_FQ_CODEL is not set 
     677CONFIG_NET_SCH_FQ_CODEL=m 
    678678CONFIG_NET_SCH_LLQ=m 
    679679CONFIG_NET_SCH_INGRESS=y 
     
    698698# CONFIG_NET_ACT_POLICE is not set 
    699699# CONFIG_NET_ACT_GACT is not set 
    700 # CONFIG_NET_ACT_MIRRED is not set 
     700CONFIG_NET_ACT_MIRRED=y 
    701701# CONFIG_NET_ACT_NAT is not set 
    702702# CONFIG_NET_ACT_PEDIT is not set 
     
    10441044# CONFIG_NET_FC is not set 
    10451045CONFIG_MII=y 
    1046 # CONFIG_IFB is not set 
     1046CONFIG_IFB=y 
    10471047# CONFIG_NET_TEAM is not set 
    10481048# CONFIG_MACVLAN is not set 
     
    11351135CONFIG_NET_VENDOR_AVM_ATHEROS=y 
    11361136CONFIG_ATHRF2_PHY=y 
     1137# CONFIG_AR8033_PHY is not set 
    11371138CONFIG_ATHRS17_PHY=y 
    11381139# CONFIG_ATHRS27_PHY is not set 
     
    14471448CONFIG_AVM_EVENT=y 
    14481449CONFIG_AVM_EVENT_20=y 
     1450# CONFIG_AVM_PWM is not set 
    14491451CONFIG_AVM_WATCHDOG=y 
    14501452CONFIG_AVM_DEBUG=y 
     1453CONFIG_AVM_DEBUG_BUF_SHIFT=19 
    14511454CONFIG_AVM_LED_EVENTS=y 
    14521455# CONFIG_ENABLE_SKB_PROFILING_HOOKS is not set 
     
    18341837# Miscellaneous USB options 
    18351838# 
     1839CONFIG_AVM_USB_SUSPEND=y 
    18361840CONFIG_USB_DEFAULT_PERSIST=y 
    18371841# CONFIG_USB_DYNAMIC_MINORS is not set 
     
    22882292CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" 
    22892293# CONFIG_NTFS_FS is not set 
     2294CONFIG_ANTFS_FS=y 
    22902295 
    22912296# 
     
    24362441# CONFIG_DEBUG_SLAB is not set 
    24372442CONFIG_DEBUG_SLAB_DOUBLE_FREE=y 
     2443CONFIG_DEBUG_SLAB_AVM_LITE=y 
    24382444CONFIG_HAVE_DEBUG_KMEMLEAK=y 
    24392445# CONFIG_DEBUG_KMEMLEAK is not set 
     
    24992505# CONFIG_CMDLINE_BOOL is not set 
    25002506# CONFIG_DEBUG_STACKOVERFLOW is not set 
    2501 # CONFIG_SMTC_IDLE_HOOK_DEBUG is not set 
    25022507# CONFIG_RUNTIME_DEBUG is not set 
    25032508# CONFIG_SPINLOCK_TEST is not set 
  • trunk/make/linux/patches/3.10.107/012-extra_optimization.patch

    r14703 r14705  
    11--- linux-3.10/Makefile 
    22+++ linux-3.10/Makefile 
    3 @@ -577,7 +577,7 @@ 
     3@@ -579,7 +579,7 @@ 
    44 ifdef CONFIG_CC_OPTIMIZE_FOR_SIZE 
    55 KBUILD_CFLAGS  += -Os $(call cc-disable-warning,maybe-uninitialized,) 
  • trunk/make/linux/patches/3.10.107/200-dont_install_missing_avm_headers.patch

    r14703 r14705  
    99 header-y += autoconf.h 
    1010 header-y += avm_debug.h 
    11 @@ -439,17 +440,17 @@ 
     11@@ -438,17 +439,17 @@ 
    1212 header-y += avm_proc.h 
    1313 header-y += avm_profile.h 
  • trunk/make/linux/patches/3.10.107/400-ftdi-smartmouse.patch

    r14703 r14705  
    11--- linux-3.10/drivers/usb/serial/ftdi_sio_ids.h 
    22+++ linux-3.10/drivers/usb/serial/ftdi_sio_ids.h 
    3 @@ -520,6 +520,19 @@ 
     3@@ -521,6 +521,19 @@ 
    44 #define FTDI_XF_640_PID 0xFC0E /* 640: Two line Display */ 
    55 #define FTDI_XF_642_PID 0xFC0F /* 642: Two line Display */ 
     
    2323--- linux-3.10/drivers/usb/serial/ftdi_sio.c 
    2424+++ linux-3.10/drivers/usb/serial/ftdi_sio.c 
    25 @@ -948,6 +948,14 @@ 
     25@@ -955,6 +955,14 @@ 
    2626        .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk }, 
    2727    { USB_DEVICE(ST_VID, ST_STMCLT_4232_PID), 
  • trunk/make/linux/patches/3.10.107/403-ftdi-Quadmouse.patch

    r14703 r14705  
    11--- linux-3.10/drivers/usb/serial/ftdi_sio.c 
    22+++ linux-3.10/drivers/usb/serial/ftdi_sio.c 
    3 @@ -1002,6 +1002,11 @@ 
     3@@ -1009,6 +1009,11 @@ 
    44    { USB_DEVICE(FTDI_VID, FTDI_EKEY_CONV_USB_PID) }, 
    55    /* Infineon Devices */ 
     
    2929--- linux-3.10/drivers/usb/serial/ftdi_sio_ids.h 
    3030+++ linux-3.10/drivers/usb/serial/ftdi_sio_ids.h 
    31 @@ -533,6 +533,12 @@ 
     31@@ -534,6 +534,12 @@ 
    3232 #define FTDI_8U232AM_PID3  0x6003  /* FTDI USB2Serial */ 
    3333 #define FTDI_8U232AM_PID4  0x6004  /* FTDI USB2Serial */ 
  • trunk/make/linux/patches/3.10.107/7490_06.98/110-hwrev_list.patch

    r14456 r14705  
    66  
    77-AVMNET_VERSION = $(shell echo "`cat $(obj)/.avmnet-version` - `date -r $(obj)/.avmnet-version`") 
    8 +AVMNET_VERSION = "6.247.4.4  -  Revision 1496:3715  -  Fr 15. Sep 11:46:05 CEST 2017" 
     8+AVMNET_VERSION = "6.285-JZ_38755_AVM_PA_MEM_OPTIDo 17. Mai 16:21:47 CEST 2018" 
    99  
    1010 obj-y  += avmnet_config.o avmnet_common.o .avmnet-version.o 
  • trunk/make/linux/patches/3.10.107/7490_06.98/690-no_system-load-1_messages.patch

    r14074 r14705  
    11--- linux-3.10/drivers/char/avm_power/avm_cpu_process.c 
    22+++ linux-3.10/drivers/char/avm_power/avm_cpu_process.c 
    3 @@ -300,6 +300,7 @@ 
     3@@ -361,6 +361,7 @@ 
    44                         global_page_state(NR_PAGETABLE)+ 
    55                         global_page_state(NR_BOUNCE); 
    66  
    7 +            if(pcpuidle->fullrun > 1) 
    8              printk(KERN_WARNING"system-load %d%s loadavg %lu.%lu %lu.%lu %lu.%lu - %d tasks:%lu %% curr:%s(%lu %%) max:%s(%lu %%, pid:%d) " 
    9                                 "pgstat: sum=%lu free=%lu slab=%lu alloc=%lu/s fault=%lu/s (sleep %lu)" 
    10                      "\n",  
     7+            if (pcpuidle->fullrun > 1) 
     8             printk(KERN_WARNING"[%x]system-load %d%s loadavg %lu.%lu %lu.%lu %lu.%lu - %d tasks:%lu %% curr:%s(%lu %%)" 
     9                                "max:%s(%lu %%, pid:%d) " 
     10                                "pgstat: sum=%lu free=%lu slab=%lu alloc=%lu/s fault=%lu/s%s%s (sleep %lu)" 
Hinweis: Hilfe zur Verwendung der Changeset-Ansicht finden Sie unter TracChangeset.