Merge git://git.denx.de/u-boot-rockchip

[J-u-boot.git] / include / configs / rpi.h

diff --git a/include/configs/rpi.h b/include/configs/rpi.h
index b31e2acce6aaa8f12ecd44f1e08cd1a5a50f0bb1..84cebd6eb79ae51634c856908078c58fdcf4b842 100644 (file)
--- a/include/configs/rpi.h
+++ b/include/configs/rpi.h
@@ -42,11 +42,6 @@
 /* Memory layout */
 #define CONFIG_NR_DRAM_BANKS           1
 #define CONFIG_SYS_SDRAM_BASE          0x00000000
-#ifdef CONFIG_ARM64
-#define CONFIG_SYS_TEXT_BASE           0x00080000
-#else
-#define CONFIG_SYS_TEXT_BASE           0x00008000
-#endif
 #define CONFIG_SYS_UBOOT_BASE          CONFIG_SYS_TEXT_BASE
 /*
  * The board really has 256M. However, the VC (VideoCore co-processor) shares
@@ -71,37 +66,20 @@
 #define CONFIG_VIDEO_BCM2835
 
 #ifdef CONFIG_CMD_USB
-#define CONFIG_USB_HOST_ETHER
-#define CONFIG_USB_ETHER_SMSC95XX
 #define CONFIG_TFTP_TSIZE
 #define CONFIG_MISC_INIT_R
-#define CONFIG_SYS_USB_EVENT_POLL
-#endif
-
-/* Console UART */
-#ifdef CONFIG_BCM2837
-#define CONFIG_BCM283X_MU_SERIAL
-#else
-#define CONFIG_PL01X_SERIAL
 #endif
 
 /* Console configuration */
 #define CONFIG_SYS_CBSIZE              1024
-#define CONFIG_SYS_PBSIZE              (CONFIG_SYS_CBSIZE +            \
-                                        sizeof(CONFIG_SYS_PROMPT) + 16)
 
 /* Environment */
 #define CONFIG_ENV_SIZE                        SZ_16K
-#define CONFIG_ENV_IS_IN_FAT
-#define FAT_ENV_INTERFACE              "mmc"
-#define FAT_ENV_DEVICE_AND_PART                "0:1"
-#define FAT_ENV_FILE                   "uboot.env"
 #define CONFIG_ENV_VARS_UBOOT_CONFIG
 #define CONFIG_SYS_LOAD_ADDR           0x1000000
 #define CONFIG_PREBOOT                 "usb start"
 
 /* Shell */
-#define CONFIG_SYS_MAXARGS             16
 #define CONFIG_CMDLINE_EDITING
 
 /* ATAGs support for bootm/bootz */