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

package/boot/uboot-kirkwood: fix build errors for nsa310 and nsa325

Browse source 
With upstream changes, the last update to U-Boot 2017.03
broke the nsa310 and nsa325 targets. Also fix some redefines.

Signed-off-by: Paul Wassi <p.wassi@gmx.at>
This commit is contained in:
Paul Wassi 2017-03-25 11:46:10 +01:00 committed by John Crispin
parent 49acec5b5f
commit 55920643b1
3 changed files with 14 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -528,10 +528,11 @@ new file mode 100644
index 0000000..d26ef35 index 0000000..d26ef35
--- /dev/null --- /dev/null
+++ b/configs/nsa310_defconfig +++ b/configs/nsa310_defconfig
@@ -0,0 +1,19 @@ @@ -0,0 +1,22 @@
+CONFIG_ARM=y +CONFIG_ARM=y
+CONFIG_KIRKWOOD=y +CONFIG_KIRKWOOD=y
+CONFIG_TARGET_NSA310=y +CONFIG_TARGET_NSA310=y
+CONFIG_IDENT_STRING="\nZyXEL NSA310 1-Bay Power Media Server"
+CONFIG_BOOTDELAY=3 +CONFIG_BOOTDELAY=3
+CONFIG_SYS_PROMPT="NSA310> " +CONFIG_SYS_PROMPT="NSA310> "
+# CONFIG_CMD_IMLS is not set +# CONFIG_CMD_IMLS is not set
@ -541,11 +542,13 @@ index 0000000..d26ef35
+CONFIG_OF_LIBFDT=y +CONFIG_OF_LIBFDT=y
+CONFIG_CMD_SETEXPR=y +CONFIG_CMD_SETEXPR=y
+CONFIG_CMD_DHCP=y +CONFIG_CMD_DHCP=y
+CONFIG_CMD_NAND=y +CONFIG_CMD_MII=y
+CONFIG_CMD_PING=y +CONFIG_CMD_PING=y
+CONFIG_CMD_USB=y +CONFIG_CMD_USB=y
+CONFIG_CMD_EXT2=y +CONFIG_CMD_EXT2=y
+CONFIG_CMD_FAT=y +CONFIG_CMD_FAT=y
+CONFIG_EFI_PARTITION=y
+CONFIG_CMD_UBI=y
+CONFIG_USB=y +CONFIG_USB=y
+CONFIG_USB_STORAGE=y +CONFIG_USB_STORAGE=y
diff --git a/include/configs/nsa310.h b/include/configs/nsa310.h diff --git a/include/configs/nsa310.h b/include/configs/nsa310.h
@ -553,7 +556,7 @@ new file mode 100644
index 0000000..86ef825 index 0000000..86ef825
--- /dev/null --- /dev/null
+++ b/include/configs/nsa310.h +++ b/include/configs/nsa310.h
@@ -0,0 +1,168 @@ @@ -0,0 +1,144 @@
+/* Copyright (C) 2015-2016 bodhi <mibodhi@gmail.com> +/* Copyright (C) 2015-2016 bodhi <mibodhi@gmail.com>
+ * + *
+ * Based on + * Based on
@ -587,12 +590,6 @@ index 0000000..86ef825
+#define _CONFIG_NSA310_H +#define _CONFIG_NSA310_H
+ +
+/* +/*
+ * Version number information
+ */
+
+#define CONFIG_IDENT_STRING "\nZyXEL NSA310 1-Bay Power Media Server \n"
+
+/*
+ * High Level Configuration Options (easy to change) + * High Level Configuration Options (easy to change)
+ */ + */
+#define CONFIG_FEROCEON_88FR131 /* CPU Core subversion */ +#define CONFIG_FEROCEON_88FR131 /* CPU Core subversion */
@ -608,15 +605,9 @@ index 0000000..86ef825
+/* +/*
+ * Commands configuration + * Commands configuration
+ */ + */
+#define CONFIG_SYS_NO_FLASH /* Declare no flash (NOR/SPI) */
+#define CONFIG_SYS_MVFS /* Picks up Filesystem from mv-common.h */
+#define CONFIG_CMD_DHCP
+#define CONFIG_CMD_ENV +#define CONFIG_CMD_ENV
+#define CONFIG_CMD_IDE +#define CONFIG_CMD_IDE
+#define CONFIG_CMD_MII
+#define CONFIG_CMD_NAND +#define CONFIG_CMD_NAND
+#define CONFIG_CMD_PING
+#define CONFIG_CMD_USB
+#define CONFIG_CMD_DATE +#define CONFIG_CMD_DATE
+#define CONFIG_SYS_LONGHELP +#define CONFIG_SYS_LONGHELP
+#define CONFIG_PREBOOT +#define CONFIG_PREBOOT
@ -629,10 +620,6 @@ index 0000000..86ef825
+ */ + */
+#include "mv-common.h" +#include "mv-common.h"
+ +
+/* Remove or override few declarations from mv-common.h */
+#undef CONFIG_SYS_PROMPT /* previously defined in mv-common.h */
+#define CONFIG_SYS_PROMPT "NSA310> " /* Command Prompt */
+
+/* +/*
+ * Environment variables configurations + * Environment variables configurations
+ */ + */
@ -693,13 +680,10 @@ index 0000000..86ef825
+/* +/*
+ * File system + * File system
+ */ + */
+#define CONFIG_CMD_EXT2
+#define CONFIG_CMD_EXT4 +#define CONFIG_CMD_EXT4
+#define CONFIG_CMD_FAT
+#define CONFIG_CMD_JFFS2 +#define CONFIG_CMD_JFFS2
+#define CONFIG_JFFS2_NAND +#define CONFIG_JFFS2_NAND
+#define CONFIG_JFFS2_LZO +#define CONFIG_JFFS2_LZO
+#define CONFIG_CMD_UBI
+#define CONFIG_CMD_UBIFS +#define CONFIG_CMD_UBIFS
+#define CONFIG_RBTREE +#define CONFIG_RBTREE
+#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */ +#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */
@ -708,11 +692,6 @@ index 0000000..86ef825
+#define CONFIG_LZO +#define CONFIG_LZO
+ +
+/* +/*
+ * EFI partition
+ */
+#define CONFIG_EFI_PARTITION
+
+/*
+ * Date Time + * Date Time
+ */ + */
+#ifdef CONFIG_CMD_DATE +#ifdef CONFIG_CMD_DATE

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

