global: Convert CONFIG_LOADADDR to CONFIG_SYS_LOADADDR

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

diff --git a/include/configs/xpress.h b/include/configs/xpress.h
index e3ae4e8..01c3ee3 100644 (file)
--- a/include/configs/xpress.h
+++ b/include/configs/xpress.h
@@ -1,15 +1,14 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * Copyright (C) 2015-2016 Stefan Roese <sr@denx.de>
  *
  * Configuration settings for the CCV xPress board
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 #ifndef __XPRESS_CONFIG_H
 #define __XPRESS_CONFIG_H
 
 #include "mx6_common.h"
-#include <asm/imx-common/gpio.h>
+#include <asm/mach-imx/gpio.h>
 
 /* SPL options */
 #include "imx6_spl.h"
@@ -17,32 +16,16 @@
 /* Size of malloc() pool */
 #define CONFIG_SYS_MALLOC_LEN          (16 << 20)
 
-#define CONFIG_MXC_UART
-#define CONFIG_MXC_UART_BASE           UART1_BASE
+#define CONFIG_MXC_UART_BASE           MX6UL_UART7_BASE_ADDR
 
 /* MMC Configs */
 #define CONFIG_SYS_FSL_ESDHC_ADDR      USDHC2_BASE_ADDR
-#define CONFIG_SUPPORT_EMMC_BOOT       /* eMMC specific */
-
-/* I2C configs */
-#define CONFIG_SYS_I2C
-#define CONFIG_SYS_I2C_MXC
-#define CONFIG_SYS_I2C_MXC_I2C1                /* enable I2C bus 1 */
-#define CONFIG_SYS_I2C_MXC_I2C2                /* enable I2C bus 2 */
-#define CONFIG_SYS_I2C_MXC_I2C4                /* enable I2C bus 4 */
-#define CONFIG_SYS_I2C_SPEED           100000
 
 /* Miscellaneous configurable options */
-#define CONFIG_SYS_MEMTEST_START       0x80000000
-#define CONFIG_SYS_MEMTEST_END         (CONFIG_SYS_MEMTEST_START + 0x10000000)
 
-#define CONFIG_SYS_LOAD_ADDR           CONFIG_LOADADDR
 #define CONFIG_SYS_HZ                  1000
 
-#define CONFIG_CMDLINE_EDITING
-
 /* Physical Memory Map */
-#define CONFIG_NR_DRAM_BANKS           1
 #define PHYS_SDRAM                     MMDC0_ARB_BASE_ADDR
 #define PHYS_SDRAM_SIZE                        (128 << 20)
 
@@ -56,32 +39,20 @@
        (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
 
 /* Environment is in stored in the eMMC boot partition */
-#define CONFIG_ENV_SIZE                        (16 << 10)
-#define CONFIG_ENV_IS_IN_MMC
-#define CONFIG_ENV_OFFSET              (512 << 10)
-#define CONFIG_SYS_MMC_ENV_DEV         0       /* USDHC2 */
-#define CONFIG_SYS_MMC_ENV_PART                1       /* boot parition */
 #define CONFIG_MMCROOT                 "/dev/mmcblk0p2"  /* USDHC2 */
 
 /* USB Configs */
-#define CONFIG_USB_EHCI
-#define CONFIG_USB_EHCI_MX6
 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET
 #define CONFIG_MXC_USB_PORTSC          (PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CONFIG_MXC_USB_FLAGS           0
 #define CONFIG_USB_MAX_CONTROLLER_COUNT        2
 
 #define CONFIG_FEC_MXC
-#define CONFIG_MII
 #define CONFIG_FEC_ENET_DEV            0
 #define IMX_FEC_BASE                   ENET_BASE_ADDR
 #define CONFIG_FEC_MXC_PHYADDR          0x0
 #define CONFIG_FEC_XCV_TYPE             RMII
 #define CONFIG_ETHPRIME                        "FEC"
-#define CONFIG_PHYLIB
-#define CONFIG_PHY_SMSC
-
-#define CONFIG_IMX_THERMAL
 
 #define CONFIG_SYS_MMC_IMG_LOAD_PART   1
 
@@ -91,7 +62,7 @@
 #define CONFIG_EXTRA_ENV_SETTINGS \
        "script=boot.scr\0" \
        "image=zImage\0" \
-       "console=ttymxc0\0" \
+       "console=ttymxc6\0" \
        "fdt_high=0xffffffff\0" \
        "initrd_high=0xffffffff\0" \
        "fdt_file=undefined\0" \