summaryrefslogtreecommitdiff
path: root/board/vpac270
diff options
context:
space:
mode:
authorMarek Vasut <marek.vasut@gmail.com>2010-09-28 15:50:49 +0200
committerWolfgang Denk <wd@denx.de>2010-10-19 23:05:02 +0200
commit720a650caa510bf8e941f8da247fc572958f3c3d (patch)
tree7432139e3ab46495a93ec02e5fb20ffc6ed01869 /board/vpac270
parent2cad92fd674d035a04631b9ab044c030f95e0fec (diff)
PXA: Fix vpac270 for Reloc
Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Diffstat (limited to 'board/vpac270')
-rw-r--r--board/vpac270/Makefile10
-rw-r--r--board/vpac270/config.mk1
-rw-r--r--board/vpac270/lowlevel_init.S39
-rw-r--r--board/vpac270/vpac270.c10
4 files changed, 10 insertions, 50 deletions
diff --git a/board/vpac270/Makefile b/board/vpac270/Makefile
index f5014fc2534..c3599178da7 100644
--- a/board/vpac270/Makefile
+++ b/board/vpac270/Makefile
@@ -24,17 +24,15 @@ include $(TOPDIR)/config.mk
LIB = $(obj)lib$(BOARD).a
COBJS := vpac270.o
-SOBJS := lowlevel_init.o
-SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c)
+SRCS := $(COBJS:.o=.c)
OBJS := $(addprefix $(obj),$(COBJS))
-SOBJS := $(addprefix $(obj),$(SOBJS))
-$(LIB): $(obj).depend $(OBJS) $(SOBJS)
- $(AR) $(ARFLAGS) $@ $(OBJS) $(SOBJS)
+$(LIB): $(obj).depend $(OBJS)
+ $(AR) $(ARFLAGS) $@ $(OBJS)
clean:
- rm -f $(SOBJS) $(OBJS)
+ rm -f $(OBJS)
distclean: clean
rm -f $(LIB) core *.bak $(obj).depend
diff --git a/board/vpac270/config.mk b/board/vpac270/config.mk
deleted file mode 100644
index 0f10662ce38..00000000000
--- a/board/vpac270/config.mk
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SYS_TEXT_BASE = 0xa1000000
diff --git a/board/vpac270/lowlevel_init.S b/board/vpac270/lowlevel_init.S
deleted file mode 100644
index c40d12fa140..00000000000
--- a/board/vpac270/lowlevel_init.S
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Voipac PXA270 Lowlevel Hardware Initialization
- *
- * Copyright (C) 2010 Marek Vasut <marek.vasut@gmail.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 <version.h>
-#include <asm/arch/pxa-regs.h>
-#include <asm/arch/macro.h>
-
-.globl lowlevel_init
-lowlevel_init:
- pxa_gpio_setup
- pxa_wait_ticks 0x8000
- pxa_mem_setup
- pxa_wakeup
- pxa_intr_setup
- pxa_clock_setup
-
- mov pc, lr
diff --git a/board/vpac270/vpac270.c b/board/vpac270/vpac270.c
index f91ff97b2c4..91d85800bbf 100644
--- a/board/vpac270/vpac270.c
+++ b/board/vpac270/vpac270.c
@@ -32,6 +32,10 @@ DECLARE_GLOBAL_DATA_PTR;
*/
int board_init(void)
{
+ /* We have RAM, disable cache */
+ dcache_disable();
+ icache_disable();
+
/* memory and cpu-speed are setup before relocation */
/* so we do _nothing_ here */
@@ -49,13 +53,11 @@ struct serial_device *default_serial_console(void)
return &serial_ffuart_device;
}
-
+extern void pxa_dram_init(void);
int dram_init(void)
{
+ pxa_dram_init();
gd->ram_size = PHYS_SDRAM_1_SIZE;
-#ifdef CONFIG_256M_U_BOOT
- gd->ram_size += PHYS_SDRAM_2_SIZE;
-#endif
return 0;
}