Merge tag 'efi-next' of https://source.denx.de/u-boot/custodians/u-boot-efi into...

[platform/kernel/u-boot.git] / include / configs / snapper9g45.h

diff --git a/include/configs/snapper9g45.h b/include/configs/snapper9g45.h
index fcd35b7..3889a88 100644 (file)
--- a/include/configs/snapper9g45.h
+++ b/include/configs/snapper9g45.h
@@ -19,10 +19,6 @@
 #define CONFIG_SYS_AT91_SLOW_CLOCK     32768
 
 /* CPU */
-#define CONFIG_CMDLINE_TAG             /* enable passing of ATAGs      */
-#define CONFIG_SETUP_MEMORY_TAGS
-#define CONFIG_INITRD_TAG
-#define CONFIG_SKIP_LOWLEVEL_INIT_ONLY
 
 /* SDRAM */
 #define CONFIG_SYS_SDRAM_BASE          ATMEL_BASE_CS6
@@ -43,16 +39,11 @@
 #define CONFIG_SYS_NAND_READY_PIN      AT91_PIN_PC8
 
 /* Ethernet */
-#define CONFIG_MACB
 #define CONFIG_RMII
 #define CONFIG_NET_RETRY_COUNT         20
 #define CONFIG_RESET_PHY_R
 #define CONFIG_AT91_WANTS_COMMON_PHY
 #define CONFIG_TFTP_PORT
-#define CONFIG_TFTP_TSIZE
-
-/* MMC */
-#define CONFIG_GENERIC_ATMEL_MCI
 
 /* LCD */
 #define CONFIG_ATMEL_LCD
@@ -60,19 +51,15 @@
 
 /* GPIOs and IO expander */
 #define CONFIG_ATMEL_LEGACY
-#define CONFIG_AT91_GPIO
 #define CONFIG_AT91_GPIO_PULLUP                1
 
 /* UARTs/Serial console */
-#define CONFIG_ATMEL_USART
 
 /* Boot options */
-#define CONFIG_SYS_LOAD_ADDR           0x23000000
 
 #define CONFIG_BOOTP_BOOTFILESIZE
 
 /* Environment settings */
-#define CONFIG_ENV_OVERWRITE
 
 #define        CONFIG_EXTRA_ENV_SETTINGS       \
        "ethaddr=00:00:00:00:00:00\0" \
@@ -96,7 +83,4 @@
 
 /* Console settings */
 
-/* U-Boot memory settings */
-#define CONFIG_SYS_MALLOC_LEN          (1 << 20)
-
 #endif /* __CONFIG_H */