colin/u-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ARM: omap3_logic: Unlock NAND automatically in U-Boot

Browse Source 
The Micron Flash is locked by default.  This will automaticlly
unlock so manually unlocking is unnecessary in U-Boot.

Signed-off-by: Adam Ford <aford173@gmail.com>
This commit is contained in:
Adam Ford
2017-12-03 06:24:53 -06:00
committed by Tom Rini
parent 5decc7b014
commit 157af4f81f
2 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
board/logicpd/omap3som/omap3logic.c
View File

@@ -207,6 +207,16 @@ int board_init(void)
} }
#ifdef CONFIG_BOARD_LATE_INIT #ifdef CONFIG_BOARD_LATE_INIT
static void unlock_nand(void)
{
int dev = nand_curr_device;
struct mtd_info *mtd;
mtd = get_nand_dev_by_index(dev);
nand_unlock(mtd, 0, mtd->size, 0);
}
int board_late_init(void) int board_late_init(void)
{ {
struct board_id *board; struct board_id *board;
@@ -256,6 +266,10 @@ int board_late_init(void)
/* restore hsusb0_data5 pin as hsusb0_data5 */ /* restore hsusb0_data5 pin as hsusb0_data5 */
MUX_VAL(CP(HSUSB0_DATA5), (IEN | PTD | DIS | M0)); MUX_VAL(CP(HSUSB0_DATA5), (IEN | PTD | DIS | M0));
#ifdef CONFIG_CMD_NAND_LOCK_UNLOCK
unlock_nand();
#endif
return 0; return 0;
} }
#endif #endif

2
include/configs/omap3_logic.h
View File

@@ -93,7 +93,6 @@
#define CONFIG_PREBOOT \ #define CONFIG_PREBOOT \
"setenv preboot;" \ "setenv preboot;" \
"nand unlock;" \
"saveenv;" "saveenv;"
#define CONFIG_EXTRA_ENV_SETTINGS \ #define CONFIG_EXTRA_ENV_SETTINGS \
@@ -192,7 +191,6 @@
"tftpboot $loadaddr zImage;" \ "tftpboot $loadaddr zImage;" \
"bootz $loadaddr\0" \ "bootz $loadaddr\0" \
"nandbootcommon=echo 'Booting kernel from NAND...';" \ "nandbootcommon=echo 'Booting kernel from NAND...';" \
"nand unlock;" \
"run nandargs;" \ "run nandargs;" \
"run common_bootargs;" \ "run common_bootargs;" \
"run dump_bootargs;" \ "run dump_bootargs;" \