diff --git a/config/boot-marvell.cmd b/config/boot-marvell.cmd index 25a7ed8cae..79914b8e86 100644 --- a/config/boot-marvell.cmd +++ b/config/boot-marvell.cmd @@ -1,9 +1,16 @@ +if ext4load mmc 0:1 0x00000000 /boot/.verbose +then +setenv verbosity 7 +else +setenv verbosity 1 +fi + setenv ethaddr 00:50:43:84:fb:2f setenv eth1addr 00:50:43:25:fb:84 setenv eth2addr 00:50:43:84:25:2f setenv eth3addr 00:50:43:0d:19:18 # -setenv bootargs "selinux=0 cgroup_disable=memory scandelay root=/dev/mmcblk0p1 rw rootfstype=ext4 console=ttyS0,115200 loglevel=7 rootwait" +setenv bootargs "selinux=0 cgroup_disable=memory scandelay root=/dev/mmcblk0p1 rw rootfstype=ext4 console=ttyS0,115200 loglevel=${verbosity} rootwait" ext2load mmc 0:1 ${fdtaddr} boot/dtb/armada-388-clearfog.dtb ext2load mmc 0:1 ${loadaddr} boot/zImage bootz ${loadaddr} - ${fdtaddr} diff --git a/config/linux-marvell-next.config b/config/linux-marvell-next.config index b96d518013..0a90b8a164 100644 --- a/config/linux-marvell-next.config +++ b/config/linux-marvell-next.config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 4.4.1 Kernel Configuration +# Linux/arm 4.4.6 Kernel Configuration # CONFIG_ARM=y CONFIG_ARM_HAS_SG_CHAIN=y @@ -113,7 +113,7 @@ CONFIG_GENERIC_SCHED_CLOCK=y CONFIG_CGROUPS=y # CONFIG_CGROUP_DEBUG is not set CONFIG_CGROUP_FREEZER=y -# CONFIG_CGROUP_PIDS is not set +CONFIG_CGROUP_PIDS=y CONFIG_CGROUP_DEVICE=y CONFIG_CPUSETS=y CONFIG_PROC_PID_CPUSET=y @@ -135,7 +135,7 @@ CONFIG_CGROUP_WRITEBACK=y CONFIG_NAMESPACES=y CONFIG_UTS_NS=y CONFIG_IPC_NS=y -# CONFIG_USER_NS is not set +CONFIG_USER_NS=y CONFIG_PID_NS=y CONFIG_NET_NS=y # CONFIG_SCHED_AUTOGROUP is not set @@ -538,7 +538,7 @@ CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 CONFIG_FORCE_MAX_ZONEORDER=11 CONFIG_ALIGNMENT_TRAP=y # CONFIG_UACCESS_WITH_MEMCPY is not set -# CONFIG_SECCOMP is not set +CONFIG_SECCOMP=y CONFIG_SWIOTLB=y CONFIG_IOMMU_HELPER=y # CONFIG_XEN is not set @@ -1136,6 +1136,7 @@ CONFIG_BRIDGE_VLAN_FILTERING=y CONFIG_HAVE_NET_DSA=y CONFIG_NET_DSA=m CONFIG_NET_DSA_HWMON=y +CONFIG_NET_DSA_TAG_EDSA=y CONFIG_VLAN_8021Q=y CONFIG_VLAN_8021Q_GVRP=y CONFIG_VLAN_8021Q_MVRP=y @@ -1205,7 +1206,7 @@ CONFIG_CLS_U32_MARK=y # CONFIG_NET_CLS_RSVP is not set # CONFIG_NET_CLS_RSVP6 is not set CONFIG_NET_CLS_FLOW=m -# CONFIG_NET_CLS_CGROUP is not set +CONFIG_NET_CLS_CGROUP=y # CONFIG_NET_CLS_BPF is not set # CONFIG_NET_CLS_FLOWER is not set CONFIG_NET_EMATCH=y @@ -1250,7 +1251,7 @@ CONFIG_NET_SWITCHDEV=y CONFIG_RPS=y CONFIG_RFS_ACCEL=y CONFIG_XPS=y -# CONFIG_CGROUP_NET_PRIO is not set +CONFIG_CGROUP_NET_PRIO=y CONFIG_CGROUP_NET_CLASSID=y CONFIG_NET_RX_BUSY_POLL=y CONFIG_BQL=y @@ -1778,7 +1779,32 @@ CONFIG_SATA_MV=y CONFIG_MD=y # CONFIG_BLK_DEV_MD is not set # CONFIG_BCACHE is not set -# CONFIG_BLK_DEV_DM is not set +CONFIG_BLK_DEV_DM_BUILTIN=y +CONFIG_BLK_DEV_DM=y +# CONFIG_DM_MQ_DEFAULT is not set +# CONFIG_DM_DEBUG is not set +CONFIG_DM_BUFIO=m +CONFIG_DM_BIO_PRISON=m +CONFIG_DM_PERSISTENT_DATA=m +# CONFIG_DM_DEBUG_BLOCK_STACK_TRACING is not set +CONFIG_DM_CRYPT=m +CONFIG_DM_SNAPSHOT=m +CONFIG_DM_THIN_PROVISIONING=m +CONFIG_DM_CACHE=m +CONFIG_DM_CACHE_MQ=m +CONFIG_DM_CACHE_SMQ=m +CONFIG_DM_CACHE_CLEANER=m +# CONFIG_DM_ERA is not set +# CONFIG_DM_MIRROR is not set +# CONFIG_DM_RAID is not set +# CONFIG_DM_ZERO is not set +# CONFIG_DM_MULTIPATH is not set +# CONFIG_DM_DELAY is not set +# CONFIG_DM_UEVENT is not set +# CONFIG_DM_FLAKEY is not set +# CONFIG_DM_VERITY is not set +# CONFIG_DM_SWITCH is not set +# CONFIG_DM_LOG_WRITES is not set # CONFIG_TARGET_CORE is not set # CONFIG_FUSION is not set @@ -1829,13 +1855,13 @@ CONFIG_ATM_DUMMY=m # # Distributed Switch Architecture drivers # -# CONFIG_NET_DSA_MV88E6XXX is not set +CONFIG_NET_DSA_MV88E6XXX=m # CONFIG_NET_DSA_MV88E6060 is not set # CONFIG_NET_DSA_MV88E6XXX_NEED_PPU is not set # CONFIG_NET_DSA_MV88E6131 is not set # CONFIG_NET_DSA_MV88E6123_61_65 is not set # CONFIG_NET_DSA_MV88E6171 is not set -# CONFIG_NET_DSA_MV88E6352 is not set +CONFIG_NET_DSA_MV88E6352=m # CONFIG_NET_DSA_BCM_SF2 is not set CONFIG_ETHERNET=y CONFIG_NET_VENDOR_3COM=y @@ -2094,7 +2120,10 @@ CONFIG_ATH9K_PCOEM=y # CONFIG_ATH6KL is not set # CONFIG_AR5523 is not set # CONFIG_WIL6210 is not set -# CONFIG_ATH10K is not set +CONFIG_ATH10K=m +CONFIG_ATH10K_PCI=m +# CONFIG_ATH10K_DEBUG is not set +# CONFIG_ATH10K_DEBUGFS is not set # CONFIG_WCN36XX is not set # CONFIG_B43 is not set # CONFIG_B43LEGACY is not set @@ -2261,7 +2290,7 @@ CONFIG_VT_CONSOLE_SLEEP=y CONFIG_HW_CONSOLE=y # CONFIG_VT_HW_CONSOLE_BINDING is not set CONFIG_UNIX98_PTYS=y -# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set +CONFIG_DEVPTS_MULTIPLE_INSTANCES=y CONFIG_LEGACY_PTYS=y CONFIG_LEGACY_PTY_COUNT=256 # CONFIG_SERIAL_NONSTANDARD is not set @@ -3672,7 +3701,9 @@ CONFIG_NVMEM=m # CONFIG_DCACHE_WORD_ACCESS=y # CONFIG_EXT2_FS is not set -# CONFIG_EXT3_FS is not set +CONFIG_EXT3_FS=y +CONFIG_EXT3_FS_POSIX_ACL=y +CONFIG_EXT3_FS_SECURITY=y CONFIG_EXT4_FS=y CONFIG_EXT4_USE_FOR_EXT2=y CONFIG_EXT4_FS_POSIX_ACL=y @@ -4047,7 +4078,6 @@ CONFIG_DEBUG_MVEBU_UART0=y # CONFIG_DEBUG_LL_UART_PL01X is not set CONFIG_DEBUG_LL_INCLUDE="debug/8250.S" CONFIG_DEBUG_UART_8250=y -# CONFIG_DEBUG_UART_BCM63XX is not set CONFIG_DEBUG_UART_PHYS=0x01c28000 CONFIG_DEBUG_UART_VIRT=0xf1c28000 CONFIG_DEBUG_UART_8250_SHIFT=2