diff options
| author | Tom Rini <trini@konsulko.com> | 2015-08-02 07:40:37 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-08-02 07:40:37 -0400 |
| commit | 7a1af7a79bd79ded6a78d0c1afdbc3353669e313 (patch) | |
| tree | 6adcb6dfb2782e8502ca07e2533bee3f95eaeae9 /include/configs/nitrogen6x.h | |
| parent | 8968b914be7bfd67d179d0395898bd9db67aaad1 (diff) | |
| parent | f85764cc1f6ab01ffc60dd78de9c4de4cff2b5ce (diff) | |
| download | blackbird-obmc-uboot-7a1af7a79bd79ded6a78d0c1afdbc3353669e313.tar.gz blackbird-obmc-uboot-7a1af7a79bd79ded6a78d0c1afdbc3353669e313.zip | |
Merge branch 'master' of git://www.denx.de/git/u-boot-imx
Diffstat (limited to 'include/configs/nitrogen6x.h')
| -rw-r--r-- | include/configs/nitrogen6x.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h index 3bb2e8f870..dd4cb0f893 100644 --- a/include/configs/nitrogen6x.h +++ b/include/configs/nitrogen6x.h @@ -26,11 +26,6 @@ #define CONFIG_USB_ETH_CDC #define CONFIG_NETCONSOLE -#define CONFIG_CMD_FUSE -#ifdef CONFIG_CMD_FUSE -#define CONFIG_MXC_OCOTP -#endif - #define CONFIG_MXC_UART #define CONFIG_MXC_UART_BASE UART2_BASE |
