aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2015-09-18 13:39:55 +0000
committerFelix Fietkau <nbd@openwrt.org>2015-09-18 13:39:55 +0000
commitc429250ee49c31cc5e369332f042ada025c84ac2 (patch)
treecf879c700e8cfa85d11af0f645e80ca26bf990b9 /target/linux
parent69391f49b517c1cc1328fcf9406c605816dd3b17 (diff)
downloadupstream-c429250ee49c31cc5e369332f042ada025c84ac2.tar.gz
upstream-c429250ee49c31cc5e369332f042ada025c84ac2.tar.bz2
upstream-c429250ee49c31cc5e369332f042ada025c84ac2.zip
arm64: switch to Kernel 4.1
- fix Kernel dts subdir location - enable virtio networking we are using -M virt which supports virtio devices changes in symbols due to make kernel_oldconfig: - CONFIG_ARCH_BINFMT_ELF_RANDOMIZE_PIE=y : removed fix security: upstream id: d1fd836dcf00d2028c700c7e44d2c23404062c90 - CONFIG_ARM64_CPU_SUSPEND: removed commit id: af3cfdbf56b91785650f54e7c9a899d814b4b9fb - CONFIG_ARM64_PGTABLE_LEVELS=3 : renamed PGTABLE_LEVELS commit id: 9f25e6ad58e1fb3b4d441e4c55635c4598a6fa94 - CONFIG_GENERIC_CLOCKEVENTS_BUILD=y : removed upstream commit id: 9f083b74df3a7eaa100b456f2dc195512daf728e -# CONFIG_PREEMPT_RCU: unnecessary unknown remove reasons: -CONFIG_GENERIC_IOMAP=y -# CONFIG_POWER_RESET_GPIO is not set -# CONFIG_POWER_RESET_GPIO_RESTART is not set -# CONFIG_POWER_RESET_LTC2952 is not set -# CONFIG_POWER_RESET_SYSCON is not set -# CONFIG_XEN is not set tested and boot, networking work with qemu Signed-off-by: Dirk Neukirchen <dirkneukirchen@web.de> SVN-Revision: 47005
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/arm64/Makefile2
-rw-r--r--target/linux/arm64/config-default56
-rw-r--r--target/linux/arm64/image/boot-wrapper/Makefile2
3 files changed, 46 insertions, 14 deletions
diff --git a/target/linux/arm64/Makefile b/target/linux/arm64/Makefile
index 8292cfed8b..25ece9ad45 100644
--- a/target/linux/arm64/Makefile
+++ b/target/linux/arm64/Makefile
@@ -13,7 +13,7 @@ FEATURES:=fpu ramdisk
CFLAGS:=-Os -pipe -fno-caller-saves
MAINTAINER:=Florian Fainelli <florian@openwrt.org>
-KERNEL_PATCHVER:=3.18
+KERNEL_PATCHVER:=4.1
DEVICE_TYPE:=developerboard
diff --git a/target/linux/arm64/config-default b/target/linux/arm64/config-default
index 1ff61d5d59..55d333d556 100644
--- a/target/linux/arm64/config-default
+++ b/target/linux/arm64/config-default
@@ -1,16 +1,31 @@
CONFIG_64BIT=y
-CONFIG_ARCH_BINFMT_ELF_RANDOMIZE_PIE=y
+CONFIG_ACPI=y
+# CONFIG_ACPI_CONTAINER is not set
+# CONFIG_ACPI_CUSTOM_DSDT is not set
+# CONFIG_ACPI_DEBUG is not set
+# CONFIG_ACPI_DOCK is not set
+# CONFIG_ACPI_EC_DEBUGFS is not set
+CONFIG_ACPI_GENERIC_GSI=y
+# CONFIG_ACPI_PCI_SLOT is not set
+# CONFIG_ACPI_PROCFS_POWER is not set
+CONFIG_ACPI_REDUCED_HARDWARE_ONLY=y
CONFIG_ARCH_DMA_ADDR_T_64BIT=y
+# CONFIG_ARCH_EXYNOS7 is not set
+# CONFIG_ARCH_FSL_LS2085A is not set
CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y
CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
+CONFIG_ARCH_HAS_ELF_RANDOMIZE=y
+CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y
CONFIG_ARCH_HAS_HOLES_MEMORYMODEL=y
CONFIG_ARCH_HAS_SG_CHAIN=y
CONFIG_ARCH_HAS_TICK_BROADCAST=y
CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
CONFIG_ARCH_REQUIRE_GPIOLIB=y
+# CONFIG_ARCH_SEATTLE is not set
CONFIG_ARCH_SELECT_MEMORY_MODEL=y
CONFIG_ARCH_SPARSEMEM_DEFAULT=y
CONFIG_ARCH_SPARSEMEM_ENABLE=y
+# CONFIG_ARCH_SPRD is not set
CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y
CONFIG_ARCH_SUSPEND_POSSIBLE=y
# CONFIG_ARCH_THUNDER is not set
@@ -22,10 +37,10 @@ CONFIG_ARCH_WANT_GENERAL_HUGETLB=y
CONFIG_ARCH_WANT_HUGE_PMD_SHARE=y
CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
# CONFIG_ARCH_XGENE is not set
+# CONFIG_ARCH_ZYNQMP is not set
CONFIG_ARM64=y
CONFIG_ARM64_4K_PAGES=y
# CONFIG_ARM64_64K_PAGES is not set
-# CONFIG_ARM64_CPU_SUSPEND is not set
# CONFIG_ARM64_CRYPTO is not set
CONFIG_ARM64_ERRATUM_819472=y
CONFIG_ARM64_ERRATUM_824069=y
@@ -33,11 +48,12 @@ CONFIG_ARM64_ERRATUM_826319=y
CONFIG_ARM64_ERRATUM_827319=y
CONFIG_ARM64_ERRATUM_832075=y
CONFIG_ARM64_ERRATUM_845719=y
-CONFIG_ARM64_PGTABLE_LEVELS=3
+# CONFIG_ARM64_PTDUMP is not set
# CONFIG_ARM64_RANDOMIZE_TEXT_OFFSET is not set
CONFIG_ARM64_VA_BITS=39
CONFIG_ARM64_VA_BITS_39=y
# CONFIG_ARM64_VA_BITS_48 is not set
+# CONFIG_ARMV8_DEPRECATED is not set
CONFIG_ARM_AMBA=y
CONFIG_ARM_ARCH_TIMER=y
CONFIG_ARM_ARCH_TIMER_EVTSTREAM=y
@@ -46,6 +62,7 @@ CONFIG_ARM_GIC_V3=y
# CONFIG_ARM_SP805_WATCHDOG is not set
CONFIG_ATOMIC64_SELFTEST=y
CONFIG_AUDIT_ARCH_COMPAT_GENERIC=y
+CONFIG_AVERAGE=y
CONFIG_BLK_DEV_SD=y
CONFIG_BLOCK_COMPAT=y
CONFIG_BOUNCE=y
@@ -73,6 +90,8 @@ CONFIG_CRC16=y
CONFIG_CRYPTO_CRC32C=y
CONFIG_CRYPTO_HASH=y
CONFIG_CRYPTO_HASH2=y
+CONFIG_CRYPTO_RNG2=y
+CONFIG_CRYPTO_WORKQUEUE=y
CONFIG_CUSE=y
CONFIG_DCACHE_WORD_ACCESS=y
CONFIG_DEBUG_INFO=y
@@ -92,20 +111,22 @@ CONFIG_FB_CFB_FILLRECT=y
CONFIG_FB_CFB_IMAGEBLIT=y
CONFIG_FB_CMDLINE=y
CONFIG_FB_MODE_HELPERS=y
+# CONFIG_FB_SM750 is not set
CONFIG_FIX_EARLYCON_MEM=y
CONFIG_FRAME_POINTER=y
+# CONFIG_FSL_MC_BUS is not set
+# CONFIG_FS_DAX is not set
CONFIG_FS_MBCACHE=y
CONFIG_FUSE_FS=y
CONFIG_GENERIC_ALLOCATOR=y
CONFIG_GENERIC_CLOCKEVENTS=y
CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
-CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
CONFIG_GENERIC_CPU_AUTOPROBE=y
CONFIG_GENERIC_CSUM=y
CONFIG_GENERIC_EARLY_IOREMAP=y
CONFIG_GENERIC_IO=y
-CONFIG_GENERIC_IOMAP=y
CONFIG_GENERIC_IRQ_SHOW=y
+CONFIG_GENERIC_IRQ_SHOW_LEVEL=y
CONFIG_GENERIC_PCI_IOMAP=y
CONFIG_GENERIC_SCHED_CLOCK=y
CONFIG_GENERIC_SMP_IDLE_THREAD=y
@@ -113,6 +134,7 @@ CONFIG_GENERIC_STRNCPY_FROM_USER=y
CONFIG_GENERIC_STRNLEN_USER=y
CONFIG_GENERIC_TIME_VSYSCALL=y
CONFIG_GPIOLIB=y
+CONFIG_GPIO_ACPI=y
CONFIG_GPIO_DEVRES=y
CONFIG_GPIO_GENERIC=y
CONFIG_GPIO_GENERIC_PLATFORM=y
@@ -125,9 +147,11 @@ CONFIG_HAS_IOMEM=y
CONFIG_HAS_IOPORT_MAP=y
# CONFIG_HAVE_64BIT_ALIGNED_ACCESS is not set
CONFIG_HAVE_ARCH_AUDITSYSCALL=y
+CONFIG_HAVE_ARCH_BITREVERSE=y
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_ARCH_TRANSPARENT_HUGEPAGE=y
# CONFIG_HAVE_BOOTMEM_INFO_NODE is not set
@@ -135,6 +159,7 @@ CONFIG_HAVE_BPF_JIT=y
CONFIG_HAVE_CC_STACKPROTECTOR=y
CONFIG_HAVE_CLK=y
CONFIG_HAVE_CLK_PREPARE=y
+CONFIG_HAVE_CMPXCHG_DOUBLE=y
CONFIG_HAVE_CONTEXT_TRACKING=y
CONFIG_HAVE_C_RECORDMCOUNT=y
CONFIG_HAVE_DEBUG_BUGVERBOSE=y
@@ -160,6 +185,7 @@ CONFIG_HAVE_RCU_TABLE_FREE=y
CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
CONFIG_HAVE_UID16=y
CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y
+# CONFIG_HPET is not set
# CONFIG_HUGETLBFS is not set
CONFIG_IKCONFIG=y
CONFIG_IKCONFIG_PROC=y
@@ -172,11 +198,14 @@ CONFIG_IP_PNP_DHCP=y
# CONFIG_IP_PNP_RARP is not set
CONFIG_IRQCHIP=y
CONFIG_IRQ_DOMAIN=y
+CONFIG_IRQ_DOMAIN_HIERARCHY=y
CONFIG_IRQ_WORK=y
CONFIG_JBD=y
CONFIG_JBD2=y
+CONFIG_KVM_COMPAT=y
CONFIG_LIBFDT=y
CONFIG_LOCKD=y
+CONFIG_LOCK_SPIN_ON_OWNER=y
CONFIG_LOGO=y
CONFIG_LOGO_LINUX_CLUT224=y
# CONFIG_LOGO_LINUX_MONO is not set
@@ -222,23 +251,25 @@ CONFIG_OF_RESERVED_MEM=y
CONFIG_OLD_SIGSUSPEND3=y
CONFIG_PAGEFLAGS_EXTENDED=y
CONFIG_PCI=y
+CONFIG_PCI_BUS_ADDR_T_64BIT=y
CONFIG_PCI_DOMAINS=y
CONFIG_PCI_DOMAINS_GENERIC=y
+CONFIG_PCI_LABEL=y
CONFIG_PERF_USE_VMALLOC=y
+CONFIG_PGTABLE_LEVELS=3
CONFIG_PHYS_ADDR_T_64BIT=y
# CONFIG_PHY_XGENE is not set
+# CONFIG_PMIC_OPREGION is not set
+CONFIG_PNP=y
+CONFIG_PNPACPI=y
+CONFIG_PNP_DEBUG_MESSAGES=y
CONFIG_POSIX_MQUEUE=y
CONFIG_POSIX_MQUEUE_SYSCTL=y
CONFIG_POWER_RESET=y
-# CONFIG_POWER_RESET_GPIO is not set
-# CONFIG_POWER_RESET_GPIO_RESTART is not set
-# CONFIG_POWER_RESET_LTC2952 is not set
-# CONFIG_POWER_RESET_SYSCON is not set
CONFIG_POWER_RESET_VEXPRESS=y
# CONFIG_POWER_RESET_XGENE is not set
CONFIG_POWER_SUPPLY=y
# CONFIG_PREEMPT_NONE is not set
-# CONFIG_PREEMPT_RCU is not set
CONFIG_PREEMPT_VOLUNTARY=y
CONFIG_PROFILING=y
CONFIG_RCU_STALL_COMMON=y
@@ -252,6 +283,7 @@ CONFIG_RWSEM_XCHGADD_ALGORITHM=y
CONFIG_SCSI=y
# CONFIG_SCSI_LOWLEVEL is not set
# CONFIG_SCSI_PROC_FS is not set
+CONFIG_SERIAL_8250_PNP=y
# CONFIG_SERIAL_AMBA_PL010 is not set
CONFIG_SERIAL_AMBA_PL011=y
CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
@@ -263,6 +295,7 @@ CONFIG_SPARSEMEM_MANUAL=y
CONFIG_SPARSEMEM_VMEMMAP=y
CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
CONFIG_SPARSE_IRQ=y
+CONFIG_SRCU=y
CONFIG_STOP_MACHINE=y
CONFIG_SUNRPC=y
# CONFIG_SWAP is not set
@@ -282,6 +315,5 @@ CONFIG_VIRTIO_BLK=y
# CONFIG_VIRTIO_CONSOLE is not set
CONFIG_VIRTIO_MMIO=y
# CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set
-# CONFIG_VIRTIO_NET is not set
-# CONFIG_XEN is not set
+CONFIG_VIRTIO_NET=y
CONFIG_XPS=y
diff --git a/target/linux/arm64/image/boot-wrapper/Makefile b/target/linux/arm64/image/boot-wrapper/Makefile
index cf58590545..fa397087a3 100644
--- a/target/linux/arm64/image/boot-wrapper/Makefile
+++ b/target/linux/arm64/image/boot-wrapper/Makefile
@@ -26,7 +26,7 @@ define Build/Compile
$(MAKE) -C $(PKG_BUILD_DIR) \
KERNEL="../Image" \
DTC="$(LINUX_DIR)/scripts/dtc/dtc" \
- FDT_SRC="$(LINUX_DIR)/arch/$(LINUX_KARCH)/boot/dts/foundation-v8.dts" \
+ FDT_SRC="$(LINUX_DIR)/arch/$(LINUX_KARCH)/boot/dts/arm/foundation-v8.dts" \
CROSS_COMPILE="$(TARGET_CROSS)" \
BOOTARGS="console=ttyAMA0 earlyprintk"
endef