global: Migrate CONFIG_EXTRA_ENV_SETTINGS to CFG

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

diff --git a/include/configs/dh_imx6.h b/include/configs/dh_imx6.h
index 178f5a6..6aef15c 100644 (file)
--- a/include/configs/dh_imx6.h
+++ b/include/configs/dh_imx6.h
@@ -21,44 +21,27 @@
  * 0x12_0000-0x1f_ffff ... UNUSED
  */
 
-/* SPL */
-#include "imx6_spl.h"                  /* common IMX6 SPL configuration */
-#define CONFIG_SPL_TARGET              "u-boot-with-spl.imx"
-
 /* Miscellaneous configurable options */
 
-/* Bootcounter */
-#define CONFIG_SYS_BOOTCOUNT_BE
-
 /* MMC Configs */
-#define CONFIG_SYS_FSL_ESDHC_ADDR      0
-#define CONFIG_SYS_FSL_USDHC_NUM       3
-
-/* SATA Configs */
-#define CONFIG_LBA48
+#define CFG_SYS_FSL_ESDHC_ADDR 0
+#define CFG_SYS_FSL_USDHC_NUM  3
 
 /* UART */
 #define CONFIG_MXC_UART_BASE           UART1_BASE
 
 /* USB Configs */
 #ifdef CONFIG_CMD_USB
-#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 /* Enabled USB controller number */
 
 /* USB Gadget (DFU, UMS) */
 #if defined(CONFIG_CMD_DFU) || defined(CONFIG_CMD_USB_MASS_STORAGE)
 #define DFU_DEFAULT_POLL_TIMEOUT       300
-
-/* USB IDs */
-#define CONFIG_G_DNL_UMS_VENDOR_NUM    0x0525
-#define CONFIG_G_DNL_UMS_PRODUCT_NUM   0xA4A5
 #endif
 #endif
 
-#ifndef CONFIG_SPL_BUILD
-#define CONFIG_EXTRA_ENV_SETTINGS      \
+#define CFG_EXTRA_ENV_SETTINGS \
        "console=ttymxc0,115200\0"      \
        "fdt_addr=0x18000000\0"         \
        "fdt_high=0xffffffff\0"         \
@@ -70,8 +53,7 @@
        "fdtfile=imx6q-dhcom-pdk2.dtb\0"\
        "update_sf=" /* Erase SPI NOR and install U-Boot from SD */     \
                "load mmc 0:1 ${loadaddr} /boot/u-boot-with-spl.imx && "\
-               "sf probe && sf erase 0x0 0xa0000 && "                  \
-               "sf write ${loadaddr} 0x400 ${filesize}\0"              \
+               "sf probe && sf update ${loadaddr} 0x400 ${filesize}\0" \
        BOOTENV
 
 #define BOOT_TARGET_DEVICES(func) \
@@ -82,20 +64,13 @@
        func(DHCP, dhcp, na)
 
 #include <config_distro_bootcmd.h>
-#endif
 
 /* Physical Memory Map */
 #define PHYS_SDRAM                     MMDC0_ARB_BASE_ADDR
 
-#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 CONFIG_SYS_INIT_SP_OFFSET \
-       (CONFIG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE)
-
-#define CONFIG_SYS_INIT_SP_ADDR \
-       (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
+#define CFG_SYS_SDRAM_BASE             PHYS_SDRAM
+#define CFG_SYS_INIT_RAM_ADDR  IRAM_BASE_ADDR
+#define CFG_SYS_INIT_RAM_SIZE  IRAM_SIZE
 
 /* Environment */