Author: Nishanth Menon
Description:  Beagle x-loader patch to enable NAND/MMC/UART/USB Downloads

Patch created on Wed Apr  9 23:12:56 CDT 2008
---------------
Change Details:
 ./board/omap3530beagle/config.mk                      |    2 
 x-load.beagle/./Makefile                              |   25 
 x-load.beagle/./board/omap3530beagle/omap3530beagle.c |   21 
 x-load.beagle/./common/Makefile                       |   48 +
 x-load.beagle/./common/cmd_load.c                     |  547 ++++++++++++++++++
 x-load.beagle/./include/configs/omap3530beagle.h      |    6 
 x-load.beagle/./lib/board.c                           |   31 -
 7 files changed, 662 insertions(+), 18 deletions(-)
---------------
diff -ruNbB x-load.beagle.old/. x-load.beagle/.
diff -ruNbB x-load.beagle.old/./board/omap3530beagle/config.mk x-load.beagle/./board/omap3530beagle/config.mk
--- x-load.beagle.old/./board/omap3530beagle/config.mk	2007-11-30 13:34:43.000000000 -0600
+++ x-load.beagle/./board/omap3530beagle/config.mk	2008-04-09 22:16:57.000000000 -0500
@@ -19,4 +19,4 @@
 # initial stack at 0x4020fffc used in s_init (below xloader).
 # The run time stack is (above xloader, 2k below)
 # If any globals exist there needs to be room for them also
-TEXT_BASE = 0x40200800
+TEXT_BASE = 0x40208800
diff -ruNbB x-load.beagle.old/./board/omap3530beagle/omap3530beagle.c x-load.beagle/./board/omap3530beagle/omap3530beagle.c
--- x-load.beagle.old/./board/omap3530beagle/omap3530beagle.c	2008-03-12 00:36:14.000000000 -0600
+++ x-load.beagle/./board/omap3530beagle/omap3530beagle.c	2008-04-09 23:10:34.000000000 -0500
@@ -46,10 +46,10 @@
 typedef struct dpll_param dpll_param;
 
 /* Following functions are exported from lowlevel_init.S */
-extern dpll_param *get_mpu_dpll_param();
-extern dpll_param *get_iva_dpll_param();
-extern dpll_param *get_core_dpll_param();
-extern dpll_param *get_per_dpll_param();
+extern dpll_param *get_mpu_dpll_param(void);
+extern dpll_param *get_iva_dpll_param(void);
+extern dpll_param *get_core_dpll_param(void);
+extern dpll_param *get_per_dpll_param(void);
 
 #define __raw_readl(a)    (*(volatile unsigned int *)(a))
 #define __raw_writel(v,a) (*(volatile unsigned int *)(a) = (v))
@@ -57,6 +57,7 @@
 #define __raw_writew(v,a) (*(volatile unsigned short *)(a) = (v))
 extern int fat_register_device(block_dev_desc_t * dev_desc, int part_no);
 
+static void blinkLEDs(void);
 /*******************************************************
  * Routine: delay
  * Description: spinning delay to use before udelay works
@@ -538,14 +539,14 @@
 	sr32(CM_FCLKEN_PER, 3, 1, 0x1);	/* FCKen GPT2 */
 
 #ifdef CFG_NS16550
+////#ifdef CONFIG_SERIAL3
+	sr32(CM_FCLKEN_PER, 11, 1, 0x1);
+	sr32(CM_ICLKEN_PER, 11, 1, 0x1);
+////#else
 	/* Enable UART1 clocks */
 	sr32(CM_FCLKEN1_CORE, 13, 1, 0x1);
 	sr32(CM_ICLKEN1_CORE, 13, 1, 0x1);
-
-	/* UART 3 Clocks */
-	sr32(CM_FCLKEN_PER, 11, 1, 0x1);
-	sr32(CM_ICLKEN_PER, 11, 1, 0x1);
-
+////#endif
 #endif
 
 	/* Enable GPIO5 clocks for blinky LEDs */
@@ -780,7 +781,7 @@
 	return 0;
 }
 
