Difuse/difos
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

kirkwood: Add support for Sheevaplug

Browse source 
Globalscale SheevaPlug:
* Marvell Kirkwood 88F6281
* 512 MB SDRAM
* 512 MB Flash
* Gigabit Network
* USB 2.0
* SD slot
* Serial console

The device is supported in mainline uboot/linux the commit adds only
some openwrt config for building an image.

Installation:
1 - Update uboot:
setenv ipaddr '192.168.0.111'
setenv serverip '192.168.0.1'
tftpboot u-boot.kwb
nand erase 0x0 0x100000
nand write 0x800000 0x0 0x100000
reset
2 - Install OpenWRT:
setenv ethaddr 00:50:43:01:xx:xx
saveenv
setenv ipaddr '192.168.0.111'
setenv serverip '192.168.0.1'
tftpboot openwrt-kirkwood-globalscale_sheevaplug-squashfs-factory.bin
nand erase.part ubi
nand write 0x800000 ubi 0x600000
reset

Signed-off-by: BERENYI Balazs <balazs@wee.hu>
Reviewed-by: Pawel Dembicki <paweldembicki@gmail.com>
[add vendor name for uboot-kirkwood, merge patches, copy to 5.10,
add AUTORELEASE for uboot-kirkwood, refresh patches]
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
This commit is contained in:
BERENYI Balazs 2021-01-02 18:49:42 +00:00 committed by Adrian Schmutzler
parent a509b80065
commit 03d66d6b8f
8 changed files with 160 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
package/boot/uboot-envtools/files/kirkwood
View file

@ -15,6 +15,7 @@ case "$board" in
checkpoint,l-50|\ checkpoint,l-50|\
cloudengines,pogoe02|\ cloudengines,pogoe02|\
cloudengines,pogoplugv4|\ cloudengines,pogoplugv4|\
globalscale,sheevaplug|\
iom,ix2-200|\ iom,ix2-200|\
linksys,e4200-v2|\ linksys,e4200-v2|\
linksys,ea4500|\ linksys,ea4500|\

10
package/boot/uboot-kirkwood/Makefile
View file

