August 2010 - U-Boot

[U-Boot] A bl command question about smdk2410 in u-boot-2010.06
by Paul Hsu 11 Aug '10

11 Aug '10

Hi Jianchun, The result of objdump is based on the ELF format. It knows that the piece of code should be put to address 0x33f80000 to run, although the code is running at address 0x0 after power-on. And bl instruction is a jump instruction according to an offset of PC. That't why you see the following code 33f80060: eb0000e6 bl 33f80400 <__coloured_LED_init> When boot-up , this instruction is executing in NOR flash. After sdram initialization, and code re-location, sdram contains the real code. BR, Paul .......... 33f80050 <start_code>: 33f80050: e10f0000 mrs r0, CPSR 33f80054: e3c0001f bic r0, r0, #31 ; 0x1f 33f80058: e38000d3 orr r0, r0, #211 ; 0xd3 33f8005c: e129f000 msr CPSR_fc, r0 33f80060: eb0000e6 bl 33f80400 <__coloured_LED_init> 33f80064: eb0000e6 bl 33f80404 <__red_LED_on> 33f80068: e3a00453 mov r0, #1392508928 ; 0x53000000 33f8006c: e3a01000 mov r1, #0 ; 0x0 33f80070: e5801000 str r1, [r0] 33f80074: e3e01000 mvn r1, #0 ; 0x0 33f80078: e59f0360 ldr r0, [pc, #864] ; 33f803e0 <fiq+0x60> 33f8007c: e5801000 str r1, [r0] 33f80080: e59f135c ldr r1, [pc, #860] ; 33f803e4 <fiq+0x64> 33f80084: e59f035c ldr r0, [pc, #860] ; 33f803e8 <fiq+0x68> 33f80088: e5801000 str r1, [r0] 33f8008c: e59f0358 ldr r0, [pc, #856] ; 33f803ec <fiq+0x6c> 33f80090: e3a01003 mov r1, #3 ; 0x3 33f80094: e5801000 str r1, [r0] 33f80098: eb000019 bl 33f80104 <cpu_init_crit> 33f8009c <relocate>: 33f8009c: e24f00a4 sub r0, pc, #164 ; 0xa4 33f800a0: e51f1068 ldr r1, [pc, #-104] ; 33f80040 <_TEXT_BASE> ............. 33f80400 <__coloured_LED_init>: 33f80400: e1a0f00e mov pc, lr 33f80404 <__red_LED_on>: 33f80404: e1a0f00e mov pc, lr 33f80408 <__red_LED_off>: 33f80408: e1a0f00e mov pc, lr 33f8040c <__green_LED_on>: 33f8040c: e1a0f00e mov pc, lr 33f80410 <__green_LED_off>: 33f80410: e1a0f00e mov pc, lr 33f80414 <__yellow_LED_on>: 33f80414: e1a0f00e mov pc, lr 33f80418 <__yellow_LED_off>: 33f80418: e1a0f00e mov pc, lr 33f8041c <__blue_LED_on>: 33f8041c: e1a0f00e mov pc, lr 33f80420 <__blue_LED_off>: 33f80420: e1a0f00e mov pc, lr -- Paul Hsu pochun.hsu(a)gmail.com

1 0

[U-Boot] Email Notice
by info＠nationallottery.co.uk 11 Aug '10

11 Aug '10

Your email address won £500,000 GPB. Contact claims officer: uknl-mr.grahamwilbe rt(a)windowslive.com

1 0

[U-Boot] [PATCH V6 0/3] Add support for MB86R0x SoCs
by Matthias Weisser 10 Aug '10

10 Aug '10

