KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

uboot-kirkwood: fix whitespaces

Browse source 
remove whitespaces from the patches

Signed-off-by: Alberto Bursi <alberto.bursi@outlook.it>
This commit is contained in:
Alberto Bursi 2018-06-18 19:49:16 +02:00 committed by Mathias Kresin
parent 4ec9763ee9
commit ccd1dc3d20
8 changed files with 29 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
package/boot/uboot-kirkwood/patches/007-nsa310-uboot-generic.patch
View file

@ -28,20 +28,20 @@ NOTE: this patch is ready for upstream, LEDE-specific parts are in
@@ -56,6 +56,9 @@ config TARGET_GOFLEXHOME @@ -56,6 +56,9 @@ config TARGET_GOFLEXHOME
config TARGET_NAS220 config TARGET_NAS220
bool "BlackArmor NAS220" bool "BlackArmor NAS220"
+config TARGET_NSA310 +config TARGET_NSA310
+ bool "Zyxel NSA310 Board" + bool "Zyxel NSA310 Board"
+ +
config TARGET_NSA310S config TARGET_NSA310S
bool "Zyxel NSA310S" bool "Zyxel NSA310S"
@@ -80,6 +83,7 @@ source "board/raidsonic/ib62x0/Kconfig" @@ -80,6 +83,7 @@ source "board/raidsonic/ib62x0/Kconfig"
source "board/Seagate/dockstar/Kconfig" source "board/Seagate/dockstar/Kconfig"
source "board/Seagate/goflexhome/Kconfig" source "board/Seagate/goflexhome/Kconfig"
source "board/Seagate/nas220/Kconfig" source "board/Seagate/nas220/Kconfig"
+source "board/zyxel/nsa310/Kconfig" +source "board/zyxel/nsa310/Kconfig"
source "board/zyxel/nsa310s/Kconfig" source "board/zyxel/nsa310s/Kconfig"
endif endif
--- /dev/null --- /dev/null
+++ b/board/zyxel/nsa310/Kconfig +++ b/board/zyxel/nsa310/Kconfig

6
package/boot/uboot-kirkwood/patches/008-nsa325-uboot-generic.patch
View file

@ -3,19 +3,19 @@
@@ -62,6 +62,9 @@ config TARGET_NSA310 @@ -62,6 +62,9 @@ config TARGET_NSA310
config TARGET_NSA310S config TARGET_NSA310S
bool "Zyxel NSA310S" bool "Zyxel NSA310S"
+config TARGET_NSA325 +config TARGET_NSA325
+ bool "Zyxel NSA325 board" + bool "Zyxel NSA325 board"
+ +
endchoice endchoice
config SYS_SOC config SYS_SOC
@@ -85,5 +88,6 @@ source "board/Seagate/goflexhome/Kconfig @@ -85,5 +88,6 @@ source "board/Seagate/goflexhome/Kconfig
source "board/Seagate/nas220/Kconfig" source "board/Seagate/nas220/Kconfig"
source "board/zyxel/nsa310/Kconfig" source "board/zyxel/nsa310/Kconfig"
source "board/zyxel/nsa310s/Kconfig" source "board/zyxel/nsa310s/Kconfig"
+source "board/zyxel/nsa325/Kconfig" +source "board/zyxel/nsa325/Kconfig"
endif endif
--- /dev/null --- /dev/null
+++ b/board/zyxel/nsa325/Kconfig +++ b/board/zyxel/nsa325/Kconfig

16
package/boot/uboot-kirkwood/patches/010-pogoplug_v4.patch
View file

