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 f060c33c6322c7e8f7f8f474c2bdabb491a117c4..b3837956bce0e4e94629045ea7c28c59f4d6e8aa 100644 (file)
--- a/package/boot/uboot-kirkwood/patches/110-dockstar.patch
+++ b/package/boot/uboot-kirkwood/patches/110-dockstar.patch
@@ -8,16 +8,7 @@
 
  /*
   * mv-common.h should be defined after CMD configs since it used them
-@@ -35,27 +36,22 @@
-  * 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}; "     \
@@ -46,7 +37,16 @@
   * Ethernet Driver configuration
 --- a/configs/dockstar_defconfig
 +++ b/configs/dockstar_defconfig
-@@ -18,7 +18,7 @@ CONFIG_CMD_PING=y
+@@ -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