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

diff --git a/include/configs/rpi.h b/include/configs/rpi.h
index f2d3646753..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
@@ -80,12 +75,10 @@
 
 /* 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