diff options
| author | Peng Fan <Peng.Fan@freescale.com> | 2015-09-10 14:40:01 +0800 |
|---|---|---|
| committer | Peng Fan <Peng.Fan@freescale.com> | 2015-09-10 14:53:11 +0800 |
| commit | ef4cb7c53418e4e1dd7cfcb7c6974cfea77ef3c0 (patch) | |
| tree | e6f85d8837ca7a6dadcfebd0d15c4ea2e9d67c96 | |
| parent | 8775d76a5b062b13c31267b9ddf2045381b92c4d (diff) | |
| download | u-boot-imx-ef4cb7c53418e4e1dd7cfcb7c6974cfea77ef3c0.zip u-boot-imx-ef4cb7c53418e4e1dd7cfcb7c6974cfea77ef3c0.tar.gz u-boot-imx-ef4cb7c53418e4e1dd7cfcb7c6974cfea77ef3c0.tar.bz2 | |
MLK-11528 imx: mx6ul check fuse before init bee
Need to check fuse bit 25 of bank 0 word 4 before initialize bee.
The bit: 0 means bee enabled, 1 means bee disabled.
If disabled, continuing initialize bee will cause system hang, so
need to check this bit before initialize bee.
Add macro to enable BEE in header file, default disabled.
Signed-off-by: Peng Fan <Peng.Fan@freescale.com>
| -rw-r--r-- | arch/arm/cpu/armv7/mx6/bee.c | 12 | ||||
| -rw-r--r-- | include/configs/mx6ul_14x14_evk.h | 3 |
2 files changed, 14 insertions, 1 deletions
diff --git a/arch/arm/cpu/armv7/mx6/bee.c b/arch/arm/cpu/armv7/mx6/bee.c index 40c4c5a..d40b584 100644 --- a/arch/arm/cpu/armv7/mx6/bee.c +++ b/arch/arm/cpu/armv7/mx6/bee.c @@ -10,6 +10,7 @@ #include <asm/system.h> #include <common.h> #include <command.h> +#include <fuse.h> DECLARE_GLOBAL_DATA_PTR; @@ -265,7 +266,7 @@ static int region_valid(u32 start, u32 size) static int do_bee_init(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) { - u32 start, size; + u32 start, size, val; int ret; struct bee_parameters *p = ¶ @@ -278,6 +279,15 @@ static int do_bee_init(cmd_tbl_t *cmdtp, int flag, int argc, if (argc > 5) return CMD_RET_USAGE; + if (fuse_read(0, 4, &val)) { + puts("Can not get fuse bank 0, word 4\n"); + } else { + if (val & (1 << 25)) { + puts("BEE disabed in fuse!\n"); + return CMD_RET_FAILURE; + } + } + /* Cache enabled? */ if ((get_cr() & (CR_I | CR_C)) != (CR_I | CR_C)) { /* diff --git a/include/configs/mx6ul_14x14_evk.h b/include/configs/mx6ul_14x14_evk.h index cc1df2e..0ccd984 100644 --- a/include/configs/mx6ul_14x14_evk.h +++ b/include/configs/mx6ul_14x14_evk.h @@ -31,6 +31,9 @@ /* uncomment for SECURE mode support */ /* #define CONFIG_SECURE_BOOT */ +/* uncomment for BEE support, needs to enable CONFIG_CMD_FUSE */ +/* #define CONFIG_CMD_BEE */ + #ifdef CONFIG_SECURE_BOOT #ifndef CONFIG_CSF_SIZE #define CONFIG_CSF_SIZE 0x4000 |