This patchset adds support for MB86R0x SoC familiy from Fujitsu, its built in lcd controller and a first board using the MB86R01. Changes since V5 - Addressed some comments in timer.c by wd(a)denx.de - Rebased to current master branch Changes since V4 - Rebased to current master branch Changes since V3 - Added support for additional oscillator frequency Changes since V2 - Rebased to current u-boot next branch Changes since V1 - Used C structs for addressing instead of base + offset - Moved offsets for assmebler code to asm-offsets.h - Moved some dublicated sections of code to functions Matthias Weisser (3): arm: Add support for MB86R0x SoCs video: add support for display controller in MB86R0x SoCs arm: Add support for jadecpu board based on MB86R01 SoC MAINTAINERS | 4 + MAKEALL | 1 + arch/arm/cpu/arm926ejs/mb86r0x/Makefile | 47 ++ arch/arm/cpu/arm926ejs/mb86r0x/clock.c | 43 ++ arch/arm/cpu/arm926ejs/mb86r0x/reset.c | 40 ++ arch/arm/cpu/arm926ejs/mb86r0x/timer.c | 142 ++++++ arch/arm/include/asm/arch-mb86r0x/asm-offsets.h | 74 +++ arch/arm/include/asm/arch-mb86r0x/hardware.h | 31 ++ arch/arm/include/asm/arch-mb86r0x/mb86r0x.h | 573 +++++++++++++++++++++++ board/syteco/jadecpu/Makefile | 55 +++ board/syteco/jadecpu/config.mk | 1 + board/syteco/jadecpu/jadecpu.c | 170 +++++++ board/syteco/jadecpu/lowlevel_init.S | 265 +++++++++++ boards.cfg | 1 + common/serial.c | 6 +- drivers/video/Makefile | 1 + drivers/video/mb86r0xgdc.c | 186 ++++++++ include/configs/jadecpu.h | 291 ++++++++++++ include/serial.h | 6 +- tools/Makefile | 3 + tools/logos/syteco.bmp | Bin 0 -> 11414 bytes 21 files changed, 1934 insertions(+), 6 deletions(-) create mode 100644 arch/arm/cpu/arm926ejs/mb86r0x/Makefile create mode 100644 arch/arm/cpu/arm926ejs/mb86r0x/clock.c create mode 100644 arch/arm/cpu/arm926ejs/mb86r0x/reset.c create mode 100644 arch/arm/cpu/arm926ejs/mb86r0x/timer.c create mode 100644 arch/arm/include/asm/arch-mb86r0x/asm-offsets.h create mode 100644 arch/arm/include/asm/arch-mb86r0x/hardware.h create mode 100644 arch/arm/include/asm/arch-mb86r0x/mb86r0x.h create mode 100644 board/syteco/jadecpu/Makefile create mode 100644 board/syteco/jadecpu/config.mk create mode 100644 board/syteco/jadecpu/jadecpu.c create mode 100644 board/syteco/jadecpu/lowlevel_init.S create mode 100644 drivers/video/mb86r0xgdc.c create mode 100644 include/configs/jadecpu.h create mode 100644 tools/logos/syteco.bmp

2 6

[U-Boot] 'usb start' works very unstable
by Sergei Trofimovich 10 Aug '10

10 Aug '10

