* Fix flash detection on TQM8260

* Remove dead code from "mkimage"

diff --git a/CHANGELOG b/CHANGELOG
index efff936166316022936efa2497c60a11011725f5..c32e47c4a907c028961e9cf397ce49e67160b70f 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -14,6 +14,10 @@
 Modifications for 1.1.6:
 ======================================================================
 
+* Fix flash detection on TQM8260
+
+* Remove dead code from "mkimage"
+
 * Add support for OXC board
 
 * modify 824x I2C driver to allow reading from I2C I/O expanders

diff --git a/board/tqm8260/flash.c b/board/tqm8260/flash.c
index a88aea4336293296d527dc3ded863c566277e249..b06bcd67b3b2b99dfd12606ab75436246a4ee8a9 100644 (file)
--- a/board/tqm8260/flash.c
+++ b/board/tqm8260/flash.c
@@ -230,7 +230,7 @@ void flash_print_info (flash_info_t * info)
                return;
        }
 
-       switch ((info->flash_id >> 16) & 0xff) {
+       switch (info->flash_id & FLASH_VENDMASK) {
        case FLASH_MAN_AMD:
                printf ("AMD ");
                break;

diff --git a/common/board.c b/common/board.c
index d451cedd23aa2af030d49f08132e75f4255f3640..5338c6b5b3d2e3d4d0f2ab390405956bcd384aa5 100644 (file)
--- a/common/board.c
+++ b/common/board.c
@@ -201,7 +201,7 @@ board_init_f (ulong bootflag)
     defined(CONFIG_OXC)                || \
     defined(CONFIG_RPXSUPER)   || \
     defined(CONFIG_W7O)                || \
-    defined(CONFIG_WALNUT405
+    defined(CONFIG_WALNUT405)
     board_pre_init();        /* very early board init code (fpga boot, etc.) */
 #endif
 

diff --git a/tools/mkimage.c b/tools/mkimage.c
index 6bb7f4da4c1719b853443705108b60851042b58e..86ada76fc18084a698644b9d9d3f29ee21262a90 100644 (file)
--- a/tools/mkimage.c
+++ b/tools/mkimage.c
@@ -131,13 +131,11 @@ static    int     get_type(char *);
 
 char   *datafile;
 char   *imagefile;
-char   *scriptfile;
 
 int dflag    = 0;
 int eflag    = 0;
 int lflag    = 0;
 int vflag    = 0;
-int sflag    = 0;
 int xflag    = 0;
 int opt_os   = IH_OS_LINUX;
 int opt_arch = IH_CPU_PPC;
@@ -206,12 +204,6 @@ main (int argc, char **argv)
                                datafile = *++argv;
                                dflag = 1;
                                goto NXTARG;
-                       case 's':
-                               if (--argc <= 0)
-                                       usage ();
-                               scriptfile = *++argv;
-                               sflag = 1;
-                               goto NXTARG;
                        case 'e':
                                if (--argc <= 0)
                                        usage ();