@ -3,13 +3,13 @@
@@ -25,6 +25,9 @@ config TARGET_LSXL @@ -25,6 +25,9 @@ config TARGET_LSXL
config TARGET_POGO_E02 config TARGET_POGO_E02
bool "pogo_e02 Board" bool "pogo_e02 Board"
+config TARGET_POGOPLUGV4 +config TARGET_POGOPLUGV4
+ bool "Pogoplug V4 Board" + bool "Pogoplug V4 Board"
+ +
config TARGET_DNS325 config TARGET_DNS325
bool "dns325 Board" bool "dns325 Board"
@@ -77,6 +80,7 @@ source "board/Marvell/guruplug/Kconfig" @@ -77,6 +80,7 @@ source "board/Marvell/guruplug/Kconfig"
source "board/Marvell/sheevaplug/Kconfig" source "board/Marvell/sheevaplug/Kconfig"
source "board/buffalo/lsxl/Kconfig" source "board/buffalo/lsxl/Kconfig"
@ -22,11 +22,11 @@
+++ b/arch/arm/mach-kirkwood/include/mach/kw88f6192.h +++ b/arch/arm/mach-kirkwood/include/mach/kw88f6192.h
@@ -16,6 +16,6 @@ @@ -16,6 +16,6 @@
#define KW_REGS_PHY_BASE KW88F6192_REGS_PHYS_BASE #define KW_REGS_PHY_BASE KW88F6192_REGS_PHYS_BASE
/* TCLK Core Clock defination */ /* TCLK Core Clock defination */
-#define CONFIG_SYS_TCLK 166000000 /* 166MHz */ -#define CONFIG_SYS_TCLK 166000000 /* 166MHz */
+#define CONFIG_SYS_TCLK 166666667 /* 166MHz */ +#define CONFIG_SYS_TCLK 166666667 /* 166MHz */
#endif /* _CONFIG_KW88F6192_H */ #endif /* _CONFIG_KW88F6192_H */
--- a/arch/arm/mach-kirkwood/include/mach/mpp.h --- a/arch/arm/mach-kirkwood/include/mach/mpp.h
+++ b/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_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_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 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_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_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_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 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_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 ) #define MPP35_TDM_CH0_TX_QL MPP( 35, 0x2, 0, 1, 0, 0, 1, 1 )
--- /dev/null --- /dev/null
@ -619,7 +619,7 @@
obj-$(CONFIG_MMC_SDHCI_XENON) += xenon_sdhci.o obj-$(CONFIG_MMC_SDHCI_XENON) += xenon_sdhci.o
obj-$(CONFIG_MMC_SDHCI_ZYNQ) += zynq_sdhci.o obj-$(CONFIG_MMC_SDHCI_ZYNQ) += zynq_sdhci.o
+obj-$(CONFIG_KIRKWOOD_MMC) += kirkwood_mmc.o +obj-$(CONFIG_KIRKWOOD_MMC) += kirkwood_mmc.o
obj-$(CONFIG_MMC_SUNXI) += sunxi_mmc.o obj-$(CONFIG_MMC_SUNXI) += sunxi_mmc.o
obj-$(CONFIG_MMC_UNIPHIER) += uniphier-sd.o obj-$(CONFIG_MMC_UNIPHIER) += uniphier-sd.o
--- /dev/null --- /dev/null
@ -1112,7 +1112,7 @@
@@ -117,4 +117,10 @@ @@ -117,4 +117,10 @@
#define CONFIG_MTD_PARTITIONS #define CONFIG_MTD_PARTITIONS
#endif #endif
+/* +/*
+ * Kirkwood MMC + * Kirkwood MMC
+ */ + */

8
package/boot/uboot-kirkwood/patches/110-dockstar.patch
View file

