global: Migrate CONFIG_MXC_UART_BASE to CFG

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

diff --git a/include/configs/rpi.h b/include/configs/rpi.h
index 55768a4..c3f8e7b 100644 (file)
--- a/include/configs/rpi.h
+++ b/include/configs/rpi.h
@@ -17,35 +17,24 @@
 
 /* Use SoC timer for AArch32, but architected timer for AArch64 */
 #ifndef CONFIG_ARM64
-#define CONFIG_SYS_TIMER_RATE          1000000
-#define CONFIG_SYS_TIMER_COUNTER       \
+#define CFG_SYS_TIMER_RATE             1000000
+#define CFG_SYS_TIMER_COUNTER  \
        (&((struct bcm2835_timer_regs *)BCM2835_TIMER_PHYSADDR)->clo)
 #endif
 
 /* Memory layout */
-#define CONFIG_SYS_SDRAM_BASE          0x00000000
-#define CONFIG_SYS_UBOOT_BASE          CONFIG_SYS_TEXT_BASE
+#define CFG_SYS_SDRAM_BASE             0x00000000
+#define CFG_SYS_UBOOT_BASE             CONFIG_TEXT_BASE
 /*
  * The board really has 256M. However, the VC (VideoCore co-processor) shares
  * the RAM, and uses a configurable portion at the top. We tell U-Boot that a
  * smaller amount of RAM is present in order to avoid stomping on the area
  * the VC uses.
  */
-#define CONFIG_SYS_SDRAM_SIZE          SZ_128M
-#define CONFIG_SYS_INIT_SP_ADDR                (CONFIG_SYS_SDRAM_BASE + \
-                                        CONFIG_SYS_SDRAM_SIZE - \
-                                        GENERATED_GBL_DATA_SIZE)
-
-#ifdef CONFIG_ARM64
-#define CONFIG_SYS_BOOTM_LEN           SZ_64M
-#endif
+#define CFG_SYS_SDRAM_SIZE             SZ_128M
 
 /* Devices */
-/* GPIO */
-#define CONFIG_BCM2835_GPIO
 /* LCD */
-#define CONFIG_LCD_DT_SIMPLEFB
-#define CONFIG_VIDEO_BCM2835
 
 /* DFU over USB/UDC */
 #ifdef CONFIG_CMD_DFU
@@ -64,7 +53,6 @@
 #endif
 
 /* Console configuration */
-#define CONFIG_SYS_CBSIZE              1024
 
 /* Environment */
 
@@ -137,7 +125,8 @@
 #if CONFIG_IS_ENABLED(CMD_MMC)
        #define BOOT_TARGET_MMC(func) \
                func(MMC, mmc, 0) \
-               func(MMC, mmc, 1)
+               func(MMC, mmc, 1) \
+               func(MMC, mmc, 2)
 #else
        #define BOOT_TARGET_MMC(func)
 #endif
@@ -168,7 +157,7 @@
 
 #include <config_distro_bootcmd.h>
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
        "dhcpuboot=usb start; dhcp u-boot.uimg; bootm\0" \
        ENV_DEVICE_SETTINGS \
        ENV_DFU_SETTINGS \