-void blinkLEDs()
+static void blinkLEDs(void)
 {
 	void *p;
 
diff -ruNbB x-load.beagle.old/./common/cmd_load.c x-load.beagle/./common/cmd_load.c
--- x-load.beagle.old/./common/cmd_load.c	1969-12-31 18:00:00.000000000 -0600
+++ x-load.beagle/./common/cmd_load.c	2008-04-09 21:14:45.000000000 -0500
@@ -0,0 +1,547 @@
+/*
+ * (C) Copyright 2000-2004
+ * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+
+/*
+ * Serial up- and download support
+ */
+#include <common.h>
+
+#define putc serial_putc
+#define tstc serial_tstc
+
+/*******************************************************
+ * Routine: delay
+ * Description: spinning delay to use before udelay works
+ ******************************************************/
+static inline void delay(unsigned long loops)
+{
+	__asm__ volatile ("1:\n" "subs %0, %1, #1\n"
+			  "bne 1b":"=r" (loops):"0"(loops));
+}
+static inline void udelay(unsigned long us)
+{
+	delay(us * 200); /* approximate */
+}
+
+void * memcpy(void * dest,const void *src,size_t count)
+{
+	char *tmp = (char *) dest, *s = (char *) src;
+
+	while (count--)
+		*tmp++ = *s++;
+
+	return dest;
+}
+
+/* -------------------------------------------------------------------- */
+
+#define XON_CHAR        17
+#define XOFF_CHAR       19
+#define START_CHAR      0x01
+#define ETX_CHAR	0x03
+#define END_CHAR        0x0D
+#define SPACE           0x20
+#define K_ESCAPE        0x23
+#define SEND_TYPE       'S'
+#define DATA_TYPE       'D'
+#define ACK_TYPE        'Y'
+#define NACK_TYPE       'N'
+#define BREAK_TYPE      'B'
+#define tochar(x) ((char) (((x) + SPACE) & 0xff))
+#define untochar(x) ((int) (((x) - SPACE) & 0xff))
+
+extern int os_data_count;
+extern int os_data_header[8];
+
+static void set_kerm_bin_mode(unsigned long *);
+static int k_recv(void);
+static ulong load_serial_bin (ulong offset);
+
+
+char his_eol;        /* character he needs at end of packet */
+int  his_pad_count;  /* number of pad chars he needs */
+char his_pad_char;   /* pad chars he needs */
+char his_quote;      /* quote chars he'll use */
+
+int do_load_serial_bin (ulong offset, int baudrate)
+{
+	ulong addr;
+	int rcode = 0;
+
+	printf ("## Ready for binary (kermit) download "
+		"to 0x%08lX at %d bps...\n",
+		offset,
+		baudrate);
+	addr = load_serial_bin (offset);
+	if (addr == ~0) {
+		printf ("## Binary (kermit) download aborted\n");
+		rcode = 1;
+	} else {
+		printf ("## Start Addr      = 0x%08lX\n", addr);
+	}
+
+	return rcode;
+}
+
+
+static ulong load_serial_bin (ulong offset)
+{
+	int size, i;
+
+	set_kerm_bin_mode ((ulong *) offset);
+	size = k_recv ();
+
+	/*
+	 * Gather any trailing characters (for instance, the ^D which
+	 * is sent by 'cu' after sending a file), and give the
+	 * box some time (100 * 1 ms)
+	 */
+	for (i=0; i<100; ++i) {
+		if (tstc()) {
+			(void) getc();
+		}
+		udelay(1000);
+	}
+
+	printf("## Total Size      = 0x%08x = %d Bytes\n", size, size);
+
+	return offset;
+}
+
+void send_pad (void)
+{
+	int count = his_pad_count;
+
+	while (count-- > 0)
+		putc (his_pad_char);
+}
+
+/* converts escaped kermit char to binary char */
+char ktrans (char in)
+{
+	if ((in & 0x60) == 0x40) {
+		return (char) (in & ~0x40);
+	} else if ((in & 0x7f) == 0x3f) {
+		return (char) (in | 0x40);
+	} else
+		return in;
+}
+
+int chk1 (char *buffer)
+{
+	int total = 0;
+
+	while (*buffer) {
+		total += *buffer++;
+	}
+	return (int) ((total + ((total >> 6) & 0x03)) & 0x3f);
+}
+
+void s1_sendpacket (char *packet)
+{
+	send_pad ();
+	while (*packet) {
+		putc (*packet++);
+	}
+}
+
+static char a_b[24];
+void send_ack (int n)
+{
+	a_b[0] = START_CHAR;
+	a_b[1] = tochar (3);
+	a_b[2] = tochar (n);
+	a_b[3] = ACK_TYPE;
+	a_b[4] = '\0';
+	a_b[4] = tochar (chk1 (&a_b[1]));
+	a_b[5] = his_eol;
+	a_b[6] = '\0';
+	s1_sendpacket (a_b);
+}
+
+void send_nack (int n)
+{
+	a_b[0] = START_CHAR;
+	a_b[1] = tochar (3);
+	a_b[2] = tochar (n);
+	a_b[3] = NACK_TYPE;
+	a_b[4] = '\0';
+	a_b[4] = tochar (chk1 (&a_b[1]));
+	a_b[5] = his_eol;
+	a_b[6] = '\0';
+	s1_sendpacket (a_b);
+}
+
+
+/* os_data_* takes an OS Open image and puts it into memory, and
+   puts the boot header in an array named os_data_header
+
+   if image is binary, no header is stored in os_data_header.
+*/
+void (*os_data_init) (void);
+void (*os_data_char) (char new_char);
+static int os_data_state, os_data_state_saved;
+int os_data_count;
+static int os_data_count_saved;
+static char *os_data_addr, *os_data_addr_saved;
+static char *bin_start_address;
+int os_data_header[8];
+static void bin_data_init (void)
+{
+	os_data_state = 0;
+	os_data_count = 0;
+	os_data_addr = bin_start_address;
+}
+static void os_data_save (void)
+{
+	os_data_state_saved = os_data_state;
+	os_data_count_saved = os_data_count;
+	os_data_addr_saved = os_data_addr;
+}
+static void os_data_restore (void)
+{
+	os_data_state = os_data_state_saved;
+	os_data_count = os_data_count_saved;
+	os_data_addr = os_data_addr_saved;
+}
+static void bin_data_char (char new_char)
+{
+	switch (os_data_state) {
+	case 0:					/* data */
+		*os_data_addr++ = new_char;
+		--os_data_count;
+		break;
+	}
+}
+static void set_kerm_bin_mode (unsigned long *addr)
+{
+	bin_start_address = (char *) addr;
+	os_data_init = bin_data_init;
+	os_data_char = bin_data_char;
+}
+
+
+/* k_data_* simply handles the kermit escape translations */
+static int k_data_escape, k_data_escape_saved;
+void k_data_init (void)
+{
+	k_data_escape = 0;
+	os_data_init ();
+}
+void k_data_save (void)
+{
+	k_data_escape_saved = k_data_escape;
+	os_data_save ();
+}
+void k_data_restore (void)
+{
+	k_data_escape = k_data_escape_saved;
+	os_data_restore ();
+}
+void k_data_char (char new_char)
+{
+	if (k_data_escape) {
+		/* last char was escape - translate this character */
+		os_data_char (ktrans (new_char));
+		k_data_escape = 0;
+	} else {
+		if (new_char == his_quote) {
+			/* this char is escape - remember */
+			k_data_escape = 1;
+		} else {
+			/* otherwise send this char as-is */
+			os_data_char (new_char);
+		}
+	}
+}
+
+#define SEND_DATA_SIZE  20
+char send_parms[SEND_DATA_SIZE];
+char *send_ptr;
+
+/* handle_send_packet interprits the protocol info and builds and
+   sends an appropriate ack for what we can do */
+void handle_send_packet (int n)
+{
+	int length = 3;
+	int bytes;
+
+	/* initialize some protocol parameters */
+	his_eol = END_CHAR;		/* default end of line character */
+	his_pad_count = 0;
+	his_pad_char = '\0';
+	his_quote = K_ESCAPE;
+
+	/* ignore last character if it filled the buffer */
+	if (send_ptr == &send_parms[SEND_DATA_SIZE - 1])
+		--send_ptr;
+	bytes = send_ptr - send_parms;	/* how many bytes we'll process */
+	do {
+		if (bytes-- <= 0)
+			break;
+		/* handle MAXL - max length */
+		/* ignore what he says - most I'll take (here) is 94 */
+		a_b[++length] = tochar (94);
+		if (bytes-- <= 0)
+			break;
+		/* handle TIME - time you should wait for my packets */
+		/* ignore what he says - don't wait for my ack longer than 1 second */
+		a_b[++length] = tochar (1);
+		if (bytes-- <= 0)
+			break;
+		/* handle NPAD - number of pad chars I need */
+		/* remember what he says - I need none */
+		his_pad_count = untochar (send_parms[2]);
+		a_b[++length] = tochar (0);
+		if (bytes-- <= 0)
+			break;
+		/* handle PADC - pad chars I need */
+		/* remember what he says - I need none */
+		his_pad_char = ktrans (send_parms[3]);
+		a_b[++length] = 0x40;	/* He should ignore this */
+		if (bytes-- <= 0)
+			break;
+		/* handle EOL - end of line he needs */
+		/* remember what he says - I need CR */
+		his_eol = untochar (send_parms[4]);
+		a_b[++length] = tochar (END_CHAR);
+		if (bytes-- <= 0)
+			break;
+		/* handle QCTL - quote control char he'll use */
+		/* remember what he says - I'll use '#' */
+		his_quote = send_parms[5];
+		a_b[++length] = '#';
+		if (bytes-- <= 0)
+			break;
+		/* handle QBIN - 8-th bit prefixing */
+		/* ignore what he says - I refuse */
+		a_b[++length] = 'N';
+		if (bytes-- <= 0)
+			break;
+		/* handle CHKT - the clock check type */
+		/* ignore what he says - I do type 1 (for now) */
+		a_b[++length] = '1';
+		if (bytes-- <= 0)
+			break;
+		/* handle REPT - the repeat prefix */
+		/* ignore what he says - I refuse (for now) */
+		a_b[++length] = 'N';
+		if (bytes-- <= 0)
+			break;
+		/* handle CAPAS - the capabilities mask */
+		/* ignore what he says - I only do long packets - I don't do windows */
+		a_b[++length] = tochar (2);	/* only long packets */
+		a_b[++length] = tochar (0);	/* no windows */
+		a_b[++length] = tochar (94);	/* large packet msb */
+		a_b[++length] = tochar (94);	/* large packet lsb */
+	} while (0);
+
+	a_b[0] = START_CHAR;
+	a_b[1] = tochar (length);
+	a_b[2] = tochar (n);
+	a_b[3] = ACK_TYPE;
+	a_b[++length] = '\0';
+	a_b[length] = tochar (chk1 (&a_b[1]));
+	a_b[++length] = his_eol;
+	a_b[++length] = '\0';
+	s1_sendpacket (a_b);
+}
+
+/* k_recv receives a OS Open image file over kermit line */
+static int k_recv (void)
+{
+	char new_char;
+	char k_state, k_state_saved;
+	int sum;
+	int done;
+	int length;
+	int n, last_n;
+	int z = 0;
+	int len_lo, len_hi;
+
+	/* initialize some protocol parameters */
+	his_eol = END_CHAR;		/* default end of line character */
+	his_pad_count = 0;
+	his_pad_char = '\0';
+	his_quote = K_ESCAPE;
+
+	/* initialize the k_recv and k_data state machine */
+	done = 0;
+	k_state = 0;
+	k_data_init ();
+	k_state_saved = k_state;
+	k_data_save ();
+	n = 0;				/* just to get rid of a warning */
+	last_n = -1;
+
+	/* expect this "type" sequence (but don't check):
+	   S: send initiate
+	   F: file header
+	   D: data (multiple)
+	   Z: end of file
+	   B: break transmission
+	 */
+
+	/* enter main loop */
+	while (!done) {
+		/* set the send packet pointer to begining of send packet parms */
+		send_ptr = send_parms;
+
+		/* With each packet, start summing the bytes starting with the length.
+		   Save the current sequence number.
+		   Note the type of the packet.
+		   If a character less than SPACE (0x20) is received - error.
+		 */
+
+#if 0
+		/* OLD CODE, Prior to checking sequence numbers */
+		/* first have all state machines save current states */
+		k_state_saved = k_state;
+		k_data_save ();
+#endif
+
+		/* get a packet */
+		/* wait for the starting character or ^C */
+		for (;;) {
+			switch (getc ()) {
+			case START_CHAR:	/* start packet */
+				goto START;
+			case ETX_CHAR:		/* ^C waiting for packet */
+				return (0);
+			default:
+				;
+			}
+		}
+START:
+		/* get length of packet */
+		sum = 0;
+		new_char = getc ();
+		if ((new_char & 0xE0) == 0)
+			goto packet_error;
+		sum += new_char & 0xff;
+		length = untochar (new_char);
+		/* get sequence number */
+		new_char = getc ();
+		if ((new_char & 0xE0) == 0)
+			goto packet_error;
+		sum += new_char & 0xff;
+		n = untochar (new_char);
+		--length;
+
+		/* NEW CODE - check sequence numbers for retried packets */
+		/* Note - this new code assumes that the sequence number is correctly
+		 * received.  Handling an invalid sequence number adds another layer
+		 * of complexity that may not be needed - yet!  At this time, I'm hoping
+		 * that I don't need to buffer the incoming data packets and can write
+		 * the data into memory in real time.
+		 */
+		if (n == last_n) {
+			/* same sequence number, restore the previous state */
+			k_state = k_state_saved;
+			k_data_restore ();
+		} else {
+			/* new sequence number, checkpoint the download */
+			last_n = n;
+			k_state_saved = k_state;
+			k_data_save ();
+		}
+		/* END NEW CODE */
+
+		/* get packet type */
+		new_char = getc ();
+		if ((new_char & 0xE0) == 0)
+			goto packet_error;
+		sum += new_char & 0xff;
+		k_state = new_char;
+		--length;
+		/* check for extended length */
+		if (length == -2) {
+			/* (length byte was 0, decremented twice) */
+			/* get the two length bytes */
+			new_char = getc ();
+			if ((new_char & 0xE0) == 0)
+				goto packet_error;
+			sum += new_char & 0xff;
+			len_hi = untochar (new_char);
+			new_char = getc ();
+			if ((new_char & 0xE0) == 0)
+				goto packet_error;
+			sum += new_char & 0xff;
+			len_lo = untochar (new_char);
+			length = len_hi * 95 + len_lo;
+			/* check header checksum */
+			new_char = getc ();
+			if ((new_char & 0xE0) == 0)
+				goto packet_error;
+			if (new_char != tochar ((sum + ((sum >> 6) & 0x03)) & 0x3f))
+				goto packet_error;
+			sum += new_char & 0xff;
+/* --length; */ /* new length includes only data and block check to come */
+		}
+		/* bring in rest of packet */
+		while (length > 1) {
+			new_char = getc ();
+			if ((new_char & 0xE0) == 0)
+				goto packet_error;
+			sum += new_char & 0xff;
+			--length;
+			if (k_state == DATA_TYPE) {
+				/* pass on the data if this is a data packet */
+				k_data_char (new_char);
+			} else if (k_state == SEND_TYPE) {
+				/* save send pack in buffer as is */
+				*send_ptr++ = new_char;
+				/* if too much data, back off the pointer */
+				if (send_ptr >= &send_parms[SEND_DATA_SIZE])
+					--send_ptr;
+			}
+		}
+		/* get and validate checksum character */
+		new_char = getc ();
+		if ((new_char & 0xE0) == 0)
+			goto packet_error;
+		if (new_char != tochar ((sum + ((sum >> 6) & 0x03)) & 0x3f))
+			goto packet_error;
+		/* get END_CHAR */
+		new_char = getc ();
+		if (new_char != END_CHAR) {
+		  packet_error:
+			/* restore state machines */
+			k_state = k_state_saved;
+			k_data_restore ();
+			/* send a negative acknowledge packet in */
+			send_nack (n);
+		} else if (k_state == SEND_TYPE) {
+			/* crack the protocol parms, build an appropriate ack packet */
+			handle_send_packet (n);
+		} else {
+			/* send simple acknowledge packet in */
+			send_ack (n);
+			/* quit if end of transmission */
+			if (k_state == BREAK_TYPE)
+				done = 1;
+		}
+		++z;
+	}
+	return ((ulong) os_data_addr - (ulong) bin_start_address);
+}
diff -ruNbB x-load.beagle.old/./common/Makefile x-load.beagle/./common/Makefile
--- x-load.beagle.old/./common/Makefile	1969-12-31 18:00:00.000000000 -0600
+++ x-load.beagle/./common/Makefile	2008-04-09 21:14:45.000000000 -0500
@@ -0,0 +1,48 @@
+#
+# (C) Copyright 2004
+# Wolfgang Denk, DENX Software Engineering, wd@denx.de.
+#
+# See file CREDITS for list of people who contributed to this
+# project.
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2 of
+# the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+# MA 02111-1307 USA
+#
+
+include $(TOPDIR)/config.mk
+
+LIB	= libcommon.a
+
+AOBJS	=
+
+COBJS	= cmd_load.o
+
+OBJS	= $(AOBJS) $(COBJS)
+
+CPPFLAGS += -I..
+
+all:	$(LIB) $(AOBJS)
+
+$(LIB): .depend $(OBJS)
+	$(AR) crv $@ $(OBJS)
+
+#########################################################################
+
+.depend:	Makefile $(AOBJS:.o=.S) $(COBJS:.o=.c)
+		$(CC) -M $(CFLAGS) $(AOBJS:.o=.S) $(COBJS:.o=.c) > $@
+
+sinclude .depend
+
+#########################################################################
diff -ruNbB x-load.beagle.old/./include/configs/omap3530beagle.h x-load.beagle/./include/configs/omap3530beagle.h
--- x-load.beagle.old/./include/configs/omap3530beagle.h	2008-03-12 00:00:26.000000000 -0600
+++ x-load.beagle/./include/configs/omap3530beagle.h	2008-04-09 21:54:45.000000000 -0500
@@ -39,7 +39,9 @@
 #define CONFIG_OMAP34XX          1    /* which is a 34XX */
 #define CONFIG_OMAP3430          1    /* which is in a 3430 */
 #define CONFIG_OMAP3_BEAGLE      1    /* working with BEAGLE */
+#ifdef BEAGLE_MMC_BOOT
 #define CONFIG_DOS_PARTITION	 1
+#endif
 
 /* Uncomment this for Rev 1 boards*/
 //#define CONFIG_BEAGLE_REV1	 1
@@ -47,16 +49,18 @@
 /* Uncomment this for Rev 2 boards */
 #define CONFIG_BEAGLE_REV2	 1
 
+#ifdef BEAGLE_MMC_BOOT
 /* Disable these if MMC support is not required */
 #define CFG_CMD_MMC              1
 #define CFG_CMD_FAT              1
 #define CONFIG_MMC               1
 #define CFG_MMC_BASE             0xF0000000
+#endif
 
 #include <asm/arch/cpu.h>        /* get chip and board defs */
 
 /* uncomment it if you need timer based udelay(). it takes about 250 bytes */
-#define CFG_UDELAY
+//#define CFG_UDELAY
  
 /* Clock Defines */
 #ifdef CONFIG_OMAP3_BEAGLE
diff -ruNbB x-load.beagle.old/./lib/board.c x-load.beagle/./lib/board.c
--- x-load.beagle.old/./lib/board.c	2008-02-13 08:07:00.000000000 -0600
+++ x-load.beagle/./lib/board.c	2008-04-09 23:11:51.000000000 -0500
@@ -49,13 +49,11 @@
  	serial_init,		/* serial communications setup */
 	print_info,
 #endif
-#ifdef CFG_CMD_MMC
-	mmc_boot,
-#endif
    	nand_init,		/* board specific nand init */
   	NULL,
 };
 
