diff options
| author | Adam Ford <aford173@gmail.com> | 2017-12-03 15:24:53 +0300 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-12-13 05:33:38 +0300 |
| commit | 157af4f81fffd416d8952cd9ca5c5decc6d6de9e (patch) | |
| tree | 0c8ad1ac7daeb743aa7d004e8f9ae9c00fbe611b | |
| parent | 5decc7b014d4fd77b88eb4c71b023a4938134edf (diff) | |
| download | u-boot-157af4f81fffd416d8952cd9ca5c5decc6d6de9e.tar.xz | |
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>
| -rw-r--r-- | board/logicpd/omap3som/omap3logic.c | 14 | ||||
| -rw-r--r-- | include/configs/omap3_logic.h | 2 |
2 files changed, 14 insertions, 2 deletions
diff --git a/board/logicpd/omap3som/omap3logic.c b/board/logicpd/omap3som/omap3logic.c index a55a520e63..cebb200c5f 100644 --- a/board/logicpd/omap3som/omap3logic.c +++ b/board/logicpd/omap3som/omap3logic.c @@ -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 diff --git a/include/configs/omap3_logic.h b/include/configs/omap3_logic.h index 3ecfb58918..b095814cda 100644 --- a/include/configs/omap3_logic.h +++ b/include/configs/omap3_logic.h @@ -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;" \ |