I have 250GB USB-HDD attached to sheevaplug and using u-boot U-Boot 2010.03-00176-g42f7128 (Aug 06 2010 - 22:24:34) Marvell-Sheevaplug It's a tip of 'u-boot-marvell/testing' branch. I'm currently booting linux kernel from NAND and using ext4 rootfs placed on this USB HDD. Everything works mostly fine here (in-NAND kernel and usb survive multiple reboots). The problem is faulty usb detection in u-boot prompt. After some reboots (one reboot is usually enough) u-boot can't find attached USB storages: # reboot linux kernel and stop at u-boot prompt Marvell>> usb start (Re)start USB... USB: Register 10011 NbrPorts 1 USB EHCI 1.00 scanning bus for devices... 2 USB Device(s) found scanning bus for storage devices... error in inquiry 0 Storage Device(s) found Marvell>> usb start (Re)start USB... USB: Register 10011 NbrPorts 1 USB EHCI 1.00 scanning bus for devices... 2 USB Device(s) found scanning bus for storage devices... 0 Storage Device(s) found #ok, usb is dead? let's see if linux kernel will find it Marvell>> nand read 0x01000000 0x00100000 0x00400000 NAND read: device 0 offset 0x100000, size 0x400000 4194304 bytes read: OK Marvell>> setenv boot bootdelay bootargs bootcmd Marvell>> setenv bootargs console=ttyS0,115200 root=/dev/sda3 rw rootwait #points to usb hdd! Marvell>> bootm 0x01000000 ## Booting kernel from Legacy Image at 01000000 ... Image Name: Linux-2.6.35 Image Type: ARM Linux Kernel Image (uncompressed) Data Size: 2192340 Bytes = 2.1 MB Load Address: 00008000 Entry Point: 00008000 Verifying Checksum ... OK Loading Kernel Image ... OK OK Starting kernel ... <skip> [ 22.867424] Waiting for root device /dev/sda3... [ 23.015860] scsi0 : usb-storage 1-1:1.0 [ 26.054268] scsi 0:0:0:0: Direct-Access StoreJet Transcend PQ: 0 ANSI: 2 CCS [ 28.774083] sd 0:0:0:0: [sda] 488397168 512-byte logical blocks: (250 GB/232 GiB) [ 28.782324] sd 0:0:0:0: [sda] Write Protect is off [ 28.787167] sd 0:0:0:0: [sda] Assuming drive cache: write through [ 28.794693] sd 0:0:0:0: [sda] Assuming drive cache: write through [ 28.800822] sda: sda1 sda2 sda3 sda4 [ 28.909571] sd 0:0:0:0: [sda] Assuming drive cache: write through [ 28.915736] sd 0:0:0:0: [sda] Attached SCSI disk [ 28.944594] EXT3-fs (sda3): error: couldn't mount because of unsupported optional features (240) [ 28.953954] EXT2-fs (sda3): error: couldn't mount because of unsupported optional features (240) [ 28.992562] EXT4-fs (sda3): mounted filesystem with ordered data mode. Opts: (null) [ 29.000323] VFS: Mounted root (ext4 filesystem) on device 8:3. [ 29.006227] Freeing init memory: 112K INIT: version 2.87 booting And it finds it! *phew* It usually takes ~4 seconds to wait for root. When I power off/power on sheevaplug I am able to load something directly from USB: Marvell>> usb start (Re)start USB... USB: Register 10011 NbrPorts 1 USB EHCI 1.00 scanning bus for devices... 2 USB Device(s) found scanning bus for storage devices... 1 Storage Device(s) found Marvell>> usb storage Device 0: Vendor: StoreJet Rev: Prod: Transcend Type: Hard Disk Capacity: 28759.9 MB = 28.0 GB (488397168 x 512) Heh, capacity is reported incorrectly, but it works am I'm able to load kernel from there. Marvell>> ext2ls usb 0:2 / <DIR> 1024 . <DIR> 1024 .. <DIR> 12288 lost+found <SYM> 1 boot 0 .keep 4466528 vmlinuz-2.6.35 904705 System.map-2.6.35 49205 config-2.6.35 4466528 vmlinuz-2.6.35.old 904705 System.map-2.6.35.old 49205 config-2.6.35.old 2192404 uImage-2.6.35 331132 u-boot.kwb-20100806 Marvell>> ext2load usb 0:2 0x01000000 /uImage-2.6.35 Loading file "/uImage-2.6.35" from usb device 0:2 (usbda2) 2192404 bytes read Marvell>> bootm 0x01000000 ## Booting kernel from Legacy Image at 01000000 ... Image Name: Linux-2.6.35 Image Type: ARM Linux Kernel Image (uncompressed) Data Size: 2192340 Bytes = 2.1 MB Load Address: 00008000 Entry Point: 00008000 Verifying Checksum ... OK Loading Kernel Image ... OK OK Starting kernel ... and up to the shell# If I reboot u-boot can't find usb storages (but the in-NAND kernel will boot): [ 249.433555] Restarting system. U-Boot 2010.03-00176-g42f7128 (Aug 06 2010 - 22:24:34) Marvell-Sheevaplug ... Hit any key to stop autoboot: 0 Marvell>> usb start (Re)start USB... USB: Register 10011 NbrPorts 1 USB EHCI 1.00 scanning bus for devices... 2 USB Device(s) found scanning bus for storage devices... error in inquiry 0 Storage Device(s) found All these things are almost 100% reproducible. Vendor-shipped (Marvell's) u-boot has exactly the same disease: ** MARVELL BOARD: SHEEVA PLUG LE U-Boot 1.1.4 (Mar 19 2009 - 16:06:59) Marvell version: 3.4.16 -- Sergei

4 13

Re: [U-Boot] Pull request u-boot-arm
by Wolfgang Denk 10 Aug '10

10 Aug '10

