Changeset 41765


Ignore:
Timestamp:
2014-07-20T11:42:14+02:00 (4 years ago)
Author:
hauke
Message:

orion: Update kernel to 3.10.44

Update the kernel of the orion target to version 3.10.44.
Refresh orion config and patches to match the changes in the kernel

Tested on WRT350N-v2 device.

Signed-off-by: Maarten Bezemer <maarten.bezemer@…>
[run make kernel_oldconfig, fold a01-dt2-fixes-for-3.3.patch into dt2-setup.c,

make dt2-setup.c compile, fix harddisk subprofile]

Signed-off-by: Hauke Mehrtens <hauke@…>

Location:
trunk/target/linux/orion
Files:
1 deleted
7 edited

Legend:

Unmodified
Added
Removed
  • trunk/target/linux/orion/Makefile

    r40359 r41765  
    1313MAINTAINER:=Imre Kaloz <kaloz@openwrt.org> 
    1414 
    15 LINUX_VERSION:=3.3.8 
     15LINUX_VERSION:=3.10.44 
    1616 
    1717include $(INCLUDE_DIR)/target.mk 
  • trunk/target/linux/orion/config-default

    r37068 r41765  
    11CONFIG_ALIGNMENT_TRAP=y 
    22CONFIG_ARCH_BINFMT_ELF_RANDOMIZE_PIE=y 
    3 CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y 
     3CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y 
     4CONFIG_ARCH_HAVE_CUSTOM_GPIO_H=y 
     5# CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED is not set 
    46CONFIG_ARCH_NR_GPIO=0 
    57CONFIG_ARCH_ORION5X=y 
     8# CONFIG_ARCH_ORION5X_DT is not set 
    69CONFIG_ARCH_REQUIRE_GPIOLIB=y 
    710# CONFIG_ARCH_SELECT_MEMORY_MODEL is not set 
    811# CONFIG_ARCH_SPARSEMEM_DEFAULT is not set 
    9 # CONFIG_ARCH_USES_GETTIMEOFFSET is not set 
     12CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y 
    1013CONFIG_ARM=y 
    1114# CONFIG_ARM_CPU_SUSPEND is not set 
     
    1518# CONFIG_ARM_THUMB is not set 
    1619# CONFIG_ARPD is not set 
     20CONFIG_ATAGS=y 
    1721CONFIG_AUTO_ZRELADDR=y 
    1822# CONFIG_CACHE_L2X0 is not set 
     23CONFIG_CLKDEV_LOOKUP=y 
    1924CONFIG_CLKSRC_MMIO=y 
     25CONFIG_CLONE_BACKWARDS=y 
    2026CONFIG_CMDLINE="rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200" 
    2127CONFIG_CMDLINE_FORCE=y 
     28CONFIG_COMMON_CLK=y 
    2229CONFIG_CPU_32v5=y 
    2330CONFIG_CPU_ABRT_EV5T=y 
     
    3239CONFIG_CPU_TLB_FEROCEON=y 
    3340CONFIG_CPU_USE_DOMAINS=y 
    34 CONFIG_CRYPTO_AES=y 
    35 CONFIG_CRYPTO_ALGAPI=y 
    36 CONFIG_CRYPTO_ALGAPI2=y 
    3741CONFIG_CRYPTO_BLKCIPHER2=y 
    3842CONFIG_CRYPTO_DEV_MV_CESA=y 
     
    4246CONFIG_CRYPTO_RNG2=y 
    4347CONFIG_CRYPTO_WORKQUEUE=y 
     48CONFIG_DEBUG_LL_INCLUDE="mach/debug-macro.S" 
    4449# CONFIG_DEBUG_USER is not set 
    45 CONFIG_DECOMPRESS_LZMA=y 
    4650CONFIG_DNOTIFY=y 
    4751CONFIG_FRAME_POINTER=y 
     
    5054CONFIG_GENERIC_CLOCKEVENTS=y 
    5155CONFIG_GENERIC_CLOCKEVENTS_BUILD=y 
    52 CONFIG_GENERIC_GPIO=y 
     56CONFIG_GENERIC_IDLE_POLL_SETUP=y 
     57CONFIG_GENERIC_IO=y 
    5358CONFIG_GENERIC_IRQ_CHIP=y 
    5459CONFIG_GENERIC_IRQ_SHOW=y 
    5560CONFIG_GENERIC_PCI_IOMAP=y 
     61CONFIG_GENERIC_SMP_IDLE_THREAD=y 
     62CONFIG_GENERIC_STRNCPY_FROM_USER=y 
     63CONFIG_GENERIC_STRNLEN_USER=y 
    5664CONFIG_GPIOLIB=y 
     65CONFIG_GPIO_DEVRES=y 
    5766CONFIG_GPIO_SYSFS=y 
    5867# CONFIG_HAMRADIO is not set 
     
    6170CONFIG_HAS_IOMEM=y 
    6271CONFIG_HAS_IOPORT=y 
    63 CONFIG_HAVE_AOUT=y 
     72# CONFIG_HAVE_64BIT_ALIGNED_ACCESS is not set 
     73CONFIG_HAVE_ARCH_JUMP_LABEL=y 
    6474CONFIG_HAVE_ARCH_KGDB=y 
    6575CONFIG_HAVE_ARCH_PFN_VALID=y 
     76CONFIG_HAVE_ARCH_SECCOMP_FILTER=y 
     77CONFIG_HAVE_ARCH_TRACEHOOK=y 
     78# CONFIG_HAVE_BOOTMEM_INFO_NODE is not set 
     79CONFIG_HAVE_BPF_JIT=y 
     80CONFIG_HAVE_CLK=y 
     81CONFIG_HAVE_CLK_PREPARE=y 
     82CONFIG_HAVE_CONTEXT_TRACKING=y 
    6683CONFIG_HAVE_C_RECORDMCOUNT=y 
     84CONFIG_HAVE_DEBUG_KMEMLEAK=y 
    6785CONFIG_HAVE_DMA_API_DEBUG=y 
     86CONFIG_HAVE_DMA_ATTRS=y 
     87CONFIG_HAVE_DMA_CONTIGUOUS=y 
    6888CONFIG_HAVE_DYNAMIC_FTRACE=y 
    6989CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 
     
    7393CONFIG_HAVE_GENERIC_HARDIRQS=y 
    7494CONFIG_HAVE_IDE=y 
    75 CONFIG_HAVE_IRQ_WORK=y 
     95CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y 
    7696CONFIG_HAVE_KERNEL_GZIP=y 
    7797CONFIG_HAVE_KERNEL_LZMA=y 
     
    80100CONFIG_HAVE_LATENCYTOP_SUPPORT=y 
    81101CONFIG_HAVE_MEMBLOCK=y 
     102CONFIG_HAVE_NET_DSA=y 
    82103CONFIG_HAVE_OPROFILE=y 
    83104CONFIG_HAVE_PERF_EVENTS=y 
    84105CONFIG_HAVE_PROC_CPU=y 
    85106CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y 
    86 CONFIG_HAVE_SCHED_CLOCK=y 
    87 CONFIG_HAVE_SPARSE_IRQ=y 
     107CONFIG_HAVE_SYSCALL_TRACEPOINTS=y 
     108CONFIG_HAVE_UID16=y 
     109CONFIG_HZ_PERIODIC=y 
    88110CONFIG_INET_LRO=y 
    89111CONFIG_INITRAMFS_SOURCE="" 
     112CONFIG_IRQ_DOMAIN=y 
     113CONFIG_IRQ_WORK=y 
    90114CONFIG_KTIME_SCALAR=y 
    91115CONFIG_LEDS_GPIO=y 
    92 # CONFIG_LZO_COMPRESS is not set 
    93 # CONFIG_LZO_DECOMPRESS is not set 
    94116# CONFIG_MACH_BIGDISK is not set 
    95117# CONFIG_MACH_D2NET is not set 
     
    97119# CONFIG_MACH_DNS323 is not set 
    98120# CONFIG_MACH_DT2 is not set 
    99 # CONFIG_MACH_EDMINI_V2 is not set 
     121# CONFIG_MACH_EDMINI_V2_DT is not set 
    100122# CONFIG_MACH_KUROBOX_PRO is not set 
    101123# CONFIG_MACH_LINKSTATION_LSCHL is not set 
     
    118140CONFIG_MACH_WRT350N_V2=y 
    119141CONFIG_MDIO_BOARDINFO=y 
     142CONFIG_MODULES_USE_ELF_REL=y 
    120143CONFIG_MTD_PHYSMAP=y 
    121144CONFIG_MV643XX_ETH=y 
     145CONFIG_MVEBU_MBUS=y 
     146CONFIG_MVMDIO=y 
    122147CONFIG_NEED_DMA_MAP_STATE=y 
     148CONFIG_NEED_KUSER_HELPERS=y 
    123149CONFIG_NEED_PER_CPU_KM=y 
    124150CONFIG_NET_DSA=y 
    125 # CONFIG_NET_DSA_MV88E6060 is not set 
    126151CONFIG_NET_DSA_MV88E6131=y 
    127152CONFIG_NET_DSA_MV88E6XXX=y 
    128153CONFIG_NET_DSA_MV88E6XXX_NEED_PPU=y 
    129154CONFIG_NET_DSA_TAG_DSA=y 
    130 # CONFIG_NET_DSA_TAG_TRAILER is not set 
    131 # CONFIG_NET_VENDOR_3COM is not set 
     155CONFIG_OLD_SIGACTION=y 
     156CONFIG_OLD_SIGSUSPEND3=y 
    132157CONFIG_PAGEFLAGS_EXTENDED=y 
    133158CONFIG_PAGE_OFFSET=0xC0000000 
     
    136161CONFIG_PHYLIB=y 
    137162CONFIG_PLAT_ORION=y 
     163CONFIG_PLAT_ORION_LEGACY=y 
    138164# CONFIG_PREEMPT_RCU is not set 
     165# CONFIG_RCU_STALL_COMMON is not set 
     166CONFIG_SCHED_HRTICK=y 
    139167# CONFIG_SCSI_DMA is not set 
    140168CONFIG_SPLIT_PTLOCK_CPUS=999999 
    141169CONFIG_SYS_SUPPORTS_APM_EMULATION=y 
     170CONFIG_TICK_CPU_ACCOUNTING=y 
    142171CONFIG_UID16=y 
     172CONFIG_UIDGID_CONVERTED=y 
     173CONFIG_UNCOMPRESS_INCLUDE="mach/uncompress.h" 
    143174CONFIG_USB_ARCH_HAS_XHCI=y 
    144175CONFIG_USB_SUPPORT=y 
  • trunk/target/linux/orion/files/arch/arm/mach-orion5x/dt2-setup.c

    r27592 r41765  
    2727#include <asm/mach-types.h> 
    2828#include <asm/gpio.h> 
    29 #include <asm/leds.h> 
    3029#include <asm/mach/arch.h> 
    3130#include <asm/mach/pci.h> 
     
    147146} 
    148147 
    149 static int __init dt2_pci_map_irq(struct pci_dev *dev, u8 slot, u8 pin) 
     148static int __init dt2_pci_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) 
    150149{ 
    151150        int irq; 
     
    184183        .nr_controllers = 2, 
    185184        .preinit        = dt2_pci_preinit, 
    186         .swizzle        = pci_std_swizzle, 
    187185        .setup          = orion5x_pci_sys_setup, 
    188186        .scan           = orion5x_pci_sys_scan_bus, 
     
    329327        i2c_register_board_info(0, &dt2_i2c_rtc, 1); 
    330328 
    331         orion5x_setup_dev_boot_win(DT2_NOR_BOOT_BASE, DT2_NOR_BOOT_SIZE); 
     329        mvebu_mbus_add_window("devbus-boot", DT2_NOR_BOOT_BASE, 
     330                              DT2_NOR_BOOT_SIZE); 
     331 
    332332        platform_device_register(&dt2_nor_flash); 
    333333 
    334         orion5x_setup_dev0_win(DT2_LEDS_BASE, DT2_LEDS_SIZE); 
     334        mvebu_mbus_add_window("devbus-cs0", DT2_LEDS_BASE, DT2_LEDS_SIZE); 
    335335        platform_device_register(&dt2_leds); 
    336336 
     
    384384 * Vanilla kernel should use "tag_fixup_mem32" function. 
    385385 */ 
    386 void __init openwrt_fixup(struct machine_desc *mdesc, struct tag *t, 
    387                             char **from, struct meminfo *meminfo) 
     386void __init openwrt_fixup(struct tag *t, char **from, struct meminfo *meminfo) 
    388387{ 
    389388        char *p = NULL; 
     
    438437MACHINE_START(DT2, "Freecom DataTank Gateway") 
    439438        /* Maintainer: Zintis Petersons <Zintis.Petersons@abcsolutions.lv> */ 
    440         .boot_params    = 0x00000100, 
     439        .atag_offset    = 0x100, 
    441440        .init_machine   = dt2_init, 
    442441        .map_io         = orion5x_map_io, 
    443442        .init_irq       = orion5x_init_irq, 
    444         .timer          = &orion5x_timer, 
     443        .init_time      = orion5x_timer_init, 
    445444        .fixup          = openwrt_fixup, //tag_fixup_mem32, 
    446445MACHINE_END 
  • trunk/target/linux/orion/harddisk/config-default

    r37069 r41765  
    3333CONFIG_USB_COMMON=y 
    3434CONFIG_USB_EHCI_HCD=y 
     35CONFIG_USB_EHCI_HCD_ORION=y 
     36CONFIG_USB_EHCI_HCD_PLATFORM=y 
    3537CONFIG_USB_STORAGE=y 
    3638# CONFIG_USB_UHCI_HCD is not set 
  • trunk/target/linux/orion/patches/200-dt2_board_support.patch

    r31528 r41765  
    11--- a/arch/arm/mach-orion5x/Kconfig 
    22+++ b/arch/arm/mach-orion5x/Kconfig 
    3 @@ -16,6 +16,13 @@ config MACH_RD88F5182 
     3@@ -23,6 +23,13 @@ config MACH_RD88F5182 
    44          Say 'Y' here if you want your kernel to support the 
    55          Marvell Orion-NAS (88F5182) RD2 
     
    1717--- a/arch/arm/mach-orion5x/Makefile 
    1818+++ b/arch/arm/mach-orion5x/Makefile 
    19 @@ -18,6 +18,7 @@ obj-$(CONFIG_MACH_BIGDISK)    += d2net-setu 
     19@@ -17,6 +17,7 @@ obj-$(CONFIG_MACH_BIGDISK)    += d2net-setu 
    2020 obj-$(CONFIG_MACH_NET2BIG)     += net2big-setup.o 
    2121 obj-$(CONFIG_MACH_MSS2)                += mss2-setup.o 
  • trunk/target/linux/orion/patches/210-wn802t_support.patch

    r33963 r41765  
    11--- a/arch/arm/mach-orion5x/Kconfig 
    22+++ b/arch/arm/mach-orion5x/Kconfig 
    3 @@ -139,10 +139,13 @@ config MACH_MSS2 
     3@@ -146,10 +146,13 @@ config MACH_MSS2 
    44          Maxtor Shared Storage II platform. 
    55  
     
    4848        orion5x_uart0_init(); 
    4949  
    50         orion5x_setup_dev_boot_win(WNR854T_NOR_BOOT_BASE, 
    51 @@ -167,7 +181,7 @@ static struct hw_pci wnr854t_pci __initd 
     50        mvebu_mbus_add_window("devbus-boot", WNR854T_NOR_BOOT_BASE, 
     51@@ -166,7 +180,7 @@ static struct hw_pci wnr854t_pci __initd 
    5252  
    5353 static int __init wnr854t_pci_init(void) 
     
    5858  
    5959        return 0; 
    60 @@ -178,6 +192,18 @@ MACHINE_START(WNR854T, "Netgear WNR854T" 
     60@@ -177,6 +191,18 @@ MACHINE_START(WNR854T, "Netgear WNR854T" 
    6161        /* Maintainer: Imre Kaloz <kaloz@openwrt.org> */ 
    6262        .atag_offset    = 0x100, 
     
    6565+       .init_early     = orion5x_init_early, 
    6666+       .init_irq       = orion5x_init_irq, 
    67 +       .timer          = &orion5x_timer, 
     67+       .init_time      = orion5x_timer_init, 
    6868+       .fixup          = tag_fixup_mem32, 
    6969+       .restart        = orion5x_restart, 
  • trunk/target/linux/orion/patches/400-fix-section-mismatch-warnings.patch

    r31528 r41765  
    11--- a/arch/arm/mach-orion5x/common.c 
    22+++ b/arch/arm/mach-orion5x/common.c 
    3 @@ -192,7 +192,7 @@ void __init orion5x_init_early(void) 
     3@@ -242,7 +242,7 @@ void orion5x_setup_wins(void) 
    44  
    55 int orion5x_tclk; 
     
    1010        u32 dev, rev; 
    1111  
    12 @@ -204,7 +204,7 @@ int __init orion5x_find_tclk(void) 
    13         return 166666667; 
    14  } 
    15   
    16 -static void orion5x_timer_init(void) 
    17 +static __init void orion5x_timer_init(void) 
    18  { 
    19         orion5x_tclk = orion5x_find_tclk(); 
    20   
    21 --- a/arch/arm/mach-orion5x/addr-map.c 
    22 +++ b/arch/arm/mach-orion5x/addr-map.c 
    23 @@ -76,7 +76,7 @@ static int __init cpu_win_can_remap(cons 
    24  /* 
    25   * Description of the windows needed by the platform code 
    26   */ 
    27 -static struct __initdata orion_addr_map_cfg addr_map_cfg = { 
    28 +static struct orion_addr_map_cfg addr_map_cfg __initdata = { 
    29         .num_wins = 8, 
    30         .cpu_win_can_remap = cpu_win_can_remap, 
    31         .bridge_virt_base = ORION5X_BRIDGE_VIRT_BASE, 
Note: See TracChangeset for help on using the changeset viewer.