ARM: omap3_logic: Unlock NAND automatically in U-Boot

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>
master
Adam Ford 7 years ago committed by Tom Rini
parent 5decc7b014
commit 157af4f81f
  1. 14
      board/logicpd/omap3som/omap3logic.c
  2. 2
      include/configs/omap3_logic.h

@ -207,6 +207,16 @@ int board_init(void)
}
#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)
{
struct board_id *board;
@ -256,6 +266,10 @@ int board_late_init(void)
/* restore hsusb0_data5 pin as hsusb0_data5 */
MUX_VAL(CP(HSUSB0_DATA5), (IEN | PTD | DIS | M0));
#ifdef CONFIG_CMD_NAND_LOCK_UNLOCK
unlock_nand();
#endif
return 0;
}
#endif

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

Loading…
Cancel
Save