@ -5,7 +5,7 @@
#define CONFIG_KW88F6281 1 /* SOC Name */ #define CONFIG_KW88F6281 1 /* SOC Name */
#define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */ #define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */
+#define CONFIG_SYS_MVFS +#define CONFIG_SYS_MVFS
/* /*
* mv-common.h should be defined after CMD configs since it used them * mv-common.h should be defined after CMD configs since it used them
@@ -36,27 +37,22 @@ @@ -36,27 +37,22 @@
@ -15,7 +15,7 @@
-#define CONFIG_ENV_ADDR 0x80000 -#define CONFIG_ENV_ADDR 0x80000
-#define CONFIG_ENV_OFFSET 0x80000 /* env starts here */ -#define CONFIG_ENV_OFFSET 0x80000 /* env starts here */
+#define CONFIG_ENV_OFFSET 0xe0000 /* env starts here */ +#define CONFIG_ENV_OFFSET 0xe0000 /* env starts here */
/* /*
* Default environment variables * Default environment variables
*/ */
@ -29,7 +29,7 @@
+ "ubi part ubi; " \ + "ubi part ubi; " \
+ "ubi read 0x800000 kernel; " \ + "ubi read 0x800000 kernel; " \
+ "bootm 0x800000" + "bootm 0x800000"
#define CONFIG_EXTRA_ENV_SETTINGS \ #define CONFIG_EXTRA_ENV_SETTINGS \
- "console=console=ttyS0,115200\0" \ - "console=console=ttyS0,115200\0" \
- "mtdids=nand0=orion_nand\0" \ - "mtdids=nand0=orion_nand\0" \
@ -41,7 +41,7 @@
+ "mtdids=nand0=orion_nand\0" \ + "mtdids=nand0=orion_nand\0" \
+ "mtdparts="CONFIG_MTDPARTS_DEFAULT \ + "mtdparts="CONFIG_MTDPARTS_DEFAULT \
+ "bootargs_root=\0" + "bootargs_root=\0"
/* /*
* Ethernet Driver configuration * Ethernet Driver configuration
--- a/configs/dockstar_defconfig --- a/configs/dockstar_defconfig

6
package/boot/uboot-kirkwood/patches/120-iconnect.patch
View file

@ -6,7 +6,7 @@
#define CONFIG_ENV_SIZE 0x20000 #define CONFIG_ENV_SIZE 0x20000
-#define CONFIG_ENV_OFFSET 0x80000 -#define CONFIG_ENV_OFFSET 0x80000
+#define CONFIG_ENV_OFFSET 0xe0000 +#define CONFIG_ENV_OFFSET 0xe0000
/* /*
* Default environment variables * Default environment variables
*/ */
@ -18,7 +18,7 @@
+ "ubi part ubi; " \ + "ubi part ubi; " \
+ "ubi read 0x800000 kernel; " \ + "ubi read 0x800000 kernel; " \
"bootm 0x800000" "bootm 0x800000"
#define CONFIG_EXTRA_ENV_SETTINGS \ #define CONFIG_EXTRA_ENV_SETTINGS \
"console=console=ttyS0,115200\0" \ "console=console=ttyS0,115200\0" \
"mtdids=nand0=orion_nand\0" \ "mtdids=nand0=orion_nand\0" \
@ -26,7 +26,7 @@
- "kernel=/boot/uImage\0" \ - "kernel=/boot/uImage\0" \
- "bootargs_root=noinitrd ubi.mtd=2 root=ubi0:rootfs rootfstype=ubifs\0" - "bootargs_root=noinitrd ubi.mtd=2 root=ubi0:rootfs rootfstype=ubifs\0"
+ "bootargs_root=\0" + "bootargs_root=\0"
/* /*
* Ethernet driver configuration * Ethernet driver configuration
--- a/configs/iconnect_defconfig --- a/configs/iconnect_defconfig

4
package/boot/uboot-kirkwood/patches/130-ib62x0.patch
View file

@ -14,7 +14,7 @@
+ "ubi part ubi; " \ + "ubi part ubi; " \
+ "ubi read 0x800000 kernel; " \ + "ubi read 0x800000 kernel; " \
+ "bootm 0x800000" + "bootm 0x800000"
#define CONFIG_EXTRA_ENV_SETTINGS \ #define CONFIG_EXTRA_ENV_SETTINGS \
"console=console=ttyS0,115200\0" \ "console=console=ttyS0,115200\0" \
"mtdids=nand0=orion_nand\0" \ "mtdids=nand0=orion_nand\0" \
@ -23,7 +23,7 @@
- "fdt=/boot/ib62x0.dtb\0" \ - "fdt=/boot/ib62x0.dtb\0" \
- "bootargs_root=ubi.mtd=2 root=ubi0:rootfs rootfstype=ubifs rw\0" - "bootargs_root=ubi.mtd=2 root=ubi0:rootfs rootfstype=ubifs rw\0"
+ "bootargs_root=\0" + "bootargs_root=\0"
/* /*
* Ethernet driver configuration * Ethernet driver configuration
--- a/configs/ib62x0_defconfig --- a/configs/ib62x0_defconfig

8
package/boot/uboot-kirkwood/patches/140-pogoplug_e02.patch
View file

@ -2,11 +2,11 @@
+++ b/include/configs/pogo_e02.h +++ b/include/configs/pogo_e02.h
@@ -44,23 +44,23 @@ @@ -44,23 +44,23 @@
#endif #endif
#define CONFIG_ENV_SIZE 0x20000 /* 128k */ #define CONFIG_ENV_SIZE 0x20000 /* 128k */
-#define CONFIG_ENV_OFFSET 0x60000 /* env starts here */ -#define CONFIG_ENV_OFFSET 0x60000 /* env starts here */
+#define CONFIG_ENV_OFFSET 0xe0000 /* env starts here */ +#define CONFIG_ENV_OFFSET 0xe0000 /* env starts here */
/* /*
* Default environment variables * Default environment variables
*/ */
@ -19,7 +19,7 @@
+ "ubifsmount ubi:rootfs; " \ + "ubifsmount ubi:rootfs; " \
+ "ubi read 0x800000 kernel; " \ + "ubi read 0x800000 kernel; " \
+ "bootm 0x800000" + "bootm 0x800000"
#define CONFIG_EXTRA_ENV_SETTINGS \ #define CONFIG_EXTRA_ENV_SETTINGS \
- "mtdparts=mtdparts=orion_nand:1M(u-boot),4M(uImage)," \ - "mtdparts=mtdparts=orion_nand:1M(u-boot),4M(uImage)," \
- "32M(rootfs),-(data)\0"\ - "32M(rootfs),-(data)\0"\
@ -31,7 +31,7 @@
+ "mtdids=nand0=orion_nand\0" \ + "mtdids=nand0=orion_nand\0" \
+ "mtdparts="CONFIG_MTDPARTS_DEFAULT \ + "mtdparts="CONFIG_MTDPARTS_DEFAULT \
+ "bootargs_root=\0" + "bootargs_root=\0"
/* /*
* Ethernet Driver configuration * Ethernet Driver configuration
--- a/configs/pogo_e02_defconfig --- a/configs/pogo_e02_defconfig

4
package/boot/uboot-kirkwood/patches/150-goflexhome.patch
View file

@ -10,7 +10,7 @@
+ "ubi part ubi; " \ + "ubi part ubi; " \
+ "ubi read 0x800000 kernel; " \ + "ubi read 0x800000 kernel; " \
"bootm 0x800000" "bootm 0x800000"
#define CONFIG_EXTRA_ENV_SETTINGS \ #define CONFIG_EXTRA_ENV_SETTINGS \
"console=console=ttyS0,115200\0" \ "console=console=ttyS0,115200\0" \
"mtdids=nand0=orion_nand\0" \ "mtdids=nand0=orion_nand\0" \
@ -18,7 +18,7 @@
- "kernel=/boot/uImage\0" \ - "kernel=/boot/uImage\0" \
- "bootargs_root=ubi.mtd=root root=ubi0:root rootfstype=ubifs ro\0" - "bootargs_root=ubi.mtd=root root=ubi0:root rootfstype=ubifs ro\0"
+ "bootargs_root=\0" + "bootargs_root=\0"
/* /*
* Ethernet Driver configuration * Ethernet Driver configuration
--- a/configs/goflexhome_defconfig --- a/configs/goflexhome_defconfig