Merge tag 'v2021.10-rc4' into next

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

diff --git a/include/configs/snapper9g45.h b/include/configs/snapper9g45.h
index 24bbea7..b13584d 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
@@ -49,7 +45,6 @@
 #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
@@ -65,12 +60,10 @@
 /* UARTs/Serial console */
 
 /* 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" \
@@ -94,7 +87,4 @@
 
 /* Console settings */
 
-/* U-Boot memory settings */
-#define CONFIG_SYS_MALLOC_LEN          (1 << 20)
-
 #endif /* __CONFIG_H */