imported Freescale specific U-Boot additions for i.MX28,... release L2.6.31_10.08.01

[karo-tx-uboot.git] / board / amirix / ap1000 / ap1000.c

diff --git a/board/amirix/ap1000/ap1000.c b/board/amirix/ap1000/ap1000.c
index 7d11b29b59ab714775953d7a092f424d0b17400c..cadfe0b5bc050196fd6acc198bce90fe24de0193 100755 (executable)
--- 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"
@@ -133,7 +134,7 @@ int checkboard (void)
 }
 
 
-long int initdram (int board_type)
+phys_size_t initdram (int board_type)
 {
        char *s = getenv ("dramsize");
 
@@ -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"
@@ -669,31 +670,36 @@ U_BOOT_CMD (temp, 6, 0, do_temp_sensor,
            "        - Set config options.\n"
            "\n"
            "All values can be decimal or hex (hex preceded with 0x).\n"
-           "Only whole numbers are supported for external limits.\n");
+           "Only whole numbers are supported for external limits.");
 
 #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");
+           "loadace\n" "    - loads default configuration");
 #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");
+           "swconfig\n" "    - display software configuration byte");
 
 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");
+           "    - sleep processor until any key is pressed with poll time of 1 second");
 
 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");
+           "    - trigger a board reconfigure to the software selected configuration");
+
+int board_eth_init(bd_t *bis)
+{
+       return pci_eth_init(bis);
+}