projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://www.denx.de/git/u-boot-sunxi
[platform/kernel/u-boot.git]
/
include
/
configs
/
novena.h
diff --git
a/include/configs/novena.h
b/include/configs/novena.h
index
d58c95f
..
8cb0282
100644
(file)
--- a/
include/configs/novena.h
+++ b/
include/configs/novena.h
@@
-19,22
+19,14
@@
#include "mx6_common.h"
/* U-Boot Commands */
#include "mx6_common.h"
/* U-Boot Commands */
-#define CONFIG_CMD_ASKENV
#define CONFIG_CMD_BMODE
#define CONFIG_CMD_BMODE
-#define CONFIG_CMD_DHCP
#define CONFIG_CMD_EEPROM
#define CONFIG_CMD_EEPROM
-#define CONFIG_CMD_I2C
#define CONFIG_FAT_WRITE
#define CONFIG_FAT_WRITE
-#define CONFIG_CMD_MII
#define CONFIG_CMD_PCI
#define CONFIG_CMD_PCI
-#define CONFIG_CMD_PING
#define CONFIG_CMD_SATA
#define CONFIG_CMD_SATA
-#define CONFIG_CMD_TIME
-#define CONFIG_CMD_USB
#define CONFIG_VIDEO
/* U-Boot general configurations */
#define CONFIG_VIDEO
/* U-Boot general configurations */
-#define CONFIG_VERSION_VARIABLE /* U-BOOT version */
/* U-Boot environment */
#define CONFIG_ENV_SIZE (16 * 1024)
/* U-Boot environment */
#define CONFIG_ENV_SIZE (16 * 1024)
@@
-64,7
+56,6
@@
/* Physical Memory Map */
#define CONFIG_NR_DRAM_BANKS 1
#define PHYS_SDRAM MMDC0_ARB_BASE_ADDR
/* Physical Memory Map */
#define CONFIG_NR_DRAM_BANKS 1
#define PHYS_SDRAM MMDC0_ARB_BASE_ADDR
-#define PHYS_SDRAM_SIZE 0xF0000000
#define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM
#define CONFIG_SYS_INIT_RAM_ADDR IRAM_BASE_ADDR
#define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM
#define CONFIG_SYS_INIT_RAM_ADDR IRAM_BASE_ADDR
@@
-81,9
+72,6
@@
#define CONFIG_SYS_MALLOC_LEN (64 * 1024 * 1024)
/* SPL */
#define CONFIG_SYS_MALLOC_LEN (64 * 1024 * 1024)
/* SPL */
-#define CONFIG_SPL_FAT_SUPPORT
-#define CONFIG_SPL_EXT_SUPPORT
-#define CONFIG_SPL_MMC_SUPPORT
#include "imx6_spl.h" /* common IMX6 SPL configuration */
/* Ethernet Configuration */
#include "imx6_spl.h" /* common IMX6 SPL configuration */
/* Ethernet Configuration */
@@
-155,8
+143,8
@@
#ifdef CONFIG_CMD_USB
#define CONFIG_USB_EHCI
#define CONFIG_USB_EHCI_MX6
#ifdef CONFIG_CMD_USB
#define CONFIG_USB_EHCI
#define CONFIG_USB_EHCI_MX6
-#define CONFIG_USB_STORAGE
#define CONFIG_USB_KEYBOARD
#define CONFIG_USB_KEYBOARD
+#define CONFIG_SYS_STDIO_DEREGISTER
#define CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP
#define CONFIG_USB_HOST_ETHER
#define CONFIG_USB_ETHER_ASIX
#define CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP
#define CONFIG_USB_HOST_ETHER
#define CONFIG_USB_ETHER_ASIX