PXA: Implement ELF relocation
Subsystems (2)
PATCH 1/20 PXA: Implement ELF relocation
Based on patch by: Albert Aribaud <[email protected]>
--- arch/arm/cpu/pxa/start.S | 129 +++++++++++++++++++++---------------------- arch/arm/cpu/pxa/u-boot.lds | 19 +++---- 2 files changed, 72 insertions(+), 76 deletions(-)
arch/arm/cpu/pxa/start.S +64 -65
@@ -8,6 +8,7 @@ * Copyright (C) 2002 Kyle Harris <[email protected]> * Copyright (C) 2003 Robert Schwebel <[email protected]> * Copyright (C) 2003 Kai-Uwe Bloem <[email protected]> + * Copyright (c) 2010 Marek Vasut <[email protected]> * * See file CREDITS for list of people who contributed to this * project.
@@ -94,20 +95,16 @@ _fiq: .word fiq _TEXT_BASE: .word CONFIG_SYS_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_start_ofs +_bss_start_ofs: + .word __bss_start - _start -.globl _bss_end -_bss_end: - .word _end +.globl _bss_end_ofs +_bss_end_ofs: + .word _end - _start #ifdef CONFIG_USE_IRQ /* IRQ stack memory (calculated at run-time) */
@@ -127,30 +124,6 @@ FIQ_STACK_START: IRQ_STACK_START_IN: .word 0x0badc0de -.globl _datarel_start -_datarel_start: - .word __datarel_start - -.globl _datarelrolocal_start -_datarelrolocal_start: - .word __datarelrolocal_start - -.globl _datarellocal_start -_datarellocal_start: - .word __datarellocal_start - -.globl _datarelro_start -_datarelro_start: - .word __datarelro_start - -.globl _got_start -_got_start: - .word __got_start - -.globl _got_end -_got_end: - .word __got_end - /* * the actual reset code */
@@ -272,9 +245,8 @@ stack_setup: adr r0, _start ldr r2, _TEXT_BASE - ldr r3, _bss_start - sub r2, r3, r2 /* r2 <- size of armboot */ - add r2, r0, r2 /* r2 <- source end address */ + ldr r3, _bss_start_ofs + add r2, r0, r3 /* r2 <- source end address */ cmp r0, r6 beq clear_bss
@@ -288,36 +260,54 @@ copy_loop: ldmfd sp!, {r0-r12} #ifndef CONFIG_PRELOADER - /* fix got entries */ - ldr r1, _TEXT_BASE /* Text base */ - mov r0, r7 /* reloc addr */ - ldr r2, _got_start /* addr in Flash */ - ldr r3, _got_end /* addr in Flash */ - sub r3, r3, r1 - add r3, r3, r0 - sub r2, r2, r1 - add r2, r2, r0 - + /* + * fix .rel.dyn relocations + */ + ldr r0, _TEXT_BASE /* r0 <- Text base */ + sub r9, r7, r0 /* r9 <- relocation offset */ + ldr r10, _dynsym_start_ofs /* r10 <- sym table ofs */ + add r10, r10, r0 /* r10 <- sym table in FLASH */ + ldr r2, _rel_dyn_start_ofs /* r2 <- rel dyn start ofs */ + add r2, r2, r0 /* r2 <- rel dyn start in FLASH */ + ldr r3, _rel_dyn_end_ofs /* r3 <- rel dyn end ofs */ + add r3, r3, r0 /* r3 <- rel dyn end in FLASH */ fixloop: - ldr r4, [r2] - sub r4, r4, r1 - add r4, r4, r0 - str r4, [r2] - add r2, r2, #4 + ldr r0, [r2] /* r0 <- location to fix up, IN FLASH! */ + add r0, r9 /* r0 <- location to fix up in RAM */ + ldr r1, [r2, #4] + and r8, r1, #0xff + cmp r8, #23 /* relative fixup? */ + beq fixrel + cmp r8, #2 /* absolute fixup? */ + beq fixabs + /* ignore unknown type of fixup */ + b fixnext +fixabs: + /* absolute fix: set location to (offset) symbol value */ + mov r1, r1, LSR #4 /* r1 <- symbol index in .dynsym */ + add r1, r10, r1 /* r1 <- address of symbol in table */ + ldr r1, [r1, #4] /* r1 <- symbol value */ + add r1, r9 /* r1 <- relocated sym addr */ + b fixnext +fixrel: + /* relative fix: increase location by offset */ + ldr r1, [r0] + add r1, r1, r9 +fixnext: + str r1, [r0] + add r2, r2, #8 /* each rel.dyn entry is 8 bytes */ cmp r2, r3 - bne fixloop + blo fixloop #endif #endif /* #ifndef CONFIG_SKIP_RELOCATE_UBOOT */ clear_bss: #ifndef CONFIG_PRELOADER - ldr r0, _bss_start - ldr r1, _bss_end + ldr r0, _bss_start_ofs + ldr r1, _bss_end_ofs ldr r3, _TEXT_BASE /* Text base */ mov r4, r7 /* reloc addr */ - sub r0, r0, r3 add r0, r0, r4 - sub r1, r1, r3 add r1, r1, r4 mov r2, #0x00000000 /* clear */
@@ -332,24 +322,33 @@ clbss_l:str r2, [r0] /* clear loop... */ * initialization, now running from RAM. */ #ifdef CONFIG_ONENAND_IPL - ldr pc, _start_oneboot + ldr r0, _start_oneboot_ofs + mov pc, r0 -_start_oneboot: .word start_oneboot +_start_oneboot_ofs + : .word start_oneboot #else - ldr r0, _TEXT_BASE - ldr r2, _board_init_r - sub r2, r2, r0 - add r2, r2, r7 /* position from board_init_r in RAM */ + ldr r0, _board_init_r_ofs + adr r1, _start + add r0, r0, r1 + add lr, r0, r9 /* setup parameters for board_init_r */ mov r0, r5 /* gd_t */ mov r1, r7 /* dest_addr */ /* jump to it ... */ - mov lr, r2 mov pc, lr -_board_init_r: .word board_init_r +_board_init_r_ofs: + .word board_init_r - _start #endif +_rel_dyn_start_ofs: + .word __rel_dyn_start - _start +_rel_dyn_end_ofs: + .word __rel_dyn_end - _start +_dynsym_start_ofs: + .word __dynsym_start - _start + #else /* #if !defined(CONFIG_SYS_ARM_WITHOUT_RELOC) */ /****************************************************************************/
arch/arm/cpu/pxa/u-boot.lds +8 -11
@@ -41,21 +41,18 @@ SECTIONS . = ALIGN(4); .data : { *(.data) - __datarel_start = .; - *(.data.rel) - __datarelrolocal_start = .; - *(.data.rel.ro.local) - __datarellocal_start = .; - *(.data.rel.local) - __datarelro_start = .; - *(.data.rel.ro) } - __got_start = .; . = ALIGN(4); - .got : { *(.got) } + __rel_dyn_start = .; + .rel.dyn : { *(.rel.dyn) } + __rel_dyn_end = .; + + __dynsym_start = .; + .dynsym : { *(.dynsym) } + + . = ALIGN(4); - __got_end = .; . = .; __u_boot_cmd_start = .; .u_boot_cmd : { *(.u_boot_cmd) }
Signature · 1 line
1.7.1
PATCH 2/20 PXA: Use pxa-regs.h register definitions in start.S
--- arch/arm/cpu/pxa/start.S | 20 ++++++++------------ 1 files changed, 8 insertions(+), 12 deletions(-)
arch/arm/cpu/pxa/start.S +8 -12
@@ -566,13 +566,7 @@ fiq: /* */ /****************************************************************************/ /* Operating System Timer */ -OSTIMER_BASE: .word 0x40a00000 -#define OSMR3 0x0C -#define OSCR 0x10 -#define OWER 0x18 -#define OIER 0x1C - - .align 5 +.align 5 .globl reset_cpu /* FIXME: this code is PXA250 specific. How is this handled on */
@@ -582,18 +576,20 @@ reset_cpu: /* We set OWE:WME (watchdog enable) and wait until timeout happens */ - ldr r0, OSTIMER_BASE - ldr r1, [r0, #OWER] + ldr r0, =OWER + ldr r1, [r0] orr r1, r1, #0x0001 /* bit0: WME */ - str r1, [r0, #OWER] + str r1, [r0] /* OS timer does only wrap every 1165 seconds, so we have to set */ /* the match register as well. */ - ldr r1, [r0, #OSCR] /* read OS timer */ + ldr r0, =OSCR + ldr r1, [r0] /* read OS timer */ add r1, r1, #0x800 /* let OSMR3 match after */ add r1, r1, #0x800 /* 4096*(1/3.6864MHz)=1ms */ - str r1, [r0, #OSMR3] + ldr r0, =OSMR3 + str r1, [r0] reset_endless:
Signature · 1 line
1.7.1
PATCH 3/20 PXA: cerf250: Fix for reloc
In reply to Marek Vasut--- board/cerf250/Makefile | 10 +- board/cerf250/cerf250.c | 22 +- board/cerf250/config.mk | 5 - board/cerf250/lowlevel_init.S | 411 ----------------------------------------- include/configs/cerf250.h | 14 +- 5 files changed, 22 insertions(+), 440 deletions(-) delete mode 100644 board/cerf250/config.mk delete mode 100644 board/cerf250/lowlevel_init.S
board/cerf250/Makefile +4 -6
@@ -26,17 +26,15 @@ include $(TOPDIR)/config.mk LIB = $(obj)lib$(BOARD).a COBJS := cerf250.o flash.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
board/cerf250/cerf250.c +11 -11
@@ -39,8 +39,9 @@ DECLARE_GLOBAL_DATA_PTR;int board_init (void ) { -/* memory and cpu-speed are setup before relocation */ -/* so we do _nothing_ here */ +/* We have RAM, disable cache */ +dcache_disable (); +icache_disable ();/* arch number of cerf PXA Board */ gd->bd->bi_arch_number =MACH_TYPE_PXA_CERF ;
@@ -58,19 +59,18 @@ int board_late_init(void)return 0 ; } +extern void pxa_dram_init (void ); +int dram_init (void ) +{ +pxa_dram_init (); + gd->ram_size =PHYS_SDRAM_1_SIZE ; +return 0 ; +} -int dram_init (void ) +void dram_init_banksize (void ) { gd->bd->bi_dram[0 ].start =PHYS_SDRAM_1 ; gd->bd->bi_dram[0 ].size =PHYS_SDRAM_1_SIZE ; - gd->bd->bi_dram[1 ].start =PHYS_SDRAM_2 ; - gd->bd->bi_dram[1 ].size =PHYS_SDRAM_2_SIZE ; - gd->bd->bi_dram[2 ].start =PHYS_SDRAM_3 ; - gd->bd->bi_dram[2 ].size =PHYS_SDRAM_3_SIZE ; - gd->bd->bi_dram[3 ].start =PHYS_SDRAM_4 ; - gd->bd->bi_dram[3 ].size =PHYS_SDRAM_4_SIZE ; - -return 0 ; }#ifdef CONFIG_CMD_NET
board/cerf250/config.mk deleted +0 -5
@@ -1,5 +0,0 @@ -# -# Cerf board with PXA250 cpu -# -# -CONFIG_SYS_TEXT_BASE = 0xa3080000
board/cerf250/lowlevel_init.S deleted +0 -411
411 lines not on this page · raw message
include/configs/cerf250.h +7 -7
@@ -38,6 +38,7 @@#define CONFIG_CERF250 1/* on Cerf PXA Board */ #define BOARD_LATE_INIT 1#define CONFIG_BAUDRATE 38400 +#define CONFIG_SYS_TEXT_BASE 0x0#undef CONFIG_USE_IRQ/* we don't need IRQ/FIQ stuff */
@@ -140,15 +141,9 @@/* * Physical Memory Map */ -#define CONFIG_NR_DRAM_BANKS 4/* we have 2 banks of DRAM */ +#define CONFIG_NR_DRAM_BANKS 1/* we have 1 bank of DRAM */ #define PHYS_SDRAM_1 0xa0000000/* SDRAM Bank #1 */ #define PHYS_SDRAM_1_SIZE 0x04000000/* 64 MB */ -#define PHYS_SDRAM_2 0xa4000000/* SDRAM Bank #2 */ -#define PHYS_SDRAM_2_SIZE 0x00000000/* 0 MB */ -#define PHYS_SDRAM_3 0xa8000000/* SDRAM Bank #3 */ -#define PHYS_SDRAM_3_SIZE 0x00000000/* 0 MB */ -#define PHYS_SDRAM_4 0xac000000/* SDRAM Bank #4 */ -#define PHYS_SDRAM_4_SIZE 0x00000000/* 0 MB */ #define PHYS_FLASH_1 0x00000000/* Flash Bank #1 */ #define PHYS_FLASH_2 0x04000000/* Flash Bank #2 */
@@ -187,6 +182,9 @@#define CONFIG_SYS_PSSR_VAL 0x20 +#define CONFIG_SYS_CCCR CCCR_L27|CCCR_M2|CCCR_N10 +#define CONFIG_SYS_CKEN 0x0 +/* * Memory settings */
@@ -196,6 +194,8 @@#define CONFIG_SYS_MDCNFG_VAL 0x00001AC9#define CONFIG_SYS_MDREFR_VAL 0x03CDC017#define CONFIG_SYS_MDMRS_VAL 0x00000000 +#define CONFIG_SYS_FLYCNFG_VAL 0x00000000 +#define CONFIG_SYS_SXCNFG_VAL 0x00000000/* * PCMCIA and CF Interfaces
Signature · 1 line
1.7.1
PATCH 4/20 PXA: colibri_pxa270: Fix for reloc
In reply to Marek Vasut--- board/colibri_pxa270/Makefile | 10 +++----- board/colibri_pxa270/colibri_pxa270.c | 18 +++++++++++----- board/colibri_pxa270/config.mk | 1 - board/colibri_pxa270/lowlevel_init.S | 36 --------------------------------- include/configs/colibri_pxa270.h | 2 +- 5 files changed, 17 insertions(+), 50 deletions(-) delete mode 100644 board/colibri_pxa270/config.mk delete mode 100644 board/colibri_pxa270/lowlevel_init.S
board/colibri_pxa270/Makefile +4 -6
@@ -24,17 +24,15 @@ include $(TOPDIR)/config.mk LIB = $(obj)lib$(BOARD).a COBJS := colibri_pxa270.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
board/colibri_pxa270/colibri_pxa270.c +12 -6
@@ -42,8 +42,9 @@ struct serial_device *default_serial_console (void)int board_init (void ) { -/* memory and cpu-speed are setup before relocation */ -/* so we do _nothing_ here */ +/* We have RAM, disable cache */ +dcache_disable (); +icache_disable ();/* arch number of vpac270 */ gd->bd->bi_arch_number =MACH_TYPE_COLIBRI ;
@@ -54,13 +55,18 @@ int board_init (void)return 0 ; } -int dram_init (void ) +extern void pxa_dram_init (void ); +int dram_init (void ) { - gd->bd->bi_dram[0 ].start =PHYS_SDRAM_1 ; +pxa_dram_init (); + gd->ram_size =PHYS_SDRAM_1_SIZE ; +return 0 ; +} +void dram_init_banksize (void ) +{ + gd->bd->bi_dram[0 ].start =PHYS_SDRAM_1 ; gd->bd->bi_dram[0 ].size =PHYS_SDRAM_1_SIZE ; - -return 0 ; }#ifdef CONFIG_CMD_USB
board/colibri_pxa270/config.mk deleted +0 -1
@@ -1 +0,0 @@ -CONFIG_SYS_TEXT_BASE = 0xa1000000
board/colibri_pxa270/lowlevel_init.S deleted +0 -36
@@ -1,36 +0,0 @@ -/* - * Toradex Colibri PXA270 Lowlevel Hardware Initialization - * - * Copyright (C) 2010 Marek Vasut <[email protected]> - * - * 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
include/configs/colibri_pxa270.h +1 -1
@@ -39,7 +39,7 @@#define CONFIG_ENV_SIZE 0x4000#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 128*1024)#define CONFIG_SYS_GBL_DATA_SIZE 128 - +#define CONFIG_SYS_TEXT_BASE 0x0#define CONFIG_ENV_OVERWRITE /* override default environment */ #define CONFIG_BOOTCOMMAND \
Signature · 1 line
1.7.1
PATCH 5/20 PXA: cradle: Fix for reloc
In reply to Marek Vasut--- board/cradle/Makefile | 10 +- board/cradle/config.mk | 2 - board/cradle/cradle.c | 30 ++-- board/cradle/lowlevel_init.S | 515 ------------------------------------------ include/configs/cradle.h | 18 +- include/configs/csb226.h | 3 + 6 files changed, 28 insertions(+), 550 deletions(-) delete mode 100644 board/cradle/config.mk delete mode 100644 board/cradle/lowlevel_init.S
board/cradle/Makefile +4 -6
@@ -26,17 +26,15 @@ include $(TOPDIR)/config.mk LIB = $(obj)lib$(BOARD).a COBJS := cradle.o flash.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
board/cradle/config.mk deleted +0 -2
@@ -1,2 +0,0 @@ -CONFIG_SYS_TEXT_BASE = 0xa0f80000 -#CONFIG_SYS_TEXT_BASE = 0
board/cradle/cradle.c +14 -16
@@ -185,6 +185,10 @@ intboard_init (void)/**********************************************************/ { +/* We have RAM, disable cache */ +dcache_disable (); +icache_disable (); +led_code (0xf ,YELLOW );/* arch number of HHP Cradle */
@@ -206,24 +210,18 @@ board_init (void)return 1 ; } -int -/**********************************************************/ -dram_init (void ) -/**********************************************************/ +extern void pxa_dram_init (void ); +int dram_init (void ) +{ +pxa_dram_init (); + gd->ram_size =PHYS_SDRAM_1_SIZE ; +return 0 ; +} + +void dram_init_banksize (void ) { gd->bd->bi_dram[0 ].start =PHYS_SDRAM_1 ; - gd->bd->bi_dram[0 ].size =PHYS_SDRAM_1_SIZE ; - gd->bd->bi_dram[1 ].start =PHYS_SDRAM_2 ; - gd->bd->bi_dram[1 ].size =PHYS_SDRAM_2_SIZE ; - gd->bd->bi_dram[2 ].start =PHYS_SDRAM_3 ; - gd->bd->bi_dram[2 ].size =PHYS_SDRAM_3_SIZE ; - gd->bd->bi_dram[3 ].start =PHYS_SDRAM_4 ; - gd->bd->bi_dram[3 ].size =PHYS_SDRAM_4_SIZE ; - -return (PHYS_SDRAM_1_SIZE + -PHYS_SDRAM_2_SIZE + -PHYS_SDRAM_3_SIZE + -PHYS_SDRAM_4_SIZE ); + gd->bd->bi_dram[0 ].size =PHYS_SDRAM_1_SIZE ; }#ifdef CONFIG_CMD_NET
board/cradle/lowlevel_init.S deleted +0 -515
515 lines not on this page · raw message
include/configs/cradle.h +7 -11
@@ -39,7 +39,7 @@/* we will never enable dcache, because we have to setup MMU first */ #define CONFIG_SYS_NO_DCACHE - +#define CONFIG_SYS_TEXT_BASE 0x0/* * Size of malloc() pool */
@@ -126,15 +126,9 @@/* * Physical Memory Map */ -#define CONFIG_NR_DRAM_BANKS 4/* we have 2 banks of DRAM */ +#define CONFIG_NR_DRAM_BANKS 1/* we have 1 bank of DRAM */ #define PHYS_SDRAM_1 0xa0000000/* SDRAM Bank #1 */ #define PHYS_SDRAM_1_SIZE 0x01000000/* 64 MB */ -#define PHYS_SDRAM_2 0xa4000000/* SDRAM Bank #2 */ -#define PHYS_SDRAM_2_SIZE 0x00000000/* 0 MB */ -#define PHYS_SDRAM_3 0xa8000000/* SDRAM Bank #3 */ -#define PHYS_SDRAM_3_SIZE 0x00000000/* 0 MB */ -#define PHYS_SDRAM_4 0xac000000/* SDRAM Bank #4 */ -#define PHYS_SDRAM_4_SIZE 0x00000000/* 0 MB */ #define PHYS_FLASH_1 0x00000000/* Flash Bank #1 */ #define PHYS_FLASH_2 0x04000000/* Flash Bank #1 */
@@ -289,9 +283,9 @@* Clocks, power control and interrupts */ #define CONFIG_SYS_PSSR_VAL 0x00000020 -#define CONFIG_SYS_CCCR_VAL 0x00000141/* 100 MHz memory, 200 MHz CPU */ -#define CONFIG_SYS_CKEN_VAL 0x00000060/* FFUART and STUART enabled */ -#define CONFIG_SYS_ICMR_VAL 0x00000000/* No interrupts enabled */ +#define CONFIG_SYS_CCCR 0x00000141/* 100 MHz memory, 200 MHz CPU */ +#define CONFIG_SYS_CKEN 0x00000060/* FFUART and STUART enabled */ +#define CONFIG_SYS_ICMR 0x00000000/* No interrupts enabled */ /* FIXME *
@@ -319,6 +313,8 @@#define CONFIG_SYS_MDMRS_VAL 0x00000000#define CONFIG_SYS_MDREFR_VAL 0x00403018/* Initial setting, individual bits set in lowlevel_init.S */ #endif +#define CONFIG_SYS_FLYCNFG_VAL 0x00000000 +#define CONFIG_SYS_SXCNFG_VAL 0x00000000/* * PCMCIA and CF Interfaces (NOT USED, these values from lubbock init)
include/configs/csb226.h +3 -0
@@ -458,6 +458,9 @@#define CONFIG_SYS_PSSR_VAL 0x20 +#define CONFIG_SYS_CCCR CCCR_L27|CCCR_M2|CCCR_N10 +#define CONFIG_SYS_CKEN 0x0 +/* * Memory settings */
Signature · 1 line
1.7.1
PATCH 6/20 PXA: csb226: Fix for reloc
In reply to Marek Vasut--- board/csb226/Makefile | 10 +- board/csb226/config.mk | 15 -- board/csb226/csb226.c | 22 +- board/csb226/lowlevel_init.S | 437 ------------------------------------------ include/configs/csb226.h | 4 +- 5 files changed, 18 insertions(+), 470 deletions(-) delete mode 100644 board/csb226/config.mk delete mode 100644 board/csb226/lowlevel_init.S
board/csb226/Makefile +4 -6
@@ -26,17 +26,15 @@ include $(TOPDIR)/config.mk LIB = $(obj)lib$(BOARD).a COBJS := csb226.o flash.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
board/csb226/config.mk deleted +0 -15
@@ -1,15 +0,0 @@ -# -# Linux-Kernel is expected to be at c000'8000, entry c000'8000 -# -# we load ourself to c170'0000, the upper 1 MB of second bank -# -# download areas is c800'0000 -# - -# This is the address where U-Boot lives in flash: -#CONFIG_SYS_TEXT_BASE = 0 - -# FIXME: armboot does only work correctly when being compiled -# for the addresses _after_ relocation to RAM!! Otherwhise the -# .bss segment is assumed in flash... -CONFIG_SYS_TEXT_BASE = 0xa1fe0000
board/csb226/csb226.c +11 -11
@@ -69,8 +69,9 @@ int misc_init_r(void)int board_init (void ) { -/* memory and cpu-speed are setup before relocation */ -/* so we do _nothing_ here */ +/* We have RAM, disable cache */ +dcache_disable (); +icache_disable ();/* arch number of CSB226 board */ gd->bd->bi_arch_number =MACH_TYPE_CSB226 ;
@@ -82,21 +83,20 @@ int board_init (void) } -/** -* dram_init: - setup dynamic RAM -* -* @return: 0 in case of success -*/ +extern void pxa_dram_init (void ); +int dram_init (void ) +{ +pxa_dram_init (); + gd->ram_size =PHYS_SDRAM_1_SIZE ; +return 0 ; +} -int dram_init (void ) +void dram_init_banksize (void ) { gd->bd->bi_dram[0 ].start =PHYS_SDRAM_1 ; gd->bd->bi_dram[0 ].size =PHYS_SDRAM_1_SIZE ; - -return 0 ; } -/** * csb226_set_led: - switch LEDs on or off *
board/csb226/lowlevel_init.S deleted +0 -437
437 lines not on this page · raw message
include/configs/csb226.h +3 -1
@@ -45,7 +45,7 @@/* we will never enable dcache, because we have to setup MMU first */ #define CONFIG_SYS_NO_DCACHE - +#define CONFIG_SYS_TEXT_BASE 0x0/* * Hardware drivers */
@@ -471,6 +471,8 @@#define CONFIG_SYS_MDCNFG_VAL 0x09a909a9#define CONFIG_SYS_MDREFR_VAL 0x038ff030#define CONFIG_SYS_MDMRS_VAL 0x00220022 +#define CONFIG_SYS_FLYCNFG_VAL 0x00000000 +#define CONFIG_SYS_SXCNFG_VAL 0x00000000/* * PCMCIA and CF Interfaces
Signature · 1 line
1.7.1
PATCH 7/20 PXA: innokom: Fix for reloc
In reply to Marek Vasut--- board/innokom/Makefile | 10 +- board/innokom/config.mk | 15 -- board/innokom/innokom.c | 23 +-- board/innokom/lowlevel_init.S | 437 ----------------------------------------- include/configs/innokom.h | 8 + 5 files changed, 23 insertions(+), 470 deletions(-) delete mode 100644 board/innokom/config.mk delete mode 100644 board/innokom/lowlevel_init.S
board/innokom/Makefile +4 -6
@@ -26,17 +26,15 @@ include $(TOPDIR)/config.mk LIB = $(obj)lib$(BOARD).a COBJS := innokom.o flash.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
board/innokom/config.mk deleted +0 -15
@@ -1,15 +0,0 @@ -# -# Linux-Kernel is expected to be at c000'8000, entry c000'8000 -# -# we load ourself to c170'0000, the upper 1 MB of second bank -# -# download areas is c800'0000 -# - -# This is the address where U-Boot lives in flash: -#CONFIG_SYS_TEXT_BASE = 0 - -# FIXME: armboot does only work correctly when being compiled -# for the addresses _after_ relocation to RAM!! Otherwhise the -# .bss segment is assumed in flash... -CONFIG_SYS_TEXT_BASE = 0xa1fe0000
board/innokom/innokom.c +11 -12
@@ -100,8 +100,9 @@ int misc_init_r(void)int board_init (void ) { -/* memory and cpu-speed are setup before relocation */ -/* so we do _nothing_ here */ +/* We have RAM, disable cache */ +dcache_disable (); +icache_disable (); gd->bd->bi_arch_number =MACH_TYPE_INNOKOM ; gd->bd->bi_boot_params =0xa0000100 ;
@@ -110,22 +111,20 @@ int board_init (void)return 0 ; } +extern void pxa_dram_init (void ); +int dram_init (void ) +{ +pxa_dram_init (); + gd->ram_size =PHYS_SDRAM_1_SIZE ; +return 0 ; +} -/** -* dram_init: - setup dynamic RAM -* -* @return: 0 in case of success -*/ - -int dram_init (void ) +void dram_init_banksize (void ) { gd->bd->bi_dram[0 ].start =PHYS_SDRAM_1 ; gd->bd->bi_dram[0 ].size =PHYS_SDRAM_1_SIZE ; - -return 0 ; } -/** * innokom_set_led: - switch LEDs on or off *
board/innokom/lowlevel_init.S deleted +0 -437
437 lines not on this page · raw message
include/configs/innokom.h +8 -0
@@ -40,6 +40,8 @@#undef CONFIG_USE_IRQ/* we don't need IRQ/FIQ stuff */ /* for timer/console/ethernet */ +#define CONFIG_SYS_TEXT_BASE 0x0 +/* we will never enable dcache, because we have to setup MMU first */ #define CONFIG_SYS_NO_DCACHE
@@ -347,6 +349,9 @@*/ #define CONFIG_SYS_PSSR_VAL 0x37 +#define CONFIG_SYS_CCCR CCCR_L27|CCCR_M2|CCCR_N10 +#define CONFIG_SYS_CKEN 0x0 +/* * Memory settings *
@@ -480,6 +485,9 @@#define CONFIG_SYS_MCIO0_VAL 0x00000000#define CONFIG_SYS_MCIO1_VAL 0x00000000 +#define CONFIG_SYS_FLYCNFG_VAL 0x00000000 +#define CONFIG_SYS_SXCNFG_VAL 0x00000000 +/* #define CSB226_USER_LED0 0x00000008 #define CSB226_USER_LED1 0x00000010
Signature · 1 line
1.7.1
PATCH 8/20 PXA: lubbock: Fix for reloc
In reply to Marek Vasut--- board/lubbock/Makefile | 10 +- board/lubbock/config.mk | 3 - board/lubbock/lowlevel_init.S | 411 ----------------------------------------- board/lubbock/lubbock.c | 22 +- include/configs/lubbock.h | 8 +- 5 files changed, 22 insertions(+), 432 deletions(-) delete mode 100644 board/lubbock/config.mk delete mode 100644 board/lubbock/lowlevel_init.S
board/lubbock/Makefile +4 -6
@@ -27,17 +27,15 @@ include $(TOPDIR)/config.mk LIB = $(obj)lib$(BOARD).a COBJS := lubbock.o flash.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
board/lubbock/config.mk deleted +0 -3
@@ -1,3 +0,0 @@ -#CONFIG_SYS_TEXT_BASE = 0xa1700000 -CONFIG_SYS_TEXT_BASE = 0xa3080000 -#CONFIG_SYS_TEXT_BASE = 0
board/lubbock/lowlevel_init.S deleted +0 -411
411 lines not on this page · raw message
board/lubbock/lubbock.c +11 -11
@@ -36,8 +36,9 @@ DECLARE_GLOBAL_DATA_PTR;int board_init (void ) { -/* memory and cpu-speed are setup before relocation */ -/* so we do _nothing_ here */ +/* We have RAM, disable cache */ +dcache_disable (); +icache_disable ();/* arch number of Lubbock-Board */ gd->bd->bi_arch_number =MACH_TYPE_LUBBOCK ;
@@ -55,19 +56,18 @@ int board_late_init(void)return 0 ; } +extern void pxa_dram_init (void ); +int dram_init (void ) +{ +pxa_dram_init (); + gd->ram_size =PHYS_SDRAM_1_SIZE ; +return 0 ; +} -int dram_init (void ) +void dram_init_banksize (void ) { gd->bd->bi_dram[0 ].start =PHYS_SDRAM_1 ; gd->bd->bi_dram[0 ].size =PHYS_SDRAM_1_SIZE ; - gd->bd->bi_dram[1 ].start =PHYS_SDRAM_2 ; - gd->bd->bi_dram[1 ].size =PHYS_SDRAM_2_SIZE ; - gd->bd->bi_dram[2 ].start =PHYS_SDRAM_3 ; - gd->bd->bi_dram[2 ].size =PHYS_SDRAM_3_SIZE ; - gd->bd->bi_dram[3 ].start =PHYS_SDRAM_4 ; - gd->bd->bi_dram[3 ].size =PHYS_SDRAM_4_SIZE ; - -return 0 ; }#ifdef CONFIG_CMD_NET
include/configs/lubbock.h +7 -1
@@ -43,7 +43,7 @@#define CONFIG_MMC #define BOARD_LATE_INIT 1#define CONFIG_DOS_PARTITION - +#define CONFIG_SYS_TEXT_BASE 0x0#undef CONFIG_USE_IRQ/* we don't need IRQ/FIQ stuff */ /* we will never enable dcache, because we have to setup MMU first */
@@ -202,6 +202,9 @@#define CONFIG_SYS_PSSR_VAL 0x20 +#define CONFIG_SYS_CCCR CCCR_L27|CCCR_M2|CCCR_N10 +#define CONFIG_SYS_CKEN 0x0 +/* * Memory settings */
@@ -212,6 +215,9 @@#define CONFIG_SYS_MDREFR_VAL 0x00018018#define CONFIG_SYS_MDMRS_VAL 0x00000000 +#define CONFIG_SYS_FLYCNFG_VAL 0x00000000 +#define CONFIG_SYS_SXCNFG_VAL 0x00000000 +/* * PCMCIA and CF Interfaces */
Signature · 1 line
1.7.1
PATCH 9/20 PXA: palmld: Fix for reloc
In reply to Marek Vasut--- board/palmld/Makefile | 10 +++---- board/palmld/config.mk | 1 - board/palmld/lowlevel_init.S | 45 --------------------------------- board/palmld/palmld.c | 16 +++++++++-- board/palmld/u-boot.lds | 56 ------------------------------------------ include/configs/palmld.h | 1 + 6 files changed, 18 insertions(+), 111 deletions(-) delete mode 100644 board/palmld/config.mk delete mode 100644 board/palmld/lowlevel_init.S delete mode 100644 board/palmld/u-boot.lds
board/palmld/Makefile +4 -6
@@ -24,17 +24,15 @@ include $(TOPDIR)/config.mk LIB = $(obj)lib$(BOARD).a COBJS := palmld.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
board/palmld/config.mk deleted +0 -1
@@ -1 +0,0 @@ -TEXT_BASE = 0xa1000000
board/palmld/lowlevel_init.S deleted +0 -45
45 lines not on this page · raw message
board/palmld/palmld.c +13 -3
@@ -33,7 +33,11 @@ DECLARE_GLOBAL_DATA_PTR;int board_init (void ) { -/* arch number of Lubbock-Board */ +/* We have RAM, disable cache */ +dcache_disable (); +icache_disable (); + +/* arch number of PalmLD */ gd->bd->bi_arch_number =MACH_TYPE_PALMLD ;/* adress of boot parameters */
@@ -52,12 +56,18 @@ 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 ; +return 0 ; +} + +void dram_init_banksize (void ) +{ gd->bd->bi_dram[0 ].start =PHYS_SDRAM_1 ; gd->bd->bi_dram[0 ].size =PHYS_SDRAM_1_SIZE ; - -return 0 ; }ulong board_flash_get_legacy (ulong base,int banknum,flash_info_t *info)
board/palmld/u-boot.lds deleted +0 -56
56 lines not on this page · raw message
include/configs/palmld.h +1 -0
@@ -34,6 +34,7 @@#define CONFIG_ENV_OVERWRITE #define CONFIG_SYS_MALLOC_LEN (128*1024)#define CONFIG_SYS_GBL_DATA_SIZE 128 +#define CONFIG_SYS_TEXT_BASE 0x0#define CONFIG_BOOTCOMMAND \ "if mmcinfo && fatload mmc 0 0xa0000000 uboot.script ; then " \
Signature · 1 line
1.7.1
PATCH 10/20 PXA: palmtc: Fix for reloc
In reply to Marek Vasut--- board/palmtc/Makefile | 9 +++--- board/palmtc/config.mk | 1 - board/palmtc/lowlevel_init.S | 39 ----------------------------- board/palmtc/palmtc.c | 13 +++++++++- board/palmtc/u-boot.lds | 56 ------------------------------------------ include/configs/palmtc.h | 1 + 6 files changed, 17 insertions(+), 102 deletions(-) delete mode 100644 board/palmtc/config.mk delete mode 100644 board/palmtc/lowlevel_init.S delete mode 100644 board/palmtc/u-boot.lds
board/palmtc/Makefile +4 -5
@@ -24,17 +24,16 @@ include $(TOPDIR)/config.mk LIB = $(obj)lib$(BOARD).a COBJS := palmtc.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
board/palmtc/config.mk deleted +0 -1
@@ -1 +0,0 @@ -TEXT_BASE = 0xa1000000
board/palmtc/lowlevel_init.S deleted +0 -39
@@ -1,39 +0,0 @@ -/* - * Palm Tungsten|C Lowlevel Hardware Initialization - * - * Copyright (C) 2010 Marek Vasut <[email protected]> - * - * 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
board/palmtc/palmtc.c +12 -1
@@ -32,6 +32,10 @@ DECLARE_GLOBAL_DATA_PTR;int board_init (void ) { +/* We have RAM, disable cache */ +dcache_disable (); +icache_disable (); +/* Arch number of Palm Tungsten|C */ gd->bd->bi_arch_number =MACH_TYPE_PALMTC ;
@@ -51,9 +55,16 @@ 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 ; +return 0 ; +} + +void dram_init_banksize (void ) +{ gd->bd->bi_dram[0 ].start =PHYS_SDRAM_1 ; gd->bd->bi_dram[0 ].size =PHYS_SDRAM_1_SIZE ; -return 0 ; }
board/palmtc/u-boot.lds deleted +0 -56
56 lines not on this page · raw message
include/configs/palmtc.h +1 -0
@@ -36,6 +36,7 @@#define CONFIG_ENV_OVERWRITE #define CONFIG_SYS_MALLOC_LEN (128*1024)#define CONFIG_SYS_GBL_DATA_SIZE 128 +#define CONFIG_SYS_TEXT_BASE 0x0#define CONFIG_BOOTCOMMAND \ "if mmc init && fatload mmc 0 0xa0000000 uboot.script ; then " \
Signature · 1 line
1.7.1
PATCH 11/20 PXA: pleb2: Fix for reloc
In reply to Marek Vasut--- board/pleb2/Makefile | 10 +- board/pleb2/config.mk | 3 - board/pleb2/lowlevel_init.S | 488 ------------------------------------------- board/pleb2/pleb2.c | 22 +- include/configs/pleb2.h | 18 +- 5 files changed, 23 insertions(+), 518 deletions(-) delete mode 100644 board/pleb2/config.mk delete mode 100644 board/pleb2/lowlevel_init.S
board/pleb2/Makefile +4 -6
@@ -27,17 +27,15 @@ include $(TOPDIR)/config.mk LIB = $(obj)lib$(BOARD).a COBJS := pleb2.o flash.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
board/pleb2/config.mk deleted +0 -3
@@ -1,3 +0,0 @@ -CONFIG_SYS_TEXT_BASE = 0xa1F80000 -#CONFIG_SYS_TEXT_BASE = 0xa3080000 -#CONFIG_SYS_TEXT_BASE = 0
board/pleb2/lowlevel_init.S deleted +0 -488
488 lines not on this page · raw message
board/pleb2/pleb2.c +11 -11
@@ -36,8 +36,9 @@ DECLARE_GLOBAL_DATA_PTR;int board_init (void ) { -/* memory and cpu-speed are setup before relocation */ -/* so we do _nothing_ here */ +/* We have RAM, disable cache */ +dcache_disable (); +icache_disable ();/* arch number of Lubbock-Board */ gd->bd->bi_arch_number =MACH_TYPE_PLEB2 ;
@@ -55,17 +56,16 @@ int board_late_init(void)return 0 ; } +extern void pxa_dram_init (void ); +int dram_init (void ) +{ +pxa_dram_init (); + gd->ram_size =PHYS_SDRAM_1_SIZE ; +return 0 ; +} -int dram_init (void ) +void dram_init_banksize (void ) { gd->bd->bi_dram[0 ].start =PHYS_SDRAM_1 ; gd->bd->bi_dram[0 ].size =PHYS_SDRAM_1_SIZE ; - gd->bd->bi_dram[1 ].start =PHYS_SDRAM_2 ; - gd->bd->bi_dram[1 ].size =PHYS_SDRAM_2_SIZE ; - gd->bd->bi_dram[2 ].start =PHYS_SDRAM_3 ; - gd->bd->bi_dram[2 ].size =PHYS_SDRAM_3_SIZE ; - gd->bd->bi_dram[3 ].start =PHYS_SDRAM_4 ; - gd->bd->bi_dram[3 ].size =PHYS_SDRAM_4_SIZE ; - -return 0 ; }
include/configs/pleb2.h +8 -10
@@ -39,6 +39,7 @@#undef CONFIG_LCD#undef CONFIG_MMC#define BOARD_LATE_INIT 1 +#define CONFIG_SYS_TEXT_BASE 0x0#undef CONFIG_USE_IRQ/* we don't need IRQ/FIQ stuff */
@@ -155,15 +156,9 @@/* * Physical Memory Map */ -#define CONFIG_NR_DRAM_BANKS 4/* we have 2 banks of DRAM */ +#define CONFIG_NR_DRAM_BANKS 1/* we have 1 bank of DRAM */ #define PHYS_SDRAM_1 0xa0000000/* SDRAM Bank #1 */ #define PHYS_SDRAM_1_SIZE 0x02000000/* 32 MB */ -#define PHYS_SDRAM_2 0xa4000000/* SDRAM Bank #2 */ -#define PHYS_SDRAM_2_SIZE 0x00000000/* 0 MB */ -#define PHYS_SDRAM_3 0xa8000000/* SDRAM Bank #3 */ -#define PHYS_SDRAM_3_SIZE 0x00000000/* 0 MB */ -#define PHYS_SDRAM_4 0xac000000/* SDRAM Bank #4 */ -#define PHYS_SDRAM_4_SIZE 0x00000000/* 0 MB */ #define PHYS_FLASH_1 0x00000000/* Flash Bank #1 */ #define PHYS_FLASH_2 0x04000000/* Flash Bank #2 */
@@ -213,9 +208,9 @@#define CONFIG_SYS_GAFR2_U_VAL 0x00000000#define CONFIG_SYS_PSSR_VAL 0x20 -#define CONFIG_SYS_CCCR_VAL 0x00000141/* 100 MHz memory, 200 MHz CPU */ -#define CONFIG_SYS_CKEN_VAL 0x00000060/* FFUART and STUART enabled */ -#define CONFIG_SYS_ICMR_VAL 0x00000000/* No interrupts enabled */ +#define CONFIG_SYS_CCCR 0x00000141/* 100 MHz memory, 200 MHz CPU */ +#define CONFIG_SYS_CKEN 0x00000060/* FFUART and STUART enabled */ +#define CONFIG_SYS_ICMR 0x00000000/* No interrupts enabled */ /* * Memory settings
@@ -231,6 +226,9 @@/* bits set in lowlevel_init.S */ #define CONFIG_SYS_MDMRS_VAL 0x00000000 +#define CONFIG_SYS_FLYCNFG_VAL 0x00000000 +#define CONFIG_SYS_SXCNFG_VAL 0x00000000 +/* * PCMCIA and CF Interfaces */
Signature · 1 line
1.7.1
PATCH 12/20 PXA: pxa255_idp: Fix for reloc
In reply to Marek Vasut--- board/pxa255_idp/Makefile | 10 +- board/pxa255_idp/config.mk | 3 - board/pxa255_idp/lowlevel_init.S | 496 -------------------------------------- board/pxa255_idp/pxa_idp.c | 23 +- include/configs/pxa255_idp.h | 8 +- 5 files changed, 22 insertions(+), 518 deletions(-) delete mode 100644 board/pxa255_idp/config.mk delete mode 100644 board/pxa255_idp/lowlevel_init.S
board/pxa255_idp/Makefile +4 -6
@@ -27,17 +27,15 @@ include $(TOPDIR)/config.mk LIB = $(obj)lib$(BOARD).a COBJS := pxa_idp.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
board/pxa255_idp/config.mk deleted +0 -3
@@ -1,3 +0,0 @@ -#CONFIG_SYS_TEXT_BASE = 0xa1700000 -CONFIG_SYS_TEXT_BASE = 0xa3080000 -#CONFIG_SYS_TEXT_BASE = 0
board/pxa255_idp/lowlevel_init.S deleted +0 -496
496 lines not on this page · raw message
board/pxa255_idp/pxa_idp.c +11 -12
@@ -43,8 +43,9 @@ DECLARE_GLOBAL_DATA_PTR;int board_init (void ) { -/* memory and cpu-speed are setup before relocation */ -/* so we do _nothing_ here */ +/* We have RAM, disable cache */ +dcache_disable (); +icache_disable ();/* arch number of Lubbock-Board */ gd->bd->bi_arch_number =MACH_TYPE_PXA_IDP ;
@@ -82,22 +83,20 @@ int board_late_init(void)return 0 ; } +extern void pxa_dram_init (void ); +int dram_init (void ) +{ +pxa_dram_init (); + gd->ram_size =PHYS_SDRAM_1_SIZE ; +return 0 ; +} -int dram_init (void ) +void dram_init_banksize (void ) { gd->bd->bi_dram[0 ].start =PHYS_SDRAM_1 ; gd->bd->bi_dram[0 ].size =PHYS_SDRAM_1_SIZE ; - gd->bd->bi_dram[1 ].start =PHYS_SDRAM_2 ; - gd->bd->bi_dram[1 ].size =PHYS_SDRAM_2_SIZE ; - gd->bd->bi_dram[2 ].start =PHYS_SDRAM_3 ; - gd->bd->bi_dram[2 ].size =PHYS_SDRAM_3_SIZE ; - gd->bd->bi_dram[3 ].start =PHYS_SDRAM_4 ; - gd->bd->bi_dram[3 ].size =PHYS_SDRAM_4_SIZE ; - -return 0 ; } -#ifdef DEBUG_BLINKC_ENABLE void delay_c (void )
include/configs/pxa255_idp.h +7 -1
@@ -43,6 +43,7 @@*/ #undef CONFIG_SKIP_LOWLEVEL_INIT/* define for developing */ #undef CONFIG_SKIP_RELOCATE_UBOOT/* define for developing */ +#define CONFIG_SYS_TEXT_BASE 0x0/* * define the following to enable debug blinks. A debug blink function
@@ -271,7 +272,7 @@/* * Physical Memory Map */ -#define CONFIG_NR_DRAM_BANKS 4/* we have 1 banks of DRAM */ +#define CONFIG_NR_DRAM_BANKS 1/* we have 1 bank of DRAM */ #define PHYS_SDRAM_1 0xa0000000/* SDRAM Bank #1 */ #define PHYS_SDRAM_1_SIZE 0x04000000/* 64 MB */ #define PHYS_SDRAM_2 0xa4000000/* SDRAM Bank #2 */
@@ -317,6 +318,9 @@#define CONFIG_SYS_PSSR_VAL 0x20 +#define CONFIG_SYS_CCCR CCCR_L27|CCCR_M2|CCCR_N10 +#define CONFIG_SYS_CKEN 0x0 +/* * Memory settings */
@@ -326,6 +330,8 @@#define CONFIG_SYS_MDCNFG_VAL 0x090009C9#define CONFIG_SYS_MDREFR_VAL 0x0085C017#define CONFIG_SYS_MDMRS_VAL 0x00220022 +#define CONFIG_SYS_FLYCNFG_VAL 0x00000000 +#define CONFIG_SYS_SXCNFG_VAL 0x00000000/* * PCMCIA and CF Interfaces
Signature · 1 line
1.7.1
PATCH 13/20 PXA: trizepsiv: Fix for reloc
In reply to Marek Vasut--- board/trizepsiv/Makefile | 10 +- board/trizepsiv/config.mk | 3 - board/trizepsiv/conxs.c | 23 +- board/trizepsiv/lowlevel_init.S | 503 --------------------------------------- board/trizepsiv/pxavoltage.S | 29 --- include/configs/trizepsiv.h | 1 + 6 files changed, 17 insertions(+), 552 deletions(-) delete mode 100644 board/trizepsiv/config.mk delete mode 100644 board/trizepsiv/lowlevel_init.S delete mode 100644 board/trizepsiv/pxavoltage.S
board/trizepsiv/Makefile +4 -6
@@ -26,17 +26,15 @@ include $(TOPDIR)/config.mk LIB = $(obj)lib$(BOARD).a COBJS := conxs.o eeprom.o -SOBJS := lowlevel_init.o pxavoltage.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
board/trizepsiv/config.mk deleted +0 -3
@@ -1,3 +0,0 @@ -CONFIG_SYS_TEXT_BASE =0xa1f00000 -# 0xa1700000 -#CONFIG_SYS_TEXT_BASE = 0
board/trizepsiv/conxs.c +12 -11
@@ -104,8 +104,9 @@ void usb_board_stop(void)int board_init (void ) { -/* memory and cpu-speed are setup before relocation */ -/* so we do _nothing_ here */ +/* We have RAM, disable cache */ +dcache_disable (); +icache_disable ();/* arch number of ConXS Board */ gd->bd->bi_arch_number =776 ;
@@ -138,18 +139,18 @@ struct serial_device *default_serial_console (void)return &serial_ffuart_device; } -int dram_init (void ) +extern void pxa_dram_init (void ); +int dram_init (void ) +{ +pxa_dram_init (); + gd->ram_size =PHYS_SDRAM_1_SIZE ; +return 0 ; +} + +void dram_init_banksize (void ) { gd->bd->bi_dram[0 ].start =PHYS_SDRAM_1 ; gd->bd->bi_dram[0 ].size =PHYS_SDRAM_1_SIZE ; - gd->bd->bi_dram[1 ].start =PHYS_SDRAM_2 ; - gd->bd->bi_dram[1 ].size =PHYS_SDRAM_2_SIZE ; - gd->bd->bi_dram[2 ].start =PHYS_SDRAM_3 ; - gd->bd->bi_dram[2 ].size =PHYS_SDRAM_3_SIZE ; - gd->bd->bi_dram[3 ].start =PHYS_SDRAM_4 ; - gd->bd->bi_dram[3 ].size =PHYS_SDRAM_4_SIZE ; - -return 0 ; }#ifdef CONFIG_DRIVER_DM9000
board/trizepsiv/lowlevel_init.S deleted +0 -503
503 lines not on this page · raw message
board/trizepsiv/pxavoltage.S deleted +0 -29
@@ -1,29 +0,0 @@ -/* - * (C) Copyright 2007 - * Stefano Babic, DENX Gmbh, sbabic at 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 <asm/arch/pxa-regs.h> - - .global initPXAvoltage - -initPXAvoltage: - mov pc, lr
include/configs/trizepsiv.h +1 -0
@@ -44,6 +44,7 @@#define CONFIG_MMC 1#define BOARD_LATE_INIT 1 +#define CONFIG_SYS_TEXT_BASE 0x0#undef CONFIG_USE_IRQ/* we don't need IRQ/FIQ stuff */
Signature · 1 line
1.7.1
PATCH 14/20 PXA: xaeniax: Fix for reloc
In reply to Marek Vasut--- board/xaeniax/Makefile | 10 +- board/xaeniax/config.mk | 2 - board/xaeniax/lowlevel_init.S | 424 ----------------------------------------- board/xaeniax/xaeniax.c | 22 +- include/configs/xaeniax.h | 9 +- 5 files changed, 22 insertions(+), 445 deletions(-) delete mode 100644 board/xaeniax/config.mk delete mode 100644 board/xaeniax/lowlevel_init.S
board/xaeniax/Makefile +4 -6
@@ -26,17 +26,15 @@ include $(TOPDIR)/config.mk LIB = $(obj)lib$(BOARD).a COBJS := xaeniax.o flash.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
board/xaeniax/config.mk deleted +0 -2
@@ -1,2 +0,0 @@ -CONFIG_SYS_TEXT_BASE = 0xa3FB0000 -#CONFIG_SYS_TEXT_BASE = 0
board/xaeniax/lowlevel_init.S deleted +0 -424
424 lines not on this page · raw message
board/xaeniax/xaeniax.c +11 -11
@@ -39,8 +39,9 @@ DECLARE_GLOBAL_DATA_PTR;int board_init (void ) { -/* memory and cpu-speed are setup before relocation */ -/* so we do _nothing_ here */ +/* We have RAM, disable cache */ +dcache_disable (); +icache_disable ();/* arch number of xaeniax */ gd->bd->bi_arch_number =585 ;
@@ -58,19 +59,18 @@ int board_late_init(void)return 0 ; } +extern void pxa_dram_init (void ); +int dram_init (void ) +{ +pxa_dram_init (); + gd->ram_size =PHYS_SDRAM_1_SIZE ; +return 0 ; +} -int dram_init (void ) +void dram_init_banksize (void ) { gd->bd->bi_dram[0 ].start =PHYS_SDRAM_1 ; gd->bd->bi_dram[0 ].size =PHYS_SDRAM_1_SIZE ; -/* gd->bd->bi_dram[1].start = PHYS_SDRAM_2;*/ -/* gd->bd->bi_dram[1].size = PHYS_SDRAM_2_SIZE;*/ -/* gd->bd->bi_dram[2].start = PHYS_SDRAM_3; */ -/* gd->bd->bi_dram[2].size = PHYS_SDRAM_3_SIZE; */ -/* gd->bd->bi_dram[3].start = PHYS_SDRAM_4; */ -/* gd->bd->bi_dram[3].size = PHYS_SDRAM_4_SIZE; */ - -return 0 ; }#ifdef CONFIG_CMD_NET
include/configs/xaeniax.h +7 -2
@@ -42,6 +42,7 @@*/ #define CONFIG_PXA250 1/* This is an PXA255 CPU */ #define CONFIG_XAENIAX 1/* on a xaeniax board */ +#define CONFIG_SYS_TEXT_BASE 0x0#define BOARD_LATE_INIT 1
@@ -437,8 +438,9 @@*/ #define CONFIG_SYS_PSSR_VAL 0x00000030 -#define CONFIG_SYS_CKEN_VAL 0x00000080/* */ -#define CONFIG_SYS_ICMR_VAL 0x00000000/* No interrupts enabled */ +#define CONFIG_SYS_CKEN 0x00000080/* */ +#define CONFIG_SYS_ICMR 0x00000000/* No interrupts enabled */ +#define CONFIG_SYS_CCCR CCCR_L27|CCCR_M2|CCCR_N10/*
@@ -562,6 +564,9 @@*/ #define CONFIG_SYS_MDMRS_VAL 0x00320032 +#define CONFIG_SYS_FLYCNFG_VAL 0x00000000 +#define CONFIG_SYS_SXCNFG_VAL 0x00000000 +/* * PCMCIA and CF Interfaces */
Signature · 1 line
1.7.1
PATCH 15/20 PXA: xm250: Fix for reloc
In reply to Marek Vasut--- board/xm250/Makefile | 10 +- board/xm250/config.mk | 35 --- board/xm250/lowlevel_init.S | 519 ------------------------------------------- board/xm250/xm250.c | 27 ++- include/configs/xm250.h | 9 +- 5 files changed, 24 insertions(+), 576 deletions(-) delete mode 100644 board/xm250/config.mk delete mode 100644 board/xm250/lowlevel_init.S
board/xm250/Makefile +4 -6
@@ -26,17 +26,15 @@ include $(TOPDIR)/config.mk LIB = $(obj)lib$(BOARD).a COBJS := xm250.o flash.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
board/xm250/config.mk deleted +0 -35
@@ -1,35 +0,0 @@ -# -# (C) Copyright 2003-2004 -# Wolfgang Denk, DENX Software Engineering, wd at 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 -# - -# -# MicroSys XM250 board: -# - - -# This is the address where U-Boot lives in flash: -#CONFIG_SYS_TEXT_BASE = 0 - -# FIXME: armboot does only work correctly when being compiled -# for the addresses _after_ relocation to RAM!! Otherwhise the -# .bss segment is assumed in flash... -CONFIG_SYS_TEXT_BASE = 0xA3F80000
board/xm250/lowlevel_init.S deleted +0 -519
519 lines not on this page · raw message
board/xm250/xm250.c +14 -13
@@ -56,6 +56,10 @@ intboard_init (void)/**********************************************************/ { +/* We have RAM, disable cache */ +dcache_disable (); +icache_disable (); +/* arch number of MicroSys XM250 */ gd->bd->bi_arch_number =MACH_TYPE_XM250 ;
@@ -65,21 +69,18 @@ board_init (void)return 0 ; } -int -/**********************************************************/ -dram_init (void ) -/**********************************************************/ +extern void pxa_dram_init (void ); +int dram_init (void ) { - gd->bd->bi_dram[0 ].start =PHYS_SDRAM_1 ; - gd->bd->bi_dram[0 ].size =PHYS_SDRAM_1_SIZE ; - gd->bd->bi_dram[1 ].start =PHYS_SDRAM_2 ; - gd->bd->bi_dram[1 ].size =PHYS_SDRAM_2_SIZE ; - gd->bd->bi_dram[2 ].start =PHYS_SDRAM_3 ; - gd->bd->bi_dram[2 ].size =PHYS_SDRAM_3_SIZE ; - gd->bd->bi_dram[3 ].start =PHYS_SDRAM_4 ; - gd->bd->bi_dram[3 ].size =PHYS_SDRAM_4_SIZE ; +pxa_dram_init (); + gd->ram_size =PHYS_SDRAM_1_SIZE ; +return 0 ; +} -return (0 ); +void dram_init_banksize (void ) +{ + gd->bd->bi_dram[0 ].start =PHYS_SDRAM_1 ; + gd->bd->bi_dram[0 ].size =PHYS_SDRAM_1_SIZE ; }#ifdef CONFIG_CMD_NET
include/configs/xm250.h +6 -3
@@ -35,6 +35,7 @@#define CONFIG_PXA250 1/* This is an PXA250 CPU */ #define CONFIG_XM250 1/* on a MicroSys XM250 Board */ #undef CONFIG_USE_IRQ/* we don't need IRQ/FIQ stuff */ +#define CONFIG_SYS_TEXT_BASE 0x0/* we will never enable dcache, because we have to setup MMU first */ #define CONFIG_SYS_NO_DCACHE
@@ -322,9 +323,9 @@* Clocks, power control and interrupts */ #define CONFIG_SYS_PSSR_VAL 0x00000030 -#define CONFIG_SYS_CCCR_VAL 0x00000161/* 100 MHz memory, 400 MHz CPU, 400 Turbo */ -#define CONFIG_SYS_CKEN_VAL 0x000141ec/* FFUART and STUART enabled */ -#define CONFIG_SYS_ICMR_VAL 0x00000000/* No interrupts enabled */ +#define CONFIG_SYS_CCCR 0x00000161/* 100 MHz memory, 400 MHz CPU, 400 Turbo */ +#define CONFIG_SYS_CKEN 0x000141ec/* FFUART and STUART enabled */ +#define CONFIG_SYS_ICMR 0x00000000/* No interrupts enabled */ /* FIXME *
@@ -343,6 +344,8 @@#define CONFIG_SYS_MDCNFG_VAL 0x000009c9#define CONFIG_SYS_MDMRS_VAL 0x00220022#define CONFIG_SYS_MDREFR_VAL 0x000da018/* Initial setting, individual bits set in lowlevel_init.S */ +#define CONFIG_SYS_FLYCNFG_VAL 0x00000000 +#define CONFIG_SYS_SXCNFG_VAL 0x00000000/* * PCMCIA and CF Interfaces (NOT USED, these values from lubbock init)
Signature · 1 line
1.7.1
PATCH 16/20 PXA: vpac270: Add missing CONFIG_SYS_TEXT_BASE
In reply to Marek Vasut--- include/configs/vpac270.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
include/configs/vpac270.h +1 -0
@@ -27,6 +27,7 @@*/ #define CONFIG_PXA27X 1/* Marvell PXA270 CPU */ #define CONFIG_VPAC270 1/* Voipac PXA270 board */ +#define CONFIG_SYS_TEXT_BASE 0x0/* * Environment settings
Signature · 1 line
1.7.1
PATCH 17/20 PXA: zipitz2: Add missing CONFIG_SYS_TEXT_BASE
In reply to Marek Vasut--- include/configs/zipitz2.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
include/configs/zipitz2.h +1 -0
@@ -27,6 +27,7 @@*/ #define CONFIG_PXA27X 1/* Marvell PXA270 CPU */ #define CONFIG_ZIPITZ2 1/* Zipit Z2 board */ +#define CONFIG_SYS_TEXT_BASE 0x0#undef BOARD_LATE_INIT#undef CONFIG_SKIP_RELOCATE_UBOOT
Signature · 1 line
1.7.1
PATCH 18/20 PXA: Remove "delta" board
In reply to Marek Vasut--- board/delta/Makefile | 52 ---- board/delta/config.mk | 1 - board/delta/delta.c | 378 ----------------------------- board/delta/lowlevel_init.S | 146 ----------- board/delta/nand.c | 558 ------------------------------------------- boards.cfg | 1 - include/configs/delta.h | 267 --------------------- 7 files changed, 0 insertions(+), 1403 deletions(-) delete mode 100644 board/delta/Makefile delete mode 100644 board/delta/config.mk delete mode 100644 board/delta/delta.c delete mode 100644 board/delta/lowlevel_init.S delete mode 100644 board/delta/nand.c delete mode 100644 include/configs/delta.h
board/delta/Makefile deleted +0 -52
@@ -1,52 +0,0 @@ - -# -# (C) Copyright 2000-2006 -# Wolfgang Denk, DENX Software Engineering, wd at 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$(BOARD).a - -COBJS := delta.o nand.o -SOBJS := lowlevel_init.o - -SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) -OBJS := $(addprefix $(obj),$(COBJS)) -SOBJS := $(addprefix $(obj),$(SOBJS)) - -$(LIB): $(obj).depend $(OBJS) $(SOBJS) - $(AR) $(ARFLAGS) $@ $(OBJS) $(SOBJS) - -clean: - rm -f $(SOBJS) $(OBJS) - -distclean: clean - rm -f $(LIB) core *.bak $(obj).depend - -######################################################################### - -# defines $(obj).depend target -include $(SRCTREE)/rules.mk - -sinclude $(obj).depend - -#########################################################################
board/delta/config.mk deleted +0 -1
@@ -1 +0,0 @@ -CONFIG_SYS_TEXT_BASE = 0x83008000
board/delta/delta.c deleted +0 -378
378 lines not on this page · raw message
board/delta/lowlevel_init.S deleted +0 -146
146 lines not on this page · raw message
board/delta/nand.c deleted +0 -558
558 lines not on this page · raw message
boards.cfg +0 -1
@@ -65,7 +65,6 @@ balloon3 arm pxa cerf250 arm pxa cradle arm pxa csb226 arm pxa -delta arm pxa innokom arm pxa lubbock arm pxa palmld arm pxa
include/configs/delta.h deleted +0 -267
267 lines not on this page · raw message
Signature · 1 line
1.7.1
PATCH 19/20 PXA: Remove "wepep250" board
In reply to Marek VasutThis board is broken and impossible to repair without deep knowledge or availability of the hardware.
--- board/wepep250/Makefile | 51 ------- board/wepep250/config.mk | 11 -- board/wepep250/flash.c | 324 ---------------------------------------- board/wepep250/intel.h | 99 ------------ board/wepep250/lowlevel_init.S | 145 ------------------ board/wepep250/wepep250.c | 68 --------- boards.cfg | 1 - include/configs/wepep250.h | 199 ------------------------ 8 files changed, 0 insertions(+), 898 deletions(-) delete mode 100644 board/wepep250/Makefile delete mode 100644 board/wepep250/config.mk delete mode 100644 board/wepep250/flash.c delete mode 100644 board/wepep250/intel.h delete mode 100644 board/wepep250/lowlevel_init.S delete mode 100644 board/wepep250/wepep250.c delete mode 100644 include/configs/wepep250.h
board/wepep250/Makefile deleted +0 -51
@@ -1,51 +0,0 @@ -# -# (C) Copyright 2000-2006 -# Wolfgang Denk, DENX Software Engineering, wd at 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$(BOARD).a - -COBJS := wepep250.o flash.o -SOBJS := lowlevel_init.o - -SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) -OBJS := $(addprefix $(obj),$(COBJS)) -SOBJS := $(addprefix $(obj),$(SOBJS)) - -$(LIB): $(obj).depend $(OBJS) $(SOBJS) - $(AR) $(ARFLAGS) $@ $(OBJS) $(SOBJS) - -clean: - rm -f $(SOBJS) $(OBJS) - -distclean: clean - rm -f $(LIB) core *.bak $(obj).depend - -######################################################################### - -# defines $(obj).depend target -include $(SRCTREE)/rules.mk - -sinclude $(obj).depend - -#########################################################################
board/wepep250/config.mk deleted +0 -11
@@ -1,11 +0,0 @@ -# -# This is config used for compilation of WEP EP250 sources -# -# You might change location of U-Boot in memory by setting right CONFIG_SYS_TEXT_BASE. -# This allows for example having one copy located at the end of ram and stored -# in flash device and later on while developing use other location to test -# the code in RAM device only. -# - -CONFIG_SYS_TEXT_BASE = 0xa1fe0000 -#CONFIG_SYS_TEXT_BASE = 0xa1001000
board/wepep250/flash.c deleted +0 -324
324 lines not on this page · raw message
board/wepep250/intel.h deleted +0 -99
99 lines not on this page · raw message
board/wepep250/lowlevel_init.S deleted +0 -145
145 lines not on this page · raw message
board/wepep250/wepep250.c deleted +0 -68
68 lines not on this page · raw message
boards.cfg +0 -1
@@ -401,7 +401,6 @@ lpd7a400 arm lh7a40x lpd7a40x lpd7a404 arm lh7a40x lpd7a40x colibri_pxa270 arm pxa pxa255_idp arm pxa -wepep250 arm pxa xsengine arm pxa zylonite arm pxa atngw100 avr32 at32ap - atmel at32ap700x
include/configs/wepep250.h deleted +0 -199
199 lines not on this page · raw message
Signature · 1 line
1.7.1
PATCH 20/20 PXA: Remove "xsengine" board
In reply to Marek VasutThis board is broken and it's not possible to repair it.
--- board/xsengine/Makefile | 51 ----- board/xsengine/config.mk | 1 - board/xsengine/flash.c | 470 ---------------------------------------- board/xsengine/lowlevel_init.S | 221 ------------------- board/xsengine/xsengine.c | 75 ------- boards.cfg | 1 - include/configs/xsengine.h | 216 ------------------ 7 files changed, 0 insertions(+), 1035 deletions(-) delete mode 100644 board/xsengine/Makefile delete mode 100644 board/xsengine/config.mk delete mode 100644 board/xsengine/flash.c delete mode 100644 board/xsengine/lowlevel_init.S delete mode 100644 board/xsengine/xsengine.c delete mode 100644 include/configs/xsengine.h
board/xsengine/Makefile deleted +0 -51
@@ -1,51 +0,0 @@ -# -# (C) Copyright 2000-2006 -# Wolfgang Denk, DENX Software Engineering, wd at 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$(BOARD).a - -COBJS := xsengine.o flash.o -SOBJS := lowlevel_init.o - -SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) -OBJS := $(addprefix $(obj),$(COBJS)) -SOBJS := $(addprefix $(obj),$(SOBJS)) - -$(LIB): $(obj).depend $(OBJS) $(SOBJS) - $(AR) $(ARFLAGS) $@ $(OBJS) $(SOBJS) - -clean: - rm -f $(SOBJS) $(OBJS) - -distclean: clean - rm -f $(LIB) core *.bak $(obj).depend - -######################################################################### - -# defines $(obj).depend target -include $(SRCTREE)/rules.mk - -sinclude $(obj).depend - -#########################################################################
board/xsengine/config.mk deleted +0 -1
@@ -1 +0,0 @@ -CONFIG_SYS_TEXT_BASE = 0xA3F80000
board/xsengine/flash.c deleted +0 -470
470 lines not on this page · raw message
board/xsengine/lowlevel_init.S deleted +0 -221
221 lines not on this page · raw message
board/xsengine/xsengine.c deleted +0 -75
75 lines not on this page · raw message
boards.cfg +0 -1
@@ -401,7 +401,6 @@ lpd7a400 arm lh7a40x lpd7a40x lpd7a404 arm lh7a40x lpd7a40x colibri_pxa270 arm pxa pxa255_idp arm pxa -xsengine arm pxa zylonite arm pxa atngw100 avr32 at32ap - atmel at32ap700x atstk1002 avr32 at32ap atstk1000 atmel at32ap700x
include/configs/xsengine.h deleted +0 -216
216 lines not on this page · raw message
Signature · 1 line
1.7.1