From 8bde7f776c77b343aca29b8c7b58464d915ac245 Mon Sep 17 00:00:00 2001
From: wdenk <wdenk>
Date: Fri, 27 Jun 2003 21:31:46 +0000
Subject: * Code cleanup:   - remove trailing white space, trailing empty
 lines, C++ comments, etc.   - split cmd_boot.c (separate cmd_bdinfo.c and
 cmd_load.c)

* Patches by Kenneth Johansson, 25 Jun 2003:
  - major rework of command structure
    (work done mostly by Michal Cendrowski and Joakim Kristiansen)
---
 board/pn62/Makefile   |  2 +-
 board/pn62/cmd_pn62.c | 17 ++++++++++++++---
 board/pn62/misc.c     |  4 ++--
 board/pn62/u-boot.lds |  6 +++++-
 4 files changed, 22 insertions(+), 7 deletions(-)

(limited to 'board/pn62')

diff --git a/board/pn62/Makefile b/board/pn62/Makefile
index 77e216b47..e85d4fdc6 100644
--- a/board/pn62/Makefile
+++ b/board/pn62/Makefile
@@ -28,7 +28,7 @@ LIB	= lib$(BOARD).a
 OBJS =  $(BOARD).o cmd_pn62.o misc.o
 
 $(LIB):	.depend $(OBJS)
-	$(AR) crv $@ $^
+	$(AR) crv $@ $(OBJS)
 
 #########################################################################
 
diff --git a/board/pn62/cmd_pn62.c b/board/pn62/cmd_pn62.c
index 928f6c094..421829a91 100644
--- a/board/pn62/cmd_pn62.c
+++ b/board/pn62/cmd_pn62.c
@@ -26,9 +26,7 @@
 #include <net.h>
 #include <asm/io.h>
 #include <pci.h>
-#include <cmd_autoscript.h>
-#include <cmd_bsp.h>
-
+#include <command.h>
 #include "pn62.h"
 
 #if (CONFIG_COMMANDS & CFG_CMD_BSP)
@@ -53,6 +51,12 @@ int do_led (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
     set_led (number, function);
     return 0;
 }
+cmd_tbl_t U_BOOT_CMD(led) = MK_CMD_ENTRY(
+	"led"    ,	3,	1,	do_led,
+	"led     - set LED 0..11 on the PN62 board\n",
+	"i fun\n"
+	"    - set 'i'th LED to function 'fun'\n"
+);
 
 /*
  * Command loadpci: loads a image over PCI.
@@ -161,4 +165,11 @@ int do_loadpci (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
     return rcode;
 }
 
+cmd_tbl_t U_BOOT_CMD(loadpci) = MK_CMD_ENTRY(
+	"loadpci",	2,	1,	do_loadpci,
+	"loadpci - load binary file over PCI\n",
+	"[addr]\n"
+	"    - load binary file over PCI to address 'addr'\n"
+);
+
 #endif
diff --git a/board/pn62/misc.c b/board/pn62/misc.c
index 4f71950f8..dcb2db5a9 100644
--- a/board/pn62/misc.c
+++ b/board/pn62/misc.c
@@ -154,8 +154,8 @@ int i2155x_read_vpd(int offset, int size, unsigned char *data)
 }
 
 static struct pci_device_id am79c95x_ids [] = {
-        { PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_LANCE },
-        { }
+	{ PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_LANCE },
+	{ }
 };
 
 
diff --git a/board/pn62/u-boot.lds b/board/pn62/u-boot.lds
index 5ba99b1f4..98584dcf0 100644
--- a/board/pn62/u-boot.lds
+++ b/board/pn62/u-boot.lds
@@ -103,6 +103,11 @@ SECTIONS
   _edata  =  .;
   PROVIDE (edata = .);
 
+  __u_boot_cmd_start = .;
+  .u_boot_cmd : { *(.u_boot_cmd) }
+  __u_boot_cmd_end = .;
+
+
   __start___ex_table = .;
   __ex_table : { *(__ex_table) }
   __stop___ex_table = .;
@@ -126,4 +131,3 @@ SECTIONS
   _end = . ;
   PROVIDE (end = .);
 }
-
-- 
cgit v1.2.3