Felix Fietkau
6 years ago
parent
fd686dfca3
commit
f445953d9f
@ -1,333 +0,0 @@ |
||||
CONFIG_ALIGNMENT_TRAP=y |
||||
CONFIG_ARCH_CLOCKSOURCE_DATA=y |
||||
CONFIG_ARCH_HAS_ELF_RANDOMIZE=y |
||||
CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y |
||||
CONFIG_ARCH_HAS_SG_CHAIN=y |
||||
CONFIG_ARCH_HAVE_CUSTOM_GPIO_H=y |
||||
CONFIG_ARCH_HIBERNATION_POSSIBLE=y |
||||
CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y |
||||
CONFIG_ARCH_MULTIPLATFORM=y |
||||
CONFIG_ARCH_MULTI_CPU_AUTO=y |
||||
# CONFIG_ARCH_MULTI_V4 is not set |
||||
# CONFIG_ARCH_MULTI_V4T is not set |
||||
CONFIG_ARCH_MULTI_V4_V5=y |
||||
CONFIG_ARCH_MULTI_V5=y |
||||
CONFIG_ARCH_MVEBU=y |
||||
CONFIG_ARCH_NR_GPIO=0 |
||||
# CONFIG_ARCH_OXNAS is not set |
||||
# CONFIG_ARCH_SELECT_MEMORY_MODEL is not set |
||||
# CONFIG_ARCH_SPARSEMEM_DEFAULT is not set |
||||
CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y |
||||
CONFIG_ARCH_SUPPORTS_BIG_ENDIAN=y |
||||
CONFIG_ARCH_SUPPORTS_UPROBES=y |
||||
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_ARCH_WANT_LIBATA_LEDS=y |
||||
CONFIG_ARM=y |
||||
# CONFIG_ARMADA_THERMAL is not set |
||||
CONFIG_ARM_APPENDED_DTB=y |
||||
CONFIG_ARM_ATAG_DTB_COMPAT=y |
||||
# CONFIG_ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEND is not set |
||||
CONFIG_ARM_ATAG_DTB_COMPAT_CMDLINE_FROM_BOOTLOADER=y |
||||
# CONFIG_ARM_CPU_SUSPEND is not set |
||||
CONFIG_ARM_HAS_SG_CHAIN=y |
||||
# CONFIG_ARM_KIRKWOOD_CPUIDLE is not set |
||||
CONFIG_ARM_L1_CACHE_SHIFT=5 |
||||
# CONFIG_ARM_MVEBU_V7_CPUIDLE is not set |
||||
CONFIG_ARM_PATCH_PHYS_VIRT=y |
||||
# CONFIG_ARM_THUMB is not set |
||||
CONFIG_ATA=y |
||||
CONFIG_ATAGS=y |
||||
CONFIG_ATA_LEDS=y |
||||
CONFIG_AUTO_ZRELADDR=y |
||||
# CONFIG_BINFMT_FLAT is not set |
||||
CONFIG_BLK_DEV_SD=y |
||||
CONFIG_BLK_MQ_PCI=y |
||||
CONFIG_CACHE_FEROCEON_L2=y |
||||
# CONFIG_CACHE_FEROCEON_L2_WRITETHROUGH is not set |
||||
# CONFIG_CACHE_L2X0 is not set |
||||
CONFIG_CLKDEV_LOOKUP=y |
||||
CONFIG_CLKSRC_MMIO=y |
||||
CONFIG_CLKSRC_OF=y |
||||
CONFIG_CLKSRC_PROBE=y |
||||
CONFIG_CLONE_BACKWARDS=y |
||||
CONFIG_COMMON_CLK=y |
||||
CONFIG_CPU_32v5=y |
||||
CONFIG_CPU_ABRT_EV5T=y |
||||
# CONFIG_CPU_BIG_ENDIAN is not set |
||||
CONFIG_CPU_CACHE_VIVT=y |
||||
CONFIG_CPU_COPY_FEROCEON=y |
||||
CONFIG_CPU_CP15=y |
||||
CONFIG_CPU_CP15_MMU=y |
||||
CONFIG_CPU_FEROCEON=y |
||||
# CONFIG_CPU_FEROCEON_OLD_ID is not set |
||||
# CONFIG_CPU_ICACHE_DISABLE is not set |
||||
CONFIG_CPU_IDLE=y |
||||
CONFIG_CPU_IDLE_GOV_LADDER=y |
||||
CONFIG_CPU_PABRT_LEGACY=y |
||||
CONFIG_CPU_PM=y |
||||
CONFIG_CPU_TLB_FEROCEON=y |
||||
CONFIG_CPU_USE_DOMAINS=y |
||||
CONFIG_CRC16=y |
||||
# CONFIG_CRC32_SARWATE is not set |
||||
CONFIG_CRC32_SLICEBY8=y |
||||
CONFIG_CRYPTO_CRC32C=y |
||||
CONFIG_CRYPTO_DEFLATE=y |
||||
CONFIG_CRYPTO_DES=y |
||||
CONFIG_CRYPTO_DEV_MARVELL_CESA=y |
||||
CONFIG_CRYPTO_HASH=y |
||||
CONFIG_CRYPTO_HASH2=y |
||||
CONFIG_CRYPTO_HW=y |
||||
CONFIG_CRYPTO_LZO=y |
||||
CONFIG_CRYPTO_RNG2=y |
||||
CONFIG_CRYPTO_WORKQUEUE=y |
||||
CONFIG_DEBUG_LL=y |
||||
CONFIG_DEBUG_LL_INCLUDE="debug/8250.S" |
||||
CONFIG_DEBUG_MVEBU_UART0_ALTERNATE=y |
||||
# CONFIG_DEBUG_MVEBU_UART1_ALTERNATE is not set |
||||
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_VIRT=0xfed12000 |
||||
CONFIG_DEBUG_UNCOMPRESS=y |
||||
# CONFIG_DEBUG_USER is not set |
||||
# CONFIG_DLCI is not set |
||||
CONFIG_DNOTIFY=y |
||||
CONFIG_DTC=y |
||||
# CONFIG_EARLY_PRINTK is not set |
||||
CONFIG_EDAC_ATOMIC_SCRUB=y |
||||
CONFIG_EDAC_SUPPORT=y |
||||
CONFIG_EXT4_FS=y |
||||
CONFIG_FIXED_PHY=y |
||||
CONFIG_FIX_EARLYCON_MEM=y |
||||
CONFIG_FRAME_POINTER=y |
||||
CONFIG_FS_MBCACHE=y |
||||
CONFIG_GENERIC_ALLOCATOR=y |
||||
CONFIG_GENERIC_ATOMIC64=y |
||||
CONFIG_GENERIC_BUG=y |
||||
CONFIG_GENERIC_CLOCKEVENTS=y |
||||
CONFIG_GENERIC_EARLY_IOREMAP=y |
||||
CONFIG_GENERIC_IDLE_POLL_SETUP=y |
||||
CONFIG_GENERIC_IO=y |
||||
CONFIG_GENERIC_IRQ_CHIP=y |
||||
CONFIG_GENERIC_IRQ_SHOW=y |
||||
CONFIG_GENERIC_IRQ_SHOW_LEVEL=y |
||||
CONFIG_GENERIC_PCI_IOMAP=y |
||||
CONFIG_GENERIC_PHY=y |
||||
CONFIG_GENERIC_SCHED_CLOCK=y |
||||
CONFIG_GENERIC_SMP_IDLE_THREAD=y |
||||
CONFIG_GENERIC_STRNCPY_FROM_USER=y |
||||
CONFIG_GENERIC_STRNLEN_USER=y |
||||
CONFIG_GLOB=y |
||||
CONFIG_GPIOLIB=y |
||||
CONFIG_GPIO_MVEBU=y |
||||
CONFIG_GPIO_SYSFS=y |
||||
CONFIG_HANDLE_DOMAIN_IRQ=y |
||||
CONFIG_HARDIRQS_SW_RESEND=y |
||||
CONFIG_HAS_DMA=y |
||||
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 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_CBPF_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_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_IDE=y |
||||
CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y |
||||
CONFIG_HAVE_MEMBLOCK=y |
||||
CONFIG_HAVE_MOD_ARCH_SPECIFIC=y |
||||
CONFIG_HAVE_NET_DSA=y |
||||
CONFIG_HAVE_OPROFILE=y |
||||
CONFIG_HAVE_OPTPROBES=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_SYSCALL_TRACEPOINTS=y |
||||
CONFIG_HAVE_UID16=y |
||||
CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y |
||||
CONFIG_HW_RANDOM=y |
||||
CONFIG_HZ_FIXED=0 |
||||
CONFIG_HZ_PERIODIC=y |
||||
CONFIG_I2C=y |
||||
CONFIG_I2C_BOARDINFO=y |
||||
CONFIG_I2C_CHARDEV=y |
||||
CONFIG_I2C_MV64XXX=y |
||||
CONFIG_INITRAMFS_SOURCE="" |
||||
CONFIG_IOMMU_HELPER=y |
||||
CONFIG_IP_PIMSM_V1=y |
||||
CONFIG_IP_PIMSM_V2=y |
||||
CONFIG_IRQCHIP=y |
||||
CONFIG_IRQ_DOMAIN=y |
||||
CONFIG_IRQ_FORCED_THREADING=y |
||||
CONFIG_IRQ_WORK=y |
||||
CONFIG_JBD2=y |
||||
CONFIG_KIRKWOOD_CLK=y |
||||
CONFIG_KIRKWOOD_THERMAL=y |
||||
CONFIG_LEDS_GPIO=y |
||||
CONFIG_LEDS_NETXBIG=y |
||||
CONFIG_LEDS_NS2=y |
||||
CONFIG_LEGACY_PTYS=y |
||||
CONFIG_LEGACY_PTY_COUNT=256 |
||||
CONFIG_LIBFDT=y |
||||
CONFIG_LZO_COMPRESS=y |
||||
CONFIG_LZO_DECOMPRESS=y |
||||
CONFIG_MACH_KIRKWOOD=y |
||||
CONFIG_MACH_MVEBU_ANY=y |
||||
CONFIG_MANGLE_BOOTARGS=y |
||||
CONFIG_MDIO_BOARDINFO=y |
||||
# CONFIG_MFD_MAX77620 is not set |
||||
CONFIG_MIGHT_HAVE_PCI=y |
||||
CONFIG_MMC=y |
||||
CONFIG_MMC_BLOCK=y |
||||
CONFIG_MMC_MVSDIO=y |
||||
# CONFIG_MMC_TIFM_SD is not set |
||||
CONFIG_MODULES_USE_ELF_REL=y |
||||
# CONFIG_MTD_CFI is not set |
||||
CONFIG_MTD_CMDLINE_PARTS=y |
||||
CONFIG_MTD_NAND=y |
||||
CONFIG_MTD_NAND_ECC=y |
||||
CONFIG_MTD_NAND_ORION=y |
||||
CONFIG_MTD_UBI=y |
||||
CONFIG_MTD_UBI_BEB_LIMIT=20 |
||||
CONFIG_MTD_UBI_BLOCK=y |
||||
# CONFIG_MTD_UBI_FASTMAP is not set |
||||
# CONFIG_MTD_UBI_GLUEBI is not set |
||||
CONFIG_MTD_UBI_WL_THRESHOLD=4096 |
||||
CONFIG_MULTI_IRQ_HANDLER=y |
||||
CONFIG_MV643XX_ETH=y |
||||
CONFIG_MVEBU_CLK_COMMON=y |
||||
CONFIG_MVEBU_MBUS=y |
||||
CONFIG_MVMDIO=y |
||||
# CONFIG_MVNETA is not set |
||||
CONFIG_MVSW61XX_PHY=y |
||||
CONFIG_NEED_DMA_MAP_STATE=y |
||||
CONFIG_NEED_KUSER_HELPERS=y |
||||
CONFIG_NEED_PER_CPU_KM=y |
||||
CONFIG_NLS=y |
||||
CONFIG_NO_BOOTMEM=y |
||||
CONFIG_OF=y |
||||
CONFIG_OF_ADDRESS=y |
||||
CONFIG_OF_ADDRESS_PCI=y |
||||
CONFIG_OF_EARLY_FLATTREE=y |
||||
CONFIG_OF_FLATTREE=y |
||||
CONFIG_OF_GPIO=y |
||||
CONFIG_OF_IRQ=y |
||||
CONFIG_OF_MDIO=y |
||||
CONFIG_OF_NET=y |
||||
CONFIG_OF_PCI=y |
||||
CONFIG_OF_PCI_IRQ=y |
||||
CONFIG_OF_RESERVED_MEM=y |
||||
CONFIG_OLD_SIGACTION=y |
||||
CONFIG_OLD_SIGSUSPEND3=y |
||||
CONFIG_ORION_IRQCHIP=y |
||||
CONFIG_ORION_TIMER=y |
||||
CONFIG_ORION_WATCHDOG=y |
||||
CONFIG_OUTER_CACHE=y |
||||
CONFIG_PAGE_OFFSET=0xC0000000 |
||||
CONFIG_PCI=y |
||||
CONFIG_PCI_DOMAINS=y |
||||
CONFIG_PCI_DOMAINS_GENERIC=y |
||||
CONFIG_PCI_MVEBU=y |
||||
CONFIG_PERF_USE_VMALLOC=y |
||||
CONFIG_PGTABLE_LEVELS=2 |
||||
CONFIG_PHYLIB=y |
||||
CONFIG_PHY_MVEBU_SATA=y |
||||
CONFIG_PINCTRL=y |
||||
CONFIG_PINCTRL_KIRKWOOD=y |
||||
CONFIG_PINCTRL_MVEBU=y |
||||
# CONFIG_PINCTRL_SINGLE is not set |
||||
CONFIG_PLAT_ORION=y |
||||
CONFIG_POWER_RESET=y |
||||
# CONFIG_POWER_RESET_BRCMKONA is not set |
||||
CONFIG_POWER_RESET_GPIO=y |
||||
# CONFIG_POWER_RESET_QNAP is not set |
||||
CONFIG_POWER_SUPPLY=y |
||||
CONFIG_RATIONAL=y |
||||
# CONFIG_RCU_STALL_COMMON is not set |
||||
CONFIG_REGMAP=y |
||||
CONFIG_REGMAP_I2C=y |
||||
CONFIG_REGMAP_SPI=y |
||||
CONFIG_REGULATOR=y |
||||
CONFIG_REGULATOR_FIXED_VOLTAGE=y |
||||
CONFIG_RTC_CLASS=y |
||||
CONFIG_RTC_DRV_MV=y |
||||
CONFIG_RTC_I2C_AND_SPI=y |
||||
CONFIG_RTC_MC146818_LIB=y |
||||
CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
||||
CONFIG_SATA_MV=y |
||||
# CONFIG_SCHED_INFO is not set |
||||
CONFIG_SCSI=y |
||||
CONFIG_SERIAL_8250_DEPRECATED_OPTIONS=y |
||||
CONFIG_SERIAL_8250_FSL=y |
||||
# CONFIG_SERIAL_MVEBU_UART is not set |
||||
CONFIG_SERIAL_OF_PLATFORM=y |
||||
CONFIG_SG_POOL=y |
||||
CONFIG_SOC_BUS=y |
||||
CONFIG_SPARSE_IRQ=y |
||||
CONFIG_SPI=y |
||||
CONFIG_SPI_MASTER=y |
||||
CONFIG_SPI_ORION=y |
||||
CONFIG_SPLIT_PTLOCK_CPUS=999999 |
||||
CONFIG_SRAM=y |
||||
CONFIG_SRCU=y |
||||
CONFIG_SWCONFIG=y |
||||
CONFIG_SWIOTLB=y |
||||
CONFIG_SWPHY=y |
||||
CONFIG_SYS_SUPPORTS_APM_EMULATION=y |
||||
CONFIG_THERMAL=y |
||||
CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y |
||||
CONFIG_THERMAL_GOV_STEP_WISE=y |
||||
CONFIG_THERMAL_OF=y |
||||
CONFIG_TICK_CPU_ACCOUNTING=y |
||||
CONFIG_UBIFS_FS=y |
||||
CONFIG_UBIFS_FS_ADVANCED_COMPR=y |
||||
CONFIG_UBIFS_FS_LZO=y |
||||
CONFIG_UBIFS_FS_ZLIB=y |
||||
CONFIG_UNCOMPRESS_INCLUDE="debug/uncompress.h" |
||||
CONFIG_USB=y |
||||
CONFIG_USB_COMMON=y |
||||
CONFIG_USB_EHCI_HCD=y |
||||
CONFIG_USB_EHCI_HCD_ORION=y |
||||
# CONFIG_USB_EHCI_HCD_PLATFORM is not set |
||||
CONFIG_USB_EHCI_PCI=y |
||||
CONFIG_USB_LED_TRIG=y |
||||
CONFIG_USB_STORAGE=y |
||||
CONFIG_USB_SUPPORT=y |
||||
# CONFIG_USB_UHCI_HCD is not set |
||||
CONFIG_USE_OF=y |
||||
CONFIG_VECTORS_BASE=0xffff0000 |
||||
# CONFIG_VFP is not set |
||||
CONFIG_VM_EVENT_COUNTERS=y |
||||
CONFIG_WAN=y |
||||
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_ZLIB_DEFLATE=y |
||||
CONFIG_ZLIB_INFLATE=y |
||||
@ -1,30 +0,0 @@ |
||||
--- a/arch/arm/boot/dts/kirkwood-ib62x0.dts
|
||||
+++ b/arch/arm/boot/dts/kirkwood-ib62x0.dts
|
||||
@@ -5,7 +5,7 @@
|
||||
|
||||
/ {
|
||||
model = "RaidSonic ICY BOX IB-NAS62x0 (Rev B)";
|
||||
- compatible = "raidsonic,ib-nas6210-b", "raidsonic,ib-nas6220-b", "raidsonic,ib-nas6210", "raidsonic,ib-nas6220", "raidsonic,ib-nas62x0", "marvell,kirkwood-88f6281", "marvell,kirkwood";
|
||||
+ compatible = "raidsonic,ib-nas62x0", "marvell,kirkwood-88f6281", "marvell,kirkwood";
|
||||
|
||||
memory {
|
||||
device_type = "memory";
|
||||
@@ -117,13 +117,13 @@
|
||||
};
|
||||
|
||||
partition@100000 {
|
||||
- label = "uImage";
|
||||
- reg = <0x0100000 0x600000>;
|
||||
+ label = "second stage u-boot";
|
||||
+ reg = <0x100000 0x200000>;
|
||||
};
|
||||
|
||||
- partition@700000 {
|
||||
- label = "root";
|
||||
- reg = <0x0700000 0xf900000>;
|
||||
+ partition@200000 {
|
||||
+ label = "ubi";
|
||||
+ reg = <0x200000 0xfe00000>;
|
||||
};
|
||||
|
||||
};
|
||||
@ -1,50 +0,0 @@ |
||||
--- a/arch/arm/boot/dts/kirkwood-iconnect.dts
|
||||
+++ b/arch/arm/boot/dts/kirkwood-iconnect.dts
|
||||
@@ -15,8 +15,6 @@
|
||||
chosen {
|
||||
bootargs = "console=ttyS0,115200n8 earlyprintk";
|
||||
stdout-path = &uart0;
|
||||
- linux,initrd-start = <0x4500040>;
|
||||
- linux,initrd-end = <0x4800000>;
|
||||
};
|
||||
|
||||
ocp@f1000000 {
|
||||
@@ -145,28 +143,23 @@
|
||||
status = "okay";
|
||||
|
||||
partition@0 {
|
||||
- label = "uboot";
|
||||
- reg = <0x0000000 0xc0000>;
|
||||
+ label = "u-boot";
|
||||
+ reg = <0x0000000 0xe0000>;
|
||||
};
|
||||
|
||||
- partition@a0000 {
|
||||
- label = "env";
|
||||
- reg = <0xa0000 0x20000>;
|
||||
+ partition@e0000 {
|
||||
+ label = "u-boot environment";
|
||||
+ reg = <0xe0000 0x100000>;
|
||||
};
|
||||
|
||||
partition@100000 {
|
||||
- label = "zImage";
|
||||
- reg = <0x100000 0x300000>;
|
||||
+ label = "second stage u-boot";
|
||||
+ reg = <0x100000 0x200000>;
|
||||
};
|
||||
|
||||
- partition@540000 {
|
||||
- label = "initrd";
|
||||
- reg = <0x540000 0x300000>;
|
||||
- };
|
||||
-
|
||||
- partition@980000 {
|
||||
- label = "boot";
|
||||
- reg = <0x980000 0x1f400000>;
|
||||
+ partition@200000 {
|
||||
+ label = "ubi";
|
||||
+ reg = <0x200000 0x1fe00000>;
|
||||
};
|
||||
};
|
||||
|
||||
@ -1,32 +0,0 @@ |
||||
--- a/arch/arm/boot/dts/kirkwood-dockstar.dts
|
||||
+++ b/arch/arm/boot/dts/kirkwood-dockstar.dts
|
||||
@@ -77,18 +77,22 @@
|
||||
|
||||
partition@0 {
|
||||
label = "u-boot";
|
||||
- reg = <0x0000000 0x100000>;
|
||||
- read-only;
|
||||
+ reg = <0x0000000 0xe0000>;
|
||||
+ };
|
||||
+
|
||||
+ partition@e0000 {
|
||||
+ label = "u-boot environment";
|
||||
+ reg = <0xe0000 0x100000>;
|
||||
};
|
||||
|
||||
partition@100000 {
|
||||
- label = "uImage";
|
||||
- reg = <0x0100000 0x400000>;
|
||||
+ label = "second stage u-boot";
|
||||
+ reg = <0x100000 0x200000>;
|
||||
};
|
||||
|
||||
- partition@500000 {
|
||||
- label = "data";
|
||||
- reg = <0x0500000 0xfb00000>;
|
||||
+ partition@200000 {
|
||||
+ label = "ubi";
|
||||
+ reg = <0x200000 0xfe00000>;
|
||||
};
|
||||
};
|
||||
|
||||
@ -1,33 +0,0 @@ |
||||
--- a/arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts
|
||||
+++ b/arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts
|
||||
@@ -185,18 +185,18 @@
|
||||
};
|
||||
|
||||
partition@a0000 {
|
||||
- label = "env";
|
||||
+ label = "u-boot environment";
|
||||
reg = <0xa0000 0x20000>;
|
||||
read-only;
|
||||
};
|
||||
|
||||
partition@100000 {
|
||||
- label = "uImage";
|
||||
+ label = "kernel";
|
||||
reg = <0x100000 0x300000>;
|
||||
};
|
||||
|
||||
partition@400000 {
|
||||
- label = "rootfs";
|
||||
+ label = "ubi";
|
||||
reg = <0x400000 0x1C00000>;
|
||||
};
|
||||
};
|
||||
@@ -210,7 +210,7 @@
|
||||
};
|
||||
|
||||
ð0 {
|
||||
- status = "okay";
|
||||
+ status = "disabled";
|
||||
ethernet0-port@0 {
|
||||
speed = <1000>;
|
||||
duplex = <1>;
|
||||
@ -1,258 +0,0 @@ |
||||
--- a/arch/arm/boot/dts/Makefile
|
||||
+++ b/arch/arm/boot/dts/Makefile
|
||||
@@ -220,6 +220,7 @@ dtb-$(CONFIG_MACH_KIRKWOOD) += \
|
||||
kirkwood-linkstation-lswsxl.dtb \
|
||||
kirkwood-linkstation-lswvl.dtb \
|
||||
kirkwood-linkstation-lswxl.dtb \
|
||||
+ kirkwood-linksys-audi.dtb \
|
||||
kirkwood-linksys-viper.dtb \
|
||||
kirkwood-lschlv2.dtb \
|
||||
kirkwood-lsxhl.dtb \
|
||||
--- /dev/null
|
||||
+++ b/arch/arm/boot/dts/kirkwood-linksys-audi.dts
|
||||
@@ -0,0 +1,245 @@
|
||||
+/*
|
||||
+ * kirkwood-linksys-audi.dts - Device Tree file for Linksys EA3500
|
||||
+ *
|
||||
+ * (c) 2013 Jonas Gorski <jogo@openwrt.org>
|
||||
+ * (c) 2013 Deutsche Telekom Innovation Laboratories
|
||||
+ * (c) 2014 Luka Perkov <luka@openwrt.org>
|
||||
+ * (c) 2014 Dan Walters <dan@walters.io>
|
||||
+ *
|
||||
+ * This file is licensed under the terms of the GNU General Public
|
||||
+ * License version 2. This program is licensed "as is" without any
|
||||
+ * warranty of any kind, whether express or implied.
|
||||
+ */
|
||||
+
|
||||
+/dts-v1/;
|
||||
+
|
||||
+#include "kirkwood.dtsi"
|
||||
+#include "kirkwood-6282.dtsi"
|
||||
+
|
||||
+/ {
|
||||
+ model = "Linksys Audi (EA3500)";
|
||||
+ compatible = "linksys,audi", "marvell,kirkwood-88f6282", "marvell,kirkwood";
|
||||
+
|
||||
+ memory {
|
||||
+ device_type = "memory";
|
||||
+ reg = <0x00000000 0x4000000>;
|
||||
+ };
|
||||
+
|
||||
+ aliases {
|
||||
+ serial0 = &uart0;
|
||||
+ };
|
||||
+
|
||||
+ chosen {
|
||||
+ stdout-path = "serial0:115200n8";
|
||||
+ };
|
||||
+
|
||||
+ gpio_keys {
|
||||
+ compatible = "gpio-keys";
|
||||
+ #address-cells = <1>;
|
||||
+ #size-cells = <0>;
|
||||
+ pinctrl-0 = < &pmx_btn_wps &pmx_btn_reset >;
|
||||
+ pinctrl-names = "default";
|
||||
+
|
||||
+ wps {
|
||||
+ label = "WPS Button";
|
||||
+ linux,code = <KEY_WPS_BUTTON>;
|
||||
+ gpios = <&gpio1 15 GPIO_ACTIVE_LOW>;
|
||||
+ };
|
||||
+
|
||||
+ reset {
|
||||
+ label = "Reset Button";
|
||||
+ linux,code = <KEY_RESTART>;
|
||||
+ gpios = <&gpio1 16 GPIO_ACTIVE_LOW>;
|
||||
+ };
|
||||
+ };
|
||||
+
|
||||
+ gpio-leds {
|
||||
+ compatible = "gpio-leds";
|
||||
+ pinctrl-0 = < &pmx_led_green_power >;
|
||||
+ pinctrl-names = "default";
|
||||
+
|
||||
+ green-power {
|
||||
+ label = "audi:green:power";
|
||||
+ gpios = <&gpio0 7 GPIO_ACTIVE_HIGH>;
|
||||
+ };
|
||||
+ };
|
||||
+
|
||||
+ mvsw61xx {
|
||||
+ compatible = "marvell,88e6171";
|
||||
+ status = "okay";
|
||||
+ reg = <0x10>;
|
||||
+
|
||||
+ mii-bus = <&mdio>;
|
||||
+ cpu-port-0 = <5>;
|
||||
+ cpu-port-1 = <6>;
|
||||
+ is-indirect;
|
||||
+ };
|
||||
+
|
||||
+ dsa {
|
||||
+ compatible = "marvell,dsa";
|
||||
+ #address-cells = <2>;
|
||||
+ #size-cells = <0>;
|
||||
+
|
||||
+ dsa,ethernet = <ð0port>;
|
||||
+ dsa,mii-bus = <&mdio>;
|
||||
+
|
||||
+ switch@16,0 {
|
||||
+ #address-cells = <1>;
|
||||
+ #size-cells = <0>;
|
||||
+ reg = <16 0>; /* MDIO address 16, switch 0 in tree */
|
||||
+
|
||||
+ port@0 {
|
||||
+ reg = <0>;
|
||||
+ label = "ethernet1";
|
||||
+ };
|
||||
+
|
||||
+ port@1 {
|
||||
+ reg = <1>;
|
||||
+ label = "ethernet2";
|
||||
+ };
|
||||
+
|
||||
+ port@2 {
|
||||
+ reg = <2>;
|
||||
+ label = "ethernet3";
|
||||
+ };
|
||||
+
|
||||
+ port@3 {
|
||||
+ reg = <3>;
|
||||
+ label = "ethernet4";
|
||||
+ };
|
||||
+
|
||||
+ port@4 {
|
||||
+ reg = <4>;
|
||||
+ label = "internet";
|
||||
+ };
|
||||
+
|
||||
+ port@5 {
|
||||
+ reg = <5>;
|
||||
+ label = "cpu";
|
||||
+ };
|
||||
+ };
|
||||
+ };
|
||||
+};
|
||||
+
|
||||
+&pinctrl {
|
||||
+ pmx_led_green_power: pmx-led-green-power {
|
||||
+ marvell,pins = "mpp7";
|
||||
+ marvell,function = "gpo";
|
||||
+ };
|
||||
+ pmx_btn_wps: pmx-btn-wps {
|
||||
+ marvell,pins = "mpp47";
|
||||
+ marvell,function = "gpio";
|
||||
+ };
|
||||
+ pmx_btn_reset: pmx-btn-reset {
|
||||
+ marvell,pins = "mpp48";
|
||||
+ marvell,function = "gpio";
|
||||
+ };
|
||||
+};
|
||||
+
|
||||
+&nand {
|
||||
+ status = "okay";
|
||||
+ pinctrl-0 = <&pmx_nand>;
|
||||
+ pinctrl-names = "default";
|
||||
+
|
||||
+ partitions {
|
||||
+ compatible = "fixed-partitions";
|
||||
+ #address-cells = <1>;
|
||||
+ #size-cells = <1>;
|
||||
+
|
||||
+ partition@0 {
|
||||
+ label = "u-boot";
|
||||
+ reg = <0x0 0x80000>;
|
||||
+ read-only;
|
||||
+ };
|
||||
+
|
||||
+ partition@80000 {
|
||||
+ label = "u_env";
|
||||
+ reg = <0x80000 0x4000>;
|
||||
+ };
|
||||
+
|
||||
+ partition@84000 {
|
||||
+ label = "s_env";
|
||||
+ reg = <0x84000 0x4000>;
|
||||
+ };
|
||||
+
|
||||
+ partition@200000 {
|
||||
+ label = "kernel1";
|
||||
+ reg = <0x200000 0x290000>;
|
||||
+ };
|
||||
+
|
||||
+ partition@490000 {
|
||||
+ label = "rootfs1";
|
||||
+ reg = <0x490000 0x1170000>;
|
||||
+ };
|
||||
+
|
||||
+ partition@1600000 {
|
||||
+ label = "kernel2";
|
||||
+ reg = <0x1600000 0x290000>;
|
||||
+ };
|
||||
+
|
||||
+ partition@1890000 {
|
||||
+ label = "rootfs2";
|
||||
+ reg = <0x1890000 0x1170000>;
|
||||
+ };
|
||||
+
|
||||
+ partition@2a00000 {
|
||||
+ label = "syscfg";
|
||||
+ reg = <0x2a00000 0x1600000>;
|
||||
+ };
|
||||
+
|
||||
+ partition@88000 {
|
||||
+ label = "unused";
|
||||
+ reg = <0x88000 0x178000>;
|
||||
+ };
|
||||
+
|
||||
+ };
|
||||
+};
|
||||
+
|
||||
+&pciec {
|
||||
+ status = "okay";
|
||||
+};
|
||||
+
|
||||
+&pcie0 {
|
||||
+ status = "okay";
|
||||
+};
|
||||
+
|
||||
+&pcie1 {
|
||||
+ status = "okay";
|
||||
+};
|
||||
+
|
||||
+&mdio {
|
||||
+ status = "okay";
|
||||
+};
|
||||
+
|
||||
+&uart0 {
|
||||
+ status = "okay";
|
||||
+};
|
||||
+
|
||||
+/* eth0 is connected to a Marvell 88E6171 switch, without a PHY. So set
|
||||
+ * fixed speed and duplex.
|
||||
+ */
|
||||
+ð0 {
|
||||
+ status = "okay";
|
||||
+ ethernet0-port@0 {
|
||||
+ speed = <1000>;
|
||||
+ duplex = <1>;
|
||||
+ };
|
||||
+};
|
||||
+
|
||||
+/* eth1 is connected to the switch at port 6. However DSA only supports a
|
||||
+ * single CPU port. Upstream uses DSA so they disable this port to avoid confusion.
|
||||
+ */
|
||||
+ð1 {
|
||||
+ status = "okay";
|
||||
+ ethernet1-port@0 {
|
||||
+ speed = <1000>;
|
||||
+ duplex = <1>;
|
||||
+ };
|
||||
+};
|
||||
+
|
||||
+/* There is no battery on the board, so the RTC does not keep
|
||||
+ * time when there is no power, making it useless.
|
||||
+ */
|
||||
+&rtc {
|
||||
+ status = "disabled";
|
||||
+};
|
||||
@ -1,64 +0,0 @@ |
||||
--- a/arch/arm/boot/dts/kirkwood-linksys-viper.dts
|
||||
+++ b/arch/arm/boot/dts/kirkwood-linksys-viper.dts
|
||||
@@ -69,6 +69,17 @@
|
||||
};
|
||||
};
|
||||
|
||||
+ mvsw61xx {
|
||||
+ compatible = "marvell,88e6171";
|
||||
+ status = "okay";
|
||||
+ reg = <0x10>;
|
||||
+
|
||||
+ mii-bus = <&mdio>;
|
||||
+ cpu-port-0 = <5>;
|
||||
+ cpu-port-1 = <6>;
|
||||
+ is-indirect;
|
||||
+ };
|
||||
+
|
||||
dsa {
|
||||
compatible = "marvell,dsa";
|
||||
#address-cells = <2>;
|
||||
@@ -161,22 +172,22 @@
|
||||
};
|
||||
|
||||
partition@200000 {
|
||||
- label = "kernel";
|
||||
+ label = "kernel1";
|
||||
reg = <0x200000 0x2A0000>;
|
||||
};
|
||||
|
||||
partition@4A0000 {
|
||||
- label = "rootfs";
|
||||
+ label = "rootfs1";
|
||||
reg = <0x4A0000 0x1760000>;
|
||||
};
|
||||
|
||||
partition@1C00000 {
|
||||
- label = "alt_kernel";
|
||||
+ label = "kernel2";
|
||||
reg = <0x1C00000 0x2A0000>;
|
||||
};
|
||||
|
||||
partition@1EA0000 {
|
||||
- label = "alt_rootfs";
|
||||
+ label = "rootfs2";
|
||||
reg = <0x1EA0000 0x1760000>;
|
||||
};
|
||||
|
||||
@@ -225,10 +236,14 @@
|
||||
};
|
||||
|
||||
/* eth1 is connected to the switch at port 6. However DSA only supports a
|
||||
- * single CPU port. So leave this port disabled to avoid confusion.
|
||||
+ * single CPU port. Upstream uses DSA so they disable this port to avoid confusion.
|
||||
*/
|
||||
ð1 {
|
||||
- status = "disabled";
|
||||
+ status = "okay";
|
||||
+ ethernet1-port@0 {
|
||||
+ speed = <1000>;
|
||||
+ duplex = <1>;
|
||||
+ };
|
||||
};
|
||||
|
||||
/* There is no battery on the board, so the RTC does not keep
|
||||
@ -1,130 +0,0 @@ |
||||
--- a/arch/arm/boot/dts/Makefile
|
||||
+++ b/arch/arm/boot/dts/Makefile
|
||||
@@ -207,6 +207,7 @@ dtb-$(CONFIG_MACH_KIRKWOOD) += \
|
||||
kirkwood-ds411.dtb \
|
||||
kirkwood-ds411j.dtb \
|
||||
kirkwood-ds411slim.dtb \
|
||||
+ kirkwood-goflexhome.dtb \
|
||||
kirkwood-goflexnet.dtb \
|
||||
kirkwood-guruplug-server-plus.dtb \
|
||||
kirkwood-ib62x0.dtb \
|
||||
--- /dev/null
|
||||
+++ b/arch/arm/boot/dts/kirkwood-goflexhome.dts
|
||||
@@ -0,0 +1,117 @@
|
||||
+/dts-v1/;
|
||||
+
|
||||
+#include "kirkwood.dtsi"
|
||||
+#include "kirkwood-6281.dtsi"
|
||||
+
|
||||
+/ {
|
||||
+ model = "Seagate GoFlex Home";
|
||||
+ compatible = "seagate,goflexhome", "marvell,kirkwood-88f6281", "marvell,kirkwood";
|
||||
+
|
||||
+ memory {
|
||||
+ device_type = "memory";
|
||||
+ reg = <0x00000000 0x8000000>;
|
||||
+ };
|
||||
+
|
||||
+ chosen {
|
||||
+ bootargs = "console=ttyS0,115200n8 earlyprintk root=/dev/sda1 rootdelay=10";
|
||||
+ stdout-path = &uart0;
|
||||
+ };
|
||||
+
|
||||
+ ocp@f1000000 {
|
||||
+ pinctrl: pin-controller@10000 {
|
||||
+ pmx_usb_power_enable: pmx-usb-power-enable {
|
||||
+ marvell,pins = "mpp29";
|
||||
+ marvell,function = "gpio";
|
||||
+ };
|
||||
+ pmx_led_white: pmx-led-white {
|
||||
+ marvell,pins = "mpp40";
|
||||
+ marvell,function = "gpio";
|
||||
+ };
|
||||
+ pmx_led_green: pmx-led_green {
|
||||
+ marvell,pins = "mpp46";
|
||||
+ marvell,function = "gpio";
|
||||
+ };
|
||||
+ pmx_led_orange: pmx-led-orange {
|
||||
+ marvell,pins = "mpp47";
|
||||
+ marvell,function = "gpio";
|
||||
+ };
|
||||
+ };
|
||||
+ serial@12000 {
|
||||
+ status = "ok";
|
||||
+ };
|
||||
+
|
||||
+ sata@80000 {
|
||||
+ status = "okay";
|
||||
+ nr-ports = <2>;
|
||||
+ };
|
||||
+
|
||||
+ };
|
||||
+ gpio-leds {
|
||||
+ compatible = "gpio-leds";
|
||||
+
|
||||
+ health {
|
||||
+ label = "status:green:health";
|
||||
+ gpios = <&gpio1 14 GPIO_ACTIVE_LOW>;
|
||||
+ linux,default-trigger = "default-on";
|
||||
+ };
|
||||
+ fault {
|
||||
+ label = "status:orange:fault";
|
||||
+ gpios = <&gpio1 15 GPIO_ACTIVE_LOW>;
|
||||
+ };
|
||||
+ misc {
|
||||
+ label = "status:white:misc";
|
||||
+ gpios = <&gpio1 8 GPIO_ACTIVE_LOW>;
|
||||
+ linux,default-trigger = "disk-activity";
|
||||
+ };
|
||||
+ };
|
||||
+ regulators {
|
||||
+ compatible = "simple-bus";
|
||||
+ #address-cells = <1>;
|
||||
+ #size-cells = <0>;
|
||||
+ pinctrl-0 = <&pmx_usb_power_enable>;
|
||||
+ pinctrl-names = "default";
|
||||
+
|
||||
+ usb_power: regulator@1 {
|
||||
+ compatible = "regulator-fixed";
|
||||
+ reg = <1>;
|
||||
+ regulator-name = "USB Power";
|
||||
+ regulator-min-microvolt = <5000000>;
|
||||
+ regulator-max-microvolt = <5000000>;
|
||||
+ enable-active-high;
|
||||
+ regulator-always-on;
|
||||
+ regulator-boot-on;
|
||||
+ gpio = <&gpio0 29 GPIO_ACTIVE_HIGH>;
|
||||
+ };
|
||||
+ };
|
||||
+};
|
||||
+
|
||||
+&nand {
|
||||
+ chip-delay = <40>;
|
||||
+ status = "okay";
|
||||
+
|
||||
+ partition@0 {
|
||||
+ label = "u-boot";
|
||||
+ reg = <0x0000000 0x100000>;
|
||||
+ read-only;
|
||||
+ };
|
||||
+
|
||||
+ partition@100000 {
|
||||
+ label = "ubi";
|
||||
+ reg = <0x100000 0x0ff00000>;
|
||||
+ };
|
||||
+};
|
||||
+
|
||||
+&mdio {
|
||||
+ status = "okay";
|
||||
+
|
||||
+ ethphy0: ethernet-phy@0 {
|
||||
+ reg = <0>;
|
||||
+ };
|
||||
+};
|
||||
+
|
||||
+ð0 {
|
||||
+ status = "okay";
|
||||
+ ethernet0-port@0 {
|
||||
+ phy-handle = <ðphy0>;
|
||||
+ };
|
||||
+};
|
||||
@ -1,23 +0,0 @@ |
||||
--- a/arch/arm/boot/dts/kirkwood-goflexnet.dts
|
||||
+++ b/arch/arm/boot/dts/kirkwood-goflexnet.dts
|
||||
@@ -158,18 +158,8 @@
|
||||
};
|
||||
|
||||
partition@100000 {
|
||||
- label = "uImage";
|
||||
- reg = <0x0100000 0x400000>;
|
||||
- };
|
||||
-
|
||||
- partition@500000 {
|
||||
- label = "pogoplug";
|
||||
- reg = <0x0500000 0x2000000>;
|
||||
- };
|
||||
-
|
||||
- partition@2500000 {
|
||||
- label = "root";
|
||||
- reg = <0x02500000 0xd800000>;
|
||||
+ label = "ubi";
|
||||
+ reg = <0x0100000 0x0ff00000>;
|
||||
};
|
||||
};
|
||||
|
||||
@ -1,48 +0,0 @@ |
||||
--- a/arch/arm/boot/dts/kirkwood-nsa3x0-common.dtsi
|
||||
+++ b/arch/arm/boot/dts/kirkwood-nsa3x0-common.dtsi
|
||||
@@ -111,40 +111,16 @@
|
||||
|
||||
partition@0 {
|
||||
label = "uboot";
|
||||
- reg = <0x0000000 0x0100000>;
|
||||
+ reg = <0x0000000 0x00c0000>;
|
||||
read-only;
|
||||
};
|
||||
partition@100000 {
|
||||
label = "uboot_env";
|
||||
- reg = <0x0100000 0x0080000>;
|
||||
+ reg = <0x00c0000 0x0080000>;
|
||||
};
|
||||
- partition@180000 {
|
||||
- label = "key_store";
|
||||
- reg = <0x0180000 0x0080000>;
|
||||
- };
|
||||
- partition@200000 {
|
||||
- label = "info";
|
||||
- reg = <0x0200000 0x0080000>;
|
||||
- };
|
||||
- partition@280000 {
|
||||
- label = "etc";
|
||||
- reg = <0x0280000 0x0a00000>;
|
||||
- };
|
||||
- partition@c80000 {
|
||||
- label = "kernel_1";
|
||||
- reg = <0x0c80000 0x0a00000>;
|
||||
- };
|
||||
- partition@1680000 {
|
||||
- label = "rootfs1";
|
||||
- reg = <0x1680000 0x2fc0000>;
|
||||
- };
|
||||
- partition@4640000 {
|
||||
- label = "kernel_2";
|
||||
- reg = <0x4640000 0x0a00000>;
|
||||
- };
|
||||
- partition@5040000 {
|
||||
- label = "rootfs2";
|
||||
- reg = <0x5040000 0x2fc0000>;
|
||||
+ partition@140000 {
|
||||
+ label = "ubi";
|
||||
+ reg = <0x0140000 0x7ec0000>;
|
||||
};
|
||||
};
|
||||
|
||||
@ -1,147 +0,0 @@ |
||||
kirkwood: add nsa310b dtb, a zyxel nsa310 variant
|
||||
|
||||
add support to a nsa310 variant with red/green usb led
|
||||
and lm85 temp/fan controller
|
||||
|
||||
Signed-off-by: Alberto Bursi <alberto.bursi@outlook.it>
|
||||
|
||||
NOTE: this patch can be upstreamed as-is, LEDE-specific
|
||||
nand partitions are set in another patch
|
||||
|
||||
--- a/arch/arm/boot/dts/Makefile
|
||||
+++ b/arch/arm/boot/dts/Makefile
|
||||
@@ -238,6 +238,7 @@ dtb-$(CONFIG_MACH_KIRKWOOD) += \
|
||||
kirkwood-ns2mini.dtb \
|
||||
kirkwood-nsa310.dtb \
|
||||
kirkwood-nsa310a.dtb \
|
||||
+ kirkwood-nsa310b.dtb \
|
||||
kirkwood-nsa320.dtb \
|
||||
kirkwood-nsa325.dtb \
|
||||
kirkwood-openblocks_a6.dtb \
|
||||
--- /dev/null
|
||||
+++ b/arch/arm/boot/dts/kirkwood-nsa310b.dts
|
||||
@@ -0,0 +1,124 @@
|
||||
+/dts-v1/;
|
||||
+
|
||||
+#include "kirkwood-nsa3x0-common.dtsi"
|
||||
+
|
||||
+/*
|
||||
+ * There are at least two different NSA310 designs. This variant has
|
||||
+ * a red/green USB Led (same as nsa310) and a lm85 temp/fan controller.
|
||||
+ */
|
||||
+
|
||||
+/ {
|
||||
+ model = "ZyXEL NSA310b";
|
||||
+ compatible = "zyxel,nsa310b", "zyxel,nsa310", "marvell,kirkwood-88f6281", "marvell,kirkwood";
|
||||
+
|
||||
+ memory {
|
||||
+ device_type = "memory";
|
||||
+ reg = <0x00000000 0x10000000>;
|
||||
+ };
|
||||
+
|
||||
+ chosen {
|
||||
+ bootargs = "console=ttyS0,115200";
|
||||
+ stdout-path = &uart0;
|
||||
+ };
|
||||
+
|
||||
+ ocp@f1000000 {
|
||||
+ pinctrl: pin-controller@10000 {
|
||||
+ pinctrl-names = "default";
|
||||
+
|
||||
+ pmx_led_esata_green: pmx-led-esata-green {
|
||||
+ marvell,pins = "mpp12";
|
||||
+ marvell,function = "gpio";
|
||||
+ };
|
||||
+
|
||||
+ pmx_led_esata_red: pmx-led-esata-red {
|
||||
+ marvell,pins = "mpp13";
|
||||
+ marvell,function = "gpio";
|
||||
+ };
|
||||
+
|
||||
+ pmx_led_usb_green: pmx-led-usb-green {
|
||||
+ marvell,pins = "mpp15";
|
||||
+ marvell,function = "gpio";
|
||||
+ };
|
||||
+
|
||||
+ pmx_led_usb_red: pmx-led-usb-red {
|
||||
+ marvell,pins = "mpp16";
|
||||
+ marvell,function = "gpio";
|
||||
+ };
|
||||
+
|
||||
+ pmx_led_sys_green: pmx-led-sys-green {
|
||||
+ marvell,pins = "mpp28";
|
||||
+ marvell,function = "gpio";
|
||||
+ };
|
||||
+
|
||||
+ pmx_led_sys_red: pmx-led-sys-red {
|
||||
+ marvell,pins = "mpp29";
|
||||
+ marvell,function = "gpio";
|
||||
+ };
|
||||
+
|
||||
+ pmx_led_hdd_green: pmx-led-hdd-green {
|
||||
+ marvell,pins = "mpp41";
|
||||
+ marvell,function = "gpio";
|
||||
+ };
|
||||
+
|
||||
+ pmx_led_hdd_red: pmx-led-hdd-red {
|
||||
+ marvell,pins = "mpp42";
|
||||
+ marvell,function = "gpio";
|
||||
+ };
|
||||
+
|
||||
+ };
|
||||
+
|
||||
+ i2c@11000 {
|
||||
+ status = "okay";
|
||||
+
|
||||
+ lm85: lm85@2e {
|
||||
+ compatible = "national,lm85";
|
||||
+ reg = <0x2e>;
|
||||
+ };
|
||||
+ };
|
||||
+ };
|
||||
+
|
||||
+ gpio-leds {
|
||||
+ compatible = "gpio-leds";
|
||||
+
|
||||
+ green-sys {
|
||||
+ label = "nsa310:green:sys";
|
||||
+ gpios = <&gpio0 28 GPIO_ACTIVE_HIGH>;
|
||||
+ };
|
||||
+ red-sys {
|
||||
+ label = "nsa310:red:sys";
|
||||
+ gpios = <&gpio0 29 GPIO_ACTIVE_HIGH>;
|
||||
+ };
|
||||
+ green-hdd {
|
||||
+ label = "nsa310:green:hdd";
|
||||
+ gpios = <&gpio1 9 GPIO_ACTIVE_HIGH>;
|
||||
+ };
|
||||
+ red-hdd {
|
||||
+ label = "nsa310:red:hdd";
|
||||
+ gpios = <&gpio1 10 GPIO_ACTIVE_HIGH>;
|
||||
+ };
|
||||
+ green-esata {
|
||||
+ label = "nsa310:green:esata";
|
||||
+ gpios = <&gpio0 12 GPIO_ACTIVE_HIGH>;
|
||||
+ };
|
||||
+ red-esata {
|
||||
+ label = "nsa310:red:esata";
|
||||
+ gpios = <&gpio0 13 GPIO_ACTIVE_HIGH>;
|
||||
+ };
|
||||
+ green-usb {
|
||||
+ label = "nsa310:green:usb";
|
||||
+ gpios = <&gpio0 15 GPIO_ACTIVE_HIGH>;
|
||||
+ };
|
||||
+ red-usb {
|
||||
+ label = "nsa310:red:usb";
|
||||
+ gpios = <&gpio0 16 GPIO_ACTIVE_HIGH>;
|
||||
+ };
|
||||
+ green-copy {
|
||||
+ label = "nsa310:green:copy";
|
||||
+ gpios = <&gpio1 7 GPIO_ACTIVE_HIGH>;
|
||||
+ };
|
||||
+ red-copy {
|
||||
+ label = "nsa310:red:copy";
|
||||
+ gpios = <&gpio1 8 GPIO_ACTIVE_HIGH>;
|
||||
+ };
|
||||
+ };
|
||||
+};
|
||||
@ -1,173 +0,0 @@ |
||||
--- /dev/null
|
||||
+++ b/arch/arm/boot/dts/kirkwood-on100.dts
|
||||
@@ -0,0 +1,160 @@
|
||||
+/dts-v1/;
|
||||
+
|
||||
+#include "kirkwood.dtsi"
|
||||
+#include "kirkwood-6282.dtsi"
|
||||
+
|
||||
+/ {
|
||||
+ model = "Cisco Systems ON100";
|
||||
+ compatible = "cisco,on100", "marvell,kirkwood-88f6282", "marvell,kirkwood";
|
||||
+
|
||||
+ memory {
|
||||
+ device_type = "memory";
|
||||
+ reg = <0x00000000 0x20000000>;
|
||||
+ };
|
||||
+
|
||||
+ aliases {
|
||||
+ serial0 = &uart0;
|
||||
+ };
|
||||
+
|
||||
+ chosen {
|
||||
+ bootargs = "console=ttyS0,115200n8 earlyprintk";
|
||||
+ stdout-path = "serial0:115200n8";
|
||||
+ };
|
||||
+
|
||||
+ gpio_keys {
|
||||
+ compatible = "gpio-keys";
|
||||
+ #address-cells = <1>;
|
||||
+ #size-cells = <0>;
|
||||
+ pinctrl-0 = <&pmx_btn_reset>;
|
||||
+ pinctrl-names = "default";
|
||||
+
|
||||
+ button@1 {
|
||||
+ label = "Reset Button";
|
||||
+ linux,code = <KEY_RESTART>;
|
||||
+ gpios = <&gpio1 9 GPIO_ACTIVE_LOW>;
|
||||
+ };
|
||||
+ };
|
||||
+
|
||||
+ gpio-leds {
|
||||
+ compatible = "gpio-leds";
|
||||
+ pinctrl-0 = < &pmx_led_health_r &pmx_led_health_g >;
|
||||
+ pinctrl-names = "default";
|
||||
+
|
||||
+ health-g {
|
||||
+ label = "on100:green:health";
|
||||
+ gpios = <&gpio1 12 GPIO_ACTIVE_LOW>;
|
||||
+ };
|
||||
+
|
||||
+ health-r {
|
||||
+ label = "on100:red:health";
|
||||
+ gpios = <&gpio1 13 GPIO_ACTIVE_LOW>;
|
||||
+ };
|
||||
+
|
||||
+ health2-g {
|
||||
+ label = "on100:green:health2";
|
||||
+ gpios = <&gpio1 14 GPIO_ACTIVE_LOW>;
|
||||
+ };
|
||||
+
|
||||
+ health2-r {
|
||||
+ label = "on100:red:health2";
|
||||
+ gpios = <&gpio1 15 GPIO_ACTIVE_LOW>;
|
||||
+ };
|
||||
+ };
|
||||
+};
|
||||
+
|
||||
+ð0 {
|
||||
+ status = "okay";
|
||||
+
|
||||
+ ethernet0-port@0 {
|
||||
+ phy-handle = <ðphy0>;
|
||||
+ phy-connection-type = "rgmii-id";
|
||||
+ };
|
||||
+};
|
||||
+
|
||||
+ð1 {
|
||||
+ status = "okay";
|
||||
+
|
||||
+ ethernet1-port@0 {
|
||||
+ phy-handle = <ðphy1>;
|
||||
+ phy-connection-type = "rgmii-id";
|
||||
+ };
|
||||
+};
|
||||
+
|
||||
+&mdio {
|
||||
+ status = "okay";
|
||||
+
|
||||
+ ethphy0: ethernet-phy@0 {
|
||||
+ /* Marvell 88E1121R */
|
||||
+ compatible = "ethernet-phy-id0141.0cb0",
|
||||
+ "ethernet-phy-ieee802.3-c22";
|
||||
+ reg = <0>;
|
||||
+ };
|
||||
+
|
||||
+ ethphy1: ethernet-phy@1 {
|
||||
+ /* Marvell 88E1121R */
|
||||
+ compatible = "ethernet-phy-id0141.0cb0",
|
||||
+ "ethernet-phy-ieee802.3-c22";
|
||||
+ reg = <1>;
|
||||
+ };
|
||||
+};
|
||||
+
|
||||
+&nand {
|
||||
+ status = "okay";
|
||||
+
|
||||
+ partition@0 {
|
||||
+ label = "u-boot";
|
||||
+ reg = <0x00000000 0x000a0000>;
|
||||
+ read-only;
|
||||
+ };
|
||||
+
|
||||
+ partition@a0000 {
|
||||
+ label = "u-boot environment";
|
||||
+ reg = <0x000a0000 0x00020000>;
|
||||
+ read-only;
|
||||
+ };
|
||||
+
|
||||
+ partition@c0000 {
|
||||
+ label = "kernel";
|
||||
+ reg = <0x000c0000 0x00540000>;
|
||||
+ };
|
||||
+
|
||||
+ partition@600000 {
|
||||
+ label = "ubi";
|
||||
+ reg = <0x00600000 0x1fa00000>;
|
||||
+ };
|
||||
+};
|
||||
+
|
||||
+&pinctrl {
|
||||
+ pmx_led_health_r: pmx-led-health-r {
|
||||
+ marvell,pins = "mpp45";
|
||||
+ marvell,function = "gpio";
|
||||
+ };
|
||||
+
|
||||
+ pmx_led_health_g: pmx-led-health-g {
|
||||
+ marvell,pins = "mpp44";
|
||||
+ marvell,function = "gpio";
|
||||
+ };
|
||||
+
|
||||
+ pmx_led_health2_r: pmx-led-health2-r {
|
||||
+ marvell,pins = "mpp47";
|
||||
+ marvell,function = "gpio";
|
||||
+ };
|
||||
+
|
||||
+ pmx_led_health2_g: pmx-led-health2-g {
|
||||
+ marvell,pins = "mpp46";
|
||||
+ marvell,function = "gpio";
|
||||
+ };
|
||||
+
|
||||
+ pmx_btn_reset: pmx-led-reset {
|
||||
+ marvell,pins = "mpp31";
|
||||
+ marvell,function = "gpio";
|
||||
+ };
|
||||
+};
|
||||
+
|
||||
+&sdio {
|
||||
+ status = "okay";
|
||||
+};
|
||||
+
|
||||
+&uart0 {
|
||||
+ status = "okay";
|
||||
+};
|
||||
--- a/arch/arm/boot/dts/Makefile
|
||||
+++ b/arch/arm/boot/dts/Makefile
|
||||
@@ -241,6 +241,7 @@ dtb-$(CONFIG_MACH_KIRKWOOD) += \
|
||||
kirkwood-nsa310b.dtb \
|
||||
kirkwood-nsa320.dtb \
|
||||
kirkwood-nsa325.dtb \
|
||||
+ kirkwood-on100.dtb \
|
||||
kirkwood-openblocks_a6.dtb \
|
||||
kirkwood-openblocks_a7.dtb \
|
||||
kirkwood-openrd-base.dtb \
|
||||
@ -1,59 +0,0 @@ |
||||
--- a/arch/arm/boot/dts/kirkwood-pogoplug-series-4.dts
|
||||
+++ b/arch/arm/boot/dts/kirkwood-pogoplug-series-4.dts
|
||||
@@ -23,6 +23,7 @@
|
||||
};
|
||||
|
||||
chosen {
|
||||
+ bootargs = "console=ttyS0,115200";
|
||||
stdout-path = "uart0:115200n8";
|
||||
};
|
||||
|
||||
@@ -36,8 +37,8 @@
|
||||
eject {
|
||||
debounce_interval = <50>;
|
||||
wakeup-source;
|
||||
- linux,code = <KEY_EJECTCD>;
|
||||
- label = "Eject Button";
|
||||
+ linux,code = <KEY_RESTART>;
|
||||
+ label = "Reset";
|
||||
gpios = <&gpio0 29 GPIO_ACTIVE_LOW>;
|
||||
};
|
||||
};
|
||||
@@ -136,29 +137,19 @@
|
||||
#size-cells = <1>;
|
||||
|
||||
partition@0 {
|
||||
- label = "u-boot";
|
||||
- reg = <0x00000000 0x200000>;
|
||||
+ label = "uboot";
|
||||
+ reg = <0x00000000 0x1c0000>;
|
||||
read-only;
|
||||
};
|
||||
|
||||
- partition@200000 {
|
||||
- label = "uImage";
|
||||
- reg = <0x00200000 0x300000>;
|
||||
- };
|
||||
-
|
||||
- partition@500000 {
|
||||
- label = "uImage2";
|
||||
- reg = <0x00500000 0x300000>;
|
||||
+ partition@1c0000 {
|
||||
+ label = "uboot_env";
|
||||
+ reg = <0x001c0000 0x40000>;
|
||||
};
|
||||
|
||||
- partition@800000 {
|
||||
- label = "failsafe";
|
||||
- reg = <0x00800000 0x800000>;
|
||||
- };
|
||||
-
|
||||
- partition@1000000 {
|
||||
- label = "root";
|
||||
- reg = <0x01000000 0x7000000>;
|
||||
+ partition@200000 {
|
||||
+ label = "ubi";
|
||||
+ reg = <0x00200000 0x7e00000>;
|
||||
};
|
||||
};
|
||||
};
|
||||
@ -1,35 +0,0 @@ |
||||
From: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
|
||||
Subject: [PATCH] net: mv643xx_eth: Make TSO disabled by default
|
||||
|
||||
Data corruption has been observed to be produced by TSO. For instance,
|
||||
accessing files on a NFS-server with TSO enabled results in different data
|
||||
transferred each time.
|
||||
|
||||
This has been observed only on Kirkwood platforms, i.e. with the mv643xx_eth
|
||||
driver. Same tests on platforms using the mvneta ethernet driver have
|
||||
passed without errors.
|
||||
|
||||
Make TSO disabled by default for now, until we can found a proper fix
|
||||
for the regression.
|
||||
|
||||
Fixes: 3ae8f4e0b98 ('net: mv643xx_eth: Implement software TSO')
|
||||
Reported-by: Slawomir Gajzner <slawomir.gajzner <at> gmail.com>
|
||||
Reported-by: Julien D'Ascenzio <jdascenzio <at> yahoo.fr>
|
||||
Signed-off-by: Ezequiel Garcia <ezequiel.garcia <at> free-electrons.com>
|
||||
---
|
||||
--- a/drivers/net/ethernet/marvell/mv643xx_eth.c
|
||||
+++ b/drivers/net/ethernet/marvell/mv643xx_eth.c
|
||||
@@ -3197,11 +3197,11 @@ static int mv643xx_eth_probe(struct plat
|
||||
dev->watchdog_timeo = 2 * HZ;
|
||||
dev->base_addr = 0;
|
||||
|
||||
- dev->features = NETIF_F_SG | NETIF_F_IP_CSUM | NETIF_F_TSO;
|
||||
+ dev->features = NETIF_F_SG | NETIF_F_IP_CSUM;
|
||||
dev->vlan_features = dev->features;
|
||||
|
||||
dev->features |= NETIF_F_RXCSUM;
|
||||
- dev->hw_features = dev->features;
|
||||
+ dev->hw_features = dev->features | NETIF_F_TSO;
|
||||
|
||||
dev->priv_flags |= IFF_UNICAST_FLT;
|
||||
dev->gso_max_segs = MV643XX_MAX_TSO_SEGS;
|
||||
@ -1,10 +0,0 @@ |
||||
--- a/arch/arm/mach-mvebu/Kconfig
|
||||
+++ b/arch/arm/mach-mvebu/Kconfig
|
||||
@@ -117,6 +117,7 @@ config MACH_DOVE
|
||||
config MACH_KIRKWOOD
|
||||
bool "Marvell Kirkwood boards"
|
||||
depends on ARCH_MULTI_V5
|
||||
+ select ARCH_WANT_LIBATA_LEDS
|
||||
select CPU_FEROCEON
|
||||
select GPIOLIB
|
||||
select KIRKWOOD_CLK
|
||||
@ -1,62 +0,0 @@ |
||||
The WRT1900AC among other Linksys routers uses a dual-firmware layout.
|
||||
Dynamically rename the active partition to "ubi".
|
||||
|
||||
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
|
||||
---
|
||||
--- a/drivers/mtd/ofpart.c
|
||||
+++ b/drivers/mtd/ofpart.c
|
||||
@@ -25,6 +25,8 @@ static bool node_has_compatible(struct d
|
||||
return of_get_property(pp, "compatible", NULL);
|
||||
}
|
||||
|
||||
+static int mangled_rootblock;
|
||||
+
|
||||
static int parse_fixed_partitions(struct mtd_info *master,
|
||||
const struct mtd_partition **pparts,
|
||||
struct mtd_part_parser_data *data)
|
||||
@@ -32,6 +34,7 @@ static int parse_fixed_partitions(struct
|
||||
struct mtd_partition *parts;
|
||||
struct device_node *mtd_node;
|
||||
struct device_node *ofpart_node;
|
||||
+ const char *owrtpart = "ubi";
|
||||
const char *partname;
|
||||
struct device_node *pp;
|
||||
int nr_parts, i, ret = 0;
|
||||
@@ -110,9 +113,15 @@ static int parse_fixed_partitions(struct
|
||||
parts[i].size = of_read_number(reg + a_cells, s_cells);
|
||||
parts[i].of_node = pp;
|
||||
|
||||
- partname = of_get_property(pp, "label", &len);
|
||||
- if (!partname)
|
||||
- partname = of_get_property(pp, "name", &len);
|
||||
+ if (mangled_rootblock && (i == mangled_rootblock)) {
|
||||
+ partname = owrtpart;
|
||||
+ } else {
|
||||
+ partname = of_get_property(pp, "label", &len);
|
||||
+
|
||||
+ if (!partname)
|
||||
+ partname = of_get_property(pp, "name", &len);
|
||||
+ }
|
||||
+
|
||||
parts[i].name = partname;
|
||||
|
||||
if (of_get_property(pp, "read-only", &len))
|
||||
@@ -220,6 +229,18 @@ static int __init ofpart_parser_init(voi
|
||||
return 0;
|
||||
}
|
||||
|
||||
+static int __init active_root(char *str)
|
||||
+{
|
||||
+ get_option(&str, &mangled_rootblock);
|
||||
+
|
||||
+ if (!mangled_rootblock)
|
||||
+ return 1;
|
||||
+
|
||||
+ return 1;
|
||||
+}
|
||||
+
|
||||
+__setup("mangled_rootblock=", active_root);
|
||||
+
|
||||
static void __exit ofpart_parser_exit(void)
|
||||
{
|
||||
deregister_mtd_parser(&ofpart_parser);
|
||||
Loading…
Reference in new issue