> The following changes since commit 201532a69cf7e7a84bff354fdab45947425d22b4: > > Merge branch 'master' of ../master (2010-08-10 22:20:27 +0200) > > are available in the git repository at: > > git://git.denx.de/u-boot-arm.git master > > Albert Aribaud (6): > ide: add configuration > ide: reorder object files alphabetically > ide: add mvsata_ide driver > cmd_ide: add support for orion5x > edminiv2: add mvsata_ide and cmd_ide support > orion5x: allow overriding default mappings windows > > Li Haibo (1): > MX51EVK: fix return value of get_timer_masked > > Prafulla Wadaskar (2): > cmd_ide: add support for Kirkwood > Kirkwood: openrd_base: Added SATA support > > Reinhard Meyer (1): > fix cmd_mmc.c, line 136 missing " > > Steve Sakoman (8): > ARMV7: Add pad mux support for OMAP4 > ARMV7: Fix udelay for OMAP4 > ARMV7: Modify i2c driver for more reliable operation on OMAP4 > ARMV7: Add support for the TWL6030 I2C power chip used in OMAP4 systems > ARMV7: Restructure omap3 musb driver to allow code sharing between OMAP3 and OMAP4 > ARMV7: Enable musb driver and usbtty on OMAP4430 SDP > ARMV7: Enable musb driver and usbtty on OMAP4 Panda > ARMV7: Update default environment for OMAP4 boards > > arch/arm/cpu/arm926ejs/orion5x/cpu.c | 40 ++-- > arch/arm/cpu/armv7/mx51/timer.c | 2 +- > arch/arm/cpu/armv7/omap-common/timer.c | 9 - > arch/arm/cpu/armv7/omap4/board.c | 11 + > arch/arm/include/asm/arch-kirkwood/kirkwood.h | 5 + > arch/arm/include/asm/arch-omap3/cpu.h | 3 + > arch/arm/include/asm/arch-omap3/i2c.h | 4 +- > arch/arm/include/asm/arch-omap4/cpu.h | 3 + > arch/arm/include/asm/arch-omap4/mux_omap4.h | 344 +++++++++++++++++++++++++ > arch/arm/include/asm/arch-omap4/omap4.h | 2 + > arch/arm/include/asm/arch-omap4/sys_proto.h | 1 + > arch/arm/include/asm/arch-orion5x/cpu.h | 98 ++++++-- > arch/arm/include/asm/arch-orion5x/orion5x.h | 3 + > arch/powerpc/include/asm/config.h | 3 + > board/ti/panda/panda.c | 26 ++ > board/ti/panda/panda.h | 265 +++++++++++++++++++ > board/ti/sdp4430/sdp.c | 26 ++ > board/ti/sdp4430/sdp.h | 265 +++++++++++++++++++ > common/cmd_ide.c | 25 ++- > common/cmd_mmc.c | 2 +- > doc/README.PXA_CF | 8 + > drivers/block/Makefile | 7 +- > drivers/block/mvsata_ide.c | 140 ++++++++++ > drivers/i2c/omap24xx_i2c.c | 31 ++- > drivers/i2c/omap24xx_i2c.h | 4 + > drivers/power/Makefile | 1 + > drivers/power/twl6030.c | 78 ++++++ > drivers/usb/musb/omap3.c | 16 ++ > drivers/usb/musb/omap3.h | 3 +- > include/configs/ap325rxa.h | 1 + > include/configs/edminiv2.h | 34 +++- > include/configs/ms7720se.h | 1 + > include/configs/omap4_panda.h | 26 ++- > include/configs/omap4_sdp4430.h | 26 ++- > include/configs/openrd_base.h | 31 +++ > include/configs/r2dplus.h | 1 + > include/configs/r7780mp.h | 1 + > include/twl6030.h | 91 +++++++ > 38 files changed, 1556 insertions(+), 81 deletions(-) > create mode 100644 arch/arm/include/asm/arch-omap4/mux_omap4.h > create mode 100644 board/ti/panda/panda.h > create mode 100644 board/ti/sdp4430/sdp.h > create mode 100644 drivers/block/mvsata_ide.c > create mode 100644 drivers/power/twl6030.c > create mode 100644 include/twl6030.h Applied, thanks. Best regards, Wolfgang Denk -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd(a)denx.de "Confound these ancestors.... They've stolen our best ideas!" - Ben Jonson

1 0

[U-Boot] Pull request - net
by Ben Warren 10 Aug '10

10 Aug '10

2 1

[U-Boot] Please pull u-boot-ppc4xx/master
by Stefan Roese 10 Aug '10

10 Aug '10

The following changes since commit b417260d871d4d8d336c160d95ed40cc8c0fb0fa: PXA: Declare __io for vpac270 IDE (2010-08-09 01:15:22 +0200) are available in the git repository at: git://www.denx.de/git/u-boot-ppc4xx.git master Heiko Schocher (1): ppc4xx: Fix building of sc3 board Matthias Fuchs (3): ppc4xx: Fix building of AR405 board ppc4xx: Fix building of CANBT board ppc4xx: Fix building of PMC440 board Stefan Roese (1): ppc4xx: Fix/Update katmai board header Wolfgang Denk (1): ppc4xx: cleanup default environment for AMCC boards board/esd/ar405/config.mk | 9 +-------- board/esd/canbt/config.mk | 8 +------- board/esd/pmc440/config.mk | 2 +- board/sc3/config.mk | 2 +- include/configs/AR405.h | 10 +++++----- include/configs/CANBT.h | 6 +++--- include/configs/PMC440.h | 8 ++++---- include/configs/amcc-common.h | 6 ++---- include/configs/katmai.h | 14 +++----------- include/configs/sc3.h | 5 +++-- 10 files changed, 24 insertions(+), 46 deletions(-)

