uboot-kirkwood: fix whitespaces

[openwrt/staging/mkresin.git] / package / boot / uboot-kirkwood / patches / 008-nsa325-uboot-generic.patch

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 4b4356e5d5e8ab6d5560413562355117061bc7a8..7fed859031cf8dc28bfe48ee9e3f94b420b6c413 100644 (file)
--- a/package/boot/uboot-kirkwood/patches/008-nsa325-uboot-generic.patch
+++ b/package/boot/uboot-kirkwood/patches/008-nsa325-uboot-generic.patch
@@ -1,27 +1,22 @@
-diff --git a/arch/arm/mach-kirkwood/Kconfig b/arch/arm/mach-kirkwood/Kconfig
-index 819bd3b..6a2d578 100644
 --- a/arch/arm/mach-kirkwood/Kconfig
 +++ b/arch/arm/mach-kirkwood/Kconfig
 @@ -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
-diff --git a/board/zyxel/nsa325/Kconfig b/board/zyxel/nsa325/Kconfig
-new file mode 100644
-index 0000000..1fe5ead
 --- /dev/null
 +++ b/board/zyxel/nsa325/Kconfig
 @@ -0,0 +1,12 @@
@@ -37,9 +32,6 @@ index 0000000..1fe5ead
 +      default "nsa325"
 +
 +endif
-diff --git a/board/zyxel/nsa325/MAINTAINERS b/board/zyxel/nsa325/MAINTAINERS
-new file mode 100644
-index 0000000..130b4d9
 --- /dev/null
 +++ b/board/zyxel/nsa325/MAINTAINERS
 @@ -0,0 +1,6 @@
@@ -49,9 +41,6 @@ index 0000000..130b4d9
 +F:    board/zyxel/nsa325/
 +F:    include/configs/nsa325.h
 +F:    configs/nsa325_defconfig
-diff --git a/board/zyxel/nsa325/Makefile b/board/zyxel/nsa325/Makefile
-new file mode 100644
-index 0000000..4ee953b
 --- /dev/null
 +++ b/board/zyxel/nsa325/Makefile
 @@ -0,0 +1,13 @@
@@ -68,9 +57,6 @@ index 0000000..4ee953b
 +
 +obj-y := nsa325.o
 +
-diff --git a/board/zyxel/nsa325/kwbimage.cfg b/board/zyxel/nsa325/kwbimage.cfg
-new file mode 100644
-index 0000000..5a27d38
 --- /dev/null
 +++ b/board/zyxel/nsa325/kwbimage.cfg
 @@ -0,0 +1,78 @@
@@ -152,9 +138,6 @@ index 0000000..5a27d38
 +# End of Header extension
 +DATA 0x0 0x0
 +
-diff --git a/board/zyxel/nsa325/nsa325.c b/board/zyxel/nsa325/nsa325.c
-new file mode 100644
-index 0000000..4cd1c0f
 --- /dev/null
 +++ b/board/zyxel/nsa325/nsa325.c
 @@ -0,0 +1,265 @@
@@ -423,9 +406,6 @@ index 0000000..4cd1c0f
 +
 +#endif
 +
-diff --git a/board/zyxel/nsa325/nsa325.h b/board/zyxel/nsa325/nsa325.h
-new file mode 100644
-index 0000000..996653e
 --- /dev/null
 +++ b/board/zyxel/nsa325/nsa325.h
 @@ -0,0 +1,77 @@
@@ -506,14 +486,12 @@ index 0000000..996653e
 +#define BTN_COPY                              37
 +
 +#endif /* __NSA325_H */
-diff --git a/configs/nsa325_defconfig b/configs/nsa325_defconfig
-new file mode 100644
-index 0000000..48e09cc
 --- /dev/null
 +++ b/configs/nsa325_defconfig
-@@ -0,0 +1,34 @@
+@@ -0,0 +1,37 @@
 +CONFIG_ARM=y
 +CONFIG_KIRKWOOD=y
++CONFIG_SYS_TEXT_BASE=0x600000
 +CONFIG_TARGET_NSA325=y
 +CONFIG_IDENT_STRING="\nZyXEL NSA325 2-Bay Power Media Server"
 +CONFIG_BOOTDELAY=3
@@ -536,6 +514,7 @@ index 0000000..48e09cc
 +CONFIG_CMD_EXT4=y
 +CONFIG_CMD_FAT=y
 +CONFIG_CMD_JFFS2=y
++CONFIG_MTDPARTS_DEFAULT="mtdparts=orion_nand:0x0c0000(uboot),0x80000(uboot_env),0x7ec0000(ubi)"
 +CONFIG_CMD_MTDPARTS=y
 +CONFIG_CMD_ENV=y
 +CONFIG_CMD_NAND=y
@@ -546,12 +525,10 @@ index 0000000..48e09cc
 +CONFIG_USB_STORAGE=y
 +CONFIG_LZMA=y
 +CONFIG_LZO=y
-diff --git a/include/configs/nsa325.h b/include/configs/nsa325.h
-new file mode 100644
-index 0000000..e5a8e2a
++CONFIG_SYS_LONGHELP=y
 --- /dev/null
 +++ b/include/configs/nsa325.h
-@@ -0,0 +1,129 @@
+@@ -0,0 +1,122 @@
 +/*
 + * (C) Copyright 2016 bodhi <mibodhi@gmail.com>
 + *
@@ -603,7 +580,6 @@ index 0000000..e5a8e2a
 +/*
 + * Commands configuration
 + */
-+#define CONFIG_SYS_LONGHELP
 +#define CONFIG_PREBOOT
 +
 +/*
@@ -634,16 +610,10 @@ index 0000000..e5a8e2a
 +      "ubi read 0x800000 kernel; " \
 +      "bootm 0x800000"
 +
-+#define CONFIG_MTDPARTS \
-+      "mtdparts=orion_nand:" \
-+      "0x0c0000(uboot)," \
-+      "0x80000(uboot_env)," \
-+      "0x7ec0000(ubi)\0"
-+
 +#define CONFIG_EXTRA_ENV_SETTINGS \
 +      "console=console=ttyS0,115200\0"        \
 +      "mtdids=nand0=orion_nand\0"             \
-+      "mtdparts="CONFIG_MTDPARTS              \
++      "mtdparts="CONFIG_MTDPARTS_DEFAULT      \
 +      "bootargs_root=\0"
 +
 +/*