uboot-kirkwood: Revert "uboot-kirkwood: enable sata in nsa310 uboot"

[oweals/openwrt.git] / package / boot / uboot-kirkwood / patches / 110-dockstar.patch

diff --git a/package/boot/uboot-kirkwood/patches/110-dockstar.patch b/package/boot/uboot-kirkwood/patches/110-dockstar.patch
index 94d62cee82b90a96ca98388f22f7948d641d60a9..b3837956bce0e4e94629045ea7c28c59f4d6e8aa 100644 (file)
--- a/package/boot/uboot-kirkwood/patches/110-dockstar.patch
+++ b/package/boot/uboot-kirkwood/patches/110-dockstar.patch
@@ -1,23 +1,14 @@
 --- a/include/configs/dockstar.h
 +++ b/include/configs/dockstar.h
-@@ -19,6 +19,7 @@
+@@ -17,6 +17,7 @@
+ #define CONFIG_FEROCEON_88FR131       1       /* CPU Core subversion */
  #define CONFIG_KW88F6281      1       /* SOC Name */
- #define CONFIG_MACH_DOCKSTAR  /* Machine type */
  #define CONFIG_SKIP_LOWLEVEL_INIT     /* disable board lowlevel_init */
 +#define CONFIG_SYS_MVFS
- 
+
  /*
   * mv-common.h should be defined after CMD configs since it used them
-@@ -37,29 +38,29 @@
-  * it has to be rounded to sector size
-  */
- #define CONFIG_ENV_SIZE                       0x20000 /* 128k */
--#define CONFIG_ENV_ADDR                       0x80000
--#define CONFIG_ENV_OFFSET             0x80000 /* env starts here */
-+#define CONFIG_ENV_OFFSET             0xe0000 /* env starts here */
- 
- /*
-  * Default environment variables
+@@ -37,19 +38,15 @@
   */
  #define CONFIG_BOOTCOMMAND \
        "setenv bootargs ${console} ${mtdparts} ${bootargs_root}; "     \
@@ -26,30 +17,41 @@
 -      "ubifsload 0x800000 ${kernel}; " \
 -      "ubifsload 0x1100000 ${initrd}; " \
 -      "bootm 0x800000 0x1100000"
--
--#define CONFIG_MTDPARTS               "mtdparts=orion_nand:1m(uboot),-(root)\0"
 +      "ubi part ubi; " \
 +      "ubi read 0x800000 kernel; " \
 +      "bootm 0x800000"
-+
-+#define CONFIG_MTDPARTS \
-+      "mtdparts=orion_nand:"                          \
-+      "0xe0000@0x0(uboot),"                           \
-+      "0x20000@0xe0000(uboot_env),"                   \
-+      "0x100000@0x100000(second_stage_uboot),"        \
-+      "-@0x200000(ubi)\0"
- 
+
  #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" \
 -      "initrd=/boot/uInitrd\0" \
 -      "bootargs_root=ubi.mtd=1 root=ubi0:root rootfstype=ubifs ro\0"
 +      "console=console=ttyS0,115200\0"        \
 +      "mtdids=nand0=orion_nand\0"             \
-+      "mtdparts="CONFIG_MTDPARTS              \
++      "mtdparts="CONFIG_MTDPARTS_DEFAULT "\0" \
 +      "bootargs_root=\0"
- 
+
  /*
   * Ethernet Driver configuration
+--- a/configs/dockstar_defconfig
++++ b/configs/dockstar_defconfig
+@@ -5,7 +5,7 @@ CONFIG_KIRKWOOD=y
+ CONFIG_SYS_TEXT_BASE=0x600000
+ CONFIG_TARGET_DOCKSTAR=y
+ CONFIG_ENV_SIZE=0x20000
+-CONFIG_ENV_OFFSET=0x80000
++CONFIG_ENV_OFFSET=0xE0000
+ CONFIG_NR_DRAM_BANKS=2
+ CONFIG_IDENT_STRING="\nSeagate FreeAgent DockStar"
+ CONFIG_BOOTDELAY=3
+@@ -23,7 +23,7 @@ CONFIG_CMD_EXT2=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_OF_CONTROL=y