2 1

[U-Boot] Pull request u-boot-arm
by Wolfgang Denk 10 Aug '10

10 Aug '10

The following changes since commit 201532a69cf7e7a84bff354fdab45947425d22b4: Merge branch 'master' of ../master (2010-08-10 22:20:27 +0200) are available in the git repository at: git://git.denx.de/u-boot-arm.git master Albert Aribaud (6): ide: add configuration ide: reorder object files alphabetically ide: add mvsata_ide driver cmd_ide: add support for orion5x edminiv2: add mvsata_ide and cmd_ide support orion5x: allow overriding default mappings windows Li Haibo (1): MX51EVK: fix return value of get_timer_masked Prafulla Wadaskar (2): cmd_ide: add support for Kirkwood Kirkwood: openrd_base: Added SATA support Reinhard Meyer (1): fix cmd_mmc.c, line 136 missing " Steve Sakoman (8): ARMV7: Add pad mux support for OMAP4 ARMV7: Fix udelay for OMAP4 ARMV7: Modify i2c driver for more reliable operation on OMAP4 ARMV7: Add support for the TWL6030 I2C power chip used in OMAP4 systems ARMV7: Restructure omap3 musb driver to allow code sharing between OMAP3 and OMAP4 ARMV7: Enable musb driver and usbtty on OMAP4430 SDP ARMV7: Enable musb driver and usbtty on OMAP4 Panda ARMV7: Update default environment for OMAP4 boards arch/arm/cpu/arm926ejs/orion5x/cpu.c | 40 ++-- arch/arm/cpu/armv7/mx51/timer.c | 2 +- arch/arm/cpu/armv7/omap-common/timer.c | 9 - arch/arm/cpu/armv7/omap4/board.c | 11 + arch/arm/include/asm/arch-kirkwood/kirkwood.h | 5 + arch/arm/include/asm/arch-omap3/cpu.h | 3 + arch/arm/include/asm/arch-omap3/i2c.h | 4 +- arch/arm/include/asm/arch-omap4/cpu.h | 3 + arch/arm/include/asm/arch-omap4/mux_omap4.h | 344 +++++++++++++++++++++++++ arch/arm/include/asm/arch-omap4/omap4.h | 2 + arch/arm/include/asm/arch-omap4/sys_proto.h | 1 + arch/arm/include/asm/arch-orion5x/cpu.h | 98 ++++++-- arch/arm/include/asm/arch-orion5x/orion5x.h | 3 + arch/powerpc/include/asm/config.h | 3 + board/ti/panda/panda.c | 26 ++ board/ti/panda/panda.h | 265 +++++++++++++++++++ board/ti/sdp4430/sdp.c | 26 ++ board/ti/sdp4430/sdp.h | 265 +++++++++++++++++++ common/cmd_ide.c | 25 ++- common/cmd_mmc.c | 2 +- doc/README.PXA_CF | 8 + drivers/block/Makefile | 7 +- drivers/block/mvsata_ide.c | 140 ++++++++++ drivers/i2c/omap24xx_i2c.c | 31 ++- drivers/i2c/omap24xx_i2c.h | 4 + drivers/power/Makefile | 1 + drivers/power/twl6030.c | 78 ++++++ drivers/usb/musb/omap3.c | 16 ++ drivers/usb/musb/omap3.h | 3 +- include/configs/ap325rxa.h | 1 + include/configs/edminiv2.h | 34 +++- include/configs/ms7720se.h | 1 + include/configs/omap4_panda.h | 26 ++- include/configs/omap4_sdp4430.h | 26 ++- include/configs/openrd_base.h | 31 +++ include/configs/r2dplus.h | 1 + include/configs/r7780mp.h | 1 + include/twl6030.h | 91 +++++++ 38 files changed, 1556 insertions(+), 81 deletions(-) create mode 100644 arch/arm/include/asm/arch-omap4/mux_omap4.h create mode 100644 board/ti/panda/panda.h create mode 100644 board/ti/sdp4430/sdp.h create mode 100644 drivers/block/mvsata_ide.c create mode 100644 drivers/power/twl6030.c create mode 100644 include/twl6030.h

