Update MTD to that of Linux 2.6.22.1

[u-boot] / board / mx1fs2 / mx1fs2.c

diff --git a/board/mx1fs2/mx1fs2.c b/board/mx1fs2/mx1fs2.c
index f51085a979103768045727f408a8058116d07a8e..90a33c249921e4b2be82f179afdb1d804bbbe285 100644 (file)
--- a/board/mx1fs2/mx1fs2.c
+++ b/board/mx1fs2/mx1fs2.c
@@ -19,9 +19,10 @@
  */
 
 #include <common.h>
-
 #include <asm/arch/imx-regs.h>
 
+DECLARE_GLOBAL_DATA_PTR;
+
 #define SHOW_BOOT_PROGRESS(arg)        show_boot_progress(arg)
 
 extern void imx_gpio_mode(int gpio_mode);
@@ -47,7 +48,7 @@ static void logo_init(void)
        imx_gpio_mode(PD14_PF_FLM_VSYNC);
        imx_gpio_mode(PD13_PF_LP_HSYNC);
        imx_gpio_mode(PD6_PF_LSCLK);
-       imx_gpio_mode(GPIO_PORTD | GPIO_OUT | GPIO_GPIO);
+       imx_gpio_mode(GPIO_PORTD | GPIO_OUT | GPIO_DR);
        imx_gpio_mode(PD11_PF_CONTRAST);
        imx_gpio_mode(PD10_PF_SPL_SPR);
 
@@ -79,9 +80,7 @@ static void logo_init(void)
 int
 board_init(void)
 {
-       DECLARE_GLOBAL_DATA_PTR;
-
-       gd->bd->bi_arch_number = 470;
+       gd->bd->bi_arch_number = MACH_TYPE_MX1FS2;
        gd->bd->bi_boot_params = 0x08000100;
 serial_init();
        logo_init();
@@ -91,8 +90,6 @@ serial_init();
 int
 dram_init(void)
 {
-       DECLARE_GLOBAL_DATA_PTR;
-
 #if ( CONFIG_NR_DRAM_BANKS > 0 )
        gd->bd->bi_dram[0].start = MX1FS2_SDRAM_1;
        gd->bd->bi_dram[0].size = MX1FS2_SDRAM_1_SIZE;