+extern int do_load_serial_bin(ulong offset, int baudrate);
 void start_armboot (void)
 {
   	init_fnc_t **init_fnc_ptr;
@@ -68,23 +66,48 @@
 		}
 	}
      	    
+/* Lets hang for the moment */
+#if 0
+	{
+			int x=10000;
+			while(x){
+				printf("Hello there.. I am waiting..\n");
+				x--;
+			}
+	}
+#endif
+#ifdef START_LOADB_DOWNLOAD
+	do_load_serial_bin (CFG_LOADADDR, 115200);
+	goto run;
+#endif
 	buf =  (uchar*) CFG_LOADADDR;
 
-#ifdef CFG_ONENAND
+#if defined(CFG_ONENAND)
 	for (i = ONENAND_START_BLOCK; i < ONENAND_END_BLOCK; i++){
 		if (!onenand_read_block(buf, i))
 			buf += ONENAND_BLOCK_SIZE;
+		else {
+			printf("Bad block! Could not read bootloader.\n");
+			hang();
+		}
 	}
+#elif defined(CONFIG_MMC)
+	mmc_boot();
 #else
 	for (i = NAND_UBOOT_START; i < NAND_UBOOT_END; i+= NAND_BLOCK_SIZE){
 		if (!nand_read_block(buf, i))
 			buf += NAND_BLOCK_SIZE; /* advance buf ptr */
+		else {
+			printf("Bad block! Could not read bootloader.\n");
+			hang();
+		}
 	}
 #endif
 
 	if (buf == (uchar *)CFG_LOADADDR)
 		hang();
 