1 0

[U-Boot] Please pull u-boot-imx
by Stefano Babic 10 Aug '10

10 Aug '10

Hi Wolfgang, in the pull request I have already merged the fix by Reinhard Meyer ( fix cmd_mmc.c, line 136 missing "), even if it is not strictly related to imx, else I cannot compile clean. It should not be a problem ;-) The following changes since commit b417260d871d4d8d336c160d95ed40cc8c0fb0fa: Marek Vasut (1): PXA: Declare __io for vpac270 IDE are available in the git repository at: git://git.denx.de/u-boot-imx master Li Haibo (1): MX51EVK: fix return value of get_timer_masked Reinhard Meyer (1): fix cmd_mmc.c, line 136 missing " arch/arm/cpu/armv7/mx51/timer.c | 2 +- common/cmd_mmc.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) Best regards, Stefano ===================================================================== DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-0 Fax: +49-8142-66989-80 Email: office(a)denx.de =====================================================================

2 1

[U-Boot] [PATCH] orion5x: allow overriding default mappings windows
by Albert Aribaud 10 Aug '10

10 Aug '10

Turn all ORION5X_DEF{ADR,SZ}_xxx macros into ORION5X_{ADR,SZ}_xxx and allow defining them from board code to override defaults. This is particularly useful for defining board-specific FLASH address and size in board header file rather than having to tweak orion5x code. Signed-off-by: Albert Aribaud <albert.aribaud(a)free.fr> --- arch/arm/cpu/arm926ejs/orion5x/cpu.c | 40 ++++++------ arch/arm/include/asm/arch-orion5x/cpu.h | 98 ++++++++++++++++++++++++------- 2 files changed, 97 insertions(+), 41 deletions(-) diff --git a/arch/arm/cpu/arm926ejs/orion5x/cpu.c b/arch/arm/cpu/arm926ejs/orion5x/cpu.c index 03c6d06..a921e98 100644 --- a/arch/arm/cpu/arm926ejs/orion5x/cpu.c +++ b/arch/arm/cpu/arm926ejs/orion5x/cpu.c @@ -87,56 +87,56 @@ int orion5x_config_adr_windows(void) (struct orion5x_win_registers *)ORION5X_CPU_WIN_BASE; /* Window 0: PCIE MEM address space */ - writel(ORION5X_CPU_WIN_CTRL_DATA(ORION5X_DEFSZ_PCIE_MEM, + writel(ORION5X_CPU_WIN_CTRL_DATA(ORION5X_SZ_PCIE_MEM, ORION5X_TARGET_PCIE, ORION5X_ATTR_PCIE_MEM, ORION5X_WIN_ENABLE), &winregs[0].ctrl); - writel(ORION5X_DEFADR_PCIE_MEM, &winregs[0].base); - writel(ORION5X_DEFADR_PCIE_MEM_REMAP_LO, &winregs[0].remap_lo); - writel(ORION5X_DEFADR_PCIE_MEM_REMAP_HI, &winregs[0].remap_hi); + writel(ORION5X_ADR_PCIE_MEM, &winregs[0].base); + writel(ORION5X_ADR_PCIE_MEM_REMAP_LO, &winregs[0].remap_lo); + writel(ORION5X_ADR_PCIE_MEM_REMAP_HI, &winregs[0].remap_hi); /* Window 1: PCIE IO address space */ - writel(ORION5X_CPU_WIN_CTRL_DATA(ORION5X_DEFSZ_PCIE_IO, + writel(ORION5X_CPU_WIN_CTRL_DATA(ORION5X_SZ_PCIE_IO, ORION5X_TARGET_PCIE, ORION5X_ATTR_PCIE_IO, ORION5X_WIN_ENABLE), &winregs[1].ctrl); - writel(ORION5X_DEFADR_PCIE_IO, &winregs[1].base); - writel(ORION5X_DEFADR_PCIE_IO_REMAP_LO, &winregs[1].remap_lo); - writel(ORION5X_DEFADR_PCIE_IO_REMAP_HI, &winregs[1].remap_hi); + writel(ORION5X_ADR_PCIE_IO, &winregs[1].base); + writel(ORION5X_ADR_PCIE_IO_REMAP_LO, &winregs[1].remap_lo); + writel(ORION5X_ADR_PCIE_IO_REMAP_HI, &winregs[1].remap_hi); /* Window 2: PCI MEM address space */ - writel(ORION5X_CPU_WIN_CTRL_DATA(ORION5X_DEFSZ_PCI_MEM, + writel(ORION5X_CPU_WIN_CTRL_DATA(ORION5X_SZ_PCI_MEM, ORION5X_TARGET_PCI, ORION5X_ATTR_PCI_MEM, ORION5X_WIN_ENABLE), &winregs[2].ctrl); - writel(ORION5X_DEFADR_PCI_MEM, &winregs[2].base); + writel(ORION5X_ADR_PCI_MEM, &winregs[2].base); /* Window 3: PCI IO address space */ - writel(ORION5X_CPU_WIN_CTRL_DATA(ORION5X_DEFSZ_PCI_IO, + writel(ORION5X_CPU_WIN_CTRL_DATA(ORION5X_SZ_PCI_IO, ORION5X_TARGET_PCI, ORION5X_ATTR_PCI_IO, ORION5X_WIN_ENABLE), &winregs[3].ctrl); - writel(ORION5X_DEFADR_PCI_IO, &winregs[3].base); + writel(ORION5X_ADR_PCI_IO, &winregs[3].base); /* Window 4: DEV_CS0 address space */ - writel(ORION5X_CPU_WIN_CTRL_DATA(ORION5X_DEFSZ_DEV_CS0, + writel(ORION5X_CPU_WIN_CTRL_DATA(ORION5X_SZ_DEV_CS0, ORION5X_TARGET_DEVICE, ORION5X_ATTR_DEV_CS0, ORION5X_WIN_ENABLE), &winregs[4].ctrl); - writel(ORION5X_DEFADR_DEV_CS0, &winregs[4].base); + writel(ORION5X_ADR_DEV_CS0, &winregs[4].base); /* Window 5: DEV_CS1 address space */ - writel(ORION5X_CPU_WIN_CTRL_DATA(ORION5X_DEFSZ_DEV_CS1, + writel(ORION5X_CPU_WIN_CTRL_DATA(ORION5X_SZ_DEV_CS1, ORION5X_TARGET_DEVICE, ORION5X_ATTR_DEV_CS1, ORION5X_WIN_ENABLE), &winregs[5].ctrl); - writel(ORION5X_DEFADR_DEV_CS1, &winregs[5].base); + writel(ORION5X_ADR_DEV_CS1, &winregs[5].base); /* Window 6: DEV_CS2 address space */ - writel(ORION5X_CPU_WIN_CTRL_DATA(ORION5X_DEFSZ_DEV_CS2, + writel(ORION5X_CPU_WIN_CTRL_DATA(ORION5X_SZ_DEV_CS2, ORION5X_TARGET_DEVICE, ORION5X_ATTR_DEV_CS2, ORION5X_WIN_ENABLE), &winregs[6].ctrl); - writel(ORION5X_DEFADR_DEV_CS2, &winregs[6].base); + writel(ORION5X_ADR_DEV_CS2, &winregs[6].base); /* Window 7: BOOT Memory address space */ - writel(ORION5X_CPU_WIN_CTRL_DATA(ORION5X_DEFSZ_BOOTROM, + writel(ORION5X_CPU_WIN_CTRL_DATA(ORION5X_SZ_BOOTROM, ORION5X_TARGET_DEVICE, ORION5X_ATTR_BOOTROM, ORION5X_WIN_ENABLE), &winregs[7].ctrl); - writel(ORION5X_DEFADR_BOOTROM, &winregs[7].base); + writel(ORION5X_ADR_BOOTROM, &winregs[7].base); return 0; } diff --git a/arch/arm/include/asm/arch-orion5x/cpu.h b/arch/arm/include/asm/arch-orion5x/cpu.h index 22e2dd3..80717f8 100644 --- a/arch/arm/include/asm/arch-orion5x/cpu.h +++ b/arch/arm/include/asm/arch-orion5x/cpu.h @@ -75,35 +75,91 @@ enum orion5x_cpu_attrib { }; /* - * Default Device Address MAP BAR values + * Device Address MAP BAR values +/* + * All addresses and sizes not defined by board code + * will be given default values here. */ -#define ORION5X_DEFADR_PCIE_MEM 0x90000000 -#define ORION5X_DEFADR_PCIE_MEM_REMAP_LO 0x90000000 -#define ORION5X_DEFADR_PCIE_MEM_REMAP_HI 0 -#define ORION5X_DEFSZ_PCIE_MEM (128*1024*1024) -#define ORION5X_DEFADR_PCIE_IO 0xf0000000 -#define ORION5X_DEFADR_PCIE_IO_REMAP_LO 0x90000000 -#define ORION5X_DEFADR_PCIE_IO_REMAP_HI 0 -#define ORION5X_DEFSZ_PCIE_IO (64*1024) +#if !defined (ORION5X_ADR_PCIE_MEM) +#define ORION5X_ADR_PCIE_MEM 0x90000000 +#endif + +#if !defined (ORION5X_ADR_PCIE_MEM_REMAP_LO) +#define ORION5X_ADR_PCIE_MEM_REMAP_LO 0x90000000 +#endif + +#if !defined (ORION5X_ADR_PCIE_MEM_REMAP_HI) +#define ORION5X_ADR_PCIE_MEM_REMAP_HI 0 +#endif + +#if !defined (ORION5X_SZ_PCIE_MEM) +#define ORION5X_SZ_PCIE_MEM (128*1024*1024) +#endif + +#if !defined (ORION5X_ADR_PCIE_IO) +#define ORION5X_ADR_PCIE_IO 0xf0000000 +#endif + +#if !defined (ORION5X_ADR_PCIE_IO_REMAP_LO) +#define ORION5X_ADR_PCIE_IO_REMAP_LO 0x90000000 +#endif + +#if !defined (ORION5X_ADR_PCIE_IO_REMAP_HI) +#define ORION5X_ADR_PCIE_IO_REMAP_HI 0 +#endif + +#if !defined (ORION5X_SZ_PCIE_IO) +#define ORION5X_SZ_PCIE_IO (64*1024) +#endif + +#if !defined (ORION5X_ADR_PCI_MEM) +#define ORION5X_ADR_PCI_MEM 0x98000000 +#endif + +#if !defined (ORION5X_SZ_PCI_MEM) +#define ORION5X_SZ_PCI_MEM (128*1024*1024) +#endif + +#if !defined (ORION5X_ADR_PCI_IO) +#define ORION5X_ADR_PCI_IO 0xf0100000 +#endif + +#if !defined (ORION5X_SZ_PCI_IO) +#define ORION5X_SZ_PCI_IO (64*1024) +#endif + +#if !defined (ORION5X_ADR_DEV_CS0) +#define ORION5X_ADR_DEV_CS0 0xfa000000 +#endif + +#if !defined (ORION5X_SZ_DEV_CS0) +#define ORION5X_SZ_DEV_CS0 (2*1024*1024) +#endif -#define ORION5X_DEFADR_PCI_MEM 0x98000000 -#define ORION5X_DEFSZ_PCI_MEM (128*1024*1024) +#if !defined (ORION5X_ADR_DEV_CS1) +#define ORION5X_ADR_DEV_CS1 0xf8000000 +#endif -#define ORION5X_DEFADR_PCI_IO 0xf0100000 -#define ORION5X_DEFSZ_PCI_IO (64*1024) +#if !defined (ORION5X_SZ_DEV_CS1) +#define ORION5X_SZ_DEV_CS1 (32*1024*1024) +#endif -#define ORION5X_DEFADR_DEV_CS0 0xfa000000 -#define ORION5X_DEFSZ_DEV_CS0 (2*1024*1024) +#if !defined (ORION5X_ADR_DEV_CS2) +#define ORION5X_ADR_DEV_CS2 0xfa800000 +#endif -#define ORION5X_DEFADR_DEV_CS1 0xf8000000 -#define ORION5X_DEFSZ_DEV_CS1 (32*1024*1024) +#if !defined (ORION5X_SZ_DEV_CS2) +#define ORION5X_SZ_DEV_CS2 (1*1024*1024) +#endif -#define ORION5X_DEFADR_DEV_CS2 0xfa800000 -#define ORION5X_DEFSZ_DEV_CS2 (1*1024*1024) +#if !defined (ORION5X_ADR_BOOTROM) +#define ORION5X_ADR_BOOTROM 0xFFF80000 +#endif -#define ORION5X_DEFADR_BOOTROM 0xFFF80000 -#define ORION5X_DEFSZ_BOOTROM (512*1024) +#if !defined (ORION5X_SZ_BOOTROM) +#define ORION5X_SZ_BOOTROM (512*1024) +#endif /* * PCIE registers are used for SoC device ID and revision -- 1.6.4.4

4 4