Merge branch 'rpi-2023.04' of https://source.denx.de/u-boot/custodians/u-boot-raspberrypi

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

diff --git a/include/configs/xtfpga.h b/include/configs/xtfpga.h
index 9201dac..9655b66 100644 (file)
--- a/include/configs/xtfpga.h
+++ b/include/configs/xtfpga.h
@@ -27,7 +27,7 @@
 #else
 #define CFG_SYS_MEMORY_BASE            0x60000000
 #define CFG_SYS_IO_BASE                0x90000000
-#define CONFIG_MAX_MEM_MAPPED          0x10000000
+#define CFG_MAX_MEM_MAPPED             0x10000000
 #endif
 
 /* Onboard RAM sizes:
@@ -53,26 +53,10 @@
 
 /* Memory test is destructive so default must not overlap vectors or U-Boot*/
 
-/* Load address for stand-alone applications.
- * MEMADDR cannot be used here, because the definition needs to be
- * a plain number as it's used as -Ttext argument for ld in standalone
- * example makefile.
- * Handle noMMU vs MMUv2 vs MMUv3 distinction here manually.
- */
-#if XCHAL_HAVE_PTP_MMU
-#if XCHAL_VECBASE_RESET_VADDR == XCHAL_VECBASE_RESET_PADDR
-#define CONFIG_STANDALONE_LOAD_ADDR    0x00800000
-#else
-#define CONFIG_STANDALONE_LOAD_ADDR    0xd0800000
-#endif
-#else
-#define CONFIG_STANDALONE_LOAD_ADDR    0x60800000
-#endif
-
-#if defined(CONFIG_MAX_MEM_MAPPED) && \
-       CONFIG_MAX_MEM_MAPPED < CFG_SYS_SDRAM_SIZE
+#if defined(CFG_MAX_MEM_MAPPED) && \
+       CFG_MAX_MEM_MAPPED < CFG_SYS_SDRAM_SIZE
 #define XTENSA_SYS_TEXT_ADDR           \
-       (MEMADDR(CONFIG_MAX_MEM_MAPPED) - CONFIG_SYS_MONITOR_LEN)
+       (MEMADDR(CFG_MAX_MEM_MAPPED) - CONFIG_SYS_MONITOR_LEN)
 #else
 #define XTENSA_SYS_TEXT_ADDR           \
        (MEMADDR(CFG_SYS_SDRAM_SIZE) - CONFIG_SYS_MONITOR_LEN)
@@ -136,7 +120,7 @@
 /* Ethernet Driver Info */
 /*======================*/
 
-#define CONFIG_ETHBASE                 00:50:C2:13:6f:00
+#define CFG_ETHBASE                    00:50:C2:13:6f:00
 #define CFG_SYS_ETHOC_BASE             IOADDR(0x0d030000)
 #define CFG_SYS_ETHOC_BUFFER_ADDR      IOADDR(0x0D800000)