OMAP3: updated pinmux and environment for new revision of mcx board

The mcx board was slightly modified and the pinmux must be updated.
There is no need to support the old board, that becomes obsolete.

Signed-off-by: Stefano Babic <sbabic@denx.de>

diff --git a/board/htkw/mcx/mcx.h b/board/htkw/mcx/mcx.h
index 867cc9e88da2fb659151642f9e525f83fa21c8b3..1003bfddd929fdd308a18ba34ce1b1315acf2aa7 100644 (file)
--- a/board/htkw/mcx/mcx.h
+++ b/board/htkw/mcx/mcx.h
@@ -143,28 +143,28 @@ const omap3_sysinfo sysinfo = {
        MUX_VAL(CP(DSS_HSYNC),          (IDIS | PTD | DIS | M0)) \
        MUX_VAL(CP(DSS_VSYNC),          (IDIS | PTD | DIS | M0)) \
        MUX_VAL(CP(DSS_ACBIAS),         (IDIS | PTD | DIS | M0)) \
-       MUX_VAL(CP(DSS_DATA0),          (IEN | PTU | EN  | M4))\
-       MUX_VAL(CP(DSS_DATA1),          (IEN | PTU | EN  | M4)) \
-       MUX_VAL(CP(DSS_DATA2),          (IEN | PTU | EN  | M4)) \
+       MUX_VAL(CP(DSS_DATA0),          (IDIS | PTD | DIS | M0)) \
+       MUX_VAL(CP(DSS_DATA1),          (IDIS | PTD | DIS | M0)) \
+       MUX_VAL(CP(DSS_DATA2),          (IDIS | PTD | DIS | M0)) \
        MUX_VAL(CP(DSS_DATA3),          (IDIS | PTD | DIS | M0)) \
        MUX_VAL(CP(DSS_DATA4),          (IDIS | PTD | DIS | M0)) \
        MUX_VAL(CP(DSS_DATA5),          (IDIS | PTD | DIS | M0)) \
        MUX_VAL(CP(DSS_DATA6),          (IDIS | PTD | DIS | M0)) \
        MUX_VAL(CP(DSS_DATA7),          (IDIS | PTD | DIS | M0)) \
-       MUX_VAL(CP(DSS_DATA8),          (IEN | PTU | EN  | M4)) \
-       MUX_VAL(CP(DSS_DATA9),          (IEN | PTU | EN  | M4)) \
+       MUX_VAL(CP(DSS_DATA8),          (IDIS | PTD | DIS | M0)) \
+       MUX_VAL(CP(DSS_DATA9),          (IDIS | PTD | DIS | M0)) \
        MUX_VAL(CP(DSS_DATA10),         (IDIS | PTD | DIS | M0)) \
        MUX_VAL(CP(DSS_DATA11),         (IDIS | PTD | DIS | M0)) \
        MUX_VAL(CP(DSS_DATA12),         (IDIS | PTD | DIS | M0)) \
        MUX_VAL(CP(DSS_DATA13),         (IDIS | PTD | DIS | M0)) \
        MUX_VAL(CP(DSS_DATA14),         (IDIS | PTD | DIS | M0)) \
-       MUX_VAL(CP(DSS_DATA15),         (IDIS | PTD | DIS | M0))\
-       MUX_VAL(CP(DSS_DATA16),         (IEN | PTU | EN  | M4)) \
-       MUX_VAL(CP(DSS_DATA17),         (IEN | PTU | EN  | M4)) \
-       MUX_VAL(CP(DSS_DATA18),         (IEN | PTU | EN  | M4)) \
+       MUX_VAL(CP(DSS_DATA15),         (IDIS | PTD | DIS | M0)) \
+       MUX_VAL(CP(DSS_DATA16),         (IDIS | PTD | DIS | M0)) \
+       MUX_VAL(CP(DSS_DATA17),         (IDIS | PTD | DIS | M0)) \
+       MUX_VAL(CP(DSS_DATA18),         (IDIS | PTD | DIS | M0)) \
        MUX_VAL(CP(DSS_DATA19),         (IDIS | PTD | DIS | M0)) \
        MUX_VAL(CP(DSS_DATA20),         (IDIS | PTD | DIS | M0)) \
-       MUX_VAL(CP(DSS_DATA21),         (IDIS | PTD | DIS | M0))  \
+       MUX_VAL(CP(DSS_DATA21),         (IDIS | PTD | DIS | M0)) \
        MUX_VAL(CP(DSS_DATA22),         (IDIS | PTD | DIS | M0)) \
        MUX_VAL(CP(DSS_DATA23),         (IDIS | PTD | DIS | M0)) \
        /* CAMERA */\
@@ -313,11 +313,11 @@ const omap3_sysinfo sysinfo = {
        MUX_VAL(CP(RMII_TXEN),          (PTD | M0)) \
        MUX_VAL(CP(RMII_50MHZ_CLK),     (IEN  | PTD | EN  | M0)) \
        /* HECC */\
-       MUX_VAL(CP(HECC1_TXD),          (IEN  | PTD | EN  | M4)) \
-       MUX_VAL(CP(HECC1_RXD),          (IEN  | PTD | EN  | M4)) \
+       MUX_VAL(CP(HECC1_TXD),          (IEN  | PTD | EN  | M0)) \
+       MUX_VAL(CP(HECC1_RXD),          (IEN  | PTD | EN  | M0)) \
        /* HSUSB */\
        MUX_VAL(CP(HSUSB0_CLK),         (IEN  | PTD | DIS | M0)) \
-       MUX_VAL(CP(HSUSB0_STP),         (IDIS | PTU | EN  | M0)) \
+       MUX_VAL(CP(HSUSB0_STP),         (IEN  | PTU | DIS  | M0)) \
        MUX_VAL(CP(HSUSB0_DIR),         (IEN  | PTD | DIS | M0)) \
        MUX_VAL(CP(HSUSB0_NXT),         (IEN  | PTD | DIS | M0)) \
        MUX_VAL(CP(HSUSB0_DATA0),       (IEN  | PTD | DIS | M0)) \

diff --git a/include/configs/mcx.h b/include/configs/mcx.h
index 359522a649c31b059e7e003920cc0f72f6697c59..d3061a294c290b1f9ac58b2b4056026f29e72044 100644 (file)
--- a/include/configs/mcx.h
+++ b/include/configs/mcx.h
@@ -256,22 +256,24 @@
                "run nandargs; "                                        \
                "ubi part nand0,4;"                                     \
                "ubi readvol ${loadaddr} kernel;"                       \
-               "run addip addtty addmtd addfb addeth addmisc;"         \
+               "run addtty addmtd addfb addeth addmisc;"               \
                "bootm ${loadaddr}\0"                                   \
-       "swupdate_args=setenv bootargs ubi.mtd=6 root=ubi0:fs_recovery "\
-               "rootfstype=ubifs quiet loglevel=1 "                    \
-                       "consoleblank=0 ${swupdate_misc}\0"             \
+       "swupdate_args=setenv bootargs root=/dev/ram "                  \
+               "quiet loglevel=1 "                                     \
+               "consoleblank=0 ${swupdate_misc}\0"                     \
        "swupdate=echo Running Sw-Update...;"                           \
                "if printenv mtdparts;then echo Starting SwUpdate...; " \
                "else mtdparts default;fi; "                            \
                "ubi part nand0,5;"                                     \
                "ubi readvol 0x82000000 kernel_recovery;"               \
+               "ubi part nand0,6;"                                     \
+               "ubi readvol 0x84000000 fs_recovery;"                   \
                "run swupdate_args; "                                   \
                "setenv bootargs ${bootargs} "                          \
                        "${mtdparts} "                                  \
                        "vram=6M omapfb.vram=1:2M,2:2M,3:2M "           \
                        "omapdss.def_disp=lcd;"                         \
-               "bootm ${loadaddr}\0"
+               "bootm 0x82000000 0x84000000\0"
 
 #define CONFIG_BOOTCOMMAND \
        "run nandboot"