Convert CONFIG_LBA48 et al to Kconfig

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

diff --git a/include/configs/tbs2910.h b/include/configs/tbs2910.h
index c935577..dd2c5d7 100644 (file)
--- a/include/configs/tbs2910.h
+++ b/include/configs/tbs2910.h
@@ -12,49 +12,17 @@
 
 /* General configuration */
 
-#define CONFIG_MACH_TYPE               3980
-
-#define CONFIG_SYS_HZ                  1000
-
-#define CONFIG_IMX_THERMAL
-
 /* Physical Memory Map */
 #define CONFIG_SYS_SDRAM_BASE          MMDC0_ARB_BASE_ADDR
 
 #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_MALLOC_LEN          (128 * 1024 * 1024)
-
-#define CONFIG_SYS_MEMTEST_START       CONFIG_SYS_SDRAM_BASE
-#define CONFIG_SYS_MEMTEST_END \
-       (CONFIG_SYS_MEMTEST_START + 500 * 1024 * 1024)
 
 #define CONFIG_SYS_BOOTMAPSZ           0x10000000
 
-/* Serial console */
-#define CONFIG_MXC_UART
-#define CONFIG_MXC_UART_BASE           UART1_BASE /* select UART1/UART2 */
-
-/* Ethernet */
-#define CONFIG_FEC_MXC
-#define CONFIG_FEC_MXC
-#define IMX_FEC_BASE                   ENET_BASE_ADDR
-#define CONFIG_FEC_XCV_TYPE            RGMII
-#define CONFIG_ETHPRIME                        "FEC"
-#define CONFIG_FEC_MXC_PHYADDR         4
-#define CONFIG_PHY_ATHEROS
-
 /* Framebuffer */
-#ifdef CONFIG_VIDEO
-#define CONFIG_VIDEO_BMP_RLE8
 #define CONFIG_IMX_HDMI
 #define CONFIG_IMX_VIDEO_SKIP
-#endif
 
 /* PCI */
 #ifdef CONFIG_CMD_PCI
@@ -63,44 +31,16 @@
 #define CONFIG_PCIE_IMX_PERST_GPIO     IMX_GPIO_NR(7, 12)
 #endif
 
-/* SATA */
-#ifdef CONFIG_CMD_SATA
-#define CONFIG_SYS_SATA_MAX_DEVICE     1
-#define CONFIG_DWC_AHSATA_PORT_ID      0
-#define CONFIG_DWC_AHSATA_BASE_ADDR    SATA_ARB_BASE_ADDR
-#define CONFIG_LBA48
-#define CONFIG_SYS_64BIT_LBA
-#endif
-
 /* USB */
 #ifdef CONFIG_CMD_USB
-#define CONFIG_EHCI_HCD_INIT_AFTER_RESET
 #define CONFIG_MXC_USB_PORTSC          (PORT_PTS_UTMI | PORT_PTS_PTW)
 #ifdef CONFIG_CMD_USB_MASS_STORAGE
 #define CONFIG_USBD_HS
 #endif /* CONFIG_CMD_USB_MASS_STORAGE */
-#ifdef CONFIG_USB_KEYBOARD
-#define CONFIG_USE_PREBOOT
-#define CONFIG_PREBOOT \
-       "usb start; " \
-       "if hdmidet; then " \
-               "run set_con_hdmi; " \
-       "else " \
-               "run set_con_serial; " \
-       "fi"
-#endif /* CONFIG_USB_KEYBOARD */
 #endif /* CONFIG_CMD_USB      */
 
-/* Environment organization */
-#define CONFIG_SYS_MMC_ENV_DEV         2 /* overwritten on SD boot */
-#define CONFIG_SYS_MMC_ENV_PART                1 /* overwritten on SD boot */
-#define CONFIG_ENV_SIZE                        (8 * 1024)
-#define CONFIG_ENV_OFFSET              (384 * 1024)
-#define CONFIG_ENV_OVERWRITE
-
-#define CONFIG_BOARD_SIZE_LIMIT                392192 /* (CONFIG_ENV_OFFSET - 1024) */
-
 #define CONFIG_EXTRA_ENV_SETTINGS \
+       BOOTENV \
        "bootargs_mmc1=console=ttymxc0,115200 di0_primary console=tty1\0" \
        "bootargs_mmc2=video=mxcfb0:dev=hdmi,1920x1080M@60 " \
                        "video=mxcfb1:off video=mxcfb2:off fbmem=28M\0" \
@@ -117,20 +57,28 @@
                        "bootm 0x10800000 0x10d00000\0" \
        "console=ttymxc0\0" \
        "fan=gpio set 92\0" \
+       "fdt_addr_r=0x18000000\0" \
+       "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \
+       "kernel_addr_r=0x12000000\0" \
+       "pxefile_addr_r=0x10100000\0" \
+       "ramdisk_addr_r=0x18080000\0" \
+       "scriptaddr=0x10000000\0" \
        "set_con_serial=setenv stdout serial; " \
                        "setenv stderr serial\0" \
-       "set_con_hdmi=setenv stdout serial,vga; " \
-                       "setenv stderr serial,vga\0" \
-       "stderr=serial,vga\0" \
+       "set_con_hdmi=setenv stdout serial,vidconsole; " \
+                       "setenv stderr serial,vidconsole\0" \
+       "stderr=serial,vidconsole\0" \
        "stdin=serial,usbkbd\0" \
-       "stdout=serial,vga\0"
+       "stdout=serial,vidconsole\0"
+
+/* Enable distro boot */
+#define BOOT_TARGET_DEVICES(func) \
+       func(MMC, mmc, 0) \
+       func(MMC, mmc, 1) \
+       func(MMC, mmc, 2) \
+       func(SATA, sata, 0) \
+       func(USB, usb, 0)
 
-#define CONFIG_BOOTCOMMAND \
-       "mmc rescan; " \
-       "if run bootcmd_up1; then " \
-               "run bootcmd_up2; " \
-       "else " \
-               "run bootcmd_mmc; " \
-       "fi"
+#include <config_distro_bootcmd.h>
 
 #endif                        /* __TBS2910_CONFIG_H * */