Convert CONFIG_LBA48 et al to Kconfig

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

diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h
index ea5711d..5db8b2b 100644 (file)
--- a/include/configs/apalis_imx6.h
+++ b/include/configs/apalis_imx6.h
@@ -25,20 +25,12 @@
 #define CONFIG_SYS_FSL_ESDHC_ADDR      0
 #define CONFIG_SYS_FSL_USDHC_NUM       3
 
-/*
- * SATA Configs
- */
-#ifdef CONFIG_CMD_SATA
-#define CONFIG_LBA48
-#endif
-
 /* Network */
 #define PHY_ANEG_TIMEOUT               15000 /* PHY needs longer aneg time */
 
 /* USB Configs */
 /* Host */
 #define CONFIG_USB_MAX_CONTROLLER_COUNT                2
-#define CONFIG_EHCI_HCD_INIT_AFTER_RESET       /* For OTG port */
 #define CONFIG_MXC_USB_PORTSC          (PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CONFIG_MXC_USB_FLAGS           0
 /* Client */
@@ -89,32 +81,15 @@
        "ramdisk_addr_r=0x12200000\0" \
        "scriptaddr=0x17000000\0"
 
-#define NFS_BOOTCMD \
-       "nfsargs=ip=:::::eth0:on root=/dev/nfs ro\0" \
-       "nfsboot=run setup; " \
-               "setenv bootargs ${defargs} ${nfsargs} ${setupargs} " \
-               "${vidargs}; echo Booting via DHCP/TFTP/NFS...; " \
-               "run nfsdtbload; dhcp ${kernel_addr_r} " \
-               "&& run fdt_fixup && bootz ${kernel_addr_r} ${dtbparam}\0" \
-       "nfsdtbload=setenv dtbparam; tftp ${fdt_addr_r} ${fdt_file} " \
-               "&& setenv dtbparam \" - ${fdt_addr_r}\" && true\0"
-
-#ifndef CONFIG_TDX_APALIS_IMX6_V1_0
-#define FDT_FILE "imx6q-apalis-eval.dtb"
-#define FDT_FILE_V1_0 "imx6q-apalis_v1_0-eval.dtb"
-#else
-#define FDT_FILE "imx6q-apalis_v1_0-eval.dtb"
-#endif
 #define CONFIG_EXTRA_ENV_SETTINGS \
        BOOTENV \
        "boot_file=zImage\0" \
+       "boot_script_dhcp=boot.scr\0" \
        "console=ttymxc0\0" \
        "defargs=enable_wait_mode=off vmalloc=400M\0" \
-       "fdt_file=" FDT_FILE "\0" \
-       "fdtfile=" FDT_FILE "\0" \
+       "fdt_board=eval\0" \
        "fdt_fixup=;\0" \
        MEM_LAYOUT_ENV_SETTINGS \
-       NFS_BOOTCMD \
        UBOOT_UPDATE \
        "setethupdate=if env exists ethaddr; then; else setenv ethaddr " \
                "00:14:2d:00:00:00; fi; tftpboot ${loadaddr} " \
@@ -136,10 +111,6 @@
        "vidargs=mxc_hdmi.only_cea=1 fbmem=32M\0"
 
 /* Miscellaneous configurable options */
-#undef CONFIG_SYS_CBSIZE
-#define CONFIG_SYS_CBSIZE              1024
-#undef CONFIG_SYS_MAXARGS
-#define CONFIG_SYS_MAXARGS             48
 
 /* Physical Memory Map */
 #define PHYS_SDRAM                     MMDC0_ARB_BASE_ADDR
@@ -148,9 +119,4 @@
 #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)
-
 #endif /* __CONFIG_H */