Merge tag 'u-boot-at91-2023.07-a' of https://source.denx.de/u-boot/custodians/u-boot...

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

diff --git a/include/configs/pcl063.h b/include/configs/pcl063.h
index dea8712..38dcee0 100644 (file)
--- a/include/configs/pcl063.h
+++ b/include/configs/pcl063.h
@@ -11,9 +11,6 @@
 #include <linux/sizes.h>
 #include "mx6_common.h"
 
-/* SPL options */
-#include "imx6_spl.h"
-
 /*
  * There is a bug in some i.MX6UL processors that results in the initial
  * portion of OCRAM being unavailable when booting from (at least) an SD
@@ -25,7 +22,7 @@
 #define CFG_SYS_FSL_USDHC_NUM  1
 
 /* Console configs */
-#define CONFIG_MXC_UART_BASE           UART1_BASE
+#define CFG_MXC_UART_BASE              UART1_BASE
 
 /* MMC Configs */
 
@@ -37,18 +34,18 @@
 #define PHYS_SDRAM                     MMDC0_ARB_BASE_ADDR
 #define PHYS_SDRAM_SIZE                        SZ_256M
 
-#define CONFIG_SYS_SDRAM_BASE          PHYS_SDRAM
-#define CONFIG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
-#define CONFIG_SYS_INIT_RAM_SIZE       IRAM_SIZE
+#define CFG_SYS_SDRAM_BASE             PHYS_SDRAM
+#define CFG_SYS_INIT_RAM_ADDR  IRAM_BASE_ADDR
+#define CFG_SYS_INIT_RAM_SIZE  IRAM_SIZE
 
 /* NAND */
-#define CONFIG_SYS_NAND_BASE           0x40000000
+#define CFG_SYS_NAND_BASE              0x40000000
 
 /* USB Configs */
-#define CONFIG_MXC_USB_PORTSC          (PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS           0
+#define CFG_MXC_USB_PORTSC             (PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_FLAGS              0
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
        "console=ttymxc0,115200n8\0" \
        "fdt_addr_r=0x82000000\0" \
        "fdt_high=0xffffffff\0" \