@ -8,7 +8,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_VERSION:=2020.04 PKG_VERSION:=2020.04
PKG_RELEASE:=1 PKG_RELEASE:=$(AUTORELEASE)
PKG_HASH:=fe732aaf037d9cc3c0909bad8362af366ae964bbdac6913a34081ff4ad565372 PKG_HASH:=fe732aaf037d9cc3c0909bad8362af366ae964bbdac6913a34081ff4ad565372
@ -94,6 +94,11 @@ define U-Boot/pogoplugv4
BUILD_DEVICES:=cloudengines_pogoplugv4 BUILD_DEVICES:=cloudengines_pogoplugv4
endef endef
define U-Boot/sheevaplug
NAME:=Globalscale SheevaPlug
BUILD_DEVICES:=globalscale_sheevaplug
endef
UBOOT_TARGETS := \ UBOOT_TARGETS := \
dockstar dockstar_second_stage \ dockstar dockstar_second_stage \
goflexhome \ goflexhome \
@ -105,7 +110,8 @@ UBOOT_TARGETS := \
nsa310s \ nsa310s \
nsa325 \ nsa325 \
pogo_e02 pogo_e02_second_stage \ pogo_e02 pogo_e02_second_stage \
pogoplugv4 pogoplugv4 \
sheevaplug
define Build/Configure define Build/Configure
$(if $(findstring _second_stage,$(BUILD_VARIANT)), $(if $(findstring _second_stage,$(BUILD_VARIANT)),

39
package/boot/uboot-kirkwood/patches/170-sheevaplug.patch Normal file
View file

@ -0,0 +1,39 @@
--- a/include/configs/sheevaplug.h
+++ b/include/configs/sheevaplug.h
@@ -45,15 +45,17 @@
/*
* Default environment variables
*/
-#define CONFIG_BOOTCOMMAND "${x_bootcmd_kernel}; " \
- "setenv bootargs ${x_bootargs} ${x_bootargs_root}; " \
- "bootm 0x6400000;"
+#define CONFIG_BOOTCOMMAND \
+ "setenv bootargs ${console} ${mtdparts} ${bootargs_root}; " \
+ "ubi part ubi; " \
+ "ubi read 0x800000 kernel; " \
+ "bootm 0x800000"
-#define CONFIG_EXTRA_ENV_SETTINGS "x_bootargs=console" \
- "=ttyS0,115200 mtdparts="CONFIG_MTDPARTS_DEFAULT \
- "x_bootcmd_kernel=nand read 0x6400000 0x100000 0x400000\0" \
- "x_bootcmd_usb=usb start\0" \
- "x_bootargs_root=root=/dev/mtdblock3 rw rootfstype=jffs2\0"
+#define CONFIG_EXTRA_ENV_SETTINGS \
+ "console=console=ttyS0,115200\0" \
+ "mtdids="CONFIG_MTDIDS_DEFAULT "\0" \
+ "mtdparts="CONFIG_MTDPARTS_DEFAULT "\0" \
+ "bootargs_root=\0"
/*
* Ethernet Driver configuration
--- a/configs/sheevaplug_defconfig
+++ b/configs/sheevaplug_defconfig
@@ -30,7 +30,7 @@ CONFIG_CMD_FAT=y
CONFIG_CMD_JFFS2=y
CONFIG_CMD_MTDPARTS=y
CONFIG_MTDIDS_DEFAULT="nand0=orion_nand"
-CONFIG_MTDPARTS_DEFAULT="mtdparts=orion_nand:512K(uboot),512K(env),4M(kernel),-(rootfs)"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=orion_nand:1M(uboot),-(ubi)"
CONFIG_CMD_UBI=y
CONFIG_ISO_PARTITION=y
CONFIG_OF_CONTROL=y

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

@ -204,3 +204,13 @@
+#include "openwrt-kirkwood-common.h" +#include "openwrt-kirkwood-common.h"
+ +
#endif /* _CONFIG_NSA310S_H */ #endif /* _CONFIG_NSA310S_H */
--- a/configs/sheevaplug_defconfig
+++ b/configs/sheevaplug_defconfig
@@ -49,4 +49,7 @@
CONFIG_DM_USB=y
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_STORAGE=y
+CONFIG_FIT=y
+CONFIG_FIT_VERBOSE=y
CONFIG_LZMA=y
+CONFIG_LZO=y

1
target/linux/kirkwood/base-files/etc/board.d/02_network
View file

@ -18,6 +18,7 @@ case "$board" in
;; ;;
"cloudengines,pogoe02"|\ "cloudengines,pogoe02"|\
"cloudengines,pogoplugv4"|\ "cloudengines,pogoplugv4"|\
"globalscale,sheevaplug"|\
"iom,iconnect-1.1"|\ "iom,iconnect-1.1"|\
"iom,ix2-200"|\ "iom,ix2-200"|\
"raidsonic,ib-nas62x0"|\ "raidsonic,ib-nas62x0"|\

7
target/linux/kirkwood/image/Makefile
View file

@ -67,6 +67,13 @@ define Device/cloudengines_pogoplugv4
endef endef
TARGET_DEVICES += cloudengines_pogoplugv4 TARGET_DEVICES += cloudengines_pogoplugv4
define Device/globalscale_sheevaplug
DEVICE_VENDOR := Globalscale
DEVICE_MODEL := Sheevaplug
DEVICE_PACKAGES := kmod-mvsdio
endef
TARGET_DEVICES += globalscale_sheevaplug
define Device/iom_iconnect-1.1 define Device/iom_iconnect-1.1
DEVICE_VENDOR := Iomega DEVICE_VENDOR := Iomega
DEVICE_MODEL := Iconnect DEVICE_MODEL := Iconnect

47
target/linux/kirkwood/patches-5.10/112-sheevaplug.patch Normal file
View file

@ -0,0 +1,47 @@
--- a/arch/arm/boot/dts/kirkwood-sheevaplug-common.dtsi
+++ b/arch/arm/boot/dts/kirkwood-sheevaplug-common.dtsi
@@ -78,13 +78,8 @@
};
partition@100000 {
- label = "uImage";
- reg = <0x0100000 0x400000>;
- };
-
- partition@500000 {
- label = "root";
- reg = <0x0500000 0x1fb00000>;
+ label = "ubi";
+ reg = <0x0100000 0x1ff00000>;
};
};
--- a/arch/arm/boot/dts/kirkwood-sheevaplug.dts
+++ b/arch/arm/boot/dts/kirkwood-sheevaplug.dts
@@ -13,6 +13,13 @@
model = "Globalscale Technologies SheevaPlug";
compatible = "globalscale,sheevaplug", "marvell,kirkwood-88f6281", "marvell,kirkwood";
+ aliases {
+ led-boot = &led_health;
+ led-failsafe = &led_health;
+ led-running = &led_health;
+ led-upgrade = &led_health;
+ };
+
ocp@f1000000 {
mvsdio@90000 {
pinctrl-0 = <&pmx_sdio>;
@@ -28,10 +35,10 @@
pinctrl-0 = <&pmx_led_blue &pmx_led_red>;
pinctrl-names = "default";
- health {
+ led_health: health {
label = "sheevaplug:blue:health";
gpios = <&gpio1 17 GPIO_ACTIVE_LOW>;
- default-state = "keep";
+ default-state = "on";
};
misc {

47
target/linux/kirkwood/patches-5.4/112-sheevaplug.patch Normal file
View file

@ -0,0 +1,47 @@
--- a/arch/arm/boot/dts/kirkwood-sheevaplug-common.dtsi
+++ b/arch/arm/boot/dts/kirkwood-sheevaplug-common.dtsi
@@ -78,13 +78,8 @@
};
partition@100000 {
- label = "uImage";
- reg = <0x0100000 0x400000>;
- };
-
- partition@500000 {
- label = "root";
- reg = <0x0500000 0x1fb00000>;
+ label = "ubi";
+ reg = <0x0100000 0x1ff00000>;
};
};
--- a/arch/arm/boot/dts/kirkwood-sheevaplug.dts
+++ b/arch/arm/boot/dts/kirkwood-sheevaplug.dts
@@ -13,6 +13,13 @@
model = "Globalscale Technologies SheevaPlug";
compatible = "globalscale,sheevaplug", "marvell,kirkwood-88f6281", "marvell,kirkwood";
+ aliases {
+ led-boot = &led_health;
+ led-failsafe = &led_health;
+ led-running = &led_health;
+ led-upgrade = &led_health;
+ };
+
ocp@f1000000 {
mvsdio@90000 {
pinctrl-0 = <&pmx_sdio>;
@@ -28,10 +35,10 @@
pinctrl-0 = <&pmx_led_blue &pmx_led_red>;
pinctrl-names = "default";
- health {
+ led_health: health {
label = "sheevaplug:blue:health";
gpios = <&gpio1 17 GPIO_ACTIVE_LOW>;
- default-state = "keep";
+ default-state = "on";
};
misc {