Convert CONFIG_HOSTNAME et al to Kconfig

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

diff --git a/include/configs/aristainetos2.h b/include/configs/aristainetos2.h
index fcf364b..8541354 100644 (file)
--- a/include/configs/aristainetos2.h
+++ b/include/configs/aristainetos2.h
@@ -11,31 +11,23 @@
 #ifndef __ARISTAINETOS2_CONFIG_H
 #define __ARISTAINETOS2_CONFIG_H
 
-#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
 
 /* Framebuffer */
-#define CONFIG_SYS_LDB_CLOCK   28341000
+#define CFG_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 CFG_SYS_FSL_ESDHC_ADDR      USDHC1_BASE_ADDR
 
-#define IMX_FEC_BASE                   ENET_BASE_ADDR
 #define CONFIG_FEC_MXC_PHYADDR         0
 
-#define CONFIG_SYS_SPI_ST_ENABLE_WP_PIN
-
 #ifdef CONFIG_IMX_HAB
 #define HAB_EXTRA_SETTINGS \
        "hab_check_addr=" \
@@ -114,9 +106,6 @@
        "splashpos=m,m\0" \
        "console=" CONSOLE_DEV "\0" \
        "emmcroot=/dev/mmcblk1p1 rootwait rw\0" \
-       "mtdids=nor0=spi0.0\0" \
-       "mtdparts=mtdparts=spi0.0:832k(u-boot),64k(env),64k(env-red)," \
-               "-(ubi-nor)\0" \
        "mk_fitfile_path=setenv fit_file /${sysnum}/system.itb\0" \
        "mk_rescue_fitfile_path=setenv rescue_fit_file /${rescue_sysnum}/system.itb\0" \
        "mk_uboot_path=setenv uboot /${sysnum}/u-boot.imx\0" \
@@ -183,7 +172,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,33 +404,20 @@
 /* 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
 
-#define CONFIG_SYS_FSL_USDHC_NUM       2
+#define CFG_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
 
 /* UBI support */
 
-/* Framebuffer */
-/* check this console not needed, after test remove it */
-#define CONFIG_IMX_VIDEO_SKIP
-#define CONFIG_VIDEO_BMP_LOGO
-
-#define CONFIG_IMX6_PWM_PER_CLK        66000000
-
 #define CONFIG_ENV_FLAGS_LIST_STATIC "ethaddr:mw,serial#:sw,board_type:sw," \
                "sysnum:dw,panel:sw,ipaddr:iw,serverip:iw"