+run:
 	/* go run U-Boot and never return */
   	printf("Starting OS Bootloader...\n");
  	((init_fnc_t *)CFG_LOADADDR)();
diff -ruNbB x-load.beagle.old/./Makefile x-load.beagle/./Makefile
--- x-load.beagle.old/./Makefile	2008-02-09 20:49:45.000000000 -0600
+++ x-load.beagle/./Makefile	2008-04-09 23:12:52.000000000 -0500
@@ -70,6 +70,7 @@
 LIBS += fs/fat/libfat.a
 LIBS += disk/libdisk.a
 LIBS += drivers/libdrivers.a
+LIBS += common/libcommon.a
 .PHONY : $(LIBS)
 
 # Add GCC lib
@@ -144,9 +145,29 @@
 
 	@./mkconfig $(@:_config=) arm omap3 omap3430sdp
 
+# Default: Memory Boot - Onenand/NAND based on board..
 omap3530beagle_config :    unconfig
-
-	@./mkconfig $(@:_config=) arm omap3 omap3530beagle
+	@./mkconfig omap3530beagle arm omap3 omap3530beagle;\
+	mv ./include/config.h /tmp/.beagle.tmp.h;\
+    echo "#define BEAGLE_MEM_BOOT" > ./include/config.h;\
+	cat /tmp/.beagle.tmp.h >>./include/config.h;\
+	rm /tmp/.beagle.tmp.h
+
+# MMC Boot configuration
+omap3530beagle_mmc_config :    unconfig
+	@./mkconfig omap3530beagle arm omap3 omap3530beagle;\
+	mv ./include/config.h /tmp/.beagle.tmp.h;\
+    echo "#define BEAGLE_MMC_BOOT" > ./include/config.h;\
+	cat /tmp/.beagle.tmp.h >>./include/config.h;\
+	rm /tmp/.beagle.tmp.h
+
+# SRAM-Supported Peripheral Boot configuration
+omap3530beagle_download_config :    unconfig
+	@./mkconfig omap3530beagle arm omap3 omap3530beagle;\
+	mv ./include/config.h /tmp/.beagle.tmp.h;\
+    echo "#define START_LOADB_DOWNLOAD" > ./include/config.h;\
+	cat /tmp/.beagle.tmp.h >>./include/config.h;\
+	rm /tmp/.beagle.tmp.h
 
 #########################################################################
 
