diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-05-11 09:25:36 +0200 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-05-11 09:25:36 +0200 |
| commit | ec7023db8dc95966919589541f1ca09355a3f7a5 (patch) | |
| tree | 69be08a0b3f19e3e1d99ea7829931f8f800a01d9 /include/configs/nitrogen6x.h | |
| parent | e825b100d209a9d3c79b2998452cafa94eec986a (diff) | |
| parent | d782c1fe7246301143ed78c0d86ea6c81f9325f9 (diff) | |
| download | u-boot-imx-ec7023db8dc95966919589541f1ca09355a3f7a5.zip u-boot-imx-ec7023db8dc95966919589541f1ca09355a3f7a5.tar.gz u-boot-imx-ec7023db8dc95966919589541f1ca09355a3f7a5.tar.bz2 | |
Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
Conflicts:
drivers/mtd/nand/mxc_nand_spl.c
include/configs/m28evk.h
Diffstat (limited to 'include/configs/nitrogen6x.h')
| -rw-r--r-- | include/configs/nitrogen6x.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h index 93e7fe4..aea91bc 100644 --- a/include/configs/nitrogen6x.h +++ b/include/configs/nitrogen6x.h @@ -44,6 +44,11 @@ #define CONFIG_MISC_INIT_R #define CONFIG_MXC_GPIO +#define CONFIG_CMD_FUSE +#ifdef CONFIG_CMD_FUSE +#define CONFIG_MXC_OCOTP +#endif + #define CONFIG_MXC_UART #define CONFIG_MXC_UART_BASE UART2_BASE |