Convert CONFIG_LBA48 et al to Kconfig

[J-u-boot.git] / include / configs / aristainetos2.h

diff --git a/include/configs/aristainetos2.h b/include/configs/aristainetos2.h
index b73b0d5b92b3ea5130ae64a7f6cf3b1945b11c4e..0c44f7483bdb0718645fbc6fc0cb9f45ce6ebf3a 100644 (file)
--- a/include/configs/aristainetos2.h
+++ b/include/configs/aristainetos2.h
@@ -14,27 +14,20 @@
 #define CONFIG_HOSTNAME                "aristainetos2"
 
 #if (CONFIG_SYS_BOARD_VERSION == 5)
-#define CONFIG_MXC_UART_BASE   UART2_BASE
 #define CONSOLE_DEV    "ttymxc1"
 #elif (CONFIG_SYS_BOARD_VERSION == 6)
-#define CONFIG_MXC_UART_BASE   UART1_BASE
 #define CONSOLE_DEV    "ttymxc0"
 #endif
 
-#define CONFIG_FEC_XCV_TYPE            RGMII
-
 /* Framebuffer */
 #define CONFIG_SYS_LDB_CLOCK   28341000
 
 #include "mx6_common.h"
 
-#define CONFIG_MMCROOT         "/dev/mmcblk0p1"
 
 /* MMC Configs */
 #define CONFIG_SYS_FSL_ESDHC_ADDR      USDHC1_BASE_ADDR
 
-#define IMX_FEC_BASE                   ENET_BASE_ADDR
-#define CONFIG_ETHPRIME                        "FEC"
 #define CONFIG_FEC_MXC_PHYADDR         0
 
 #define CONFIG_SYS_SPI_ST_ENABLE_WP_PIN
@@ -186,7 +179,7 @@
                "${pubkey}\0" \
        "mainRargs=setenv bootargs console=${console},${baudrate} " \
                "rescue_sysnum=${rescue_sysnum} root=${emmcroot} rootfstype=ext4\0" \
-       "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \
+       "mmcroot=/dev/mmcblk0p1 rootwait rw\0" \
        "mmcargs=setenv bootargs console=${console},${baudrate} " \
                "root=${mmcroot}\0" \
        "mmcRargs=setenv bootargs console=${console},${baudrate} " \
@@ -415,8 +408,6 @@
        HAB_EXTRA_SETTINGS \
        EXTRA_ENV_BOARD_SETTINGS
 
-#define CONFIG_ARP_TIMEOUT             200UL
-
 /* Physical Memory Map */
 #define PHYS_SDRAM                     MMDC0_ARB_BASE_ADDR
 
@@ -424,17 +415,11 @@
 #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 CONFIG_SYS_FSL_USDHC_NUM       2
 
 /* DMA stuff, needed for GPMI/MXS NAND support */
 
 /* USB Configs */
-#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
 
@@ -443,8 +428,6 @@
 /* Framebuffer */
 /* check this console not needed, after test remove it */
 #define CONFIG_IMX_VIDEO_SKIP
-#define CONFIG_VIDEO_LOGO
-#define CONFIG_VIDEO_BMP_LOGO
 
 #define CONFIG_IMX6_PWM_PER_CLK        66000000