Merge branch 'cleanups' into next

[oweals/u-boot.git] / board / amirix / ap1000 / ap1000.c

diff --git a/board/amirix/ap1000/ap1000.c b/board/amirix/ap1000/ap1000.c
index dd836ce221d9c541696e504e0c1dd00ed5d2af69..fcf26984ff5be6004dc354dc49236a3f762cac6a 100644 (file)
--- a/board/amirix/ap1000/ap1000.c
+++ b/board/amirix/ap1000/ap1000.c
@@ -23,6 +23,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <netdev.h>
 #include <asm/processor.h>
 
 #include "powerspan.h"
@@ -36,8 +37,8 @@ int board_pre_init (void)
 /** serial number and platform display at startup */
 int checkboard (void)
 {
-       unsigned char *s = getenv ("serial#");
-       unsigned char *e;
+       char *s = getenv ("serial#");
+       char *e;
 
        /* After a loadace command, the SystemAce control register is left in a wonky state. */
        /* this code did not work in board_pre_init */
@@ -133,15 +134,15 @@ int checkboard (void)
 }
 
 
-long int initdram (int board_type)
+phys_size_t initdram (int board_type)
 {
-       unsigned char *s = getenv ("dramsize");
+       char *s = getenv ("dramsize");
 
        if (s != NULL) {
                if ((s[0] == '0') && ((s[1] == 'x') || (s[1] == 'X'))) {
                        s += 2;
                }
-               return simple_strtoul (s, NULL, 16);
+               return (long int)simple_strtoul (s, NULL, 16);
        } else {
                /* give all 64 MB */
                return 64 * 1024 * 1024;
@@ -293,7 +294,7 @@ int do_swconfigbyte (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
 
        printf ("Writing to Flash... ");
        write_result =
-               flash_write (sector_buffer, SW_BYTE_SECTOR_ADDR,
+               flash_write ((char *)sector_buffer, SW_BYTE_SECTOR_ADDR,
                             SW_BYTE_SECTOR_SIZE);
        if (write_result != 0) {
                flash_perror (write_result);
@@ -658,7 +659,7 @@ done:
 }
 
 U_BOOT_CMD (temp, 6, 0, do_temp_sensor,
-           "temp    - interact with the temperature sensor\n",
+           "interact with the temperature sensor",
            "temp [s]\n"
            "        - Show status.\n"
            "temp l LOW [HIGH] [THERM]\n"
@@ -673,27 +674,32 @@ U_BOOT_CMD (temp, 6, 0, do_temp_sensor,
 
 #if 0
 U_BOOT_CMD (loadace, 2, 0, do_loadace,
-           "loadace - load fpga configuration from System ACE compact flash\n",
+           "load fpga configuration from System ACE compact flash",
            "N\n"
            "    - Load configuration N (0-7) from System ACE compact flash\n"
            "loadace\n" "    - loads default configuration\n");
 #endif
 
 U_BOOT_CMD (swconfig, 2, 0, do_swconfigbyte,
-           "swconfig- display or modify the software configuration byte\n",
+           "display or modify the software configuration byte",
            "N [ADDRESS]\n"
            "    - set software configuration byte to N, optionally use ADDRESS as\n"
            "      location of buffer for flash copy\n"
            "swconfig\n" "    - display software configuration byte\n");
 
 U_BOOT_CMD (pause, 2, 0, do_pause,
-           "pause   - sleep processor until any key is pressed with poll time of N seconds\n",
+           "sleep processor until any key is pressed with poll time of N seconds",
            "N\n"
            "    - sleep processor until any key is pressed with poll time of N seconds\n"
            "pause\n"
            "    - sleep processor until any key is pressed with poll time of 1 second\n");
 
 U_BOOT_CMD (swrecon, 1, 0, do_swreconfig,
-           "swrecon - trigger a board reconfigure to the software selected configuration\n",
+           "trigger a board reconfigure to the software selected configuration",
            "\n"
            "    - trigger a board reconfigure to the software selected configuration\n");
+
+int board_eth_init(bd_t *bis)
+{
+       return pci_eth_init(bis);
+}