diff options
| -rw-r--r-- | board/vpac270/Makefile | 10 | ||||
| -rw-r--r-- | board/vpac270/config.mk | 1 | ||||
| -rw-r--r-- | board/vpac270/lowlevel_init.S | 39 | ||||
| -rw-r--r-- | board/vpac270/vpac270.c | 10 | ||||
| -rw-r--r-- | include/configs/vpac270.h | 6 |
5 files changed, 13 insertions, 53 deletions
diff --git a/board/vpac270/Makefile b/board/vpac270/Makefile index f5014fc..c359917 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 0f10662..0000000 --- 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 c40d12f..0000000 --- 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 f91ff97..91d8580 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; } diff --git a/include/configs/vpac270.h b/include/configs/vpac270.h index 1bcd2f3..1923a17 100644 --- a/include/configs/vpac270.h +++ b/include/configs/vpac270.h @@ -34,7 +34,7 @@ #define CONFIG_ENV_OVERWRITE #define CONFIG_SYS_MALLOC_LEN (128*1024) #define CONFIG_SYS_GBL_DATA_SIZE 128 - +#define CONFIG_ARCH_CPU_INIT #define CONFIG_BOOTCOMMAND \ "if mmc init && fatload mmc 0 0xa4000000 uImage; then " \ "bootm 0xa4000000; " \ @@ -51,7 +51,7 @@ #define CONFIG_BOOTDELAY 2 /* Autoboot delay */ #define CONFIG_CMDLINE_TAG #define CONFIG_SETUP_MEMORY_TAGS - +#define CONFIG_SYS_TEXT_BASE 0x0 #define CONFIG_LZMA /* LZMA compression support */ /* @@ -183,7 +183,7 @@ #define CONFIG_SYS_LOAD_ADDR (0x5c000000) #define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1 #define CONFIG_SYS_INIT_SP_ADDR \ - (CONFIG_SYS_GBL_DATA_SIZE + CONFIG_STACKSIZE + PHYS_SDRAM_1) + (PHYS_SDRAM_1 + CONFIG_SYS_GBL_DATA_SIZE + 2048) /* * NOR FLASH |