projects
/
oweals
/
openwrt.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
d42c9ce
)
uboot-kirkwood: update to 2019.01
author
Paul Wassi
<p.wassi@gmx.at>
Thu, 27 Dec 2018 13:38:46 +0000
(14:38 +0100)
committer
Hauke Mehrtens
<hauke@hauke-m.de>
Sun, 17 Feb 2019 18:22:39 +0000
(19:22 +0100)
Update U-Boot to current 2019.01 release for kirkwood platform
Signed-off-by: Paul Wassi <p.wassi@gmx.at>
package/boot/uboot-kirkwood/Makefile
patch
|
blob
|
history
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
package/boot/uboot-kirkwood/patches/200-openwrt-config.patch
patch
|
blob
|
history
diff --git
a/package/boot/uboot-kirkwood/Makefile
b/package/boot/uboot-kirkwood/Makefile
index e724bdf614cfab383ad79b08951ac36481c3fc3a..4ce1485a134dcece15f05e41a1eec12e67977460 100644
(file)
--- a/
package/boot/uboot-kirkwood/Makefile
+++ b/
package/boot/uboot-kirkwood/Makefile
@@
-7,10
+7,10
@@
include $(TOPDIR)/rules.mk
include $(TOPDIR)/rules.mk
-PKG_VERSION:=201
8.03
+PKG_VERSION:=201
9.01
PKG_RELEASE:=1
PKG_RELEASE:=1
-PKG_HASH:=
7e7477534409d5368eb1371ffde6820f0f79780a1a1f676161c48442cb303dfd
+PKG_HASH:=
50bd7e5a466ab828914d080d5f6a432345b500e8fba1ad3b7b61e95e60d51c22
include $(INCLUDE_DIR)/u-boot.mk
include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/u-boot.mk
include $(INCLUDE_DIR)/package.mk
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 264c160748c32d83335b2a37df582c67551e8234..25d252d13fd5ea400d3ccf0649147201218ee868 100644
(file)
--- a/
package/boot/uboot-kirkwood/patches/007-nsa310-uboot-generic.patch
+++ b/
package/boot/uboot-kirkwood/patches/007-nsa310-uboot-generic.patch
@@
-35,14
+35,14
@@
NOTE: this patch is ready for upstream, LEDE-specific parts are in
config TARGET_NSA310S
bool "Zyxel NSA310S"
config TARGET_NSA310S
bool "Zyxel NSA310S"
-@@ -8
0,6 +83
,7 @@ source "board/raidsonic/ib62x0/Kconfig"
+@@ -8
6,6 +89
,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"
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
+ source "board/alliedtelesis/SBx81LIFKW/Kconfig"
+ source "board/alliedtelesis/SBx81LIFXCAT/Kconfig"
--- /dev/null
+++ b/board/zyxel/nsa310/Kconfig
@@ -0,0 +1,12 @@
--- /dev/null
+++ b/board/zyxel/nsa310/Kconfig
@@ -0,0 +1,12 @@
@@
-505,16
+505,19
@@
NOTE: this patch is ready for upstream, LEDE-specific parts are in
+#endif /* __NSA310_H */
--- /dev/null
+++ b/configs/nsa310_defconfig
+#endif /* __NSA310_H */
--- /dev/null
+++ b/configs/nsa310_defconfig
-@@ -0,0 +1,
37
@@
+@@ -0,0 +1,
40
@@
+CONFIG_ARM=y
+CONFIG_KIRKWOOD=y
+CONFIG_SYS_TEXT_BASE=0x600000
+CONFIG_TARGET_NSA310=y
+CONFIG_IDENT_STRING="\nZyXEL NSA310 1-Bay Power Media Server"
+CONFIG_ARM=y
+CONFIG_KIRKWOOD=y
+CONFIG_SYS_TEXT_BASE=0x600000
+CONFIG_TARGET_NSA310=y
+CONFIG_IDENT_STRING="\nZyXEL NSA310 1-Bay Power Media Server"
++CONFIG_NR_DRAM_BANKS=2
+CONFIG_BOOTDELAY=3
+CONFIG_SYS_PROMPT="NSA310> "
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+CONFIG_BOOTDELAY=3
+CONFIG_SYS_PROMPT="NSA310> "
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
++CONFIG_MVGBE=y
++CONFIG_MII=y
+CONFIG_SYS_NS16550=y
+CONFIG_CMD_FDT=y
+CONFIG_OF_LIBFDT=y
+CONFIG_SYS_NS16550=y
+CONFIG_CMD_FDT=y
+CONFIG_OF_LIBFDT=y
@@
-545,7
+548,7
@@
NOTE: this patch is ready for upstream, LEDE-specific parts are in
+CONFIG_SYS_LONGHELP=y
--- /dev/null
+++ b/include/configs/nsa310.h
+CONFIG_SYS_LONGHELP=y
--- /dev/null
+++ b/include/configs/nsa310.h
-@@ -0,0 +1,11
9
@@
+@@ -0,0 +1,11
7
@@
+/* Copyright (C) 2015-2016 bodhi <mibodhi@gmail.com>
+ *
+ * Based on
+/* Copyright (C) 2015-2016 bodhi <mibodhi@gmail.com>
+ *
+ * Based on
@@
-654,8
+657,6
@@
NOTE: this patch is ready for upstream, LEDE-specific parts are in
+ */
+#define CONFIG_JFFS2_NAND
+#define CONFIG_JFFS2_LZO
+ */
+#define CONFIG_JFFS2_NAND
+#define CONFIG_JFFS2_LZO
-+#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */
-+#define CONFIG_MTD_PARTITIONS
+
+/*
+ * Date Time
+
+/*
+ * Date Time
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 0ce3fe02e1ce7aa9aaee3561d74ca8d004066571..d0bef45f88bd64a137eb25d6dc1cb607c47c377f 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,22
+1,23
@@
--- a/arch/arm/mach-kirkwood/Kconfig
+++ b/arch/arm/mach-kirkwood/Kconfig
--- a/arch/arm/mach-kirkwood/Kconfig
+++ b/arch/arm/mach-kirkwood/Kconfig
-@@ -6
2,6 +62,9 @@ config TARGET_NSA310
- config TARGET_
NSA310S
- bool "
Zyxel NSA310S
"
-
+@@ -6
8,6 +68,9 @@ config TARGET_SBx81LIFKW
+ config TARGET_
SBx81LIFXCAT
+ bool "
Allied Telesis SBx81GP24/SBx81GT24
"
+
+config TARGET_NSA325
+ bool "Zyxel NSA325 board"
+
endchoice
+config TARGET_NSA325
+ bool "Zyxel NSA325 board"
+
endchoice
-
+
config SYS_SOC
config SYS_SOC
-@@ -
85,5 +88,6
@@ source "board/Seagate/goflexhome/Kconfig
+@@ -
91,6 +94,7
@@ 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"
source "board/Seagate/nas220/Kconfig"
source "board/zyxel/nsa310/Kconfig"
source "board/zyxel/nsa310s/Kconfig"
+source "board/zyxel/nsa325/Kconfig"
-
- endif
+ source "board/alliedtelesis/SBx81LIFKW/Kconfig"
+ source "board/alliedtelesis/SBx81LIFXCAT/Kconfig"
+
--- /dev/null
+++ b/board/zyxel/nsa325/Kconfig
@@ -0,0 +1,12 @@
--- /dev/null
+++ b/board/zyxel/nsa325/Kconfig
@@ -0,0 +1,12 @@
@@
-488,16
+489,19
@@
+#endif /* __NSA325_H */
--- /dev/null
+++ b/configs/nsa325_defconfig
+#endif /* __NSA325_H */
--- /dev/null
+++ b/configs/nsa325_defconfig
-@@ -0,0 +1,
37
@@
+@@ -0,0 +1,
40
@@
+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_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_NR_DRAM_BANKS=2
+CONFIG_BOOTDELAY=3
+CONFIG_SYS_PROMPT="NSA325> "
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+CONFIG_BOOTDELAY=3
+CONFIG_SYS_PROMPT="NSA325> "
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
++CONFIG_MVGBE=y
++CONFIG_MII=y
+CONFIG_SYS_NS16550=y
+CONFIG_CMD_FDT=y
+CONFIG_OF_LIBFDT=y
+CONFIG_SYS_NS16550=y
+CONFIG_CMD_FDT=y
+CONFIG_OF_LIBFDT=y
@@
-528,7
+532,7
@@
+CONFIG_SYS_LONGHELP=y
--- /dev/null
+++ b/include/configs/nsa325.h
+CONFIG_SYS_LONGHELP=y
--- /dev/null
+++ b/include/configs/nsa325.h
-@@ -0,0 +1,12
2
@@
+@@ -0,0 +1,12
0
@@
+/*
+ * (C) Copyright 2016 bodhi <mibodhi@gmail.com>
+ *
+/*
+ * (C) Copyright 2016 bodhi <mibodhi@gmail.com>
+ *
@@
-638,8
+642,6
@@
+ */
+#define CONFIG_JFFS2_NAND
+#define CONFIG_JFFS2_LZO
+ */
+#define CONFIG_JFFS2_NAND
+#define CONFIG_JFFS2_LZO
-+#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */
-+#define CONFIG_MTD_PARTITIONS
+
+/*
+ * Date Time
+
+/*
+ * Date Time
diff --git
a/package/boot/uboot-kirkwood/patches/010-pogoplug_v4.patch
b/package/boot/uboot-kirkwood/patches/010-pogoplug_v4.patch
index 568c8bf5f0560cf5670532e2ff91cc626caff419..8aed96ad18c86228b656b61d956e2448331bb012 100644
(file)
--- a/
package/boot/uboot-kirkwood/patches/010-pogoplug_v4.patch
+++ b/
package/boot/uboot-kirkwood/patches/010-pogoplug_v4.patch
@@
-10,7
+10,7
@@
config TARGET_DNS325
bool "dns325 Board"
config TARGET_DNS325
bool "dns325 Board"
-@@ -
77,6 +80
,7 @@ source "board/Marvell/guruplug/Kconfig"
+@@ -
83,6 +86
,7 @@ source "board/Marvell/guruplug/Kconfig"
source "board/Marvell/sheevaplug/Kconfig"
source "board/buffalo/lsxl/Kconfig"
source "board/cloudengines/pogo_e02/Kconfig"
source "board/Marvell/sheevaplug/Kconfig"
source "board/buffalo/lsxl/Kconfig"
source "board/cloudengines/pogo_e02/Kconfig"
@@
-20,7
+20,7
@@
source "board/keymile/km_arm/Kconfig"
--- a/arch/arm/mach-kirkwood/include/mach/kw88f6192.h
+++ b/arch/arm/mach-kirkwood/include/mach/kw88f6192.h
source "board/keymile/km_arm/Kconfig"
--- a/arch/arm/mach-kirkwood/include/mach/kw88f6192.h
+++ b/arch/arm/mach-kirkwood/include/mach/kw88f6192.h
-@@ -1
6,6 +16
,6 @@
+@@ -1
5,6 +15
,6 @@
#define KW_REGS_PHY_BASE KW88F6192_REGS_PHYS_BASE
/* TCLK Core Clock defination */
#define KW_REGS_PHY_BASE KW88F6192_REGS_PHYS_BASE
/* TCLK Core Clock defination */
@@
-30,7
+30,7
@@
#endif /* _CONFIG_KW88F6192_H */
--- a/arch/arm/mach-kirkwood/include/mach/mpp.h
+++ b/arch/arm/mach-kirkwood/include/mach/mpp.h
#endif /* _CONFIG_KW88F6192_H */
--- a/arch/arm/mach-kirkwood/include/mach/mpp.h
+++ b/arch/arm/mach-kirkwood/include/mach/mpp.h
-@@ -21
7,10 +217
,12 @@
+@@ -21
6,10 +216
,12 @@
#define MPP33_GPIO MPP( 33, 0x0, 1, 1, 0, 1, 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_GPIO MPP( 33, 0x0, 1, 1, 0, 1, 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 )
@@
-532,16
+532,19
@@
+#endif /* __POGOPLUGV4_H */
--- /dev/null
+++ b/configs/pogoplugv4_defconfig
+#endif /* __POGOPLUGV4_H */
--- /dev/null
+++ b/configs/pogoplugv4_defconfig
-@@ -0,0 +1,4
0
@@
+@@ -0,0 +1,4
3
@@
+CONFIG_ARM=y
+CONFIG_KIRKWOOD=y
+CONFIG_SYS_TEXT_BASE=0x600000
+CONFIG_TARGET_POGOPLUGV4=y
+CONFIG_SYS_PROMPT="pogoplugv4> "
+CONFIG_IDENT_STRING="\nPogoplug V4"
+CONFIG_ARM=y
+CONFIG_KIRKWOOD=y
+CONFIG_SYS_TEXT_BASE=0x600000
+CONFIG_TARGET_POGOPLUGV4=y
+CONFIG_SYS_PROMPT="pogoplugv4> "
+CONFIG_IDENT_STRING="\nPogoplug V4"
++CONFIG_NR_DRAM_BANKS=2
+CONFIG_BOOTDELAY=3
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+CONFIG_BOOTDELAY=3
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
++CONFIG_MVGBE=y
++CONFIG_MII=y
+CONFIG_SYS_NS16550=y
+CONFIG_CMD_FDT=y
+CONFIG_OF_LIBFDT=y
+CONFIG_SYS_NS16550=y
+CONFIG_CMD_FDT=y
+CONFIG_OF_LIBFDT=y
@@
-575,7
+578,7
@@
+CONFIG_SYS_LONGHELP=y
--- a/drivers/gpio/kw_gpio.c
+++ b/drivers/gpio/kw_gpio.c
+CONFIG_SYS_LONGHELP=y
--- a/drivers/gpio/kw_gpio.c
+++ b/drivers/gpio/kw_gpio.c
-@@ -14
8,3 +148
,36 @@ void kw_gpio_set_blink(unsigned pin, int
+@@ -14
7,3 +147
,36 @@ void kw_gpio_set_blink(unsigned pin, int
/* Set blinking. */
__set_blinking(pin, blink);
}
/* Set blinking. */
__set_blinking(pin, blink);
}
@@
-621,7
+624,7
@@
+obj-$(CONFIG_KIRKWOOD_MMC) += kirkwood_mmc.o
obj-$(CONFIG_MMC_SUNXI) += sunxi_mmc.o
+obj-$(CONFIG_KIRKWOOD_MMC) += kirkwood_mmc.o
obj-$(CONFIG_MMC_SUNXI) += sunxi_mmc.o
- obj-$(CONFIG_MMC_UNIPHIER) += uniphier-sd.o
+ obj-$(CONFIG_MMC_UNIPHIER) +=
tmio-common.o
uniphier-sd.o
--- /dev/null
+++ b/drivers/mmc/kirkwood_mmc.c
@@ -0,0 +1,482 @@
--- /dev/null
+++ b/drivers/mmc/kirkwood_mmc.c
@@ -0,0 +1,482 @@
@@
-1109,8
+1112,8
@@
+}
--- a/include/configs/mv-common.h
+++ b/include/configs/mv-common.h
+}
--- a/include/configs/mv-common.h
+++ b/include/configs/mv-common.h
-@@ -
117,4 +11
7,10 @@
- #define CONFIG_
MTD_PARTITIONS
+@@ -
77,4 +7
7,10 @@
+ #define CONFIG_
SYS_MAX_NAND_DEVICE 1
#endif
+/*
#endif
+/*
@@
-1122,7
+1125,7
@@
#endif /* _MV_COMMON_H */
--- /dev/null
+++ b/include/configs/pogoplugv4.h
#endif /* _MV_COMMON_H */
--- /dev/null
+++ b/include/configs/pogoplugv4.h
-@@ -0,0 +1,12
9
@@
+@@ -0,0 +1,12
7
@@
+/*
+ * Copyright (C) 2014-2016 bodhi <mibodhi@gmail.com>
+ * Based on
+/*
+ * Copyright (C) 2014-2016 bodhi <mibodhi@gmail.com>
+ * Based on
@@
-1229,8
+1232,6
@@
+ */
+#define CONFIG_JFFS2_NAND
+#define CONFIG_JFFS2_LZO
+ */
+#define CONFIG_JFFS2_NAND
+#define CONFIG_JFFS2_LZO
-+#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */
-+#define CONFIG_MTD_PARTITIONS
+
+/*
+ * SATA
+
+/*
+ * SATA
diff --git
a/package/boot/uboot-kirkwood/patches/110-dockstar.patch
b/package/boot/uboot-kirkwood/patches/110-dockstar.patch
index ff2c33877b683d1ac6ba2d2b016af63984fc5ed6..f060c33c6322c7e8f7f8f474c2bdabb491a117c4 100644
(file)
--- a/
package/boot/uboot-kirkwood/patches/110-dockstar.patch
+++ b/
package/boot/uboot-kirkwood/patches/110-dockstar.patch
@@
-1,6
+1,6
@@
--- a/include/configs/dockstar.h
+++ b/include/configs/dockstar.h
--- a/include/configs/dockstar.h
+++ b/include/configs/dockstar.h
-@@ -1
8,6 +18
,7 @@
+@@ -1
7,6 +17
,7 @@
#define CONFIG_FEROCEON_88FR131 1 /* CPU Core subversion */
#define CONFIG_KW88F6281 1 /* SOC Name */
#define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */
#define CONFIG_FEROCEON_88FR131 1 /* CPU Core subversion */
#define CONFIG_KW88F6281 1 /* SOC Name */
#define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */
@@
-8,7
+8,7
@@
/*
* 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
-@@ -3
6,27 +37
,22 @@
+@@ -3
5,27 +36
,22 @@
* it has to be rounded to sector size
*/
#define CONFIG_ENV_SIZE 0x20000 /* 128k */
* it has to be rounded to sector size
*/
#define CONFIG_ENV_SIZE 0x20000 /* 128k */
@@
-46,12
+46,12
@@
* Ethernet Driver configuration
--- a/configs/dockstar_defconfig
+++ b/configs/dockstar_defconfig
* Ethernet Driver configuration
--- a/configs/dockstar_defconfig
+++ b/configs/dockstar_defconfig
-@@ -16,7 +16,7 @@ CONFIG_CMD_PING=y
- CONFIG_CMD_EXT2=y
+@@ -18,7 +18,7 @@ CONFIG_CMD_PING=y
CONFIG_CMD_FAT=y
CONFIG_CMD_JFFS2=y
CONFIG_CMD_FAT=y
CONFIG_CMD_JFFS2=y
+ CONFIG_CMD_MTDPARTS=y
-CONFIG_MTDPARTS_DEFAULT="mtdparts=orion_nand:1m(uboot),-(root)"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=orion_nand:0xe0000@0x0(uboot),0x20000@0xe0000(uboot_env),0x100000@0x100000(second_stage_uboot),-@0x200000(ubi)"
CONFIG_CMD_UBI=y
CONFIG_ISO_PARTITION=y
-CONFIG_MTDPARTS_DEFAULT="mtdparts=orion_nand:1m(uboot),-(root)"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=orion_nand:0xe0000@0x0(uboot),0x20000@0xe0000(uboot_env),0x100000@0x100000(second_stage_uboot),-@0x200000(ubi)"
CONFIG_CMD_UBI=y
CONFIG_ISO_PARTITION=y
- CONFIG_
ENV_IS_IN_NAND
=y
+ CONFIG_
OF_CONTROL
=y
diff --git
a/package/boot/uboot-kirkwood/patches/120-iconnect.patch
b/package/boot/uboot-kirkwood/patches/120-iconnect.patch
index 114aa1559da26d95f37eda483cf3503d2ad8c454..e7acf1a27f9577daf9d8251f423118be6cb71bc1 100644
(file)
--- a/
package/boot/uboot-kirkwood/patches/120-iconnect.patch
+++ b/
package/boot/uboot-kirkwood/patches/120-iconnect.patch
@@
-1,6
+1,6
@@
--- a/include/configs/iconnect.h
+++ b/include/configs/iconnect.h
--- a/include/configs/iconnect.h
+++ b/include/configs/iconnect.h
-@@ -4
4,24 +44
,22 @@
+@@ -4
2,24 +42
,22 @@
#define CONFIG_ENV_SECT_SIZE 0x20000
#endif
#define CONFIG_ENV_SIZE 0x20000
#define CONFIG_ENV_SECT_SIZE 0x20000
#endif
#define CONFIG_ENV_SIZE 0x20000
@@
-32,7
+32,7
@@
* Ethernet driver configuration
--- a/configs/iconnect_defconfig
+++ b/configs/iconnect_defconfig
* Ethernet driver configuration
--- a/configs/iconnect_defconfig
+++ b/configs/iconnect_defconfig
-@@ -1
0,12 +10,13
@@ CONFIG_SYS_PROMPT="iconnect => "
+@@ -1
1,13 +11,14
@@ CONFIG_SYS_PROMPT="iconnect => "
CONFIG_CMD_NAND=y
CONFIG_CMD_USB=y
# CONFIG_CMD_SETEXPR is not set
CONFIG_CMD_NAND=y
CONFIG_CMD_USB=y
# CONFIG_CMD_SETEXPR is not set
@@
-42,8
+42,9
@@
CONFIG_CMD_EXT2=y
CONFIG_CMD_FAT=y
CONFIG_CMD_JFFS2=y
CONFIG_CMD_EXT2=y
CONFIG_CMD_FAT=y
CONFIG_CMD_JFFS2=y
+ CONFIG_CMD_MTDPARTS=y
-CONFIG_MTDPARTS_DEFAULT="mtdparts=orion_nand:0x80000@0x0(uboot),0x20000@0x80000(uboot_env),-@0xa0000(rootfs)"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=orion_nand:0xe0000@0x0(uboot),0x20000@0xe0000(uboot_env),0x100000@0x100000(second_stage_uboot),-@0x200000(ubi)"
CONFIG_CMD_UBI=y
CONFIG_ISO_PARTITION=y
-CONFIG_MTDPARTS_DEFAULT="mtdparts=orion_nand:0x80000@0x0(uboot),0x20000@0x80000(uboot_env),-@0xa0000(rootfs)"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=orion_nand:0xe0000@0x0(uboot),0x20000@0xe0000(uboot_env),0x100000@0x100000(second_stage_uboot),-@0x200000(ubi)"
CONFIG_CMD_UBI=y
CONFIG_ISO_PARTITION=y
- CONFIG_
ENV_IS_IN_NAND
=y
+ CONFIG_
OF_CONTROL
=y
diff --git
a/package/boot/uboot-kirkwood/patches/130-ib62x0.patch
b/package/boot/uboot-kirkwood/patches/130-ib62x0.patch
index 269cf7336de458fbdfe577c365bd51fd6bcc39ff..2327c4a910ba46718ecfe1f557c74632207ac45c 100644
(file)
--- a/
package/boot/uboot-kirkwood/patches/130-ib62x0.patch
+++ b/
package/boot/uboot-kirkwood/patches/130-ib62x0.patch
@@
-1,6
+1,6
@@
--- a/include/configs/ib62x0.h
+++ b/include/configs/ib62x0.h
--- a/include/configs/ib62x0.h
+++ b/include/configs/ib62x0.h
-@@ -4
9,21 +49
,15 @@
+@@ -4
7,21 +47
,15 @@
*/
#define CONFIG_BOOTCOMMAND \
"setenv bootargs ${console} ${mtdparts} ${bootargs_root}; " \
*/
#define CONFIG_BOOTCOMMAND \
"setenv bootargs ${console} ${mtdparts} ${bootargs_root}; " \
@@
-29,12
+29,12
@@
* Ethernet driver configuration
--- a/configs/ib62x0_defconfig
+++ b/configs/ib62x0_defconfig
* Ethernet driver configuration
--- a/configs/ib62x0_defconfig
+++ b/configs/ib62x0_defconfig
-@@ -19,7 +19,7 @@ CONFIG_CMD_PING=y
- CONFIG_CMD_EXT2=y
+@@ -21,7 +21,7 @@ CONFIG_CMD_PING=y
CONFIG_CMD_FAT=y
CONFIG_CMD_JFFS2=y
CONFIG_CMD_FAT=y
CONFIG_CMD_JFFS2=y
+ CONFIG_CMD_MTDPARTS=y
-CONFIG_MTDPARTS_DEFAULT="mtdparts=orion_nand:0xe0000@0x0(uboot),0x20000@0xe0000(uboot_env),-@0x100000(root)"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=orion_nand:0xe0000@0x0(uboot),0x20000@0xe0000(uboot_env),0x100000@0x100000(second_stage_uboot),-@0x200000(ubi)"
CONFIG_CMD_UBI=y
CONFIG_ISO_PARTITION=y
-CONFIG_MTDPARTS_DEFAULT="mtdparts=orion_nand:0xe0000@0x0(uboot),0x20000@0xe0000(uboot_env),-@0x100000(root)"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=orion_nand:0xe0000@0x0(uboot),0x20000@0xe0000(uboot_env),0x100000@0x100000(second_stage_uboot),-@0x200000(ubi)"
CONFIG_CMD_UBI=y
CONFIG_ISO_PARTITION=y
- CONFIG_
ENV_IS_IN_NAND
=y
+ CONFIG_
OF_CONTROL
=y
diff --git
a/package/boot/uboot-kirkwood/patches/140-pogoplug_e02.patch
b/package/boot/uboot-kirkwood/patches/140-pogoplug_e02.patch
index 26217fadd702d69918255929083d0216e75eed02..69e21e60f7e3565682f7b0ad4ff4a3489eb5842b 100644
(file)
--- a/
package/boot/uboot-kirkwood/patches/140-pogoplug_e02.patch
+++ b/
package/boot/uboot-kirkwood/patches/140-pogoplug_e02.patch
@@
-1,6
+1,6
@@
--- a/include/configs/pogo_e02.h
+++ b/include/configs/pogo_e02.h
--- a/include/configs/pogo_e02.h
+++ b/include/configs/pogo_e02.h
-@@ -4
4,23 +44
,23 @@
+@@ -4
2,23 +42
,23 @@
#endif
#define CONFIG_ENV_SIZE 0x20000 /* 128k */
#endif
#define CONFIG_ENV_SIZE 0x20000 /* 128k */
@@
-36,11
+36,11
@@
* Ethernet Driver configuration
--- a/configs/pogo_e02_defconfig
+++ b/configs/pogo_e02_defconfig
* Ethernet Driver configuration
--- a/configs/pogo_e02_defconfig
+++ b/configs/pogo_e02_defconfig
-@@ -16,6 +16,7 @@ CONFIG_CMD_PING=y
- CONFIG_CMD_EXT2=y
+@@ -18,6 +18,7 @@ CONFIG_CMD_PING=y
CONFIG_CMD_FAT=y
CONFIG_CMD_JFFS2=y
CONFIG_CMD_FAT=y
CONFIG_CMD_JFFS2=y
+ CONFIG_CMD_MTDPARTS=y
+CONFIG_MTDPARTS_DEFAULT="mtdparts=orion_nand:0xe0000@0x0(uboot),0x20000@0xe0000(uboot_env),0x100000@0x100000(second_stage_uboot),-@0x200000(ubi)"
CONFIG_CMD_UBI=y
CONFIG_ISO_PARTITION=y
+CONFIG_MTDPARTS_DEFAULT="mtdparts=orion_nand:0xe0000@0x0(uboot),0x20000@0xe0000(uboot_env),0x100000@0x100000(second_stage_uboot),-@0x200000(ubi)"
CONFIG_CMD_UBI=y
CONFIG_ISO_PARTITION=y
- CONFIG_
ENV_IS_IN_NAND
=y
+ CONFIG_
OF_CONTROL
=y
diff --git
a/package/boot/uboot-kirkwood/patches/150-goflexhome.patch
b/package/boot/uboot-kirkwood/patches/150-goflexhome.patch
index 2104b67b513dcaf06ba0502217c21236c02d5ec1..854a1800c33a6e4c887d3a2eb6fa90c18ad39c2e 100644
(file)
--- a/
package/boot/uboot-kirkwood/patches/150-goflexhome.patch
+++ b/
package/boot/uboot-kirkwood/patches/150-goflexhome.patch
@@
-1,6
+1,6
@@
--- a/include/configs/goflexhome.h
+++ b/include/configs/goflexhome.h
--- a/include/configs/goflexhome.h
+++ b/include/configs/goflexhome.h
-@@ -6
9,17 +69
,15 @@
+@@ -6
6,17 +66
,15 @@
*/
#define CONFIG_BOOTCOMMAND \
"setenv bootargs ${console} ${mtdparts} ${bootargs_root}; " \
*/
#define CONFIG_BOOTCOMMAND \
"setenv bootargs ${console} ${mtdparts} ${bootargs_root}; " \
@@
-24,12
+24,12
@@
* Ethernet Driver configuration
--- a/configs/goflexhome_defconfig
+++ b/configs/goflexhome_defconfig
* Ethernet Driver configuration
--- a/configs/goflexhome_defconfig
+++ b/configs/goflexhome_defconfig
-@@ -21,7 +21,7 @@ CONFIG_CMD_EXT4=y
- CONFIG_CMD_FAT=y
+@@ -23,7 +23,7 @@ CONFIG_CMD_EXT4=y
CONFIG_CMD_JFFS2=y
CONFIG_CMD_JFFS2=y
+ CONFIG_CMD_MTDPARTS=y
CONFIG_MTDIDS_DEFAULT="nand0=orion_nand"
-CONFIG_MTDPARTS_DEFAULT="mtdparts=orion_nand:1m(uboot),6M(uImage),-(root)"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=orion_nand:1m(uboot),255m(ubi)"
CONFIG_CMD_UBI=y
CONFIG_ISO_PARTITION=y
CONFIG_MTDIDS_DEFAULT="nand0=orion_nand"
-CONFIG_MTDPARTS_DEFAULT="mtdparts=orion_nand:1m(uboot),6M(uImage),-(root)"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=orion_nand:1m(uboot),255m(ubi)"
CONFIG_CMD_UBI=y
CONFIG_ISO_PARTITION=y
- CONFIG_
ENV_IS_IN_NAND
=y
+ CONFIG_
OF_CONTROL
=y
diff --git
a/package/boot/uboot-kirkwood/patches/200-openwrt-config.patch
b/package/boot/uboot-kirkwood/patches/200-openwrt-config.patch
index 6400e5bb699808d3deb723cdae69c117b0288be2..f26675182abaada23f6e7da5d64e55dde8cd34c4 100644
(file)
--- a/
package/boot/uboot-kirkwood/patches/200-openwrt-config.patch
+++ b/
package/boot/uboot-kirkwood/patches/200-openwrt-config.patch
@@
-1,8
+1,8
@@
--- a/arch/arm/mach-kirkwood/Kconfig
+++ b/arch/arm/mach-kirkwood/Kconfig
--- a/arch/arm/mach-kirkwood/Kconfig
+++ b/arch/arm/mach-kirkwood/Kconfig
-@@ -
94,4 +94
,7 @@ source "board/zyxel/nsa310/Kconfig"
- source "board/
zyxel/nsa310s
/Kconfig"
- source "board/
zyxel/nsa325
/Kconfig"
+@@ -
102,4 +102
,7 @@ source "board/zyxel/nsa310/Kconfig"
+ source "board/
alliedtelesis/SBx81LIFKW
/Kconfig"
+ source "board/
alliedtelesis/SBx81LIFXCAT
/Kconfig"
+config SECOND_STAGE
+ bool "OpenWrt second stage hack"
+config SECOND_STAGE
+ bool "OpenWrt second stage hack"
@@
-10,16
+10,16
@@
endif
--- a/include/configs/dockstar.h
+++ b/include/configs/dockstar.h
endif
--- a/include/configs/dockstar.h
+++ b/include/configs/dockstar.h
-@@ -6
8,4 +68
,6 @@
- #define CONFIG_MTD_DEVICE /* needed for mtdparts commands */
- #define CONFIG_MTD_PARTITIONS
+@@ -6
5,4 +65
,6 @@
+ * File system
+ */
+#include "openwrt-kirkwood-common.h"
+
#endif /* _CONFIG_DOCKSTAR_H */
--- a/include/configs/ib62x0.h
+++ b/include/configs/ib62x0.h
+#include "openwrt-kirkwood-common.h"
+
#endif /* _CONFIG_DOCKSTAR_H */
--- a/include/configs/ib62x0.h
+++ b/include/configs/ib62x0.h
-@@ -8
7,4 +87
,6 @@
+@@ -8
5,4 +85
,6 @@
#define CONFIG_RTC_MV
#endif /* CONFIG_CMD_DATE */
#define CONFIG_RTC_MV
#endif /* CONFIG_CMD_DATE */
@@
-28,9
+28,9
@@
#endif /* _CONFIG_IB62x0_H */
--- a/include/configs/iconnect.h
+++ b/include/configs/iconnect.h
#endif /* _CONFIG_IB62x0_H */
--- a/include/configs/iconnect.h
+++ b/include/configs/iconnect.h
-@@ -7
6,4 +76
,6 @@
- #define CONFIG_MTD_DEVICE
- #define CONFIG_MTD_PARTITIONS
+@@ -7
2,4 +72
,6 @@
+ * File system
+ */
+#include "openwrt-kirkwood-common.h"
+
+#include "openwrt-kirkwood-common.h"
+
@@
-71,25
+71,25
@@
+#endif /* __OPENWRT_KIRKWOOD_COMMON_H */
--- a/include/configs/pogo_e02.h
+++ b/include/configs/pogo_e02.h
+#endif /* __OPENWRT_KIRKWOOD_COMMON_H */
--- a/include/configs/pogo_e02.h
+++ b/include/configs/pogo_e02.h
-@@ -7
6,4 +76
,6 @@
- #define CONFIG_MTD_DEVICE /* needed for mtdparts commands */
- #define CONFIG_MTD_PARTITIONS
+@@ -7
2,4 +72
,6 @@
+ * File system
+ */
+#include "openwrt-kirkwood-common.h"
+
#endif /* _CONFIG_POGO_E02_H */
--- a/include/configs/goflexhome.h
+++ b/include/configs/goflexhome.h
+#include "openwrt-kirkwood-common.h"
+
#endif /* _CONFIG_POGO_E02_H */
--- a/include/configs/goflexhome.h
+++ b/include/configs/goflexhome.h
-@@ -
101,4 +10
1,6 @@
- #define CONFIG_
RTC_MV
- #endif /*
CONFIG_CMD_DATE
*/
+@@ -
91,4 +9
1,6 @@
+ #define CONFIG_
SYS_ATA_IDE0_OFFSET MV_SATA_PORT0_OFFSET
+ #endif /*
CONFIG_MVSATA_IDE
*/
+#include "openwrt-kirkwood-common.h"
+
#endif /* _CONFIG_GOFLEXHOME_H */
--- a/include/configs/nsa310.h
+++ b/include/configs/nsa310.h
+#include "openwrt-kirkwood-common.h"
+
#endif /* _CONFIG_GOFLEXHOME_H */
--- a/include/configs/nsa310.h
+++ b/include/configs/nsa310.h
-@@ -11
6,4 +116
,6 @@
+@@ -11
4,4 +114
,6 @@
#define CONFIG_RTC_MV
#endif /* CONFIG_CMD_DATE */
#define CONFIG_RTC_MV
#endif /* CONFIG_CMD_DATE */
@@
-98,10
+98,10
@@
#endif /* _CONFIG_NSA310_H */
--- a/configs/dockstar_defconfig
+++ b/configs/dockstar_defconfig
#endif /* _CONFIG_NSA310_H */
--- a/configs/dockstar_defconfig
+++ b/configs/dockstar_defconfig
-@@ -26,3 +26,8 @@ CONFIG_USB=y
+@@ -31,3 +31,8 @@ CONFIG_USB=y
+ CONFIG_USB=y
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_STORAGE=y
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_STORAGE=y
- CONFIG_OF_LIBFDT=y
+CONFIG_CMD_BOOTZ=y
+CONFIG_FIT=y
+CONFIG_FIT_VERBOSE=y
+CONFIG_CMD_BOOTZ=y
+CONFIG_FIT=y
+CONFIG_FIT_VERBOSE=y
@@
-109,10
+109,10
@@
+CONFIG_LZO=y
--- a/configs/goflexhome_defconfig
+++ b/configs/goflexhome_defconfig
+CONFIG_LZO=y
--- a/configs/goflexhome_defconfig
+++ b/configs/goflexhome_defconfig
-@@ -32,3 +32,8 @@ CONFIG_USB=y
+@@ -40,3 +40,8 @@ CONFIG_USB=y
+ CONFIG_USB=y
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_STORAGE=y
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_STORAGE=y
- CONFIG_OF_LIBFDT=y
+CONFIG_CMD_BOOTZ=y
+CONFIG_FIT=y
+CONFIG_FIT_VERBOSE=y
+CONFIG_CMD_BOOTZ=y
+CONFIG_FIT=y
+CONFIG_FIT_VERBOSE=y
@@
-120,24
+120,22
@@
+CONFIG_LZO=y
--- a/configs/ib62x0_defconfig
+++ b/configs/ib62x0_defconfig
+CONFIG_LZO=y
--- a/configs/ib62x0_defconfig
+++ b/configs/ib62x0_defconfig
-@@ -
29,5 +29,8
@@ CONFIG_SYS_NS16550=y
+@@ -
35,4 +35,7
@@ CONFIG_SYS_NS16550=y
CONFIG_USB=y
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_STORAGE=y
-CONFIG_LZMA=y
CONFIG_USB=y
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_STORAGE=y
-CONFIG_LZMA=y
- CONFIG_OF_LIBFDT=y
+CONFIG_FIT=y
+CONFIG_FIT_VERBOSE=y
+CONFIG_LZMA=y
+CONFIG_LZO=y
--- a/configs/iconnect_defconfig
+++ b/configs/iconnect_defconfig
+CONFIG_FIT=y
+CONFIG_FIT_VERBOSE=y
+CONFIG_LZMA=y
+CONFIG_LZO=y
--- a/configs/iconnect_defconfig
+++ b/configs/iconnect_defconfig
-@@ -
25,5 +25,9
@@ CONFIG_SYS_NS16550=y
+@@ -
31,4 +31,8
@@ CONFIG_SYS_NS16550=y
CONFIG_USB=y
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_STORAGE=y
-CONFIG_LZMA=y
CONFIG_USB=y
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_STORAGE=y
-CONFIG_LZMA=y
- CONFIG_OF_LIBFDT=y
+CONFIG_CMD_BOOTZ=y
+CONFIG_FIT=y
+CONFIG_FIT_VERBOSE=y
+CONFIG_CMD_BOOTZ=y
+CONFIG_FIT=y
+CONFIG_FIT_VERBOSE=y
@@
-145,7
+143,7
@@
+CONFIG_LZO=y
--- a/configs/nsa310_defconfig
+++ b/configs/nsa310_defconfig
+CONFIG_LZO=y
--- a/configs/nsa310_defconfig
+++ b/configs/nsa310_defconfig
-@@ -3
2,6 +32
,9 @@ CONFIG_CMD_UBI=y
+@@ -3
5,6 +35
,9 @@ CONFIG_CMD_UBI=y
CONFIG_USB=y
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_STORAGE=y
CONFIG_USB=y
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_STORAGE=y
@@
-157,10
+155,10
@@
CONFIG_SYS_LONGHELP=y
--- a/configs/pogo_e02_defconfig
+++ b/configs/pogo_e02_defconfig
CONFIG_SYS_LONGHELP=y
--- a/configs/pogo_e02_defconfig
+++ b/configs/pogo_e02_defconfig
-@@ -26,3 +26,8 @@ CONFIG_USB=y
+@@ -31,3 +31,8 @@ CONFIG_USB=y
+ CONFIG_USB=y
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_STORAGE=y
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_STORAGE=y
- CONFIG_OF_LIBFDT=y
+CONFIG_CMD_BOOTZ=y
+CONFIG_FIT=y
+CONFIG_FIT_VERBOSE=y
+CONFIG_CMD_BOOTZ=y
+CONFIG_FIT=y
+CONFIG_FIT_VERBOSE=y