ath79: 8dev: remove wmac userspace handling

[openwrt/openwrt.git] / package / boot / uboot-kirkwood / patches / 150-goflexhome.patch

diff --git a/package/boot/uboot-kirkwood/patches/150-goflexhome.patch b/package/boot/uboot-kirkwood/patches/150-goflexhome.patch
index a7fa8e6f93b1cf0d9ab9b21b5e7dd72a050ab50d..014ae66338c72f977398cd6077c573273ccef97c 100644 (file)
--- a/package/boot/uboot-kirkwood/patches/150-goflexhome.patch
+++ b/package/boot/uboot-kirkwood/patches/150-goflexhome.patch
@@ -1,28 +1,35 @@
 --- a/include/configs/goflexhome.h
 +++ b/include/configs/goflexhome.h
-@@ -77,20 +77,18 @@
+@@ -60,17 +60,15 @@
   */
  #define CONFIG_BOOTCOMMAND \
        "setenv bootargs ${console} ${mtdparts} ${bootargs_root}; " \
 -      "ubi part root; " \
 -      "ubifsmount ubi:root; " \
 -      "ubifsload 0x800000 ${kernel}; " \
--      "bootm 0x800000"
 +      "ubi part ubi; " \
 +      "ubi read 0x800000 kernel; " \
-+      "bootm 0x800000"
- 
- #define CONFIG_MTDPARTS \
--      "mtdparts=orion_nand:1m(uboot),6M(uImage),-(root)\0"
-+      "mtdparts=orion_nand:1m(uboot),255m(ubi)\0"
+       "bootm 0x800000"
  
  #define CONFIG_EXTRA_ENV_SETTINGS \
        "console=console=ttyS0,115200\0" \
        "mtdids=nand0=orion_nand\0" \
-       "mtdparts="CONFIG_MTDPARTS \
+-      "mtdparts="CONFIG_MTDPARTS_DEFAULT \
 -      "kernel=/boot/uImage\0" \
 -      "bootargs_root=ubi.mtd=root root=ubi0:root rootfstype=ubifs ro\0"
++      "mtdparts="CONFIG_MTDPARTS_DEFAULT "\0" \
 +      "bootargs_root=\0"
  
  /*
   * Ethernet Driver configuration
+--- a/configs/goflexhome_defconfig
++++ b/configs/goflexhome_defconfig
+@@ -28,7 +28,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:1m(uboot),6M(uImage),-(root)"
++CONFIG_MTDPARTS_DEFAULT="mtdparts=orion_nand:1m(uboot),255m(ubi)"
+ CONFIG_CMD_UBI=y
+ CONFIG_ISO_PARTITION=y
+ CONFIG_OF_CONTROL=y