Rebase to 2017.07

README.u-boot-kirkwood

@@ -0,0 +1,81 @@
+Current version branch 2017.07-kirkwood-tld-1
+
+Supports the following Kirkwood devices:
+
+GoFlexNet, GoFlexHome, PogoE02, Dockstar, iConnect, NetgearStora, PogoV4/Mobile, Sheevaplug, NSA325, NSA320, NSA310S/320S, NSA310, HP T5325, Dreamplug.
+
+For u-boot images:
+
+http://forum.doozan.com/read.php?3,12381
+
+==============================================
+
+Change log (chronological order):
+
+--------
+
+Removed EXTRAVERSION from IDENT string in Kirkwood headers
+Added Netgear Stora
+
+--------
+
+Add new U-Boot env: usb_ready_retry
+
+This env allows users to select how long U-Boot will retry in testing the USB drive readiness.
+To enable the feature, set this env either in Linux or U-Boot. 
+The period could be any unsigned integer, so increase the period as needed to a 
+number where you are comfortable that the USB drive is working, and add a few seconds to be sure.
+
+--------
+
+Forwarding to 2014.01 U-Boot
+Merge branch '2013.10-kirkwood' into 2014.01-kirkwood
+
+--------
+
+Forwarding to 2014.07 U-Boot
+Merge branch '2014.01-kirkwood' into 2014.07-kirkwood
+New tag v2014.07-kirkwood.
+
+Completed pogo_v4, now supports USB, MMC, SATA
+Add LED boot sequences for boxes that did not have this code
+Add various features missing in some boxes
+Add bootz
+
+--------
+
+Added NSA325 and NSA320 u-boots (modified and manually patched with u-boot code from https://github.com/WarheadsSE/u-boot-kirkwood)
+Add uEnv.txt loading capability (u-boot command load)
+Modified jffs2 file load and list command names due to name conflicts (fsls,  fsload)
+Add new default envs in all supported u-boot to load uEnv.txt and also default booting to USB
+Various editorial changes 
+
+
+-----------
+
+Added  NSA310S and NSA310 u-boots
+Modified NSA3xx u-boots to activate the Ethernet PHY
+
+-----------
+
+Forwarding to 2015.10 U-Boot
+
+-----------
+version 2015.10-kirkwood-tld-2
+
+Added HP Thin Client T5325 u-boot
+Added buttons capability to all boxes that have buttons
+Activated 2nd SATA for NSA310S/320S u-boot
+Activated SATA and other functionalities for Sheevaplug u-boot
+
+-----------
+version 2016.05-kirkwood-tld-1
+
+Rebase to 2016.05 mainline
+
+-----------
+version 2017.07-kirkwood-tld-1
+
+- Rebase to 2017.07 mainline
+- Incorporated patch to fix "EHCI timed out on TD" error with USB drives. 
+

arch/arm/include/asm/mach-types.h

@@ -5058,3 +5058,52 @@
 #define MACH_TYPE_TOMATO               5113
 #define MACH_TYPE_OMAP3_MRC3D          5114
 #endif
+
+#ifdef CONFIG_MACH_NSA310
+# ifdef machine_arch_type
+#  undef machine_arch_type
+#  define machine_arch_type	__machine_arch_type
+# else
+#  define machine_arch_type	MACH_TYPE_NSA310
+# endif
+# define machine_is_nsa310()	(machine_arch_type == MACH_TYPE_NSA310)
+#else
+# define machine_is_nsa310()	(0)
+#endif
+
+#ifdef CONFIG_MACH_NSA320
+# ifdef machine_arch_type
+#  undef machine_arch_type
+#  define machine_arch_type	__machine_arch_type
+# else
+#  define machine_arch_type	MACH_TYPE_NSA320
+# endif
+# define machine_is_nsa320()	(machine_arch_type == MACH_TYPE_NSA320)
+#else
+# define machine_is_nsa320()	(0)
+#endif
+
+#ifdef CONFIG_MACH_NSA325
+# ifdef machine_arch_type
+#  undef machine_arch_type
+#  define machine_arch_type	__machine_arch_type
+# else
+#  define machine_arch_type	MACH_TYPE_NSA325
+# endif
+# define machine_is_nsa325()	(machine_arch_type == MACH_TYPE_NSA325)
+#else
+# define machine_is_nsa325()	(0)
+#endif
+
+#ifdef CONFIG_MACH_NSA310S
+# ifdef machine_arch_type
+#  undef machine_arch_type
+#  define machine_arch_type     __machine_arch_type
+# else
+#  define machine_arch_type     MACH_TYPE_NSA310S
+# endif
+# define machine_is_nsa310s()  (machine_arch_type == MACH_TYPE_NSA310S)
+#else
+# define machine_is_nsa310s()  (0)
+#endif
+

arch/arm/mach-kirkwood/Kconfig

@@ -59,6 +59,30 @@ config TARGET_NAS220
 config TARGET_NSA310S
 	bool "Zyxel NSA310S"
 
+config TARGET_GOFLEXNET
+        bool "GoFlex Net Board"
+
+config TARGET_POGO_V4
+        bool "Pogoplug V4 Board"
+
+config TARGET_NSA325
+        bool "Zyxel NSA325 Board"
+
+config TARGET_NSA310S
+        bool "Zyxel NSA310S NSA320S Board"
+
+config TARGET_NSA320
+        bool "Zyxel NSA320 Board"
+
+config TARGET_NSA310
+        bool "Zyxel NSA310 Board"
+
+config TARGET_NETGEAR_MS2110
+        bool "Netgear MS2110  Board"
+
+config TARGET_T5325
+        bool "HP T5325 Board"
+
 endchoice
 
 config SYS_SOC
@@ -81,5 +105,12 @@ source "board/Seagate/dockstar/Kconfig"
 source "board/Seagate/goflexhome/Kconfig"
 source "board/Seagate/nas220/Kconfig"
 source "board/zyxel/nsa310s/Kconfig"
+source "board/Seagate/goflexnet/Kconfig"
+source "board/cloudengines/pogo_v4/Kconfig"
+source "board/zyxel/nsa325/Kconfig"
+source "board/zyxel/nsa320/Kconfig"
+source "board/zyxel/nsa310/Kconfig"
+source "board/Marvell/netgear_ms2110/Kconfig"
+source "board/hp/t5325/Kconfig"
 
 endif

arch/arm/mach-kirkwood/cpu.c

@@ -183,6 +183,20 @@ int print_cpuinfo(void)
 {
 	char *rev = "??";
 	u16 devid = (readl(KW_REG_PCIE_DEVID) >> 16) & 0xffff;
+
+#ifndef CONFIG_KW88F6192
+	devid = (readl(KW_REG_PCIE_DEVID) >> 16) & 0xffff;
+#else
+	/* Temporary hack until we have a proper way to id the SoC
+	 * KW88F6192 and KW88F6702 is not correctly determined, so force correct SoC.
+	 * Note that this is just for displaying purpose during U-Boot initialization */
+	devid = 0x6192;
+#ifdef CONFIG_KW88F6702
+        devid = 0x6702;
+#endif
+
+#endif
+
 	u8 revid = readl(KW_REG_PCIE_REVID) & 0xff;
 
 	if ((readl(KW_REG_DEVICE_ID) & 0x03) > 2) {

arch/arm/mach-kirkwood/include/mach/config.h

@@ -77,6 +77,7 @@
  * Ethernet Driver configuration
  */
 #ifdef CONFIG_CMD_NET
+#define CONFIG_FEATURE_COMMAND_EDITING
 #define CONFIG_NETCONSOLE	/* include NetConsole support   */
 #define CONFIG_MII		/* expose smi ove miiphy interface */
 #define CONFIG_MVGBE		/* Enable Marvell Gbe Controller Driver */
@@ -110,6 +111,7 @@
 #define CONFIG_SYS_ATA_STRIDE		4
 /* Controller supports 48-bits LBA addressing */
 #define CONFIG_LBA48
+#define CONFIG_SYS_64BIT_LBA
 /* CONFIG_IDE requires some #defines for ATA registers */
 #define CONFIG_SYS_IDE_MAXBUS		2
 #define CONFIG_SYS_IDE_MAXDEVICE	2
@@ -134,4 +136,11 @@
 #define CONFIG_SYS_TIMER_COUNTER	(MVEBU_TIMER_BASE + 0x14)
 #define CONFIG_SYS_TIMER_RATE		CONFIG_SYS_TCLK
 
+/*
+ * GPIO
+ */
+#define CONFIG_CMD_GPIO
+#define CONFIG_KIRKWOOD_GPIO
+
+
 #endif /* _KW_CONFIG_H */

arch/arm/mach-kirkwood/include/mach/kw88f6192.h

@@ -16,6 +16,6 @@
 #define KW_REGS_PHY_BASE		KW88F6192_REGS_PHYS_BASE
 
 /* TCLK Core Clock defination */
-#define CONFIG_SYS_TCLK	  166000000 /* 166MHz */
+#define CONFIG_SYS_TCLK	166666667 /* 166MHz */
 
 #endif /* _CONFIG_KW88F6192_H */

arch/arm/mach-kirkwood/include/mach/mpp.h

@@ -217,10 +217,12 @@
 #define MPP33_GPIO		MPP( 33, 0x0, 1, 1, 0,   1,   1,   1    )
 #define MPP33_TDM_DTX		MPP( 33, 0x2, 0, 1, 0,   0,   1,   1    )
 #define MPP33_GE1_13		MPP( 33, 0x3, 0, 0, 0,   1,   1,   1    )
+#define MPP33_SATA1_ACTn        MPP( 33, 0x5, 0, 1, 0,   1,   1,   1    )
 
 #define MPP34_GPIO		MPP( 34, 0x0, 1, 1, 0,   1,   1,   1    )
 #define MPP34_TDM_SPI_CS1	MPP( 34, 0x2, 0, 1, 0,   0,   1,   1    )
 #define MPP34_GE1_14		MPP( 34, 0x3, 0, 0, 0,   1,   1,   1    )
+#define MPP34_SATA1_ACTn 	MPP( 34, 0x5, 0, 1, 0,   1,   1,   1    )
 
 #define MPP35_GPIO		MPP( 35, 0x0, 1, 1, 1,   1,   1,   1    )
 #define MPP35_TDM_CH0_TX_QL	MPP( 35, 0x2, 0, 1, 0,   0,   1,   1    )

arch/arm/mach-mvebu/include/mach/soc.h

@@ -18,6 +18,8 @@
 #define SOC_88F6810_ID		0x6810
 #define SOC_88F6820_ID		0x6820
 #define SOC_88F6828_ID		0x6828
+#define SOC_88F6192_ID          0x6192
+#define SOC_88F6702_ID          0x6702
 
 /* A375 revisions */
 #define MV_88F67XX_A0_ID	0x3

board/Marvell/dreamplug/dreamplug.h

@@ -1,4 +1,7 @@
 /*
+ * Copyright (C) 2017 bodhi <mibodhi@gmail.com>
+ *
+ * Based on:
  * (C) Copyright 2011
  * Jason Cooper <u-boot@lakedaemon.net>
  *
@@ -12,10 +15,19 @@
 #ifndef __DREAMPLUG_H
 #define __DREAMPLUG_H
 
+#define BLUETOOTH_BLUE_LED		(1 << 15)
+#define WIFI_GREEN_LED			(1 << 16)
+#define WIFIAP_GREEN_LED		(1 << 17)
+
 #define DREAMPLUG_OE_LOW	(~(0))
-#define DREAMPLUG_OE_HIGH	(~(0))
 #define DREAMPLUG_OE_VAL_LOW	0
-#define DREAMPLUG_OE_VAL_HIGH	(0xf << 16) /* 4 LED Pins high */
+
+/* #define DREAMPLUG_OE_HIGH	(~(0)) */
+/* #define DREAMPLUG_OE_VAL_HIGH	(0xf << 16)  /4 LED Pins high */
+
+#define DREAMPLUG_OE_HIGH	((BLUETOOTH_BLUE_LED | WIFI_GREEN_LED | WIFIAP_GREEN_LED)) 
+#define DREAMPLUG_OE_VAL_HIGH	(~(BLUETOOTH_BLUE_LED | WIFI_GREEN_LED | WIFIAP_GREEN_LED))
+
 
 /* PHY related */
 #define MV88E1116_MAC_CTRL2_REG		21

board/Marvell/netgear_ms2110/Kconfig

@@ -0,0 +1,12 @@
+if TARGET_NETGEAR_MS2110
+
+config SYS_BOARD
+	default "netgear_ms2110"
+
+config SYS_VENDOR
+	default "Marvell"
+
+config SYS_CONFIG_NAME
+	default "netgear_ms2110"
+
+endif

board/Marvell/netgear_ms2110/MAINTAINERS

@@ -0,0 +1,6 @@
+NETGEAR_MS2110 BOARD
+M:	bodhi <mibodhi@gmail.com>
+S:	Maintained
+F:	board/Marvell/netgear_ms2110
+F:	include/configs/netgear_ms2110.h
+F:	configs/netgear_ms2110_defconfig

board/Marvell/netgear_ms2110/Makefile

@@ -0,0 +1,13 @@
+#
+# (C) Copyright 2014 bodhi <mibodhi@gmail.com>
+#
+# Based on
+# (C) Copyright 2009
+# Marvell Semiconductor <www.marvell.com>
+# Written-by: Prafulla Wadaskar <prafulla@marvell.com>
+#
+# SPDX-License-Identifier:	GPL-2.0+
+#
+
+obj-y	:= netgear_ms2110.o
+