uboot-kirkwood: refresh patches

[openwrt/openwrt.git] / package / boot / uboot-kirkwood / patches / 120-iconnect.patch

diff --git a/package/boot/uboot-kirkwood/patches/120-iconnect.patch b/package/boot/uboot-kirkwood/patches/120-iconnect.patch
index e7acf1a27f9577daf9d8251f423118be6cb71bc1..dad3dd4744b2dfee1dc77102fd4bca0be5fdeab8 100644 (file)
--- a/package/boot/uboot-kirkwood/patches/120-iconnect.patch
+++ b/package/boot/uboot-kirkwood/patches/120-iconnect.patch
@@ -1,14 +1,6 @@
 --- a/include/configs/iconnect.h
 +++ b/include/configs/iconnect.h
-@@ -42,24 +42,22 @@
- #define CONFIG_ENV_SECT_SIZE  0x20000
- #endif
- #define CONFIG_ENV_SIZE               0x20000
--#define CONFIG_ENV_OFFSET     0x80000
-+#define CONFIG_ENV_OFFSET     0xe0000
-
- /*
-  * Default environment variables
+@@ -44,17 +44,15 @@
   */
  #define CONFIG_BOOTCOMMAND \
        "setenv bootargs ${console} ${mtdparts} ${bootargs_root}; "     \
@@ -18,7 +10,7 @@
 +      "ubi part ubi; " \
 +      "ubi read 0x800000 kernel; " \
        "bootm 0x800000"
-
+ 
  #define CONFIG_EXTRA_ENV_SETTINGS \
        "console=console=ttyS0,115200\0"        \
        "mtdids=nand0=orion_nand\0"             \
@@ -27,12 +19,21 @@
 -      "bootargs_root=noinitrd ubi.mtd=2 root=ubi0:rootfs rootfstype=ubifs\0"
 +      "mtdparts="CONFIG_MTDPARTS_DEFAULT "\0" \
 +      "bootargs_root=\0"
-
+ 
  /*
   * Ethernet driver configuration
 --- a/configs/iconnect_defconfig
 +++ b/configs/iconnect_defconfig
-@@ -11,13 +11,14 @@ CONFIG_SYS_PROMPT="iconnect => "
+@@ -5,7 +5,7 @@ CONFIG_KIRKWOOD=y
+ CONFIG_SYS_TEXT_BASE=0x600000
+ CONFIG_TARGET_ICONNECT=y
+ CONFIG_ENV_SIZE=0x20000
+-CONFIG_ENV_OFFSET=0x80000
++CONFIG_ENV_OFFSET=0xE0000
+ CONFIG_NR_DRAM_BANKS=2
+ CONFIG_IDENT_STRING=" Iomega iConnect"
+ CONFIG_BOOTDELAY=3
+@@ -16,13 +16,14 @@ CONFIG_SYS_PROMPT="iconnect => "
  CONFIG_CMD_NAND=y
  CONFIG_CMD_USB=y
  # CONFIG_CMD_SETEXPR is not set