tree moved to a better location

15 files changed, 0 insertions, 2208 deletions

diff --git a/x-loader/cpu/arm1136/Makefile b/x-loader/cpu/arm1136/Makefile
deleted file mode 100644
index b556419..0000000
--- a/x-loader/cpu/arm1136/Makefile
+++ /dev/null
@@ -1,47 +0,0 @@
-#
-# (C) Copyright 2000-2003
-# 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	= $(obj)lib$(CPU).a
-
-START	= start.o
-COBJS	= cpu.o
-
-SRCS	:= $(START:.o=.S) $(SOBJS:.o=.S) $(COBJS:.o=.c)
-OBJS	:= $(addprefix $(obj),$(SOBJS) $(COBJS))
-START	:= $(addprefix $(obj),$(START))
-
-all:	$(obj).depend $(START) $(LIB)
-
-$(LIB):	$(OBJS)
-	$(AR) crv $@ $(OBJS)
-
-#########################################################################
-
-# defines $(obj).depend target
-include $(SRCTREE)/rules.mk
-
-sinclude $(obj).depend
-
-#########################################################################
diff --git a/x-loader/cpu/arm1136/config.mk b/x-loader/cpu/arm1136/config.mk
deleted file mode 100644
index 3106824..0000000
--- a/x-loader/cpu/arm1136/config.mk
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-# (C) Copyright 2002
-# Gary Jennejohn, DENX Software Engineering, <gj@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
-PLATFORM_RELFLAGS += -fno-strict-aliasing  -fno-common -ffixed-r8
-
-PLATFORM_CPPFLAGS += -march=armv5
-# =========================================================================
-#
-# Supply options according to compiler version
-#
-# =========================================================================
-PLATFORM_CPPFLAGS +=$(call cc-option,-mapcs-32,-mabi=apcs-gnu)
-PLATFORM_CPPFLAGS +=$(call cc-option,-mno-thumb-interwork,)
-PLATFORM_RELFLAGS +=$(call cc-option,-mshort-load-bytes,$(call cc-option,-malignment-traps,))
-#
diff --git a/x-loader/cpu/arm1136/cpu.c b/x-loader/cpu/arm1136/cpu.c
deleted file mode 100644
index 1168fb9..0000000
--- a/x-loader/cpu/arm1136/cpu.c
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * (C) Copyright 2004 Texas Insturments
- *
- *
- * 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
- */
-
-/*
- * udelay() is CPU specific code
- */
-
-#include <common.h>
-
-/* See also ARM Ref. Man. */
-#define C1_MMU		(1<<0)		/* mmu off/on */
-#define C1_ALIGN	(1<<1)		/* alignment faults off/on */
-#define C1_DC		(1<<2)		/* dcache off/on */
-#define C1_WB		(1<<3)		/* merging write buffer on/off */
-#define C1_BIG_ENDIAN	(1<<7)	/* big endian off/on */
-#define C1_SYS_PROT	(1<<8)		/* system protection */
-#define C1_ROM_PROT	(1<<9)		/* ROM protection */
-#define C1_IC		(1<<12)		/* icache off/on */
-#define C1_HIGH_VECTORS	(1<<13)	/* location of vectors: low/high addresses */
-#define RESERVED_1	(0xf << 3)	/* must be 111b for R/W */
-
-int cpu_init (void)
-{
-	int i;
-
-	/* turn off I/D-cache */
-	asm ("mrc p15, 0, %0, c1, c0, 0":"=r" (i));
-	i &= ~(C1_DC | C1_IC);
-	asm ("mcr p15, 0, %0, c1, c0, 0": :"r" (i));
-
-	/* flush I/D-cache */
-	i = 0;
-	asm ("mcr p15, 0, %0, c7, c7, 0": :"r" (i));  // invalidate both caches and flush btb
-	asm ("mcr p15, 0, %0, c7, c10, 4": :"r" (i)); // mem barrier to sync things
-
-	return 0;
-}
-
-
-
-
-
-
-
-
diff --git a/x-loader/cpu/arm1136/start.S b/x-loader/cpu/arm1136/start.S
deleted file mode 100644
index 16108d0..0000000
--- a/x-loader/cpu/arm1136/start.S
+++ /dev/null
@@ -1,218 +0,0 @@
-/*
- *  armboot - Startup Code for OMP2420/ARM1136 CPU-core
- *
- *  Copyright (c) 2004  Texas Instruments
- *
- *  Copyright (c) 2001	Marius Gröger <mag@sysgo.de>
- *  Copyright (c) 2002	Alex Züpke <azu@sysgo.de>
- *  Copyright (c) 2002	Gary Jennejohn <gj@denx.de>
- *  Copyright (c) 2003	Richard Woodruff <r-woodruff2@ti.com>
- *  Copyright (c) 2003	Kshitij <kshitij@ti.com>
- *  Copyright (c) 2004	Jian Zhang <jzhang@ti.com>
- *
- * 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 <config.h>
-
-.globl _start
-_start:	
-	b	reset
- 	ldr	pc, _hang
-	ldr	pc, _hang
-	ldr	pc, _hang
-	ldr	pc, _hang
-	ldr	pc, _hang
-	ldr	pc, _hang
-	ldr	pc, _hang
-
-_hang:
- 	.word do_hang
-	
-	.word 0x12345678
-	.word 0x12345678
-	.word 0x12345678
-	.word 0x12345678
-	.word 0x12345678
-	.word 0x12345678
-	.word 0x12345678 /* now 16*4=64 */
-
-.global _end_vect
-_end_vect:
-
-	.balignl 16,0xdeadbeef
-/*
- *************************************************************************
- *
- * Startup Code (reset vector)
- *
- * do important init only if we don't start from memory!
- * setup Memory and board specific bits prior to relocation.
- * relocate armboot to ram
- * setup stack
- *
- *************************************************************************
- */
-
-_TEXT_BASE:
-	.word	TEXT_BASE
-
-.globl _armboot_start
-_armboot_start:
-	.word _start
-
-/*
- * These are defined in the board-specific linker script.
- */
-.globl _bss_start
-_bss_start:
-	.word __bss_start
-
-.globl _bss_end
-_bss_end:
-	.word _end
-
-/*
- * the actual reset code
- */
-
-reset: 
-	/*
-	 * set the cpu to SVC32 mode
-	 */
-	mrs	r0,cpsr
-	bic	r0,r0,#0x1f
-	orr	r0,r0,#0xd3
-	msr	cpsr,r0
-
-	/* Copy vectors to mask ROM indirect addr */ 
-	adr     r0, _start              /* r0 <- current position of code   */
-	add     r0, r0, #4				/* skip reset vector			*/
-	mov     r2, #64                 /* r2 <- size to copy  */
-	add     r2, r0, r2              /* r2 <- source end address         */
-	mov     r1, #0x40000000         /* build vect addr */
-	mov     r3, #0x00200000
-	add     r1, r1, r3
-	mov     r3, #0xf800
-	add     r1, r1, r3
-next:
-	ldmia   r0!, {r3-r10}           /* copy from source address [r0]    */
-	stmia   r1!, {r3-r10}           /* copy to   target address [r1]    */
-	cmp     r0, r2                  /* until source end address [r2]    */
-	bne     next                    /* loop until equal */
-
-	bl	cpy_clk_code            /* put dpll adjust code behind vectors */
- 
-	/* the mask ROM code should have PLL and others stable */
-	bl  cpu_init_crit
-
-relocate:				/* relocate U-Boot to RAM	    */
-	adr	r0, _start		/* r0 <- current position of code   */
-	ldr	r1, _TEXT_BASE		/* test if we run from flash or RAM */
-	cmp r0, r1                  /* don't reloc during debug         */
-	/* beq stack_setup */
-
-	ldr	r2, _armboot_start
-	ldr	r3, _bss_start
-	sub	r2, r3, r2		/* r2 <- size of armboot            */
-	add	r2, r0, r2		/* r2 <- source end address         */
-
-copy_loop:
-	ldmia	r0!, {r3-r10}		/* copy from source address [r0]    */
-	stmia	r1!, {r3-r10}		/* copy to   target address [r1]    */
-	cmp	r0, r2			/* until source end addreee [r2]    */
-	ble	copy_loop
-
-	/* Set up the stack						    */
-stack_setup:
-	ldr	r0, _TEXT_BASE		/* upper 128 KiB: relocated uboot   */
-	sub	sp, r0, #128		/* leave 32 words for abort-stack    */
-
-clear_bss:
-	ldr	r0, _bss_start		/* find start of bss segment        */
-	ldr	r1, _bss_end		/* stop here                        */
-	mov 	r2, #0x00000000		/* clear                            */
-
-//clbss_l:str	r2, [r0]		/* clear loop...                    */
-//	add	r0, r0, #4
-//	cmp	r0, r1
-//	bne	clbss_l
-
-	ldr	pc, _start_armboot
-
-_start_armboot:	.word start_armboot
-
-
-/*
- *************************************************************************
- *
- * CPU_init_critical registers
- *
- * setup important registers
- * setup memory timing
- *
- *************************************************************************
- */
-cpu_init_crit:
-	/*
-	 * flush v4 I/D caches
-	 */
-	mov	r0, #0
-	mcr	p15, 0, r0, c7, c7, 0	/* flush v3/v4 cache */
-	mcr	p15, 0, r0, c8, c7, 0	/* flush v4 TLB */
-
-	/*
-	 * disable MMU stuff and caches
-	 */
-	mrc	p15, 0, r0, c1, c0, 0
-	bic	r0, r0, #0x00002300	@ clear bits 13, 9:8 (--V- --RS)
-	bic	r0, r0, #0x00000087	@ clear bits 7, 2:0 (B--- -CAM)
-	orr	r0, r0, #0x00000002	@ set bit 2 (A) Align
-#ifndef CONFIG_ICACHE_OFF
-	orr	r0, r0, #0x00001000	@ set bit 12 (I) I-Cache
-#endif
-	mcr	p15, 0, r0, c1, c0, 0
-
-	/*
-         * Jump to board specific initialization... The Mask ROM will have already initialized
-         * basic memory.  Go here to bump up clock rate and handle wake up conditions.
-	 */
-	adr	r0, _start		/* r0 <- current position of code   */
-	ldr	r1, _TEXT_BASE		/* test if we run from flash or RAM */
-	cmp     r0, r1                  /* pass on info about skipping some init portions */
-	moveq   r0,#0x1                 /* flag to skip prcm and sdrc setup */
-	movne   r0,#0x0
-
-//mov r0, #1    /* this skip memory init */
-
-	mov	ip, lr          /* persevere link reg across call */
-	bl	platformsetup   /* go setup pll,mux,memory */
-
-	mov	lr, ip          /* restore link */
-	mov	pc, lr          /* back to my caller */
-
-
-/*
- * exception handler
- */
- 	.align  5
-do_hang:
-	ldr	sp, _TEXT_BASE		/* use 32 words abort stack */
-   	bl	hang				/* hang and never return */
-
diff --git a/x-loader/cpu/omap3/Makefile b/x-loader/cpu/omap3/Makefile
deleted file mode 100644
index 678619c..0000000
--- a/x-loader/cpu/omap3/Makefile
+++ /dev/null
@@ -1,47 +0,0 @@
-#
-# (C) Copyright 2000-2003
-# 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	= $(obj)lib$(CPU).a
-
-START	= start.o
-COBJS	= cpu.o mmc.o gpio.o
-
-SRCS	:= $(START:.o=.S) $(SOBJS:.o=.S) $(COBJS:.o=.c)
-OBJS	:= $(addprefix $(obj),$(SOBJS) $(COBJS))
-START	:= $(addprefix $(obj),$(START))
-
-all:	$(obj).depend $(START) $(LIB)
-
-$(LIB):	$(OBJS)
-	$(AR) crv $@ $(OBJS)
-
-#########################################################################
-
-# defines $(obj).depend target
-include $(SRCTREE)/rules.mk
-
-sinclude $(obj).depend
-
-#########################################################################
diff --git a/x-loader/cpu/omap3/config.mk b/x-loader/cpu/omap3/config.mk
deleted file mode 100644
index bd76483..0000000
--- a/x-loader/cpu/omap3/config.mk
+++ /dev/null
@@ -1,32 +0,0 @@
-#
-# (C) Copyright 2002
-# Gary Jennejohn, DENX Software Engineering, <gj@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
-#
-PLATFORM_RELFLAGS += -fno-strict-aliasing  -fno-common -ffixed-r8
-
-#PLATFORM_CPPFLAGS += -march=armv7-a
-# =========================================================================
-#
-# Supply options according to compiler version
-#
-# =========================================================================
-PLATFORM_CPPFLAGS +=$(call cc-option,-mapcs-32)
-PLATFORM_RELFLAGS +=$(call cc-option,-mshort-load-bytes,$(call cc-option,-malignment-traps,))
diff --git a/x-loader/cpu/omap3/cpu.c b/x-loader/cpu/omap3/cpu.c
deleted file mode 100644
index 1cf422a..0000000
--- a/x-loader/cpu/omap3/cpu.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * (C) Copyright 2004-2006 Texas Insturments
- *
- * (C) Copyright 2002
- * Sysgo Real-Time Solutions, GmbH <www.elinos.com>
- * Marius Groeger <mgroeger@sysgo.de>
- *
- * (C) Copyright 2002
- * Gary Jennejohn, DENX Software Engineering, <gj@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
- */
-
-/*
- * CPU specific code
- */
-#include <common.h>
-
-/* See also ARM Ref. Man. */
-#define C1_MMU		(1<<0)		/* mmu off/on */
-#define C1_ALIGN	(1<<1)		/* alignment faults off/on */
-#define C1_DC		(1<<2)		/* dcache off/on */
-#define C1_WB		(1<<3)		/* merging write buffer on/off */
-#define C1_BIG_ENDIAN	(1<<7)	/* big endian off/on */
-#define C1_SYS_PROT	(1<<8)		/* system protection */
-#define C1_ROM_PROT	(1<<9)		/* ROM protection */
-#define C1_IC		(1<<12)		/* icache off/on */
-#define C1_HIGH_VECTORS	(1<<13)	/* location of vectors: low/high addresses */
-#define RESERVED_1	(0xf << 3)	/* must be 111b for R/W */
-
-int cpu_init (void)
-{
-	return 0;
-}
-
diff --git a/x-loader/cpu/omap3/gpio.c b/x-loader/cpu/omap3/gpio.c
deleted file mode 100644
index aeb6066..0000000
--- a/x-loader/cpu/omap3/gpio.c
+++ /dev/null
@@ -1,185 +0,0 @@
-/*
- * Copyright (c) 2009 Wind River Systems, Inc.
- * Tom Rix <Tom.Rix@windriver.com>
- *
- * 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
- *
- * This work is derived from the linux 2.6.27 kernel source
- * To fetch, use the kernel repository
- * git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
- * Use the v2.6.27 tag.
- *
- * Below is the original's header including its copyright
- *
- *  linux/arch/arm/plat-omap/gpio.c
- *
- * Support functions for OMAP GPIO
- *
- * Copyright (C) 2003-2005 Nokia Corporation
- * Written by Juha Yrjölä <juha.yrjola@nokia.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-#include <common.h>
-#include <asm/arch/gpio.h>
-#include <asm/io.h>
-#include <asm/errno.h>
-
-static struct gpio_bank gpio_bank_34xx[6] = {
-	{ (void *)OMAP34XX_GPIO1_BASE, METHOD_GPIO_24XX },
-	{ (void *)OMAP34XX_GPIO2_BASE, METHOD_GPIO_24XX },
-	{ (void *)OMAP34XX_GPIO3_BASE, METHOD_GPIO_24XX },
-	{ (void *)OMAP34XX_GPIO4_BASE, METHOD_GPIO_24XX },
-	{ (void *)OMAP34XX_GPIO5_BASE, METHOD_GPIO_24XX },
-	{ (void *)OMAP34XX_GPIO6_BASE, METHOD_GPIO_24XX },
-};
-
-static struct gpio_bank *gpio_bank = &gpio_bank_34xx[0];
-
-static inline struct gpio_bank *get_gpio_bank(int gpio)
-{
-	return &gpio_bank[gpio >> 5];
-}
-
-static inline int get_gpio_index(int gpio)
-{
-	return gpio & 0x1f;
-}
-
-static inline int gpio_valid(int gpio)
-{
-	if (gpio < 0)
-		return -1;
-	if (gpio < 192)
-		return 0;
-	return -1;
-}
-
-static int check_gpio(int gpio)
-{
-	if (gpio_valid(gpio) < 0) {
-		printf("ERROR : check_gpio: invalid GPIO %d\n", gpio);
-		return -1;
-	}
-	return 0;
-}
-
-static void _set_gpio_direction(struct gpio_bank *bank, int gpio, int is_input)
-{
-	void *reg = bank->base;
-	u32 l;
-
-	switch (bank->method) {
-	case METHOD_GPIO_24XX:
-		reg += OMAP24XX_GPIO_OE;
-		break;
-	default:
-		return;
-	}
-	l = __raw_readl(reg);
-	if (is_input)
-		l |= 1 << gpio;
-	else
-		l &= ~(1 << gpio);
-	__raw_writel(l, reg);
-}
-
-void omap_set_gpio_direction(int gpio, int is_input)
-{
-	struct gpio_bank *bank;
-
-	if (check_gpio(gpio) < 0)
-		return;
-	bank = get_gpio_bank(gpio);
-	_set_gpio_direction(bank, get_gpio_index(gpio), is_input);
-}
-
-static void _set_gpio_dataout(struct gpio_bank *bank, int gpio, int enable)
-{
-	void *reg = bank->base;
-	u32 l = 0;
-
-	switch (bank->method) {
-	case METHOD_GPIO_24XX:
-		if (enable)
-			reg += OMAP24XX_GPIO_SETDATAOUT;
-		else
-			reg += OMAP24XX_GPIO_CLEARDATAOUT;
-		l = 1 << gpio;
-		break;
-	default:
-		printf("omap3-gpio unknown bank method %s %d\n",
-		       __FILE__, __LINE__);
-		return;
-	}
-	__raw_writel(l, reg);
-}
-
-void omap_set_gpio_dataout(int gpio, int enable)
-{
-	struct gpio_bank *bank;
-
-	if (check_gpio(gpio) < 0)
-		return;
-	bank = get_gpio_bank(gpio);
-	_set_gpio_dataout(bank, get_gpio_index(gpio), enable);
-}
-
-int omap_get_gpio_datain(int gpio)
-{
-	struct gpio_bank *bank;
-	void *reg;
-
-	if (check_gpio(gpio) < 0)
-		return -EINVAL;
-	bank = get_gpio_bank(gpio);
-	reg = bank->base;
-	switch (bank->method) {
-	case METHOD_GPIO_24XX:
-		reg += OMAP24XX_GPIO_DATAIN;
-		break;
-	default:
-		return -EINVAL;
-	}
-	return (__raw_readl(reg)
-			& (1 << get_gpio_index(gpio))) != 0;
-}
-
-static void _reset_gpio(struct gpio_bank *bank, int gpio)
-{
-	_set_gpio_direction(bank, get_gpio_index(gpio), 1);
-}
-
-int omap_request_gpio(int gpio)
-{
-	if (check_gpio(gpio) < 0)
-		return -EINVAL;
-
-	return 0;
-}
-
-void omap_free_gpio(int gpio)
-{
-	struct gpio_bank *bank;
-
-	if (check_gpio(gpio) < 0)
-		return;
-	bank = get_gpio_bank(gpio);
-
-	_reset_gpio(bank, gpio);
-}
diff --git a/x-loader/cpu/omap3/mmc.c b/x-loader/cpu/omap3/mmc.c
deleted file mode 100644
index e0c63b0..0000000
--- a/x-loader/cpu/omap3/mmc.c
+++ /dev/null
@@ -1,565 +0,0 @@
-/*
- * (C) Copyright 2008
- * Texas Instruments, <www.ti.com>
- * Syed Mohammed Khasim <khasim@ti.com>
- *
- * 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's version 2 of
- * the License.
- *
- * 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 <config.h>
-#include <common.h>
-#include <part.h>
-#include <fat.h>
-#include <mmc.h>
-#include <i2c.h>
-
-const unsigned short mmc_transspeed_val[15][4] = {
-	{CLKD(10, 1), CLKD(10, 10), CLKD(10, 100), CLKD(10, 1000)},
-	{CLKD(12, 1), CLKD(12, 10), CLKD(12, 100), CLKD(12, 1000)},
-	{CLKD(13, 1), CLKD(13, 10), CLKD(13, 100), CLKD(13, 1000)},
-	{CLKD(15, 1), CLKD(15, 10), CLKD(15, 100), CLKD(15, 1000)},
-	{CLKD(20, 1), CLKD(20, 10), CLKD(20, 100), CLKD(20, 1000)},
-	{CLKD(26, 1), CLKD(26, 10), CLKD(26, 100), CLKD(26, 1000)},
-	{CLKD(30, 1), CLKD(30, 10), CLKD(30, 100), CLKD(30, 1000)},
-	{CLKD(35, 1), CLKD(35, 10), CLKD(35, 100), CLKD(35, 1000)},
-	{CLKD(40, 1), CLKD(40, 10), CLKD(40, 100), CLKD(40, 1000)},
-	{CLKD(45, 1), CLKD(45, 10), CLKD(45, 100), CLKD(45, 1000)},
-	{CLKD(52, 1), CLKD(52, 10), CLKD(52, 100), CLKD(52, 1000)},
-	{CLKD(55, 1), CLKD(55, 10), CLKD(55, 100), CLKD(55, 1000)},
-	{CLKD(60, 1), CLKD(60, 10), CLKD(60, 100), CLKD(60, 1000)},
-	{CLKD(70, 1), CLKD(70, 10), CLKD(70, 100), CLKD(70, 1000)},
-	{CLKD(80, 1), CLKD(80, 10), CLKD(80, 100), CLKD(80, 1000)}
-};
-
-mmc_card_data cur_card_data;
-static block_dev_desc_t mmc_blk_dev;
-
-block_dev_desc_t *mmc_get_dev(int dev)
-{
-	return ((block_dev_desc_t *) &mmc_blk_dev);
-}
-
-void twl4030_mmc_config(void)
-{
-	unsigned char data;
-
-	data = 0x20;
-	i2c_write(0x4B, 0x82, 1, &data, 1);
-	data = 0x2;
-	i2c_write(0x4B, 0x85, 1, &data, 1);
-}
-
-unsigned char mmc_board_init(void)
-{
-	unsigned int value = 0;
-
-	twl4030_mmc_config();
-
-	value = CONTROL_PBIAS_LITE;
-	CONTROL_PBIAS_LITE = value | (1 << 2) | (1 << 1) | (1 << 9);
-
-	value = CONTROL_DEV_CONF0;
-	CONTROL_DEV_CONF0 = value | (1 << 24);
-
-	return 1;
-}
-
-void mmc_init_stream(void)
-{
-	volatile unsigned int mmc_stat;
-
-	OMAP_HSMMC_CON |= INIT_INITSTREAM;
-
-	OMAP_HSMMC_CMD = MMC_CMD0;
-	do {
-		mmc_stat = OMAP_HSMMC_STAT;
-	} while (!(mmc_stat & CC_MASK));
-
-	OMAP_HSMMC_STAT = CC_MASK;
-
-	OMAP_HSMMC_CMD = MMC_CMD0;
-	do {
-		mmc_stat = OMAP_HSMMC_STAT;
-	} while (!(mmc_stat & CC_MASK));
-
-	OMAP_HSMMC_STAT = OMAP_HSMMC_STAT;
-	OMAP_HSMMC_CON &= ~INIT_INITSTREAM;
-}
-
-unsigned char mmc_clock_config(unsigned int iclk, unsigned short clk_div)
-{
-	unsigned int val;
-
-	mmc_reg_out(OMAP_HSMMC_SYSCTL, (ICE_MASK | DTO_MASK | CEN_MASK),
-		    (ICE_STOP | DTO_15THDTO | CEN_DISABLE));
-
-	switch (iclk) {
-	case CLK_INITSEQ:
-		val = MMC_INIT_SEQ_CLK / 2;
-		break;
-	case CLK_400KHZ:
-		val = MMC_400kHz_CLK;
-		break;
-	case CLK_MISC:
-		val = clk_div;
-		break;
-	default:
-		return 0;
-	}
-	mmc_reg_out(OMAP_HSMMC_SYSCTL,
-		    ICE_MASK | CLKD_MASK, (val << CLKD_OFFSET) | ICE_OSCILLATE);
-
-	while ((OMAP_HSMMC_SYSCTL & ICS_MASK) == ICS_NOTREADY) {
-	}
-
-	OMAP_HSMMC_SYSCTL |= CEN_ENABLE;
-	return 1;
-}
-
-unsigned char mmc_init_setup(void)
-{
-	unsigned int reg_val;
-
-	mmc_board_init();
-
-	OMAP_HSMMC_SYSCONFIG |= MMC_SOFTRESET;
-	while ((OMAP_HSMMC_SYSSTATUS & RESETDONE) == 0) ;
-
-	OMAP_HSMMC_SYSCTL |= SOFTRESETALL;
-	while ((OMAP_HSMMC_SYSCTL & SOFTRESETALL) != 0x0) ;
-
-	OMAP_HSMMC_HCTL = DTW_1_BITMODE | SDBP_PWROFF | SDVS_3V0;
-	OMAP_HSMMC_CAPA |= VS30_3V0SUP | VS18_1V8SUP;
-
-	reg_val = OMAP_HSMMC_CON & RESERVED_MASK;
-
-	OMAP_HSMMC_CON = CTPL_MMC_SD | reg_val | WPP_ACTIVEHIGH |
-	    CDP_ACTIVEHIGH | MIT_CTO | DW8_1_4BITMODE | MODE_FUNC |
-	    STR_BLOCK | HR_NOHOSTRESP | INIT_NOINIT | NOOPENDRAIN;
-
-	mmc_clock_config(CLK_INITSEQ, 0);
-	OMAP_HSMMC_HCTL |= SDBP_PWRON;
-
-	OMAP_HSMMC_IE = 0x307f0033;
-
-	mmc_init_stream();
-	return 1;
-}
-
-unsigned char mmc_send_cmd(unsigned int cmd, unsigned int arg,
-			   unsigned int *response)
-{
-	volatile unsigned int mmc_stat;
-
-	while ((OMAP_HSMMC_PSTATE & DATI_MASK) == DATI_CMDDIS) {
-	}
-
-	OMAP_HSMMC_BLK = BLEN_512BYTESLEN | NBLK_STPCNT;
-	OMAP_HSMMC_STAT = 0xFFFFFFFF;
-	OMAP_HSMMC_ARG = arg;
-	OMAP_HSMMC_CMD = cmd | CMD_TYPE_NORMAL | CICE_NOCHECK |
-	    CCCE_NOCHECK | MSBS_SGLEBLK | ACEN_DISABLE | BCE_DISABLE |
-	    DE_DISABLE;
-
-	while (1) {
-		do {
-			mmc_stat = OMAP_HSMMC_STAT;
-		} while (mmc_stat == 0);
-
-		if ((mmc_stat & ERRI_MASK) != 0)
-			return (unsigned char) mmc_stat;
-
-		if (mmc_stat & CC_MASK) {
-			OMAP_HSMMC_STAT = CC_MASK;
-			response[0] = OMAP_HSMMC_RSP10;
-			if ((cmd & RSP_TYPE_MASK) == RSP_TYPE_LGHT136) {
-				response[1] = OMAP_HSMMC_RSP32;
-				response[2] = OMAP_HSMMC_RSP54;
-				response[3] = OMAP_HSMMC_RSP76;
-			}
-			break;
-		}
-	}
-	return 1;
-}
-
-unsigned char mmc_read_data(unsigned int *output_buf)
-{
-	volatile unsigned int mmc_stat;
-	unsigned int read_count = 0;
-
-	/*
-	 * Start Polled Read
-	 */
-	while (1) {
-		do {
-			mmc_stat = OMAP_HSMMC_STAT;
-		} while (mmc_stat == 0);
-
-		if ((mmc_stat & ERRI_MASK) != 0)
-			return (unsigned char) mmc_stat;
-
-		if (mmc_stat & BRR_MASK) {
-			unsigned int k;
-
-			OMAP_HSMMC_STAT |= BRR_MASK;
-			for (k = 0; k < MMCSD_SECTOR_SIZE / 4; k++) {
-				*output_buf = OMAP_HSMMC_DATA;
-				output_buf++;
-				read_count += 4;
-			}
-		}
-
-		if (mmc_stat & BWR_MASK)
-			OMAP_HSMMC_STAT |= BWR_MASK;
-
-		if (mmc_stat & TC_MASK) {
-			OMAP_HSMMC_STAT |= TC_MASK;
-			break;
-		}
-	}
-	return 1;
-}
-
-unsigned char mmc_detect_card(mmc_card_data *mmc_card_cur)
-{
-	unsigned char err;
-	unsigned int argument = 0;
-	unsigned int ocr_value, ocr_recvd, ret_cmd41, hcs_val;
-	unsigned int resp[4];
-	unsigned short retry_cnt = 2000;
-
-	/* Set to Initialization Clock */
-	err = mmc_clock_config(CLK_400KHZ, 0);
-	if (err != 1)
-		return err;
-
-	mmc_card_cur->RCA = MMC_RELATIVE_CARD_ADDRESS;
-	argument = 0x00000000;
-
-	ocr_value = (0x1FF << 15);
-	err = mmc_send_cmd(MMC_CMD0, argument, resp);
-	if (err != 1)
-		return err;
-
-	argument = SD_CMD8_CHECK_PATTERN | SD_CMD8_2_7_3_6_V_RANGE;
-	err = mmc_send_cmd(MMC_SDCMD8, argument, resp);
-	hcs_val = (err == 1) ?
-	    MMC_OCR_REG_HOST_CAPACITY_SUPPORT_SECTOR :
-	    MMC_OCR_REG_HOST_CAPACITY_SUPPORT_BYTE;
-
-	argument = 0x0000 << 16;
-	err = mmc_send_cmd(MMC_CMD55, argument, resp);
-	if (err == 1) {
-		mmc_card_cur->card_type = SD_CARD;
-		ocr_value |= hcs_val;
-		ret_cmd41 = MMC_ACMD41;
-	} else {
-		mmc_card_cur->card_type = MMC_CARD;
-		ocr_value |= MMC_OCR_REG_ACCESS_MODE_SECTOR;
-		ret_cmd41 = MMC_CMD1;
-		OMAP_HSMMC_CON &= ~OD;
-		OMAP_HSMMC_CON |= OPENDRAIN;
-	}
-
-	argument = ocr_value;
-	err = mmc_send_cmd(ret_cmd41, argument, resp);
-	if (err != 1)
-		return err;
-
-	ocr_recvd = ((mmc_resp_r3 *) resp)->ocr;
-
-	while (!(ocr_recvd & (0x1 << 31)) && (retry_cnt > 0)) {
-		retry_cnt--;
-		if (mmc_card_cur->card_type == SD_CARD) {
-			argument = 0x0000 << 16;
-			err = mmc_send_cmd(MMC_CMD55, argument, resp);
-		}
-
-		argument = ocr_value;
-		err = mmc_send_cmd(ret_cmd41, argument, resp);
-		if (err != 1)
-			return err;
-		ocr_recvd = ((mmc_resp_r3 *) resp)->ocr;
-	}
-
-	if (!(ocr_recvd & (0x1 << 31)))
-		return 0;
-
-	if (mmc_card_cur->card_type == MMC_CARD) {
-		if ((ocr_recvd & MMC_OCR_REG_ACCESS_MODE_MASK) ==
-		    MMC_OCR_REG_ACCESS_MODE_SECTOR) {
-			mmc_card_cur->mode = SECTOR_MODE;
-		} else {
-			mmc_card_cur->mode = BYTE_MODE;
-		}
-
-		ocr_recvd &= ~MMC_OCR_REG_ACCESS_MODE_MASK;
-	} else {
-		if ((ocr_recvd & MMC_OCR_REG_HOST_CAPACITY_SUPPORT_MASK)
-		    == MMC_OCR_REG_HOST_CAPACITY_SUPPORT_SECTOR) {
-			mmc_card_cur->mode = SECTOR_MODE;
-		} else {
-			mmc_card_cur->mode = BYTE_MODE;
-		}
-		ocr_recvd &= ~MMC_OCR_REG_HOST_CAPACITY_SUPPORT_MASK;
-	}
-
-	ocr_recvd &= ~(0x1 << 31);
-	if (!(ocr_recvd & ocr_value))
-		return 0;
-
-	err = mmc_send_cmd(MMC_CMD2, argument, resp);
-	if (err != 1)
-		return err;
-
-	if (mmc_card_cur->card_type == MMC_CARD) {
-		argument = mmc_card_cur->RCA << 16;
-		err = mmc_send_cmd(MMC_CMD3, argument, resp);
-		if (err != 1)
-			return err;
-	} else {
-		argument = 0x00000000;
-		err = mmc_send_cmd(MMC_SDCMD3, argument, resp);
-		if (err != 1)
-			return err;
-
-		mmc_card_cur->RCA = ((mmc_resp_r6 *) resp)->newpublishedrca;
-	}
-
-	OMAP_HSMMC_CON &= ~OD;
-	OMAP_HSMMC_CON |= NOOPENDRAIN;
-	return 1;
-}
-
-unsigned char mmc_read_cardsize(mmc_card_data *mmc_dev_data,
-				mmc_csd_reg_t *cur_csd)
-{
-	mmc_extended_csd_reg_t ext_csd;
-	unsigned int size, count, blk_len, blk_no, card_size, argument;
-	unsigned char err;
-	unsigned int resp[4];
-
-	if (mmc_dev_data->mode == SECTOR_MODE) {
-		if (mmc_dev_data->card_type == SD_CARD) {
-			card_size =
-			    (((mmc_sd2_csd_reg_t *) cur_csd)->
-			     c_size_lsb & MMC_SD2_CSD_C_SIZE_LSB_MASK) |
-			    ((((mmc_sd2_csd_reg_t *) cur_csd)->
-			      c_size_msb & MMC_SD2_CSD_C_SIZE_MSB_MASK)
-			     << MMC_SD2_CSD_C_SIZE_MSB_OFFSET);
-			mmc_dev_data->size = card_size * 1024;
-			if (mmc_dev_data->size == 0)
-				return 0;
-		} else {
-			argument = 0x00000000;
-			err = mmc_send_cmd(MMC_CMD8, argument, resp);
-			if (err != 1)
-				return err;
-			err = mmc_read_data((unsigned int *) &ext_csd);
-			if (err != 1)
-				return err;
-			mmc_dev_data->size = ext_csd.sectorcount;
-
-			if (mmc_dev_data->size == 0)
-				mmc_dev_data->size = 8388608;
-		}
-	} else {
-		if (cur_csd->c_size_mult >= 8)
-			return 0;
-
-		if (cur_csd->read_bl_len >= 12)
-			return 0;
-
-		/* Compute size */
-		count = 1 << (cur_csd->c_size_mult + 2);
-		card_size = (cur_csd->c_size_lsb & MMC_CSD_C_SIZE_LSB_MASK) |
-		    ((cur_csd->c_size_msb & MMC_CSD_C_SIZE_MSB_MASK)
-		     << MMC_CSD_C_SIZE_MSB_OFFSET);
-		blk_no = (card_size + 1) * count;
-		blk_len = 1 << cur_csd->read_bl_len;
-		size = blk_no * blk_len;
-		mmc_dev_data->size = size / MMCSD_SECTOR_SIZE;
-		if (mmc_dev_data->size == 0)
-			return 0;
-	}
-	return 1;
-}
-
-unsigned char omap_mmc_read_sect(unsigned int start_sec, unsigned int num_bytes,
-				 mmc_card_data *mmc_c,
-				 unsigned long *output_buf)
-{
-	unsigned char err;
-	unsigned int argument;
-	unsigned int resp[4];
-	unsigned int num_sec_val =
-	    (num_bytes + (MMCSD_SECTOR_SIZE - 1)) / MMCSD_SECTOR_SIZE;
-	unsigned int sec_inc_val;
-
-	if (num_sec_val == 0)
-		return 1;
-
-	if (mmc_c->mode == SECTOR_MODE) {
-		argument = start_sec;
-		sec_inc_val = 1;
-	} else {
-		argument = start_sec * MMCSD_SECTOR_SIZE;
-		sec_inc_val = MMCSD_SECTOR_SIZE;
-	}
-
-	while (num_sec_val) {
-		err = mmc_send_cmd(MMC_CMD17, argument, resp);
-		if (err != 1)
-			return err;
-
-		err = mmc_read_data((unsigned int *) output_buf);
-		if (err != 1)
-			return err;
-
-		output_buf += (MMCSD_SECTOR_SIZE / 4);
-		argument += sec_inc_val;
-		num_sec_val--;
-	}
-	return 1;
-}
-
-unsigned char configure_mmc(mmc_card_data *mmc_card_cur)
-{
-	unsigned char ret_val;
-	unsigned int argument;
-	unsigned int resp[4];
-	unsigned int trans_clk, trans_fact, trans_unit, retries = 2;
-	mmc_csd_reg_t Card_CSD;
-	unsigned char trans_speed;
-
-	ret_val = mmc_init_setup();
-
-	if (ret_val != 1)
-		return ret_val;
-
-	do {
-		ret_val = mmc_detect_card(mmc_card_cur);
-		retries--;
-	} while ((retries > 0) && (ret_val != 1));
-
-	argument = mmc_card_cur->RCA << 16;
-	ret_val = mmc_send_cmd(MMC_CMD9, argument, resp);
-	if (ret_val != 1)
-		return ret_val;
-
-	((unsigned int *) &Card_CSD)[3] = resp[3];
-	((unsigned int *) &Card_CSD)[2] = resp[2];
-	((unsigned int *) &Card_CSD)[1] = resp[1];
-	((unsigned int *) &Card_CSD)[0] = resp[0];
-
-	if (mmc_card_cur->card_type == MMC_CARD)
-		mmc_card_cur->version = Card_CSD.spec_vers;
-
-	trans_speed = Card_CSD.tran_speed;
-
-	ret_val = mmc_send_cmd(MMC_CMD4, MMC_DSR_DEFAULT << 16, resp);
-	if (ret_val != 1)
-		return ret_val;
-
-	trans_unit = trans_speed & MMC_CSD_TRAN_SPEED_UNIT_MASK;
-	trans_fact = trans_speed & MMC_CSD_TRAN_SPEED_FACTOR_MASK;
-
-	if (trans_unit > MMC_CSD_TRAN_SPEED_UNIT_100MHZ)
-		return 0;
-
-	if ((trans_fact < MMC_CSD_TRAN_SPEED_FACTOR_1_0) ||
-	    (trans_fact > MMC_CSD_TRAN_SPEED_FACTOR_8_0))
-		return 0;
-
-	trans_unit >>= 0;
-	trans_fact >>= 3;
-
-	trans_clk = mmc_transspeed_val[trans_fact - 1][trans_unit] * 2;
-	ret_val = mmc_clock_config(CLK_MISC, trans_clk);
-
-	if (ret_val != 1)
-		return ret_val;
-
-	argument = mmc_card_cur->RCA << 16;
-	ret_val = mmc_send_cmd(MMC_CMD7_SELECT, argument, resp);
-	if (ret_val != 1)
-		return ret_val;
-
-	/* Configure the block length to 512 bytes */
-	argument = MMCSD_SECTOR_SIZE;
-	ret_val = mmc_send_cmd(MMC_CMD16, argument, resp);
-	if (ret_val != 1)
-		return ret_val;
-
-	/* get the card size in sectors */
-	ret_val = mmc_read_cardsize(mmc_card_cur, &Card_CSD);
-	if (ret_val != 1)
-		return ret_val;
-
-	return 1;
-}
-unsigned long mmc_bread(int dev_num, unsigned long blknr, lbaint_t blkcnt,
-			void *dst)
-{
-	omap_mmc_read_sect(blknr, (blkcnt * MMCSD_SECTOR_SIZE), &cur_card_data,
-			   (unsigned long *) dst);
-	return 1;
-}
-
-int mmc_init(int verbose)
-{
-	unsigned char ret;
-
-	ret = configure_mmc(&cur_card_data);
-
-	if (ret == 1) {
-		mmc_blk_dev.if_type = IF_TYPE_MMC;
-		mmc_blk_dev.part_type = PART_TYPE_DOS;
-		mmc_blk_dev.dev = 0;
-		mmc_blk_dev.lun = 0;
-		mmc_blk_dev.type = 0;
-
-		/* FIXME fill in the correct size (is set to 32MByte) */
-		mmc_blk_dev.blksz = MMCSD_SECTOR_SIZE;
-		mmc_blk_dev.lba = 0x10000;
-		mmc_blk_dev.removable = 0;
-		mmc_blk_dev.block_read = mmc_bread;
-
-		fat_register_device(&mmc_blk_dev, 1);
-		return 1;
-	}
-	else 
-		return 0;
-}
-
-int mmc_read(ulong src, uchar *dst, int size)
-{
-	return 0;
-}
-
-int mmc_write(uchar *src, ulong dst, int size)
-{
-	return 0;
-}
-
-int mmc2info(ulong addr)
-{
-	return 0;
-}
diff --git a/x-loader/cpu/omap3/start.S b/x-loader/cpu/omap3/start.S
deleted file mode 100644
index 4cbf437..0000000
--- a/x-loader/cpu/omap3/start.S
+++ /dev/null
@@ -1,224 +0,0 @@
-/*
- *  armboot - Startup Code for OMP2420/ARM1136 CPU-core
- *
- *  Copyright (c) 2004-2006  Texas Instruments
- *
- *  Copyright (c) 2001	Marius Gröger <mag@sysgo.de>
- *  Copyright (c) 2002	Alex Züpke <azu@sysgo.de>
- *  Copyright (c) 2002	Gary Jennejohn <gj@denx.de>
- *  Copyright (c) 2003	Richard Woodruff <r-woodruff2@ti.com>
- *  Copyright (c) 2003	Kshitij <kshitij@ti.com>
- *  Copyright (c) 2004	Jian Zhang <jzhang@ti.com>
- *
- * 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 <config.h>
-#include <asm/arch/cpu.h>
-
-.globl _start
-_start:	
-	b	reset
- 	ldr	pc, _hang
-	ldr	pc, _hang
-	ldr	pc, _hang
-	ldr	pc, _hang
-	ldr	pc, _hang
-	ldr	pc, _hang
-	ldr	pc, _hang
-
-_hang:
- 	.word do_hang
-	
-	.word 0x12345678
-	.word 0x12345678
-	.word 0x12345678
-	.word 0x12345678
-	.word 0x12345678
-	.word 0x12345678
-	.word 0x12345678 /* now 16*4=64 */
-
-.global _end_vect
-_end_vect:
-
-	.balignl 16,0xdeadbeef
-/*
- *************************************************************************
- *
- * Startup Code (reset vector)
- *
- * do important init only if we don't start from memory!
- * setup Memory and board specific bits prior to relocation.
- * relocate armboot to ram
- * setup stack
- *
- *************************************************************************
- */
-
-_TEXT_BASE:
-	.word	TEXT_BASE
-
-.globl _armboot_start
-_armboot_start:
-	.word _start
-
-/*
- * These are defined in the board-specific linker script.
- */
-.globl _bss_start
-_bss_start:
-	.word __bss_start
-
-.globl _bss_end
-_bss_end:
-	.word _end
-
-/*
- * the actual reset code
- */
-
-reset: 
-	/*
-	 * set the cpu to SVC32 mode
-	 */
-	mrs	r0,cpsr
-	bic	r0,r0,#0x1f
-	orr	r0,r0,#0xd3
-	msr	cpsr,r0
-
-	/* Copy vectors to mask ROM indirect addr */ 
-	adr     r0, _start              /* r0 <- current position of code   */
-	add     r0, r0, #4				/* skip reset vector			*/
-	mov     r2, #64                 /* r2 <- size to copy  */
-	add     r2, r0, r2              /* r2 <- source end address         */
-	mov     r1, #SRAM_OFFSET0         /* build vect addr */
-	mov     r3, #SRAM_OFFSET1
-	add     r1, r1, r3
-	mov     r3, #SRAM_OFFSET2
-	add     r1, r1, r3
-next:
-	ldmia   r0!, {r3-r10}           /* copy from source address [r0]    */
-	stmia   r1!, {r3-r10}           /* copy to   target address [r1]    */
-	cmp     r0, r2                  /* until source end address [r2]    */
-	bne     next                    /* loop until equal */
-
-	bl	cpy_clk_code            /* put dpll adjust code behind vectors */
- 
-	/* the mask ROM code should have PLL and others stable */
-	bl  cpu_init_crit
-
-relocate:				/* relocate U-Boot to RAM	    */
-	adr	r0, _start		/* r0 <- current position of code   */
-	ldr	r1, _TEXT_BASE		/* test if we run from flash or RAM */
-	cmp r0, r1                  	/* no need to relocate if XIP       */
-	beq stack_setup			/* skip txt cpy if XIP(SRAM, SDRAM) */ 
-
-	ldr	r2, _armboot_start
-	ldr	r3, _bss_start
-	sub	r2, r3, r2		/* r2 <- size of armboot            */
-	add	r2, r0, r2		/* r2 <- source end address         */
-
-copy_loop:
-	ldmia	r0!, {r3-r10}		/* copy from source address [r0]    */
-	stmia	r1!, {r3-r10}		/* copy to   target address [r1]    */
-	cmp	r0, r2			/* until source end addreee [r2]    */
-	ble	copy_loop
-
-	/* Set up the stack						    */
-stack_setup:
-	ldr	r0, _TEXT_BASE		/* upper 128 KiB: relocated uboot   */
-	sub	sp, r0, #128		/* leave 32 words for abort-stack   */
-	and	sp, sp, #~7		/* 8 byte alinged for (ldr/str)d    */
-
-	/* Clear BSS (if any).  Is below tx (watch load addr - need space)  */
-clear_bss:
-	ldr	r0, _bss_start		/* find start of bss segment        */
-	ldr	r1, _bss_end		/* stop here                        */
-	mov 	r2, #0x00000000		/* clear value                      */
-clbss_l:
-	str	r2, [r0]		/* clear BSS location               */
-	cmp	r0, r1			/* are we at the end yet            */
-	add	r0, r0, #4		/* increment clear index pointer    */
-	bne	clbss_l                 /* keep clearing till at end        */
-
-	ldr	pc, _start_armboot	/* jump to C code                   */
-
-_start_armboot:	.word start_armboot
-
-
-/*
- *************************************************************************
- *
- * CPU_init_critical registers
- *
- * setup important registers
- * setup memory timing
- *
- *************************************************************************
- */
-cpu_init_crit:
-	/*
-	 * Invalidate L1 I/D
-	 */
-        mov	r0, #0                 /* set up for MCR */
-        mcr	p15, 0, r0, c8, c7, 0  /* invalidate TLBs */
-        mcr	p15, 0, r0, c7, c5, 1  /* invalidate icache */
-
-	/* Invalide L2 cache (gp device call point) 
-	 * - warning, this may have issues on EMU/HS devices
-	 * this call can corrupt r0-r5
-	 */
-	mov r12, #0x1		@ set up to invalide L2	
-smi: 	.word 0xE1600070	@ Call SMI monitor
-
-	/*
-	 * disable MMU stuff and caches
-	 */
-	mrc	p15, 0, r0, c1, c0, 0
-	bic	r0, r0, #0x00002000	@ clear bits 13 (--V-)
-	bic	r0, r0, #0x00000007	@ clear bits 2:0 (-CAM)
-	orr	r0, r0, #0x00000002	@ set bit 1 (--A-) Align
-#ifndef CONFIG_ICACHE_OFF
-	orr	r0, r0, #0x00001800	@ set bit 11,12 (---I Z---) BTB,I-Cache
-#endif
-	mcr	p15, 0, r0, c1, c0, 0
-
-	/*
-         * Jump to board specific initialization... The Mask ROM will have already initialized
-         * basic memory.  Go here to bump up clock rate and handle wake up conditions.
-	 */
-	adr	r0, _start		/* r0 <- current position of code   */
-	ldr	r1, _TEXT_BASE		/* test if we run from flash or RAM */
-	cmp     r0, r1                  /* pass on info about skipping some init portions */
-	moveq   r0,#0x1                 /* flag to skip prcm and sdrc setup */
-	movne   r0,#0x0
-
-	mov	ip, lr          /* persevere link reg across call */
-	bl	lowlevel_init   /* go setup pll,mux,memory */
-	mov	lr, ip          /* restore link */
-	mov	pc, lr          /* back to my caller */
-
-/*
- * exception handler
- */
- 	.align  5
-do_hang:
-	ldr	sp, _TEXT_BASE		/* use 32 words abort stack */
-   	bl	hang			/* hang and never return */
-
diff --git a/x-loader/cpu/omap4/Makefile b/x-loader/cpu/omap4/Makefile
deleted file mode 100644
index 0b39db0..0000000
--- a/x-loader/cpu/omap4/Makefile
+++ /dev/null
@@ -1,48 +0,0 @@
-#
-# (C) Copyright 2009
-# Texas Instruments, <www.ti.com>
-# (C) Copyright 2000-2003
-# 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
-# version 2 as published by the Free Software Foundation.
-#
-# 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	= $(obj)lib$(CPU).a
-
-START	= start.o
-COBJS	= cpu.o mmc.o sys_info.o
-
-SRCS	:= $(START:.o=.S) $(SOBJS:.o=.S) $(COBJS:.o=.c)
-OBJS	:= $(addprefix $(obj),$(SOBJS) $(COBJS))
-START	:= $(addprefix $(obj),$(START))
-
-all:	$(obj).depend $(START) $(LIB)
-
-$(LIB):	$(OBJS)
-	$(AR) crv $@ $(OBJS)
-
-#########################################################################
-
-# defines $(obj).depend target
-include $(SRCTREE)/rules.mk
-
-sinclude $(obj).depend
-
-#########################################################################
diff --git a/x-loader/cpu/omap4/config.mk b/x-loader/cpu/omap4/config.mk
deleted file mode 100644
index 20972b5..0000000
--- a/x-loader/cpu/omap4/config.mk
+++ /dev/null
@@ -1,32 +0,0 @@
-#
-# (C) Copyright 2002
-# Gary Jennejohn, DENX Software Engineering, <gj@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
-# version 2 as published by the Free Software Foundation.
-#
-# 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
-#
-PLATFORM_RELFLAGS += -fno-strict-aliasing  -fno-common -ffixed-r8 \
-	-msoft-float
-
-PLATFORM_CPPFLAGS += -march=armv7-a
-# =========================================================================
-#
-# Supply options according to compiler version
-#
-# =========================================================================
-PLATFORM_CPPFLAGS +=$(call cc-option,-mapcs-32,-mabi=apcs-gnu)
-PLATFORM_RELFLAGS +=$(call cc-option,-mshort-load-bytes,$(call cc-option,-malignment-traps,))
diff --git a/x-loader/cpu/omap4/cpu.c b/x-loader/cpu/omap4/cpu.c
deleted file mode 100644
index 698bbdf..0000000
--- a/x-loader/cpu/omap4/cpu.c
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * (C) Copyright 2004-2009 Texas Insturments
- *
- * (C) Copyright 2002
- * Sysgo Real-Time Solutions, GmbH <www.elinos.com>
- * Marius Groeger <mgroeger@sysgo.de>
- *
- * (C) Copyright 2002
- * Gary Jennejohn, DENX Software Engineering, <gj@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
- * version 2 as published by the Free Software Foundation.
- *
- * 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
- */
-
-/*
- * CPU specific code
- */
-
-#include <common.h>
-#include <asm/io.h>
-
-/* See also ARM Ref. Man. */
-#define C1_MMU		(1<<0)		/* mmu off/on */
-#define C1_ALIGN	(1<<1)		/* alignment faults off/on */
-#define C1_DC		(1<<2)		/* dcache off/on */
-#define C1_WB		(1<<3)		/* merging write buffer on/off */
-#define C1_BIG_ENDIAN	(1<<7)		/* big endian off/on */
-#define C1_SYS_PROT	(1<<8)		/* system protection */
-#define C1_ROM_PROT	(1<<9)		/* ROM protection */
-#define C1_IC		(1<<12)		/* icache off/on */
-#define C1_HIGH_VECTORS	(1<<13) /* location of vectors: low/high addresses */
-#define RESERVED_1	(0xf << 3)	/* must be 111b for R/W */
-
-int cpu_init (void)
-{
-	return 0;
-}
-
-unsigned int cortex_a9_rev(void)
-{
-
-	unsigned int i;
-
-	/* turn off I/D-cache */
-	asm ("mrc p15, 0, %0, c0, c0, 0" : "=r" (i));
-
-	return i;
-}
-
-unsigned int omap_revision(void)
-{
-	unsigned int rev = cortex_a9_rev();
-
-	switch(rev) {
-	case 0x410FC091:
-		return OMAP4430_ES1_0;
-	case 0x411FC092:
-		if (__raw_readl(0x4a002204) == 0x3b95c02f)
-			return OMAP4430_ES2_1;
-		else
-			return OMAP4430_ES2_0;
-	default:
-		return OMAP4430_SILICON_ID_INVALID;
-	}
-}
diff --git a/x-loader/cpu/omap4/mmc.c b/x-loader/cpu/omap4/mmc.c
deleted file mode 100644
index 6842402..0000000
--- a/x-loader/cpu/omap4/mmc.c
+++ /dev/null
@@ -1,547 +0,0 @@
-/*
- * (C) Copyright 2008
- * Texas Instruments, <www.ti.com>
- * Syed Mohammed Khasim <khasim@ti.com>
- *
- * 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's version 2 of
- * the License.
- *
- * 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 <config.h>
-#include <common.h>
-#include <part.h>
-#include <fat.h>
-#include <mmc.h>
-#include <i2c.h>
-
-const unsigned short mmc_transspeed_val[15][4] = {
-	{CLKD(10, 1), CLKD(10, 10), CLKD(10, 100), CLKD(10, 1000)},
-	{CLKD(12, 1), CLKD(12, 10), CLKD(12, 100), CLKD(12, 1000)},
-	{CLKD(13, 1), CLKD(13, 10), CLKD(13, 100), CLKD(13, 1000)},
-	{CLKD(15, 1), CLKD(15, 10), CLKD(15, 100), CLKD(15, 1000)},
-	{CLKD(20, 1), CLKD(20, 10), CLKD(20, 100), CLKD(20, 1000)},
-	{CLKD(26, 1), CLKD(26, 10), CLKD(26, 100), CLKD(26, 1000)},
-	{CLKD(30, 1), CLKD(30, 10), CLKD(30, 100), CLKD(30, 1000)},
-	{CLKD(35, 1), CLKD(35, 10), CLKD(35, 100), CLKD(35, 1000)},
-	{CLKD(40, 1), CLKD(40, 10), CLKD(40, 100), CLKD(40, 1000)},
-	{CLKD(45, 1), CLKD(45, 10), CLKD(45, 100), CLKD(45, 1000)},
-	{CLKD(52, 1), CLKD(52, 10), CLKD(52, 100), CLKD(52, 1000)},
-	{CLKD(55, 1), CLKD(55, 10), CLKD(55, 100), CLKD(55, 1000)},
-	{CLKD(60, 1), CLKD(60, 10), CLKD(60, 100), CLKD(60, 1000)},
-	{CLKD(70, 1), CLKD(70, 10), CLKD(70, 100), CLKD(70, 1000)},
-	{CLKD(80, 1), CLKD(80, 10), CLKD(80, 100), CLKD(80, 1000)}
-};
-
-mmc_card_data cur_card_data;
-static block_dev_desc_t mmc_blk_dev;
-
-block_dev_desc_t *mmc_get_dev(int dev)
-{
-	return ((block_dev_desc_t *) &mmc_blk_dev);
-}
-
-unsigned char mmc_board_init(void)
-{
-	unsigned int value = 0;
-
-	return 1;
-}
-
-void mmc_init_stream(void)
-{
-	volatile unsigned int mmc_stat;
-
-	OMAP_HSMMC_CON |= INIT_INITSTREAM;
-
-	OMAP_HSMMC_CMD = MMC_CMD0;
-	do {
-		mmc_stat = OMAP_HSMMC_STAT;
-	} while (!(mmc_stat & CC_MASK));
-
-	OMAP_HSMMC_STAT = CC_MASK;
-
-	OMAP_HSMMC_CMD = MMC_CMD0;
-	do {
-		mmc_stat = OMAP_HSMMC_STAT;
-	} while (!(mmc_stat & CC_MASK));
-
-	OMAP_HSMMC_STAT = OMAP_HSMMC_STAT;
-	OMAP_HSMMC_CON &= ~INIT_INITSTREAM;
-}
-
-unsigned char mmc_clock_config(unsigned int iclk, unsigned short clk_div)
-{
-	unsigned int val;
-
-	mmc_reg_out(OMAP_HSMMC_SYSCTL, (ICE_MASK | DTO_MASK | CEN_MASK),
-		    (ICE_STOP | DTO_15THDTO | CEN_DISABLE));
-
-	switch (iclk) {
-	case CLK_INITSEQ:
-		val = MMC_INIT_SEQ_CLK / 2;
-		break;
-	case CLK_400KHZ:
-		val = MMC_400kHz_CLK;
-		break;
-	case CLK_MISC:
-		val = clk_div;
-		break;
-	default:
-		return 0;
-	}
-	mmc_reg_out(OMAP_HSMMC_SYSCTL,
-		    ICE_MASK | CLKD_MASK, (val << CLKD_OFFSET) | ICE_OSCILLATE);
-
-	while ((OMAP_HSMMC_SYSCTL & ICS_MASK) == ICS_NOTREADY) {
-	}
-
-	OMAP_HSMMC_SYSCTL |= CEN_ENABLE;
-	return 1;
-}
-
-unsigned char mmc_init_setup(void)
-{
-	unsigned int reg_val;
-
-	mmc_board_init();
-
-	OMAP_HSMMC_SYSCONFIG |= MMC_SOFTRESET;
-	while ((OMAP_HSMMC_SYSSTATUS & RESETDONE) == 0) ;
-
-	OMAP_HSMMC_SYSCTL |= SOFTRESETALL;
-	while ((OMAP_HSMMC_SYSCTL & SOFTRESETALL) != 0x0) ;
-
-	OMAP_HSMMC_HCTL = DTW_1_BITMODE | SDBP_PWROFF | SDVS_3V0;
-	OMAP_HSMMC_CAPA |= VS30_3V0SUP | VS18_1V8SUP;
-
-	reg_val = OMAP_HSMMC_CON & RESERVED_MASK;
-
-	OMAP_HSMMC_CON = CTPL_MMC_SD | reg_val | WPP_ACTIVEHIGH |
-	    CDP_ACTIVEHIGH | MIT_CTO | DW8_1_4BITMODE | MODE_FUNC |
-	    STR_BLOCK | HR_NOHOSTRESP | INIT_NOINIT | NOOPENDRAIN;
-
-	mmc_clock_config(CLK_INITSEQ, 0);
-	OMAP_HSMMC_HCTL |= SDBP_PWRON;
-
-	OMAP_HSMMC_IE = 0x307f0033;
-
-	mmc_init_stream();
-	return 1;
-}
-
-unsigned char mmc_send_cmd(unsigned int cmd, unsigned int arg,
-			   unsigned int *response)
-{
-	volatile unsigned int mmc_stat;
-
-	while ((OMAP_HSMMC_PSTATE & DATI_MASK) == DATI_CMDDIS) {
-	}
-
-	OMAP_HSMMC_BLK = BLEN_512BYTESLEN | NBLK_STPCNT;
-	OMAP_HSMMC_STAT = 0xFFFFFFFF;
-	OMAP_HSMMC_ARG = arg;
-	OMAP_HSMMC_CMD = cmd | CMD_TYPE_NORMAL | CICE_NOCHECK |
-	    CCCE_NOCHECK | MSBS_SGLEBLK | ACEN_DISABLE | BCE_DISABLE |
-	    DE_DISABLE;
-
-	while (1) {
-		do {
-			mmc_stat = OMAP_HSMMC_STAT;
-		} while (mmc_stat == 0);
-
-		if ((mmc_stat & ERRI_MASK) != 0)
-			return (unsigned char) mmc_stat;
-
-		if (mmc_stat & CC_MASK) {
-			OMAP_HSMMC_STAT = CC_MASK;
-			response[0] = OMAP_HSMMC_RSP10;
-			if ((cmd & RSP_TYPE_MASK) == RSP_TYPE_LGHT136) {
-				response[1] = OMAP_HSMMC_RSP32;
-				response[2] = OMAP_HSMMC_RSP54;
-				response[3] = OMAP_HSMMC_RSP76;
-			}
-			break;
-		}
-	}
-	return 1;
-}
-
-unsigned char mmc_read_data(unsigned int *output_buf)
-{
-	volatile unsigned int mmc_stat;
-	unsigned int read_count = 0;
-
-	/*
-	 * Start Polled Read
-	 */
-	while (1) {
-		do {
-			mmc_stat = OMAP_HSMMC_STAT;
-		} while (mmc_stat == 0);
-
-		if ((mmc_stat & ERRI_MASK) != 0)
-			return (unsigned char) mmc_stat;
-
-		if (mmc_stat & BRR_MASK) {
-			unsigned int k;
-
-			OMAP_HSMMC_STAT |= BRR_MASK;
-			for (k = 0; k < MMCSD_SECTOR_SIZE / 4; k++) {
-				*output_buf = OMAP_HSMMC_DATA;
-				output_buf++;
-				read_count += 4;
-			}
-		}
-
-		if (mmc_stat & BWR_MASK)
-			OMAP_HSMMC_STAT |= BWR_MASK;
-
-		if (mmc_stat & TC_MASK) {
-			OMAP_HSMMC_STAT |= TC_MASK;
-			break;
-		}
-	}
-	return 1;
-}
-
-unsigned char mmc_detect_card(mmc_card_data *mmc_card_cur)
-{
-	unsigned char err;
-	unsigned int argument = 0;
-	unsigned int ocr_value, ocr_recvd, ret_cmd41, hcs_val;
-	unsigned int resp[4];
-	unsigned short retry_cnt = 2000;
-
-	/* Set to Initialization Clock */
-	err = mmc_clock_config(CLK_400KHZ, 0);
-	if (err != 1)
-		return err;
-
-	mmc_card_cur->RCA = MMC_RELATIVE_CARD_ADDRESS;
-	argument = 0x00000000;
-
-	ocr_value = (0x1FF << 15);
-	err = mmc_send_cmd(MMC_CMD0, argument, resp);
-	if (err != 1)
-		return err;
-
-	argument = SD_CMD8_CHECK_PATTERN | SD_CMD8_2_7_3_6_V_RANGE;
-	err = mmc_send_cmd(MMC_SDCMD8, argument, resp);
-	hcs_val = (err == 1) ?
-	    MMC_OCR_REG_HOST_CAPACITY_SUPPORT_SECTOR :
-	    MMC_OCR_REG_HOST_CAPACITY_SUPPORT_BYTE;
-
-	argument = 0x0000 << 16;
-	err = mmc_send_cmd(MMC_CMD55, argument, resp);
-	if (err == 1) {
-		mmc_card_cur->card_type = SD_CARD;
-		ocr_value |= hcs_val;
-		ret_cmd41 = MMC_ACMD41;
-	} else {
-		mmc_card_cur->card_type = MMC_CARD;
-		ocr_value |= MMC_OCR_REG_ACCESS_MODE_SECTOR;
-		ret_cmd41 = MMC_CMD1;
-		OMAP_HSMMC_CON &= ~OD;
-		OMAP_HSMMC_CON |= OPENDRAIN;
-	}
-
-	argument = ocr_value;
-	err = mmc_send_cmd(ret_cmd41, argument, resp);
-	if (err != 1)
-		return err;
-
-	ocr_recvd = ((mmc_resp_r3 *) resp)->ocr;
-
-	while (!(ocr_recvd & (0x1 << 31)) && (retry_cnt > 0)) {
-		retry_cnt--;
-		if (mmc_card_cur->card_type == SD_CARD) {
-			argument = 0x0000 << 16;
-			err = mmc_send_cmd(MMC_CMD55, argument, resp);
-		}
-
-		argument = ocr_value;
-		err = mmc_send_cmd(ret_cmd41, argument, resp);
-		if (err != 1)
-			return err;
-		ocr_recvd = ((mmc_resp_r3 *) resp)->ocr;
-	}
-
-	if (!(ocr_recvd & (0x1 << 31)))
-		return 0;
-
-	if (mmc_card_cur->card_type == MMC_CARD) {
-		if ((ocr_recvd & MMC_OCR_REG_ACCESS_MODE_MASK) ==
-		    MMC_OCR_REG_ACCESS_MODE_SECTOR) {
-			mmc_card_cur->mode = SECTOR_MODE;
-		} else {
-			mmc_card_cur->mode = BYTE_MODE;
-		}
-
-		ocr_recvd &= ~MMC_OCR_REG_ACCESS_MODE_MASK;
-	} else {
-		if ((ocr_recvd & MMC_OCR_REG_HOST_CAPACITY_SUPPORT_MASK)
-		    == MMC_OCR_REG_HOST_CAPACITY_SUPPORT_SECTOR) {
-			mmc_card_cur->mode = SECTOR_MODE;
-		} else {
-			mmc_card_cur->mode = BYTE_MODE;
-		}
-		ocr_recvd &= ~MMC_OCR_REG_HOST_CAPACITY_SUPPORT_MASK;
-	}
-
-	ocr_recvd &= ~(0x1 << 31);
-	if (!(ocr_recvd & ocr_value))
-		return 0;
-
-	err = mmc_send_cmd(MMC_CMD2, argument, resp);
-	if (err != 1)
-		return err;
-
-	if (mmc_card_cur->card_type == MMC_CARD) {
-		argument = mmc_card_cur->RCA << 16;
-		err = mmc_send_cmd(MMC_CMD3, argument, resp);
-		if (err != 1)
-			return err;
-	} else {
-		argument = 0x00000000;
-		err = mmc_send_cmd(MMC_SDCMD3, argument, resp);
-		if (err != 1)
-			return err;
-
-		mmc_card_cur->RCA = ((mmc_resp_r6 *) resp)->newpublishedrca;
-	}
-
-	OMAP_HSMMC_CON &= ~OD;
-	OMAP_HSMMC_CON |= NOOPENDRAIN;
-	return 1;
-}
-
-unsigned char mmc_read_cardsize(mmc_card_data *mmc_dev_data,
-				mmc_csd_reg_t *cur_csd)
-{
-	mmc_extended_csd_reg_t ext_csd;
-	unsigned int size, count, blk_len, blk_no, card_size, argument;
-	unsigned char err;
-	unsigned int resp[4];
-
-	if (mmc_dev_data->mode == SECTOR_MODE) {
-		if (mmc_dev_data->card_type == SD_CARD) {
-			card_size =
-			    (((mmc_sd2_csd_reg_t *) cur_csd)->
-			     c_size_lsb & MMC_SD2_CSD_C_SIZE_LSB_MASK) |
-			    ((((mmc_sd2_csd_reg_t *) cur_csd)->
-			      c_size_msb & MMC_SD2_CSD_C_SIZE_MSB_MASK)
-			     << MMC_SD2_CSD_C_SIZE_MSB_OFFSET);
-			mmc_dev_data->size = card_size * 1024;
-			if (mmc_dev_data->size == 0)
-				return 0;
-		} else {
-			argument = 0x00000000;
-			err = mmc_send_cmd(MMC_CMD8, argument, resp);
-			if (err != 1)
-				return err;
-			err = mmc_read_data((unsigned int *) &ext_csd);
-			if (err != 1)
-				return err;
-			mmc_dev_data->size = ext_csd.sectorcount;
-
-			if (mmc_dev_data->size == 0)
-				mmc_dev_data->size = 8388608;
-		}
-	} else {
-		if (cur_csd->c_size_mult >= 8)
-			return 0;
-
-		if (cur_csd->read_bl_len >= 12)
-			return 0;
-
-		/* Compute size */
-		count = 1 << (cur_csd->c_size_mult + 2);
-		card_size = (cur_csd->c_size_lsb & MMC_CSD_C_SIZE_LSB_MASK) |
-		    ((cur_csd->c_size_msb & MMC_CSD_C_SIZE_MSB_MASK)
-		     << MMC_CSD_C_SIZE_MSB_OFFSET);
-		blk_no = (card_size + 1) * count;
-		blk_len = 1 << cur_csd->read_bl_len;
-		size = blk_no * blk_len;
-		mmc_dev_data->size = size / MMCSD_SECTOR_SIZE;
-		if (mmc_dev_data->size == 0)
-			return 0;
-	}
-	return 1;
-}
-
-unsigned char omap_mmc_read_sect(unsigned int start_sec, unsigned int num_bytes,
-				 mmc_card_data *mmc_c,
-				 unsigned long *output_buf)
-{
-	unsigned char err;
-	unsigned int argument;
-	unsigned int resp[4];
-	unsigned int num_sec_val =
-	    (num_bytes + (MMCSD_SECTOR_SIZE - 1)) / MMCSD_SECTOR_SIZE;
-	unsigned int sec_inc_val;
-
-	if (num_sec_val == 0)
-		return 1;
-
-	if (mmc_c->mode == SECTOR_MODE) {
-		argument = start_sec;
-		sec_inc_val = 1;
-	} else {
-		argument = start_sec * MMCSD_SECTOR_SIZE;
-		sec_inc_val = MMCSD_SECTOR_SIZE;
-	}
-
-	while (num_sec_val) {
-		err = mmc_send_cmd(MMC_CMD17, argument, resp);
-		if (err != 1)
-			return err;
-
-		err = mmc_read_data((unsigned int *) output_buf);
-		if (err != 1)
-			return err;
-
-		output_buf += (MMCSD_SECTOR_SIZE / 4);
-		argument += sec_inc_val;
-		num_sec_val--;
-	}
-	return 1;
-}
-
-unsigned char configure_mmc(mmc_card_data *mmc_card_cur)
-{
-	unsigned char ret_val;
-	unsigned int argument;
-	unsigned int resp[4];
-	unsigned int trans_clk, trans_fact, trans_unit, retries = 2;
-	mmc_csd_reg_t Card_CSD;
-	unsigned char trans_speed;
-
-	ret_val = mmc_init_setup();
-
-	if (ret_val != 1)
-		return ret_val;
-
-	do {
-		ret_val = mmc_detect_card(mmc_card_cur);
-		retries--;
-	} while ((retries > 0) && (ret_val != 1));
-
-	argument = mmc_card_cur->RCA << 16;
-	ret_val = mmc_send_cmd(MMC_CMD9, argument, resp);
-	if (ret_val != 1)
-		return ret_val;
-
-	((unsigned int *) &Card_CSD)[3] = resp[3];
-	((unsigned int *) &Card_CSD)[2] = resp[2];
-	((unsigned int *) &Card_CSD)[1] = resp[1];
-	((unsigned int *) &Card_CSD)[0] = resp[0];
-
-	if (mmc_card_cur->card_type == MMC_CARD)
-		mmc_card_cur->version = Card_CSD.spec_vers;
-
-	trans_speed = Card_CSD.tran_speed;
-
-	ret_val = mmc_send_cmd(MMC_CMD4, MMC_DSR_DEFAULT << 16, resp);
-	if (ret_val != 1)
-		return ret_val;
-
-	trans_unit = trans_speed & MMC_CSD_TRAN_SPEED_UNIT_MASK;
-	trans_fact = trans_speed & MMC_CSD_TRAN_SPEED_FACTOR_MASK;
-
-	if (trans_unit > MMC_CSD_TRAN_SPEED_UNIT_100MHZ)
-		return 0;
-
-	if ((trans_fact < MMC_CSD_TRAN_SPEED_FACTOR_1_0) ||
-	    (trans_fact > MMC_CSD_TRAN_SPEED_FACTOR_8_0))
-		return 0;
-
-	trans_unit >>= 0;
-	trans_fact >>= 3;
-
-	trans_clk = mmc_transspeed_val[trans_fact - 1][trans_unit] * 2;
-	ret_val = mmc_clock_config(CLK_MISC, trans_clk);
-
-	if (ret_val != 1)
-		return ret_val;
-
-	argument = mmc_card_cur->RCA << 16;
-	ret_val = mmc_send_cmd(MMC_CMD7_SELECT, argument, resp);
-	if (ret_val != 1)
-		return ret_val;
-
-	/* Configure the block length to 512 bytes */
-	argument = MMCSD_SECTOR_SIZE;
-	ret_val = mmc_send_cmd(MMC_CMD16, argument, resp);
-	if (ret_val != 1)
-		return ret_val;
-
-	/* get the card size in sectors */
-	ret_val = mmc_read_cardsize(mmc_card_cur, &Card_CSD);
-	if (ret_val != 1)
-		return ret_val;
-
-	return 1;
-}
-unsigned long mmc_bread(int dev_num, unsigned long blknr, lbaint_t blkcnt,
-			void *dst)
-{
-	omap_mmc_read_sect(blknr, (blkcnt * MMCSD_SECTOR_SIZE), &cur_card_data,
-			   (unsigned long *) dst);
-	return 1;
-}
-
-int mmc_init(int verbose)
-{
-	unsigned char ret;
-
-	ret = configure_mmc(&cur_card_data);
-
-	if (ret == 1) {
-		mmc_blk_dev.if_type = IF_TYPE_MMC;
-		mmc_blk_dev.part_type = PART_TYPE_DOS;
-		mmc_blk_dev.dev = 0;
-		mmc_blk_dev.lun = 0;
-		mmc_blk_dev.type = 0;
-
-		/* FIXME fill in the correct size (is set to 32MByte) */
-		mmc_blk_dev.blksz = MMCSD_SECTOR_SIZE;
-		mmc_blk_dev.lba = 0x10000;
-		mmc_blk_dev.removable = 0;
-		mmc_blk_dev.block_read = mmc_bread;
-
-		fat_register_device(&mmc_blk_dev, 1);
-		return 1;
-	}
-	else 
-		return 0;
-}
-
-int mmc_read(ulong src, uchar *dst, int size)
-{
-	return 0;
-}
-
-int mmc_write(uchar *src, ulong dst, int size)
-{
-	return 0;
-}
-
-int mmc2info(ulong addr)
-{
-	return 0;
-}
diff --git a/x-loader/cpu/omap4/sys_info.c b/x-loader/cpu/omap4/sys_info.c
deleted file mode 100644
index 29d39e6..0000000
--- a/x-loader/cpu/omap4/sys_info.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * (C) Copyright 2004-2009
- * Texas Instruments, <www.ti.com>
- * Richard Woodruff <r-woodruff2@ti.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * version 2 as published by the Free Software Foundation.
- *
- * 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 <common.h>
-#include <asm/arch/cpu.h>
-#include <asm/arch/sys_info.h>
-
-
-/******************************************
- * get_cpu_rev(void) - extract version info
- ******************************************/
-u32 get_cpu_rev(void)
-{
-	return CPU_4430_ES1;
-
-}
-
-