From 482e65a16d2c49b5547b032caa060f423a3cb4a5 Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Sun, 6 Jun 2021 19:06:29 +0200 Subject: [PATCH] uboot-kirkwood: refresh patches This is only cosmetic, but the next one adding a patch here would have to do it anyway, and thus will get a smaller diff for review now. Signed-off-by: Adrian Schmutzler --- .../patches/007-nsa310-uboot-generic.patch | 4 ++-- .../patches/010-pogoplug_v4.patch | 16 +++++++-------- .../uboot-kirkwood/patches/110-dockstar.patch | 6 +++--- .../uboot-kirkwood/patches/120-iconnect.patch | 4 ++-- .../uboot-kirkwood/patches/130-ib62x0.patch | 4 ++-- .../patches/140-pogoplug_e02.patch | 4 ++-- .../patches/150-goflexhome.patch | 4 ++-- .../patches/200-openwrt-config.patch | 20 +++++++++---------- ...xx-add-support-for-RGMII-TX-RX-delay.patch | 7 +------ ...-mv88e61xx-add-support-for-MV88E6171.patch | 11 +++------- 10 files changed, 35 insertions(+), 45 deletions(-) diff --git a/package/boot/uboot-kirkwood/patches/007-nsa310-uboot-generic.patch b/package/boot/uboot-kirkwood/patches/007-nsa310-uboot-generic.patch index 09dc587bf7..16a1f08c84 100644 --- a/package/boot/uboot-kirkwood/patches/007-nsa310-uboot-generic.patch +++ b/package/boot/uboot-kirkwood/patches/007-nsa310-uboot-generic.patch @@ -28,13 +28,13 @@ NOTE: this patch is ready for upstream, LEDE-specific parts are in @@ -53,6 +53,9 @@ config TARGET_GOFLEXHOME config TARGET_NAS220 bool "BlackArmor NAS220" - + +config TARGET_NSA310 + bool "Zyxel NSA310 Board" + config TARGET_NSA310S bool "Zyxel NSA310S" - + @@ -86,6 +89,7 @@ source "board/raidsonic/ib62x0/Kconfig" source "board/Seagate/dockstar/Kconfig" source "board/Seagate/goflexhome/Kconfig" diff --git a/package/boot/uboot-kirkwood/patches/010-pogoplug_v4.patch b/package/boot/uboot-kirkwood/patches/010-pogoplug_v4.patch index 58bf664238..250caafbf8 100644 --- a/package/boot/uboot-kirkwood/patches/010-pogoplug_v4.patch +++ b/package/boot/uboot-kirkwood/patches/010-pogoplug_v4.patch @@ -3,13 +3,13 @@ @@ -25,6 +25,9 @@ config TARGET_LSXL config TARGET_POGO_E02 bool "pogo_e02 Board" - + +config TARGET_POGOPLUGV4 + bool "Pogoplug V4 Board" + config TARGET_DNS325 bool "dns325 Board" - + @@ -83,6 +86,7 @@ source "board/Marvell/guruplug/Kconfig" source "board/Marvell/sheevaplug/Kconfig" source "board/buffalo/lsxl/Kconfig" @@ -22,11 +22,11 @@ +++ b/arch/arm/mach-kirkwood/include/mach/kw88f6192.h @@ -15,6 +15,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 */ --- a/arch/arm/mach-kirkwood/include/mach/mpp.h +++ b/arch/arm/mach-kirkwood/include/mach/mpp.h @@ -35,12 +35,12 @@ #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 ) --- /dev/null @@ -630,7 +630,7 @@ obj-$(CONFIG_MMC_SDHCI_XENON) += xenon_sdhci.o obj-$(CONFIG_MMC_SDHCI_ZYNQ) += zynq_sdhci.o +obj-$(CONFIG_KIRKWOOD_MMC) += kirkwood_mmc.o - + obj-$(CONFIG_MMC_SUNXI) += sunxi_mmc.o obj-$(CONFIG_MMC_UNIPHIER) += tmio-common.o uniphier-sd.o --- /dev/null @@ -1123,7 +1123,7 @@ @@ -75,4 +75,10 @@ #define CONFIG_SYS_MAX_NAND_DEVICE 1 #endif - + +/* + * Kirkwood MMC + */ diff --git a/package/boot/uboot-kirkwood/patches/110-dockstar.patch b/package/boot/uboot-kirkwood/patches/110-dockstar.patch index b3837956bc..c3889e122e 100644 --- a/package/boot/uboot-kirkwood/patches/110-dockstar.patch +++ b/package/boot/uboot-kirkwood/patches/110-dockstar.patch @@ -5,7 +5,7 @@ #define CONFIG_KW88F6281 1 /* SOC Name */ #define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */ +#define CONFIG_SYS_MVFS - + /* * mv-common.h should be defined after CMD configs since it used them @@ -37,19 +38,15 @@ @@ -20,7 +20,7 @@ + "ubi part ubi; " \ + "ubi read 0x800000 kernel; " \ + "bootm 0x800000" - + #define CONFIG_EXTRA_ENV_SETTINGS \ - "console=console=ttyS0,115200\0" \ - "mtdids=nand0=orion_nand\0" \ @@ -32,7 +32,7 @@ + "mtdids=nand0=orion_nand\0" \ + "mtdparts="CONFIG_MTDPARTS_DEFAULT "\0" \ + "bootargs_root=\0" - + /* * Ethernet Driver configuration --- a/configs/dockstar_defconfig diff --git a/package/boot/uboot-kirkwood/patches/120-iconnect.patch b/package/boot/uboot-kirkwood/patches/120-iconnect.patch index 770a52f737..dad3dd4744 100644 --- a/package/boot/uboot-kirkwood/patches/120-iconnect.patch +++ b/package/boot/uboot-kirkwood/patches/120-iconnect.patch @@ -10,7 +10,7 @@ + "ubi part ubi; " \ + "ubi read 0x800000 kernel; " \ "bootm 0x800000" - + #define CONFIG_EXTRA_ENV_SETTINGS \ "console=console=ttyS0,115200\0" \ "mtdids=nand0=orion_nand\0" \ @@ -19,7 +19,7 @@ - "bootargs_root=noinitrd ubi.mtd=2 root=ubi0:rootfs rootfstype=ubifs\0" + "mtdparts="CONFIG_MTDPARTS_DEFAULT "\0" \ + "bootargs_root=\0" - + /* * Ethernet driver configuration --- a/configs/iconnect_defconfig diff --git a/package/boot/uboot-kirkwood/patches/130-ib62x0.patch b/package/boot/uboot-kirkwood/patches/130-ib62x0.patch index 0092d989e1..c4ee8f0330 100644 --- a/package/boot/uboot-kirkwood/patches/130-ib62x0.patch +++ b/package/boot/uboot-kirkwood/patches/130-ib62x0.patch @@ -14,7 +14,7 @@ + "ubi part ubi; " \ + "ubi read 0x800000 kernel; " \ + "bootm 0x800000" - + #define CONFIG_EXTRA_ENV_SETTINGS \ "console=console=ttyS0,115200\0" \ "mtdids=nand0=orion_nand\0" \ @@ -24,7 +24,7 @@ - "bootargs_root=ubi.mtd=2 root=ubi0:rootfs rootfstype=ubifs rw\0" + "mtdparts="CONFIG_MTDPARTS_DEFAULT "\0" \ + "bootargs_root=\0" - + /* * Ethernet driver configuration --- a/configs/ib62x0_defconfig diff --git a/package/boot/uboot-kirkwood/patches/140-pogoplug_e02.patch b/package/boot/uboot-kirkwood/patches/140-pogoplug_e02.patch index d077915c93..53ad98291c 100644 --- a/package/boot/uboot-kirkwood/patches/140-pogoplug_e02.patch +++ b/package/boot/uboot-kirkwood/patches/140-pogoplug_e02.patch @@ -12,7 +12,7 @@ + "ubifsmount ubi:rootfs; " \ + "ubi read 0x800000 kernel; " \ + "bootm 0x800000" - + #define CONFIG_EXTRA_ENV_SETTINGS \ - "mtdparts=mtdparts=orion_nand:1M(u-boot),4M(uImage)," \ - "32M(rootfs),-(data)\0"\ @@ -24,7 +24,7 @@ + "mtdids=nand0=orion_nand\0" \ + "mtdparts="CONFIG_MTDPARTS_DEFAULT "\0" \ + "bootargs_root=\0" - + /* * Ethernet Driver configuration --- a/configs/pogo_e02_defconfig diff --git a/package/boot/uboot-kirkwood/patches/150-goflexhome.patch b/package/boot/uboot-kirkwood/patches/150-goflexhome.patch index 55d69b81d5..014ae66338 100644 --- a/package/boot/uboot-kirkwood/patches/150-goflexhome.patch +++ b/package/boot/uboot-kirkwood/patches/150-goflexhome.patch @@ -10,7 +10,7 @@ + "ubi part ubi; " \ + "ubi read 0x800000 kernel; " \ "bootm 0x800000" - + #define CONFIG_EXTRA_ENV_SETTINGS \ "console=console=ttyS0,115200\0" \ "mtdids=nand0=orion_nand\0" \ @@ -19,7 +19,7 @@ - "bootargs_root=ubi.mtd=root root=ubi0:root rootfstype=ubifs ro\0" + "mtdparts="CONFIG_MTDPARTS_DEFAULT "\0" \ + "bootargs_root=\0" - + /* * Ethernet Driver configuration --- a/configs/goflexhome_defconfig diff --git a/package/boot/uboot-kirkwood/patches/200-openwrt-config.patch b/package/boot/uboot-kirkwood/patches/200-openwrt-config.patch index ae9fdf3390..bfd3d3278e 100644 --- a/package/boot/uboot-kirkwood/patches/200-openwrt-config.patch +++ b/package/boot/uboot-kirkwood/patches/200-openwrt-config.patch @@ -3,7 +3,7 @@ @@ -107,4 +107,7 @@ source "board/alliedtelesis/SBx81LIFXCAT source "board/Marvell/db-88f6281-bp/Kconfig" source "board/checkpoint/l-50/Kconfig" - + +config SECOND_STAGE + bool "OpenWrt second stage hack" + @@ -13,7 +13,7 @@ @@ -60,4 +60,6 @@ * File system */ - + +#include "openwrt-kirkwood-common.h" + #endif /* _CONFIG_DOCKSTAR_H */ @@ -22,7 +22,7 @@ @@ -77,4 +77,6 @@ #define CONFIG_RTC_MV #endif /* CONFIG_CMD_DATE */ - + +#include "openwrt-kirkwood-common.h" + #endif /* _CONFIG_IB62x0_H */ @@ -31,7 +31,7 @@ @@ -67,4 +67,6 @@ * File system */ - + +#include "openwrt-kirkwood-common.h" + #endif /* _CONFIG_ICONNECT_H */ @@ -40,7 +40,7 @@ @@ -12,6 +12,8 @@ #ifndef _CONFIG_L50_H #define _CONFIG_L50_H - + +#include "openwrt-kirkwood-common.h" + /* @@ -85,7 +85,7 @@ @@ -66,4 +66,6 @@ * File system */ - + +#include "openwrt-kirkwood-common.h" + #endif /* _CONFIG_POGO_E02_H */ @@ -94,7 +94,7 @@ @@ -85,4 +85,6 @@ #define CONFIG_SYS_ATA_IDE0_OFFSET MV_SATA_PORT0_OFFSET #endif /*CONFIG_MVSATA_IDE*/ - + +#include "openwrt-kirkwood-common.h" + #endif /* _CONFIG_GOFLEXHOME_H */ @@ -103,7 +103,7 @@ @@ -100,4 +100,6 @@ #define CONFIG_RTC_MV #endif /* CONFIG_CMD_DATE */ - + +#include "openwrt-kirkwood-common.h" + #endif /* _CONFIG_NSA310_H */ @@ -200,13 +200,13 @@ @@ -63,4 +63,6 @@ #define CONFIG_RTC_MV #endif /* CONFIG_CMD_DATE */ - + +#include "openwrt-kirkwood-common.h" + #endif /* _CONFIG_NSA310S_H */ --- a/configs/sheevaplug_defconfig +++ b/configs/sheevaplug_defconfig -@@ -49,4 +49,7 @@ +@@ -49,4 +49,7 @@ CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_STORAGE=y diff --git a/package/boot/uboot-kirkwood/patches/701-phy-mv88e61xx-add-support-for-RGMII-TX-RX-delay.patch b/package/boot/uboot-kirkwood/patches/701-phy-mv88e61xx-add-support-for-RGMII-TX-RX-delay.patch index 6e358857b7..66550f91fa 100644 --- a/package/boot/uboot-kirkwood/patches/701-phy-mv88e61xx-add-support-for-RGMII-TX-RX-delay.patch +++ b/package/boot/uboot-kirkwood/patches/701-phy-mv88e61xx-add-support-for-RGMII-TX-RX-delay.patch @@ -17,8 +17,6 @@ Signed-off-by: Pawel Dembicki drivers/net/phy/mv88e61xx.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) -diff --git a/drivers/net/phy/mv88e61xx.c b/drivers/net/phy/mv88e61xx.c -index 5aff7ed397..889327639d 100644 --- a/drivers/net/phy/mv88e61xx.c +++ b/drivers/net/phy/mv88e61xx.c @@ -94,6 +94,8 @@ @@ -30,7 +28,7 @@ index 5aff7ed397..889327639d 100644 #define PORT_REG_PHYS_CTRL_PCS_AN_EN BIT(10) #define PORT_REG_PHYS_CTRL_PCS_AN_RST BIT(9) #define PORT_REG_PHYS_CTRL_FC_VALUE BIT(7) -@@ -747,9 +749,16 @@ static int mv88e61xx_fixed_port_setup(struct phy_device *phydev, u8 port) +@@ -747,9 +749,16 @@ static int mv88e61xx_fixed_port_setup(st PORT_REG_PHYS_CTRL_SPD1000; } @@ -48,6 +46,3 @@ index 5aff7ed397..889327639d 100644 return mv88e61xx_port_write(phydev, port, PORT_REG_PHYS_CTRL, val); --- -2.20.1 - diff --git a/package/boot/uboot-kirkwood/patches/702-phy-mv88e61xx-add-support-for-MV88E6171.patch b/package/boot/uboot-kirkwood/patches/702-phy-mv88e61xx-add-support-for-MV88E6171.patch index c91a06cbed..e9caa00852 100644 --- a/package/boot/uboot-kirkwood/patches/702-phy-mv88e61xx-add-support-for-MV88E6171.patch +++ b/package/boot/uboot-kirkwood/patches/702-phy-mv88e61xx-add-support-for-MV88E6171.patch @@ -16,8 +16,6 @@ Signed-off-by: Pawel Dembicki drivers/net/phy/mv88e61xx.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) -diff --git a/drivers/net/phy/mv88e61xx.c b/drivers/net/phy/mv88e61xx.c -index 889327639d..e0b648a54e 100644 --- a/drivers/net/phy/mv88e61xx.c +++ b/drivers/net/phy/mv88e61xx.c @@ -180,6 +180,7 @@ @@ -28,7 +26,7 @@ index 889327639d..e0b648a54e 100644 #define PORT_SWITCH_ID_6172 0x1720 #define PORT_SWITCH_ID_6176 0x1760 #define PORT_SWITCH_ID_6220 0x2200 -@@ -997,6 +998,7 @@ static int mv88e61xx_probe(struct phy_device *phydev) +@@ -997,6 +998,7 @@ static int mv88e61xx_probe(struct phy_de switch (priv->id) { case PORT_SWITCH_ID_6096: case PORT_SWITCH_ID_6097: @@ -36,7 +34,7 @@ index 889327639d..e0b648a54e 100644 case PORT_SWITCH_ID_6172: case PORT_SWITCH_ID_6176: case PORT_SWITCH_ID_6240: -@@ -1152,6 +1154,17 @@ static struct phy_driver mv88e61xx_driver = { +@@ -1152,6 +1154,17 @@ static struct phy_driver mv88e61xx_drive .shutdown = &genphy_shutdown, }; @@ -54,7 +52,7 @@ index 889327639d..e0b648a54e 100644 static struct phy_driver mv88e609x_driver = { .name = "Marvell MV88E609x", .uid = 0x1410c89, -@@ -1177,6 +1190,7 @@ static struct phy_driver mv88e6071_driver = { +@@ -1177,6 +1190,7 @@ static struct phy_driver mv88e6071_drive int phy_mv88e61xx_init(void) { phy_register(&mv88e61xx_driver); @@ -62,6 +60,3 @@ index 889327639d..e0b648a54e 100644 phy_register(&mv88e609x_driver); phy_register(&mv88e6071_driver); --- -2.20.1 -