projects / openwrt / staging / jow.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 41598a8)
uboot-kirkwood: fix whitespaces
authorAlberto Bursi <alberto.bursi@outlook.it>
Mon, 18 Jun 2018 17:49:16 +0000 (19:49 +0200)
committerJo-Philipp Wich <jo@mein.io>
Tue, 18 Dec 2018 16:32:19 +0000 (17:32 +0100)
remove whitespaces from the patches

Signed-off-by: Alberto Bursi <alberto.bursi@outlook.it>
(backported from ccd1dc3d2044b3cf624f93c86e127f55c5632231)

package/boot/uboot-kirkwood/patches/007-nsa310-uboot-generic.patch patch | blob | history
package/boot/uboot-kirkwood/patches/008-nsa325-uboot-generic.patch patch | blob | history
package/boot/uboot-kirkwood/patches/010-pogoplug_v4.patch patch | blob | history
package/boot/uboot-kirkwood/patches/110-dockstar.patch patch | blob | history
package/boot/uboot-kirkwood/patches/120-iconnect.patch patch | blob | history
package/boot/uboot-kirkwood/patches/130-ib62x0.patch patch | blob | history
package/boot/uboot-kirkwood/patches/140-pogoplug_e02.patch patch | blob | history
package/boot/uboot-kirkwood/patches/150-goflexhome.patch patch | blob | history

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 f90842cadaf0f0d030b27b4969b3af01855835b7..264c160748c32d83335b2a37df582c67551e8234 100644 (file)
--- a/package/boot/uboot-kirkwood/patches/007-nsa310-uboot-generic.patch
+++ b/package/boot/uboot-kirkwood/patches/007-nsa310-uboot-generic.patch
@@ -28,20 +28,20 @@ NOTE: this patch is ready for upstream, LEDE-specific parts are in
 @@ -56,6 +56,9 @@ config TARGET_GOFLEXHOME
  config TARGET_NAS220
        bool "BlackArmor NAS220"
- 
+
 +config TARGET_NSA310
 +      bool "Zyxel NSA310 Board"
 +
  config TARGET_NSA310S
        bool "Zyxel NSA310S"
- 
+
 @@ -80,6 +83,7 @@ source "board/raidsonic/ib62x0/Kconfig"
  source "board/Seagate/dockstar/Kconfig"
  source "board/Seagate/goflexhome/Kconfig"
  source "board/Seagate/nas220/Kconfig"
 +source "board/zyxel/nsa310/Kconfig"
  source "board/zyxel/nsa310s/Kconfig"
- 
+
  endif
 --- /dev/null
 +++ b/board/zyxel/nsa310/Kconfig
diff --git a/package/boot/uboot-kirkwood/patches/008-nsa325-uboot-generic.patch b/package/boot/uboot-kirkwood/patches/008-nsa325-uboot-generic.patch
index 27144221327d1e2f5e293b9167548693aa3a9557..0ce3fe02e1ce7aa9aaee3561d74ca8d004066571 100644 (file)
--- a/package/boot/uboot-kirkwood/patches/008-nsa325-uboot-generic.patch
+++ b/package/boot/uboot-kirkwood/patches/008-nsa325-uboot-generic.patch
@@ -3,19 +3,19 @@
 @@ -62,6 +62,9 @@ config TARGET_NSA310
  config TARGET_NSA310S
        bool "Zyxel NSA310S"
- 
+
 +config TARGET_NSA325
 +      bool "Zyxel NSA325 board"
 +
  endchoice
- 
+
  config SYS_SOC
 @@ -85,5 +88,6 @@ source "board/Seagate/goflexhome/Kconfig
  source "board/Seagate/nas220/Kconfig"
  source "board/zyxel/nsa310/Kconfig"
  source "board/zyxel/nsa310s/Kconfig"
 +source "board/zyxel/nsa325/Kconfig"
- 
+
  endif
 --- /dev/null
 +++ b/board/zyxel/nsa325/Kconfig
diff --git a/package/boot/uboot-kirkwood/patches/010-pogoplug_v4.patch b/package/boot/uboot-kirkwood/patches/010-pogoplug_v4.patch
index 1508a98c1c878eee22bd8bf5028c5970cace8242..568c8bf5f0560cf5670532e2ff91cc626caff419 100644 (file)
--- 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"
- 
+
 @@ -77,6 +80,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
 @@ -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 */
 --- 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
@@ -619,7 +619,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)            += uniphier-sd.o
 --- /dev/null
@@ -1112,7 +1112,7 @@
 @@ -117,4 +117,10 @@
  #define CONFIG_MTD_PARTITIONS
  #endif
- 
+
 +/*
 + * Kirkwood MMC
 + */
diff --git a/package/boot/uboot-kirkwood/patches/110-dockstar.patch b/package/boot/uboot-kirkwood/patches/110-dockstar.patch
index e67a888a4833a32f32c617d19ec9af96aa27720d..ff2c33877b683d1ac6ba2d2b016af63984fc5ed6 100644 (file)
--- 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
 @@ -36,27 +37,22 @@
@@ -15,7 +15,7 @@
 -#define CONFIG_ENV_ADDR                       0x80000
 -#define CONFIG_ENV_OFFSET             0x80000 /* env starts here */
 +#define CONFIG_ENV_OFFSET             0xe0000 /* env starts here */
- 
+
  /*
   * Default environment variables
   */
@@ -29,7 +29,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" \
@@ -41,7 +41,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 7ff721218f51844b043c493876baebeaad085bf6..114aa1559da26d95f37eda483cf3503d2ad8c454 100644 (file)
--- a/package/boot/uboot-kirkwood/patches/120-iconnect.patch
+++ b/package/boot/uboot-kirkwood/patches/120-iconnect.patch
@@ -6,7 +6,7 @@
  #define CONFIG_ENV_SIZE               0x20000
 -#define CONFIG_ENV_OFFSET     0x80000
 +#define CONFIG_ENV_OFFSET     0xe0000
- 
+
  /*
   * Default environment variables
   */
@@ -18,7 +18,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"             \
@@ -27,7 +27,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 fcb0a88a059e3c909c705436f2042305666c783a..269cf7336de458fbdfe577c365bd51fd6bcc39ff 100644 (file)
--- 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 93adad6aa291240d9cd5461eca78b60e370de61f..26217fadd702d69918255929083d0216e75eed02 100644 (file)
--- a/package/boot/uboot-kirkwood/patches/140-pogoplug_e02.patch
+++ b/package/boot/uboot-kirkwood/patches/140-pogoplug_e02.patch
@@ -2,11 +2,11 @@
 +++ b/include/configs/pogo_e02.h
 @@ -44,23 +44,23 @@
  #endif
- 
+
  #define CONFIG_ENV_SIZE                       0x20000 /* 128k */
 -#define CONFIG_ENV_OFFSET             0x60000 /* env starts here */
 +#define CONFIG_ENV_OFFSET             0xe0000 /* env starts here */
- 
+
  /*
   * Default environment variables
   */
@@ -19,7 +19,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"\
@@ -31,7 +31,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 540c0f50708d334f8a00265432d0cdddc22c32ae..2104b67b513dcaf06ba0502217c21236c02d5ec1 100644 (file)
--- 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
Staging tree of Jo-Philipp Wich