Rename CONFIG_EHCI_IS_TDI to CONFIG_USB_EHCI_IS_TDI

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

diff --git a/include/configs/mx53ppd.h b/include/configs/mx53ppd.h
index 97d566d..f811881 100644 (file)
--- a/include/configs/mx53ppd.h
+++ b/include/configs/mx53ppd.h
@@ -11,40 +11,15 @@
 
 #include <asm/arch/imx-regs.h>
 
-#define CONSOLE_DEV    "ttymxc0"
-
-#define CONFIG_CMDLINE_TAG
-#define CONFIG_SETUP_MEMORY_TAGS
-#define CONFIG_INITRD_TAG
-
 #define CONFIG_SYS_FSL_CLK
 
-/* Size of malloc() pool */
-#define CONFIG_SYS_MALLOC_LEN          (10 * 1024 * 1024)
-
-#define CONFIG_BOARD_LATE_INIT
-#define CONFIG_REVISION_TAG
-
-#define CONFIG_MXC_UART
-#define CONFIG_MXC_UART_BASE   UART1_BASE
-
 /* USB Configs */
-#define CONFIG_USB_HOST_ETHER
-#define CONFIG_USB_ETHER_ASIX
-#define CONFIG_USB_ETHER_MCS7830
-#define CONFIG_USB_ETHER_SMSC95XX
 #define CONFIG_MXC_USB_PORT    1
 #define CONFIG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CONFIG_MXC_USB_FLAGS   0
 
-/* allow to overwrite serial and ethaddr */
-#define CONFIG_ENV_OVERWRITE
-#define CONFIG_BAUDRATE                        115200
-
 /* Command definition */
 
-#define CONFIG_LOADADDR                0x72000000      /* loadaddr env var */
-
 #define PPD_CONFIG_NFS \
        "nfsserver=192.168.252.95\0" \
        "gatewayip=192.168.252.95\0" \
@@ -65,35 +40,34 @@
 #define CONFIG_EXTRA_ENV_SETTINGS \
        PPD_CONFIG_NFS \
        "image=/boot/fitImage\0" \
-       "fdt_high=0xffffffff\0" \
        "dev=mmc\0" \
        "devnum=2\0" \
        "rootdev=mmcblk0p\0" \
        "quiet=quiet loglevel=0\0" \
-       "console=" CONSOLE_DEV "\0" \
        "lvds=ldb\0" \
        "setargs=setenv bootargs ${lvds} jtag=on mem=2G " \
-               "vt.global_cursor_default=0 bootcause=${bootcause} ${quiet} " \
-               "console=${console}\0" \
+               "vt.global_cursor_default=0 bootcause=${bootcause} ${quiet}\0" \
        "bootargs_emmc=setenv bootargs root=/dev/${rootdev}${partnum} ro " \
                "rootwait ${bootargs}\0" \
-       "doquiet=if ext2load ${dev} ${devnum}:5 0x7000A000 /boot/console; " \
-               "then setenv quiet; fi\0" \
-       "hasfirstboot=ext2load ${dev} ${devnum}:${partnum} 0x7000A000 " \
-               "/boot/bootcause/firstboot\0" \
-       "swappartitions=setexpr partnum 3 - ${partnum}\0" \
+       "doquiet=" \
+               "if ext2load ${dev} ${devnum}:5 0x7000A000 /boot/console; " \
+                       "then setenv quiet; fi\0" \
+       "hasfirstboot=" \
+               "test -e ${dev} ${devnum}:${partnum} /boot/bootcause/firstboot\0" \
+       "swappartitions=" \
+               "setexpr partnum 3 - ${partnum}\0" \
        "failbootcmd=" \
                "cls; " \
                "setcurs 5 4; " \
                "lcdputs \"Monitor failed to start. " \
                "Try again, or contact GE Service for support.\"; " \
-               "bootcount reset; \0" \
+               "bootcount reset; " \
+               "while true; do sleep 1; done; \0" \
        "altbootcmd=" \
                "run doquiet; " \
                "setenv partnum 1; run hasfirstboot || setenv partnum 2; " \
                "run hasfirstboot || setenv partnum 0; " \
                "if test ${partnum} != 0; then " \
-                       "setenv bootcause REVERT; " \
                        "run swappartitions loadimage doboot; " \
                "fi; " \
                "run failbootcmd\0" \
@@ -113,13 +87,11 @@
        "video-mode=" \
                "lcd:800x480-24@60,monitor=lcd\0" \
 
-#define CONFIG_MMCBOOTCOMMAND \
-       "if mmc dev ${devnum}; then " \
-               "run doquiet; " \
-               "run tryboot; " \
-       "fi; " \
+#define MMCBOOTCOMMAND \
+       "run doquiet; " \
+       "run tryboot; " \
 
-#define CONFIG_BOOTCOMMAND CONFIG_MMCBOOTCOMMAND
+#define CONFIG_BOOTCOMMAND MMCBOOTCOMMAND
 
 #define CONFIG_ARP_TIMEOUT     200UL
 
@@ -129,10 +101,7 @@
 #define CONFIG_SYS_MAXARGS     48      /* max number of command args */
 #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* Boot Argument Buffer Size */
 
-#define CONFIG_SYS_MEMTEST_START       0x70000000
-#define CONFIG_SYS_MEMTEST_END         0x70010000
-
-#define CONFIG_SYS_LOAD_ADDR           CONFIG_LOADADDR
+#define CONFIG_SYS_BOOTMAPSZ (256 << 20)     /* 256M */
 
 /* Physical Memory Map */
 #define PHYS_SDRAM_1                   CSD0_BASE_ADDR
@@ -151,13 +120,9 @@
        (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
 
 /* FLASH and environment organization */
-#define CONFIG_SYS_MMC_ENV_DEV 0
 
-#define CONFIG_CMD_FUSE
 #define CONFIG_FSL_IIM
 
-#define CONFIG_BCH
-
 /* Backlight Control */
 #define CONFIG_IMX6_PWM_PER_CLK 66666000