forked from openwrt/openwrt
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
kirkwood: Add support for Sheevaplug
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>
- Loading branch information
Showing
8 changed files
with
160 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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 { |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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 { |