@ -511,10 +511,11 @@ new file mode 100644
index 0000000..48e09cc index 0000000..48e09cc
--- /dev/null --- /dev/null
+++ b/configs/nsa325_defconfig +++ b/configs/nsa325_defconfig
@@ -0,0 +1,18 @@ @@ -0,0 +1,22 @@
+CONFIG_ARM=y +CONFIG_ARM=y
+CONFIG_KIRKWOOD=y +CONFIG_KIRKWOOD=y
+CONFIG_TARGET_NSA325=y +CONFIG_TARGET_NSA325=y
+CONFIG_IDENT_STRING="\nZyXEL NSA325 2-Bay Power Media Server"
+CONFIG_BOOTDELAY=3 +CONFIG_BOOTDELAY=3
+CONFIG_SYS_PROMPT="NSA325> " +CONFIG_SYS_PROMPT="NSA325> "
+# CONFIG_CMD_IMLS is not set +# CONFIG_CMD_IMLS is not set
@ -524,19 +525,21 @@ index 0000000..48e09cc
+CONFIG_OF_LIBFDT=y +CONFIG_OF_LIBFDT=y
+CONFIG_CMD_SETEXPR=y +CONFIG_CMD_SETEXPR=y
+CONFIG_CMD_DHCP=y +CONFIG_CMD_DHCP=y
+CONFIG_CMD_NAND=y +CONFIG_CMD_MII=y
+CONFIG_CMD_PING=y +CONFIG_CMD_PING=y
+CONFIG_CMD_USB=y +CONFIG_CMD_USB=y
+CONFIG_USB=y +CONFIG_USB=y
+CONFIG_CMD_EXT2=y
+CONFIG_CMD_FAT=y +CONFIG_CMD_FAT=y
+CONFIG_EFI_PARTITION=y
+CONFIG_CMD_UBI=y
+CONFIG_USB_STORAGE=y +CONFIG_USB_STORAGE=y
\ No newline at end of file
diff --git a/include/configs/nsa325.h b/include/configs/nsa325.h diff --git a/include/configs/nsa325.h b/include/configs/nsa325.h
new file mode 100644 new file mode 100644
index 0000000..e5a8e2a index 0000000..e5a8e2a
--- /dev/null --- /dev/null
+++ b/include/configs/nsa325.h +++ b/include/configs/nsa325.h
@@ -0,0 +1,170 @@ @@ -0,0 +1,148 @@
+/* +/*
+ * (C) Copyright 2016 bodhi <mibodhi@gmail.com> + * (C) Copyright 2016 bodhi <mibodhi@gmail.com>
+ * + *
@ -573,11 +576,6 @@ index 0000000..e5a8e2a
+#define _CONFIG_NSA325_H +#define _CONFIG_NSA325_H
+ +
+/* +/*
+ * Version number information
+ */
+#define CONFIG_IDENT_STRING "\nZyXEL NSA325 2-Bay Power Media Server"
+
+/*
+ * High Level Configuration Options (easy to change) + * High Level Configuration Options (easy to change)
+ */ + */
+#define CONFIG_FEROCEON_88FR131 1 /* CPU Core subversion */ +#define CONFIG_FEROCEON_88FR131 1 /* CPU Core subversion */
@ -594,15 +592,9 @@ index 0000000..e5a8e2a
+/* +/*
+ * Commands configuration + * Commands configuration
+ */ + */
+#define CONFIG_SYS_NO_FLASH /* Declare no flash (NOR/SPI) */
+#define CONFIG_SYS_MVFS /* Picks up Filesystem from mv-common.h */
+#define CONFIG_CMD_DHCP
+#define CONFIG_CMD_ENV +#define CONFIG_CMD_ENV
+#define CONFIG_CMD_IDE +#define CONFIG_CMD_IDE
+#define CONFIG_CMD_MII
+#define CONFIG_CMD_NAND +#define CONFIG_CMD_NAND
+#define CONFIG_CMD_PING
+#define CONFIG_CMD_USB
+#define CONFIG_CMD_DATE +#define CONFIG_CMD_DATE
+#define CONFIG_SYS_LONGHELP +#define CONFIG_SYS_LONGHELP
+#define CONFIG_PREBOOT +#define CONFIG_PREBOOT
@ -615,9 +607,6 @@ index 0000000..e5a8e2a
+ */ + */
+#include "mv-common.h" +#include "mv-common.h"
+ +
+#undef CONFIG_SYS_PROMPT /* previously defined in mv-common.h */
+#define CONFIG_SYS_PROMPT "NSA325> " /* Command Prompt */
+
+/* +/*
+ * Environment variables configurations + * Environment variables configurations
+ */ + */
@ -676,13 +665,10 @@ index 0000000..e5a8e2a
+/* +/*
+ * File system + * File system
+ */ + */
+#define CONFIG_CMD_EXT2
+#define CONFIG_CMD_EXT4 +#define CONFIG_CMD_EXT4
+#define CONFIG_CMD_FAT
+#define CONFIG_CMD_JFFS2 +#define CONFIG_CMD_JFFS2
+#define CONFIG_JFFS2_NAND +#define CONFIG_JFFS2_NAND
+#define CONFIG_JFFS2_LZO +#define CONFIG_JFFS2_LZO
+#define CONFIG_CMD_UBI
+#define CONFIG_CMD_UBIFS +#define CONFIG_CMD_UBIFS
+#define CONFIG_RBTREE +#define CONFIG_RBTREE
+#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */ +#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */
@ -691,11 +677,6 @@ index 0000000..e5a8e2a
+#define CONFIG_LZO +#define CONFIG_LZO
+ +
+/* +/*
+ * EFI partition
+ */
+#define CONFIG_EFI_PARTITION
+
+/*
+ * Date Time + * Date Time
+ */ + */
+#ifdef CONFIG_CMD_DATE +#ifdef CONFIG_CMD_DATE

2
package/boot/uboot-kirkwood/patches/200-openwrt-config.patch
View file

@ -107,7 +107,7 @@
#endif /* _CONFIG_GOFLEXHOME_H */ #endif /* _CONFIG_GOFLEXHOME_H */
--- a/include/configs/nsa310.h --- a/include/configs/nsa310.h
+++ b/include/configs/nsa310.h +++ b/include/configs/nsa310.h
@@ -165,4 +165,6 @@ @@ -141,4 +141,6 @@
#define CONFIG_CMD_DNS #define CONFIG_CMD_DNS
#endif /* CONFIG_CMD_DATE */ #endif /* CONFIG_CMD_DATE */