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 git://git.denx.de/u-boot-socfpga
[platform/kernel/u-boot.git]
/
include
/
configs
/
snapper9g45.h
diff --git
a/include/configs/snapper9g45.h
b/include/configs/snapper9g45.h
index
b0ed9ea
..
47dd991
100644
(file)
--- a/
include/configs/snapper9g45.h
+++ b/
include/configs/snapper9g45.h
@@
-42,7
+42,6
@@
#define CONFIG_NAND_ATMEL
#define CONFIG_ATMEL_NAND_HWECC
#define CONFIG_SYS_NAND_ECC_BASE ATMEL_BASE_ECC
#define CONFIG_NAND_ATMEL
#define CONFIG_ATMEL_NAND_HWECC
#define CONFIG_SYS_NAND_ECC_BASE ATMEL_BASE_ECC
-#define CONFIG_SYS_NO_FLASH
#define CONFIG_SYS_MAX_NAND_DEVICE 1
#define CONFIG_SYS_NAND_BASE ATMEL_BASE_CS3
#define CONFIG_SYS_NAND_DBW_8
#define CONFIG_SYS_MAX_NAND_DEVICE 1
#define CONFIG_SYS_NAND_BASE ATMEL_BASE_CS3
#define CONFIG_SYS_NAND_DBW_8
@@
-61,11
+60,6
@@
#define CONFIG_TFTP_PORT
#define CONFIG_TFTP_TSIZE
#define CONFIG_TFTP_PORT
#define CONFIG_TFTP_TSIZE
-/* USB */
-#define CONFIG_USB_EHCI
-#define CONFIG_USB_EHCI_ATMEL
-#define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 2
-
/* MMC */
#define CONFIG_GENERIC_ATMEL_MCI
/* MMC */
#define CONFIG_GENERIC_ATMEL_MCI
@@
-82,7
+76,6
@@
/* UARTs/Serial console */
#define CONFIG_ATMEL_USART
/* UARTs/Serial console */
#define CONFIG_ATMEL_USART
-#define CONFIG_BAUDRATE 115200
/* Boot options */
#define CONFIG_SYS_LOAD_ADDR 0x23000000
/* Boot options */
#define CONFIG_SYS_LOAD_ADDR 0x23000000
@@
-93,7
+86,6
@@
#define CONFIG_BOOTP_HOSTNAME
/* Environment settings */
#define CONFIG_BOOTP_HOSTNAME
/* Environment settings */
-#define CONFIG_ENV_IS_IN_NAND
#define CONFIG_ENV_OFFSET (512 << 10)
#define CONFIG_ENV_SIZE (256 << 10)
#define CONFIG_ENV_OVERWRITE
#define CONFIG_ENV_OFFSET (512 << 10)
#define CONFIG_ENV_SIZE (256 << 10)
#define CONFIG_ENV_OVERWRITE
@@
-133,7
+125,6
@@
/* Command line configuration */
#define CONFIG_CMD_PING
#define CONFIG_CMD_DHCP
/* Command line configuration */
#define CONFIG_CMD_PING
#define CONFIG_CMD_DHCP
-#define CONFIG_CMD_FAT
#define CONFIG_CMD_USB
#define CONFIG_CMD_MII
#define CONFIG_CMD_MMC
#define CONFIG_CMD_USB
#define CONFIG_CMD_MII
#define CONFIG_CMD_MMC