mtd: nand: Rename nand.h into rawnand.h

[u-boot] / board / ti / beagle / beagle.c

diff --git a/board/ti/beagle/beagle.c b/board/ti/beagle/beagle.c
index 887b577b6adf940f709c36a037e38f22c17dae66..bdf84b0be8ae428118d05a24e4db4f025b1131cd 100644 (file)
--- a/board/ti/beagle/beagle.c
+++ b/board/ti/beagle/beagle.c
@@ -20,7 +20,7 @@
 #include <status_led.h>
 #endif
 #include <twl4030.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <asm/io.h>
 #include <asm/arch/mmc_host_def.h>
 #include <asm/arch/mux.h>
@@ -341,16 +341,16 @@ int misc_init_r(void)
        switch (get_board_revision()) {
        case REVISION_AXBX:
                printf("Beagle Rev Ax/Bx\n");
-               setenv("beaglerev", "AxBx");
+               env_set("beaglerev", "AxBx");
                break;
        case REVISION_CX:
                printf("Beagle Rev C1/C2/C3\n");
-               setenv("beaglerev", "Cx");
+               env_set("beaglerev", "Cx");
                MUX_BEAGLE_C();
                break;
        case REVISION_C4:
                printf("Beagle Rev C4\n");
-               setenv("beaglerev", "C4");
+               env_set("beaglerev", "C4");
                MUX_BEAGLE_C();
                /* Set VAUX2 to 1.8V for EHCI PHY */
                twl4030_pmrecv_vsel_cfg(TWL4030_PM_RECEIVER_VAUX2_DEDICATED,
@@ -360,7 +360,7 @@ int misc_init_r(void)
                break;
        case REVISION_XM_AB:
                printf("Beagle xM Rev A/B\n");
-               setenv("beaglerev", "xMAB");
+               env_set("beaglerev", "xMAB");
                MUX_BEAGLE_XM();
                /* Set VAUX2 to 1.8V for EHCI PHY */
                twl4030_pmrecv_vsel_cfg(TWL4030_PM_RECEIVER_VAUX2_DEDICATED,
@@ -371,7 +371,7 @@ int misc_init_r(void)
                break;
        case REVISION_XM_C:
                printf("Beagle xM Rev C\n");
-               setenv("beaglerev", "xMC");
+               env_set("beaglerev", "xMC");
                MUX_BEAGLE_XM();
                /* Set VAUX2 to 1.8V for EHCI PHY */
                twl4030_pmrecv_vsel_cfg(TWL4030_PM_RECEIVER_VAUX2_DEDICATED,
@@ -397,14 +397,14 @@ int misc_init_r(void)
                        expansion_config.revision,
                        expansion_config.fab_revision);
                MUX_TINCANTOOLS_ZIPPY();
-               setenv("buddy", "zippy");
+               env_set("buddy", "zippy");
                break;
        case TINCANTOOLS_ZIPPY2:
                printf("Recognized Tincantools Zippy2 board (rev %d %s)\n",
                        expansion_config.revision,
                        expansion_config.fab_revision);
                MUX_TINCANTOOLS_ZIPPY();
-               setenv("buddy", "zippy2");
+               env_set("buddy", "zippy2");
                break;
        case TINCANTOOLS_TRAINER:
                printf("Recognized Tincantools Trainer board (rev %d %s)\n",
@@ -412,37 +412,37 @@ int misc_init_r(void)
                        expansion_config.fab_revision);
                MUX_TINCANTOOLS_ZIPPY();
                MUX_TINCANTOOLS_TRAINER();
-               setenv("buddy", "trainer");
+               env_set("buddy", "trainer");
                break;
        case TINCANTOOLS_SHOWDOG:
                printf("Recognized Tincantools Showdow board (rev %d %s)\n",
                        expansion_config.revision,
                        expansion_config.fab_revision);
                /* Place holder for DSS2 definition for showdog lcd */
-               setenv("defaultdisplay", "showdoglcd");
-               setenv("buddy", "showdog");
+               env_set("defaultdisplay", "showdoglcd");
+               env_set("buddy", "showdog");
                break;
        case KBADC_BEAGLEFPGA:
                printf("Recognized KBADC Beagle FPGA board\n");
                MUX_KBADC_BEAGLEFPGA();
-               setenv("buddy", "beaglefpga");
+               env_set("buddy", "beaglefpga");
                break;
        case LW_BEAGLETOUCH:
                printf("Recognized Liquidware BeagleTouch board\n");
-               setenv("buddy", "beagletouch");
+               env_set("buddy", "beagletouch");
                break;
        case BRAINMUX_LCDOG:
                printf("Recognized Brainmux LCDog board\n");
-               setenv("buddy", "lcdog");
+               env_set("buddy", "lcdog");
                break;
        case BRAINMUX_LCDOGTOUCH:
                printf("Recognized Brainmux LCDog Touch board\n");
-               setenv("buddy", "lcdogtouch");
+               env_set("buddy", "lcdogtouch");
                break;
        case BBTOYS_WIFI:
                printf("Recognized BeagleBoardToys WiFi board\n");
                MUX_BBTOYS_WIFI()
-               setenv("buddy", "bbtoys-wifi");
+               env_set("buddy", "bbtoys-wifi");
                break;
        case BBTOYS_VGA:
                printf("Recognized BeagleBoardToys VGA board\n");
@@ -459,20 +459,20 @@ int misc_init_r(void)
        case LSR_COM6L_ADPT:
                printf("Recognized LSR COM6L Adapter Board\n");
                MUX_BBTOYS_WIFI()
-               setenv("buddy", "lsr-com6l-adpt");
+               env_set("buddy", "lsr-com6l-adpt");
                break;
        case BEAGLE_NO_EEPROM:
                printf("No EEPROM on expansion board\n");
-               setenv("buddy", "none");
+               env_set("buddy", "none");
                break;
        default:
                printf("Unrecognized expansion board: %x\n",
                        expansion_config.device_vendor);
-               setenv("buddy", "unknown");
+               env_set("buddy", "unknown");
        }
 
        if (expansion_config.content == 1)
-               setenv(expansion_config.env_var, expansion_config.env_setting);
+               env_set(expansion_config.env_var, expansion_config.env_setting);
 
        twl4030_power_init();
        switch (get_board_revision()) {