diff options
author | Wolfgang Denk <wd@pollux.denx.de> | 2006-04-06 00:16:58 +0200 |
---|---|---|
committer | Wolfgang Denk <wd@pollux.denx.de> | 2006-04-06 00:16:58 +0200 |
commit | 71b405df4e8efc0d6ac3b308d15e74eaa029eb5c (patch) | |
tree | 4733e2865b61662f2b9f690f1ba79bf630b6f4b8 /include | |
parent | 197b049b8b8a488384f351b988dd15f78830ba4e (diff) | |
parent | 2662b40cace272da5759040622561d821c878d56 (diff) | |
download | u-boot-71b405df4e8efc0d6ac3b308d15e74eaa029eb5c.zip u-boot-71b405df4e8efc0d6ac3b308d15e74eaa029eb5c.tar.gz u-boot-71b405df4e8efc0d6ac3b308d15e74eaa029eb5c.tar.bz2 |
Merge with /home/sr/git/u-boot/cfi-flash
Diffstat (limited to 'include')
-rw-r--r-- | include/configs/p3p440.h | 3 | ||||
-rw-r--r-- | include/flash.h | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/include/configs/p3p440.h b/include/configs/p3p440.h index 0662544..aa0901f 100644 --- a/include/configs/p3p440.h +++ b/include/configs/p3p440.h @@ -147,6 +147,7 @@ "cp.b 100000 fffc0000 40000;" \ "setenv filesize;saveenv\0" \ "upd=run load;run update\0" \ + "unlock=yes\0" \ "" #define CONFIG_BOOTCOMMAND "run net_nfs" @@ -277,7 +278,7 @@ #define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */ #define CFG_FLASH_USE_BUFFER_WRITE 1 /* use buffered writes (20x faster) */ -#define CFG_FLASH_PROTECTION 1 /* hardware flash protection */ +#define CFG_FLASH_PROTECTION 1 /* use hardware flash protection */ #define CFG_FLASH_EMPTY_INFO /* print 'E' for empty sector on flinfo */ #define CFG_FLASH_QUIET_TEST 1 /* don't warn upon unknown flash */ diff --git a/include/flash.h b/include/flash.h index 4c68c68..a84dc68 100644 --- a/include/flash.h +++ b/include/flash.h @@ -45,6 +45,7 @@ typedef struct { ushort vendor; /* the primary vendor id */ ushort cmd_reset; /* Vendor specific reset command */ ushort interface; /* used for x8/x16 adjustments */ + ushort legacy_unlock; /* support Intel legacy (un)locking */ #endif } flash_info_t; |