env: Rename getenv/_f() to env_get()

[u-boot] / board / bluewater / gurnard / gurnard.c

diff --git a/board/bluewater/gurnard/gurnard.c b/board/bluewater/gurnard/gurnard.c
index 2a36d29788c631a57b91e126ced45b666796142c..8733a9af163b1489eb3a0d1f4e0f03aee1a911d3 100644 (file)
--- a/board/bluewater/gurnard/gurnard.c
+++ b/board/bluewater/gurnard/gurnard.c
@@ -21,6 +21,7 @@
 #include <spi.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
+#include <asm/mach-types.h>
 #include <asm/arch/at91sam9g45_matrix.h>
 #include <asm/arch/at91sam9_smc.h>
 #include <asm/arch/at91_common.h>
@@ -340,7 +341,7 @@ int board_init(void)
        at91_set_A_periph(AT91_PIN_PE6, 1);     /* power up */
 
        /* Select the second timing index for board rev 2 */
-       rev_str = getenv("board_rev");
+       rev_str = env_get("board_rev");
        if (rev_str && !strncmp(rev_str, "2", 1)) {
                struct udevice *dev;
 
@@ -367,7 +368,7 @@ int board_late_init(void)
         * Set MAC address so we do not need to init Ethernet before Linux
         * boot
         */
-       env_str = getenv("ethaddr");
+       env_str = env_get("ethaddr");
        if (env_str) {
                struct at91_emac *emac = (struct at91_emac *)ATMEL_BASE_EMAC;
                /* Parse MAC address */
@@ -384,7 +385,7 @@ int board_late_init(void)
                       &emac->sa2l);
                writel((env_enetaddr[4] | env_enetaddr[5] << 8), &emac->sa2h);
 
-               printf("MAC:   %s\n", getenv("ethaddr"));
+               printf("MAC:   %s\n", env_get("ethaddr"));
        } else {
                /* Not set in environment */
                printf("MAC:   not set\n");
@@ -414,12 +415,6 @@ void reset_phy(void)
 {
 }
 
-/* This breaks the Ethernet MAC at present */
-void enable_caches(void)
-{
-       dcache_enable();
-}
-
 /* SPI chip select control - only used for FPGA programming */
 #ifdef CONFIG_ATMEL_SPI