X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=include%2Fconfigs%2Frpi.h;h=6b4b5f44bf473224d5462bd142e25cdb32c8fc10;hb=d021e942107a1f7304a879cec99286ca462f7be3;hp=cab8661779e0460a5991afd3ae4697fd02ce6afb;hpb=8993056fb3d4af4f0cd078df20130d4e7c35c2f7;p=people%2Fms%2Fu-boot.git

diff --git a/include/configs/rpi.h b/include/configs/rpi.h
index cab8661779..6b4b5f44bf 100644
--- 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
@@ -75,24 +70,15 @@
 #define CONFIG_MISC_INIT_R
 #endif
 
-/* Console UART */
-#if defined (CONFIG_BCM2837) || defined(CONFIG_TARGET_RPI_0_W)
-#define CONFIG_BCM283X_MU_SERIAL
-#else
-#define CONFIG_PL01X_SERIAL
-#endif
-
 /* Console configuration */
 #define CONFIG_SYS_CBSIZE		1024
 
 /* Environment */
 #define CONFIG_ENV_SIZE			SZ_16K
-#define CONFIG_ENV_VARS_UBOOT_CONFIG
 #define CONFIG_SYS_LOAD_ADDR		0x1000000
 #define CONFIG_PREBOOT			"usb start"
 
 /* Shell */
-#define CONFIG_CMDLINE_EDITING
 
 /* ATAGs support for bootm/bootz */
 #define CONFIG_SETUP_MEMORY_TAGS