Update the kernel of the orion target to version 3.14.12. Refresh orion config and patches to match the changes in the kernel
Tested on WRT350N-v2 device. Signed-off-by: Maarten Bezemer <[email protected]> --- Makefile | 2 config-default | 177 +++++++++++++++++++++--- files/arch/arm/mach-orion5x/dt2-setup.c | 2 patches/200-dt2_board_support.patch | 4 patches/210-wn802t_support.patch | 10 - patches/400-fix-section-mismatch-warnings.patch | 31 ---- <-- Empty now, please delete patches/a01-dt2-fixes-for-3.3.patch | 2 7 files changed, 167 insertions(+), 61 deletions(-) Index: target/linux/orion/Makefile =================================================================== --- target/linux/orion/Makefile (revision 41762) +++ target/linux/orion/Makefile (working copy) @@ -12,7 +12,7 @@ SUBTARGETS:=generic harddisk MAINTAINER:=Imre Kaloz <[email protected]> -LINUX_VERSION:=3.3.8 +LINUX_VERSION:=3.14.12 include $(INCLUDE_DIR)/target.mk Index: target/linux/orion/config-default =================================================================== --- target/linux/orion/config-default (revision 41762) +++ target/linux/orion/config-default (working copy) @@ -1,12 +1,21 @@ +# CONFIG_AIO is not set CONFIG_ALIGNMENT_TRAP=y CONFIG_ARCH_BINFMT_ELF_RANDOMIZE_PIE=y -CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y +CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y +CONFIG_ARCH_HAVE_CUSTOM_GPIO_H=y +CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y +# CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED is not set CONFIG_ARCH_NR_GPIO=0 CONFIG_ARCH_ORION5X=y +# CONFIG_ARCH_ORION5X_DT is not set CONFIG_ARCH_REQUIRE_GPIOLIB=y # CONFIG_ARCH_SELECT_MEMORY_MODEL is not set # CONFIG_ARCH_SPARSEMEM_DEFAULT is not set -# CONFIG_ARCH_USES_GETTIMEOFFSET is not set +CONFIG_ARCH_SUSPEND_POSSIBLE=y +CONFIG_ARCH_USE_BUILTIN_BSWAP=y +CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y +CONFIG_ARCH_WANT_GENERAL_HUGETLB=y +CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y CONFIG_ARM=y # CONFIG_ARM_CPU_SUSPEND is not set CONFIG_ARM_L1_CACHE_SHIFT=5 @@ -13,12 +22,19 @@ CONFIG_ARM_NR_BANKS=8 CONFIG_ARM_PATCH_PHYS_VIRT=y # CONFIG_ARM_THUMB is not set -# CONFIG_ARPD is not set +CONFIG_ATAGS=y CONFIG_AUTO_ZRELADDR=y +CONFIG_AVERAGE=y +CONFIG_BLK_DEV_SD=m # CONFIG_CACHE_L2X0 is not set +CONFIG_CHR_DEV_SG=m +CONFIG_CLKDEV_LOOKUP=y CONFIG_CLKSRC_MMIO=y +CONFIG_CLONE_BACKWARDS=y CONFIG_CMDLINE="rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200" CONFIG_CMDLINE_FORCE=y +CONFIG_COMMON_CLK=y +CONFIG_COREDUMP=y CONFIG_CPU_32v5=y CONFIG_CPU_ABRT_EV5T=y CONFIG_CPU_CACHE_VIVT=y @@ -31,29 +47,52 @@ CONFIG_CPU_PABRT_LEGACY=y CONFIG_CPU_TLB_FEROCEON=y CONFIG_CPU_USE_DOMAINS=y -CONFIG_CRYPTO_AES=y -CONFIG_CRYPTO_ALGAPI=y -CONFIG_CRYPTO_ALGAPI2=y +CONFIG_CRC16=m +CONFIG_CRYPTO_AEAD=m +CONFIG_CRYPTO_AEAD2=m +CONFIG_CRYPTO_ARC4=m +CONFIG_CRYPTO_BLKCIPHER=m CONFIG_CRYPTO_BLKCIPHER2=y +CONFIG_CRYPTO_CRC32C=m CONFIG_CRYPTO_DEV_MV_CESA=y CONFIG_CRYPTO_HASH=y CONFIG_CRYPTO_HASH2=y CONFIG_CRYPTO_HW=y +CONFIG_CRYPTO_MANAGER=m +CONFIG_CRYPTO_MANAGER2=y CONFIG_CRYPTO_RNG2=y CONFIG_CRYPTO_WORKQUEUE=y +CONFIG_DEBUG_LL_INCLUDE="debug/8250.S" +CONFIG_DEBUG_UART_8250=y +# CONFIG_DEBUG_UART_8250_FLOW_CONTROL is not set +CONFIG_DEBUG_UART_8250_SHIFT=2 +# CONFIG_DEBUG_UART_8250_WORD is not set +CONFIG_DEBUG_UART_PHYS=0xf1012000 +# CONFIG_DEBUG_UART_PL01X is not set +CONFIG_DEBUG_UART_VIRT=0xfe012000 # CONFIG_DEBUG_USER is not set -CONFIG_DECOMPRESS_LZMA=y CONFIG_DNOTIFY=y +CONFIG_ELF_CORE=y +CONFIG_EXPORTFS=m +CONFIG_EXT4_FS=m CONFIG_FRAME_POINTER=y +CONFIG_FS_MBCACHE=m CONFIG_GENERIC_ATOMIC64=y CONFIG_GENERIC_BUG=y CONFIG_GENERIC_CLOCKEVENTS=y CONFIG_GENERIC_CLOCKEVENTS_BUILD=y -CONFIG_GENERIC_GPIO=y +CONFIG_GENERIC_IDLE_POLL_SETUP=y +CONFIG_GENERIC_IO=y CONFIG_GENERIC_IRQ_CHIP=y CONFIG_GENERIC_IRQ_SHOW=y +CONFIG_GENERIC_NET_UTILS=y CONFIG_GENERIC_PCI_IOMAP=y +CONFIG_GENERIC_SCHED_CLOCK=y +CONFIG_GENERIC_SMP_IDLE_THREAD=y +CONFIG_GENERIC_STRNCPY_FROM_USER=y +CONFIG_GENERIC_STRNLEN_USER=y CONFIG_GPIOLIB=y +CONFIG_GPIO_DEVRES=y CONFIG_GPIO_SYSFS=y # CONFIG_HAMRADIO is not set CONFIG_HARDIRQS_SW_RESEND=y @@ -60,43 +99,84 @@ CONFIG_HAS_DMA=y CONFIG_HAS_IOMEM=y CONFIG_HAS_IOPORT=y -CONFIG_HAVE_AOUT=y +# CONFIG_HAVE_64BIT_ALIGNED_ACCESS is not set +CONFIG_HAVE_ARCH_JUMP_LABEL=y CONFIG_HAVE_ARCH_KGDB=y CONFIG_HAVE_ARCH_PFN_VALID=y +CONFIG_HAVE_ARCH_SECCOMP_FILTER=y +CONFIG_HAVE_ARCH_TRACEHOOK=y +# CONFIG_HAVE_BOOTMEM_INFO_NODE is not set +CONFIG_HAVE_BPF_JIT=y +CONFIG_HAVE_CC_STACKPROTECTOR=y +CONFIG_HAVE_CLK=y +CONFIG_HAVE_CLK_PREPARE=y +CONFIG_HAVE_CONTEXT_TRACKING=y CONFIG_HAVE_C_RECORDMCOUNT=y +CONFIG_HAVE_DEBUG_KMEMLEAK=y CONFIG_HAVE_DMA_API_DEBUG=y +CONFIG_HAVE_DMA_ATTRS=y +CONFIG_HAVE_DMA_CONTIGUOUS=y CONFIG_HAVE_DYNAMIC_FTRACE=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_GENERIC_HARDIRQS=y CONFIG_HAVE_IDE=y -CONFIG_HAVE_IRQ_WORK=y +CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y CONFIG_HAVE_KERNEL_GZIP=y +CONFIG_HAVE_KERNEL_LZ4=y CONFIG_HAVE_KERNEL_LZMA=y CONFIG_HAVE_KERNEL_LZO=y CONFIG_HAVE_KERNEL_XZ=y CONFIG_HAVE_LATENCYTOP_SUPPORT=y CONFIG_HAVE_MEMBLOCK=y +CONFIG_HAVE_NET_DSA=y CONFIG_HAVE_OPROFILE=y CONFIG_HAVE_PERF_EVENTS=y +CONFIG_HAVE_PERF_REGS=y +CONFIG_HAVE_PERF_USER_STACK_DUMP=y CONFIG_HAVE_PROC_CPU=y CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y -CONFIG_HAVE_SCHED_CLOCK=y -CONFIG_HAVE_SPARSE_IRQ=y +CONFIG_HAVE_SYSCALL_TRACEPOINTS=y +CONFIG_HAVE_UID16=y +CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y +CONFIG_HZ_FIXED=0 +CONFIG_HZ_PERIODIC=y CONFIG_INET_LRO=y CONFIG_INITRAMFS_SOURCE="" +CONFIG_IOMMU_HELPER=y +CONFIG_IP6_NF_FILTER=m +CONFIG_IP6_NF_IPTABLES=m +CONFIG_IP6_NF_MANGLE=m +CONFIG_IP6_NF_RAW=m +CONFIG_IP6_NF_TARGET_REJECT=m +CONFIG_IPV6=m +# CONFIG_IPV6_GRE is not set +CONFIG_IPV6_MROUTE=y +CONFIG_IPV6_MULTIPLE_TABLES=y +# CONFIG_IPV6_PIMSM_V2 is not set +CONFIG_IPV6_SUBTREES=y +CONFIG_IP_NF_FILTER=m +CONFIG_IP_NF_IPTABLES=m +CONFIG_IP_NF_MANGLE=m +CONFIG_IP_NF_RAW=m +CONFIG_IP_NF_TARGET_MASQUERADE=m +CONFIG_IP_NF_TARGET_REDIRECT=m +CONFIG_IP_NF_TARGET_REJECT=m +CONFIG_IRQ_DOMAIN=y +CONFIG_IRQ_FORCED_THREADING=y +CONFIG_IRQ_WORK=y +CONFIG_JBD2=m CONFIG_KTIME_SCALAR=y CONFIG_LEDS_GPIO=y -# CONFIG_LZO_COMPRESS is not set -# CONFIG_LZO_DECOMPRESS is not set +CONFIG_LEDS_TRIGGER_USBDEV=m +CONFIG_LOCKD=m # CONFIG_MACH_BIGDISK is not set # CONFIG_MACH_D2NET is not set # CONFIG_MACH_DB88F5281 is not set # CONFIG_MACH_DNS323 is not set # CONFIG_MACH_DT2 is not set -# CONFIG_MACH_EDMINI_V2 is not set +# CONFIG_MACH_EDMINI_V2_DT is not set # CONFIG_MACH_KUROBOX_PRO is not set # CONFIG_MACH_LINKSTATION_LSCHL is not set # CONFIG_MACH_LINKSTATION_LS_HGL is not set @@ -116,19 +196,56 @@ CONFIG_MACH_WN802T=y CONFIG_MACH_WNR854T=y CONFIG_MACH_WRT350N_V2=y +CONFIG_MAGIC_SYSRQ=y CONFIG_MDIO_BOARDINFO=y +# CONFIG_MLX5_CORE is not set +CONFIG_MODULES_USE_ELF_REL=y CONFIG_MTD_PHYSMAP=y CONFIG_MV643XX_ETH=y +CONFIG_MVEBU_MBUS=y +CONFIG_MVMDIO=y +# CONFIG_MVNETA is not set CONFIG_NEED_DMA_MAP_STATE=y +CONFIG_NEED_KUSER_HELPERS=y CONFIG_NEED_PER_CPU_KM=y +CONFIG_NETFILTER=y +CONFIG_NETFILTER_ADVANCED=y +CONFIG_NETFILTER_XTABLES=m +CONFIG_NETFILTER_XT_MARK=m +CONFIG_NETFILTER_XT_MATCH_COMMENT=m +CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m +CONFIG_NETFILTER_XT_MATCH_LIMIT=m +CONFIG_NETFILTER_XT_MATCH_MAC=m +CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m +CONFIG_NETFILTER_XT_MATCH_STATE=m +CONFIG_NETFILTER_XT_MATCH_TIME=m +CONFIG_NETFILTER_XT_TARGET_CT=m +CONFIG_NETFILTER_XT_TARGET_LOG=m +CONFIG_NETFILTER_XT_TARGET_NOTRACK=m +CONFIG_NETFILTER_XT_TARGET_REDIRECT=m +CONFIG_NETFILTER_XT_TARGET_TCPMSS=m CONFIG_NET_DSA=y -# CONFIG_NET_DSA_MV88E6060 is not set CONFIG_NET_DSA_MV88E6131=y CONFIG_NET_DSA_MV88E6XXX=y CONFIG_NET_DSA_MV88E6XXX_NEED_PPU=y CONFIG_NET_DSA_TAG_DSA=y -# CONFIG_NET_DSA_TAG_TRAILER is not set +CONFIG_NET_RX_BUSY_POLL=y # CONFIG_NET_VENDOR_3COM is not set +CONFIG_NFSD=m +CONFIG_NFS_FS=m +CONFIG_NFS_V3=m +CONFIG_NF_CONNTRACK=m +CONFIG_NF_CONNTRACK_IPV4=m +CONFIG_NF_CONNTRACK_IPV6=m +CONFIG_NF_DEFRAG_IPV4=m +CONFIG_NF_DEFRAG_IPV6=m +CONFIG_NF_NAT=m +CONFIG_NF_NAT_NEEDED=y +CONFIG_NLS=m +CONFIG_NO_BOOTMEM=y +CONFIG_OLD_SIGACTION=y +CONFIG_OLD_SIGSUSPEND3=y +CONFIG_ORION_WATCHDOG=m CONFIG_PAGEFLAGS_EXTENDED=y CONFIG_PAGE_OFFSET=0xC0000000 CONFIG_PCI=y @@ -135,17 +252,37 @@ CONFIG_PERF_USE_VMALLOC=y CONFIG_PHYLIB=y CONFIG_PLAT_ORION=y +CONFIG_PLAT_ORION_LEGACY=y # CONFIG_PREEMPT_RCU is not set -# CONFIG_SCSI_DMA is not set +CONFIG_PRINTK_TIME=y +# CONFIG_RCU_STALL_COMMON is not set +CONFIG_SCHED_HRTICK=y +CONFIG_SCSI=m +CONFIG_SCSI_MOD=m CONFIG_SPLIT_PTLOCK_CPUS=999999 +CONFIG_SUNRPC=m +CONFIG_SWIOTLB=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y +CONFIG_TICK_CPU_ACCOUNTING=y CONFIG_UID16=y -CONFIG_USB_ARCH_HAS_XHCI=y +CONFIG_UNCOMPRESS_INCLUDE="mach/uncompress.h" +CONFIG_USB=m +CONFIG_USB_COMMON=m +CONFIG_USB_EHCI_HCD=m +CONFIG_USB_EHCI_HCD_ORION=m +CONFIG_USB_EHCI_HCD_PLATFORM=m +CONFIG_USB_EHCI_PCI=m +CONFIG_USB_OHCI_HCD=m +CONFIG_USB_OHCI_HCD_PLATFORM=m +CONFIG_USB_STORAGE=m CONFIG_USB_SUPPORT=y +CONFIG_USB_UHCI_HCD=m CONFIG_VECTORS_BASE=0xffff0000 # CONFIG_VFP is not set +CONFIG_WATCHDOG_CORE=y CONFIG_XZ_DEC_ARM=y CONFIG_XZ_DEC_BCJ=y CONFIG_ZBOOT_ROM_BSS=0x0 CONFIG_ZBOOT_ROM_TEXT=0x0 +# CONFIG_ZBUD is not set CONFIG_ZONE_DMA_FLAG=0 Index: target/linux/orion/files/arch/arm/mach-orion5x/dt2-setup.c =================================================================== --- target/linux/orion/files/arch/arm/mach-orion5x/dt2-setup.c (revision 41762) +++ target/linux/orion/files/arch/arm/mach-orion5x/dt2-setup.c (working copy) @@ -441,6 +441,6 @@ .init_machine = dt2_init, .map_io = orion5x_map_io, .init_irq = orion5x_init_irq, - .timer = &orion5x_timer, + .init_time = orion5x_timer_init, .fixup = openwrt_fixup, //tag_fixup_mem32, MACHINE_END Index: target/linux/orion/patches/200-dt2_board_support.patch =================================================================== --- target/linux/orion/patches/200-dt2_board_support.patch (revision 41762) +++ target/linux/orion/patches/200-dt2_board_support.patch (working copy) @@ -1,6 +1,6 @@ --- a/arch/arm/mach-orion5x/Kconfig +++ b/arch/arm/mach-orion5x/Kconfig -@@ -16,6 +16,13 @@ config MACH_RD88F5182 +@@ -23,6 +23,13 @@ config MACH_RD88F5182 Say 'Y' here if you want your kernel to support the Marvell Orion-NAS (88F5182) RD2 @@ -16,7 +16,7 @@ select I2C_BOARDINFO --- a/arch/arm/mach-orion5x/Makefile +++ b/arch/arm/mach-orion5x/Makefile -@@ -18,6 +18,7 @@ obj-$(CONFIG_MACH_BIGDISK) += d2net-setu +@@ -17,6 +17,7 @@ obj-$(CONFIG_MACH_BIGDISK) += d2net-setu obj-$(CONFIG_MACH_NET2BIG) += net2big-setup.o obj-$(CONFIG_MACH_MSS2) += mss2-setup.o obj-$(CONFIG_MACH_WNR854T) += wnr854t-setup.o Index: target/linux/orion/patches/210-wn802t_support.patch =================================================================== --- target/linux/orion/patches/210-wn802t_support.patch (revision 41762) +++ target/linux/orion/patches/210-wn802t_support.patch (working copy) @@ -1,6 +1,6 @@ --- a/arch/arm/mach-orion5x/Kconfig +++ b/arch/arm/mach-orion5x/Kconfig -@@ -139,10 +139,13 @@ config MACH_MSS2 +@@ -146,10 +146,13 @@ config MACH_MSS2 Maxtor Shared Storage II platform. config MACH_WNR854T @@ -47,8 +47,8 @@ + orion5x_uart0_init(); - orion5x_setup_dev_boot_win(WNR854T_NOR_BOOT_BASE, -@@ -167,7 +181,7 @@ static struct hw_pci wnr854t_pci __initd + mvebu_mbus_add_window("devbus-boot", WNR854T_NOR_BOOT_BASE, +@@ -166,7 +180,7 @@ static struct hw_pci wnr854t_pci __initd static int __init wnr854t_pci_init(void) { @@ -57,7 +57,7 @@ pci_common_init(&wnr854t_pci); return 0; -@@ -178,6 +192,18 @@ MACHINE_START(WNR854T, "Netgear WNR854T" +@@ -177,6 +191,18 @@ MACHINE_START(WNR854T, "Netgear WNR854T" /* Maintainer: Imre Kaloz <[email protected]> */ .atag_offset = 0x100, .init_machine = wnr854t_init, @@ -64,7 +64,7 @@ + .map_io = orion5x_map_io, + .init_early = orion5x_init_early, + .init_irq = orion5x_init_irq, -+ .timer = &orion5x_timer, ++ .init_time = orion5x_timer_init, + .fixup = tag_fixup_mem32, + .restart = orion5x_restart, +MACHINE_END Index: target/linux/orion/patches/400-fix-section-mismatch-warnings.patch =================================================================== --- target/linux/orion/patches/400-fix-section-mismatch-warnings.patch (revision 41762) +++ /dev/null @@ -1,31 +0,0 @@ ---- a/arch/arm/mach-orion5x/common.c -+++ b/arch/arm/mach-orion5x/common.c -@@ -192,7 +192,7 @@ void __init orion5x_init_early(void) - - int orion5x_tclk; - --int __init orion5x_find_tclk(void) -+static __init int orion5x_find_tclk(void) - { - u32 dev, rev; - -@@ -204,7 +204,7 @@ int __init orion5x_find_tclk(void) - return 166666667; - } - --static void orion5x_timer_init(void) -+static __init void orion5x_timer_init(void) - { - orion5x_tclk = orion5x_find_tclk(); - ---- a/arch/arm/mach-orion5x/addr-map.c -+++ b/arch/arm/mach-orion5x/addr-map.c -@@ -76,7 +76,7 @@ static int __init cpu_win_can_remap(cons - /* - * Description of the windows needed by the platform code - */ --static struct __initdata orion_addr_map_cfg addr_map_cfg = { -+static struct orion_addr_map_cfg addr_map_cfg __initdata = { - .num_wins = 8, - .cpu_win_can_remap = cpu_win_can_remap, - .bridge_virt_base = ORION5X_BRIDGE_VIRT_BASE, Index: target/linux/orion/patches/a01-dt2-fixes-for-3.3.patch =================================================================== --- target/linux/orion/patches/a01-dt2-fixes-for-3.3.patch (revision 41762) +++ target/linux/orion/patches/a01-dt2-fixes-for-3.3.patch (working copy) @@ -28,7 +28,7 @@ .init_machine = dt2_init, .map_io = orion5x_map_io, .init_irq = orion5x_init_irq, - .timer = &orion5x_timer, + .init_time = orion5x_timer_init, .fixup = openwrt_fixup, //tag_fixup_mem32, + .restart = orion5x_restart, MACHINE_END _______________________________________________ openwrt-devel mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
