July 2012 - U-Boot

[U-Boot] [PATCH 1/2] KW: Move the memory register definitions into kirkwood.h
by Marek Vasut 05 Jul '12

05 Jul '12

Also add the CPUCS register definition. Signed-off-by: Marek Vasut <marex(a)denx.de> Cc: Prafulla Wadaskar <prafulla(a)marvell.com> Cc: Wolfgang Denk <wd(a)denx.de> --- arch/arm/cpu/arm926ejs/kirkwood/dram.c | 2 -- arch/arm/include/asm/arch-kirkwood/kirkwood.h | 9 +++++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/arch/arm/cpu/arm926ejs/kirkwood/dram.c b/arch/arm/cpu/arm926ejs/kirkwood/dram.c index 181b3e7..ccb6b03 100644 --- a/arch/arm/cpu/arm926ejs/kirkwood/dram.c +++ b/arch/arm/cpu/arm926ejs/kirkwood/dram.c @@ -30,8 +30,6 @@ DECLARE_GLOBAL_DATA_PTR; -#define KW_REG_CPUCS_WIN_BAR(x) (KW_REGISTER(0x1500) + (x * 0x08)) -#define KW_REG_CPUCS_WIN_SZ(x) (KW_REGISTER(0x1504) + (x * 0x08)) /* * kw_sdram_bar - reads SDRAM Base Address Register */ diff --git a/arch/arm/include/asm/arch-kirkwood/kirkwood.h b/arch/arm/include/asm/arch-kirkwood/kirkwood.h index 47771d5..33ae827 100644 --- a/arch/arm/include/asm/arch-kirkwood/kirkwood.h +++ b/arch/arm/include/asm/arch-kirkwood/kirkwood.h @@ -77,6 +77,15 @@ #define MVCPU_WIN_ENABLE KWCPU_WIN_ENABLE #define MVCPU_WIN_DISABLE KWCPU_WIN_DISABLE +/* Kirkwood memory registers */ +#define KW_REG_CPUCS_WIN_BAR(x) (KW_REGISTER(0x1500) + ((x) * 0x08)) +#define KW_REG_CPUCS_WIN_SZ(x) (KW_REGISTER(0x1504) + ((x) * 0x08)) + +#define KW_REG_CPUCS_WIN_ENABLE (1 << 0) +#define KW_REG_CPUCS_WIN_WR_PROTECT (1 << 1) +#define KW_REG_CPUCS_WIN_WIN0_CS(x) (((x) & 0x3) << 2) +#define KW_REG_CPUCS_WIN_SIZE(x) (((x) & 0xff) << 24) + #if defined (CONFIG_KW88F6281) #include <asm/arch/kw88f6281.h> #elif defined (CONFIG_KW88F6192) -- 1.7.10

4 22

[U-Boot] [PATCH] smdk6400: Move smdk6400 board from Makefile to boards.cfg
by Zhong Hongbo 05 Jul '12

05 Jul '12

From: seedshope <bocui107(a)gmail.com> Signed-off-by: Zhong Hongbo <bocui107(a)gmail.com> --- Makefile | 20 -------------------- board/samsung/smdk6400/config.mk | 4 +--- boards.cfg | 2 ++ include/configs/smdk6400.h | 2 +- 4 files changed, 4 insertions(+), 24 deletions(-) diff --git a/Makefile b/Makefile index 0197239..e3af33f 100644 --- a/Makefile +++ b/Makefile @@ -695,26 +695,6 @@ SX1_config: unconfig fi; @$(MKCONFIG) -n $@ SX1 arm arm925t sx1 -######################################################################### -## ARM1176 Systems -######################################################################### -smdk6400_noUSB_config \ -smdk6400_config : unconfig - @mkdir -p $(obj)include $(obj)board/samsung/smdk6400 - @mkdir -p $(obj)nand_spl/board/samsung/smdk6400 - @echo "#define CONFIG_NAND_U_BOOT" > $(obj)include/config.h - @echo "CONFIG_NAND_U_BOOT = y" >> $(obj)include/config.mk - @if [ -z "$(findstring smdk6400_noUSB_config,$@)" ]; then \ - echo "RAM_TEXT = 0x57e00000" >> $(obj)board/samsung/smdk6400/config.tmp;\ - else \ - echo "RAM_TEXT = 0xc7e00000" >> $(obj)board/samsung/smdk6400/config.tmp;\ - fi - @$(MKCONFIG) smdk6400 arm arm1176 smdk6400 samsung s3c64xx - @echo "CONFIG_NAND_U_BOOT = y" >> $(obj)include/config.mk - -######################################################################### -######################################################################### - clean: @rm -f $(obj)examples/standalone/82559_eeprom \ $(obj)examples/standalone/atmel_df_pow2 \ diff --git a/board/samsung/smdk6400/config.mk b/board/samsung/smdk6400/config.mk index 6f04c2f..93a1a0d 100644 --- a/board/samsung/smdk6400/config.mk +++ b/board/samsung/smdk6400/config.mk @@ -21,10 +21,8 @@ # # download area is 0x5000c000 -sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp - ifndef CONFIG_NAND_SPL -CONFIG_SYS_TEXT_BASE = $(RAM_TEXT) +CONFIG_SYS_TEXT_BASE = $(CONFIG_RAM_TEXT) else CONFIG_SYS_TEXT_BASE = 0 endif diff --git a/boards.cfg b/boards.cfg index 53f6dc3..42b0883 100644 --- a/boards.cfg +++ b/boards.cfg @@ -47,6 +47,8 @@ flea3 arm arm1136 - CarMedi mx35pdk arm arm1136 - freescale mx35 apollon arm arm1136 apollon - omap24xx omap2420h4 arm arm1136 - ti omap24xx +smdk6400 arm arm1176 smdk6400 samsung s3c64xx smdk6400:NAND_U_BOOT,RAM_TEXT=0xc7e00000 +smdk6400_nousb arm arm1176 smdk6400 samsung s3c64xx smdk6400:NAND_U_BOOT,RAM_TEXT=0x57e00000 tnetv107x_evm arm arm1176 tnetv107xevm ti tnetv107x integratorap_cm720t arm arm720t integrator armltd - integratorap:CM720T integratorap_cm920t arm arm920t integrator armltd - integratorap:CM920T diff --git a/include/configs/smdk6400.h b/include/configs/smdk6400.h index 04caeef..47326d6 100644 --- a/include/configs/smdk6400.h +++ b/include/configs/smdk6400.h @@ -54,7 +54,7 @@ /* input clock of PLL: SMDK6400 has 12MHz input clock */ #define CONFIG_SYS_CLK_FREQ 12000000 -#if !defined(CONFIG_NAND_SPL) && (CONFIG_SYS_TEXT_BASE >= 0xc0000000) +#if !defined(CONFIG_NAND_U_BOOT) && (CONFIG_SYS_TEXT_BASE >= 0xc0000000) #define CONFIG_ENABLE_MMU #endif -- 1.7.5.4

1 1

[U-Boot] Please pull u-boot-atmel/master
by Andreas Bießmann 05 Jul '12

05 Jul '12

Dear Albert Aribaud, The following changes since commit c45272e25bdf241fbb27638465f16ce2342ed1b6: i.MX6 USDHC: Use the ESDHC clock (2012-07-02 19:53:20 +0200) are available in the git repository at: git://git.denx.de/u-boot-atmel.git master for you to fetch changes up to dc72466bd1a1c15f31c92f77e0df6f533a658ccc: AT91SAM9*: Change kernel address in dataflash to match u-boot's size (2012-07-05 11:38:42 +0200) ---------------------------------------------------------------- Alexandre Belloni (1): AT91SAM9*: Change kernel address in dataflash to match u-boot's size Andreas Bießmann (1): ehci-atmel: fix compiler warning Bo Shen (3): Atmel : usb : add EHCI driver for Atmel SoC AT91: at91sam9m10g45ek : Enable EHCI instead OHCI ATMEL/PIO: Enable new feature of PIO on Atmel device esw(a)bus-elektronik.de (2): Fix: broken boot message at serial line on AT91SAM9263-EK board Fix: AT91SAM9263 nor flash usage arch/arm/include/asm/arch-at91/at91_pio.h | 45 ++++++++++- board/atmel/at91sam9260ek/partition.c | 6 +- board/atmel/at91sam9261ek/partition.c | 6 +- board/atmel/at91sam9263ek/at91sam9263ek.c | 2 +- board/atmel/at91sam9263ek/partition.c | 6 +- board/atmel/at91sam9rlek/partition.c | 6 +- drivers/gpio/at91_gpio.c | 125 ++++++++++++++++++++++++++++- drivers/usb/host/Makefile | 1 + drivers/usb/host/ehci-atmel.c | 89 ++++++++++++++++++++ include/configs/at91sam9260ek.h | 5 +- include/configs/at91sam9261ek.h | 5 +- include/configs/at91sam9263ek.h | 10 ++- include/configs/at91sam9m10g45ek.h | 20 +---- include/configs/at91sam9rlek.h | 3 +- 14 files changed, 288 insertions(+), 41 deletions(-) create mode 100644 drivers/usb/host/ehci-atmel.c

2 1

[U-Boot] [PATCH 2/3] cm4008: Fix ROM relocation.
by Yann Vernier 05 Jul '12

05 Jul '12

Changed CONFIG_SYS_TEXT_BASE to actual address (required for board_init_f) and moved it into cm4008.h, along with a warning that it must match PHYS_FLASH_1 (since lowlevel_init relocates there). Signed-off-by: Yann Vernier <yann.vernier(a)orsoc.se> --- arch/arm/cpu/arm920t/ks8695/lowlevel_init.S | 9 +++++++-- board/cm4008/config.mk | 1 - include/configs/cm4008.h | 3 +++ 3 files changed, 10 insertions(+), 3 deletions(-) delete mode 100644 board/cm4008/config.mk diff --git a/arch/arm/cpu/arm920t/ks8695/lowlevel_init.S b/arch/arm/cpu/arm920t/ks8695/lowlevel_init.S index e9f1227..8986e58 100644 --- a/arch/arm/cpu/arm920t/ks8695/lowlevel_init.S +++ b/arch/arm/cpu/arm920t/ks8695/lowlevel_init.S @@ -92,11 +92,16 @@ lowlevel_init: * ram from address 0, and flash at 32MB. */ ldr r1, =(KS8695_IO_BASE+KS8695_MEM_CTRL0) + /* Remap flash memory to 768MB size, such that it covers + both 0 (boot) and 512MB (run) regions */ ldr r2, =0xbfc00040 str r2, [r1] /* large flash map */ - ldr pc, =(highflash+0x02000000-0x00f00000) /* jump to high flash address */ + /* Relies on PHYS_FLASH_1==CONFIG_SYS_TEXT_BASE */ + ldr pc, =(highflash) /* jump to high flash address */ highflash: - ldr r2, =0x8fe00040 + /* Move ROM to high address, and reconfigure to 4MiB size */ + ldr r2, =(((PHYS_FLASH_1+0x3f0000)<<(22-16))| \ + (PHYS_FLASH_1>>(16-12))|0x40) str r2, [r1] /* remap flash range */ /* diff --git a/board/cm4008/config.mk b/board/cm4008/config.mk deleted file mode 100644 index 0d5923b..0000000 --- a/board/cm4008/config.mk +++ /dev/null @@ -1 +0,0 @@ -CONFIG_SYS_TEXT_BASE = 0x00f00000 diff --git a/include/configs/cm4008.h b/include/configs/cm4008.h index 81e4de4..7c2e113 100644 --- a/include/configs/cm4008.h +++ b/include/configs/cm4008.h @@ -118,6 +118,9 @@ #define CONFIG_SYS_INIT_SP_ADDR 0x00020000 /* lowest 128k of RAM */ +/* CONFIG_SYS_TEXT_BASE and PHYS_FLASH_1 must match for both + relocation in lowlevel_init.S and function array in board.c */ +#define CONFIG_SYS_TEXT_BASE 0x02000000 #define PHYS_FLASH_1 0x02000000 /* Flash Bank #1 */ #define PHYS_FLASH_SECT_SIZE 0x00020000 /* 128 KB sectors (x1) */ #define CONFIG_SYS_FLASH_BASE PHYS_FLASH_1 -- 1.7.10

2 1

[U-Boot] Please pull u-boot-atmel/master
by Andreas Bießmann 05 Jul '12

05 Jul '12

Dear Albert Aribaud, The following changes since commit 3e0cac6b5158b22248f57cdf7769bf8d610fec5e: EXYNOS: SMDK5250: Enable the pinmux setup (2012-06-25 22:51:36 +0200) are available in the git repository at: git://git.denx.de/u-boot-atmel.git master for you to fetch changes up to f3f68232e709a1108b631410087d526cc23dfb55: AT91SAM9*: Change kernel address in dataflash to match u-boot's size (2012-07-02 22:15:05 +0200) ---------------------------------------------------------------- Alexandre Belloni (1): AT91SAM9*: Change kernel address in dataflash to match u-boot's size Andreas Bießmann (1): ehci-atmel: fix compiler warning Bo Shen (3): Atmel : usb : add EHCI driver for Atmel SoC AT91: at91sam9m10g45ek : Enable EHCI instead OHCI ATMEL/PIO: Enable new feature of PIO on Atmel device esw(a)bus-elektronik.de (2): Fix: brocken boot message at serial line on AT91SAM9263-EK board Fix: AT91SAM9263 nor flash usage arch/arm/include/asm/arch-at91/at91_pio.h | 45 ++++++++++- board/atmel/at91sam9260ek/partition.c | 6 +- board/atmel/at91sam9261ek/partition.c | 6 +- board/atmel/at91sam9263ek/at91sam9263ek.c | 2 +- board/atmel/at91sam9263ek/partition.c | 6 +- board/atmel/at91sam9rlek/partition.c | 6 +- drivers/gpio/at91_gpio.c | 125 ++++++++++++++++++++++++++++- drivers/usb/host/Makefile | 1 + drivers/usb/host/ehci-atmel.c | 89 ++++++++++++++++++++ include/configs/at91sam9260ek.h | 5 +- include/configs/at91sam9261ek.h | 5 +- include/configs/at91sam9263ek.h | 10 ++- include/configs/at91sam9m10g45ek.h | 20 +---- include/configs/at91sam9rlek.h | 3 +- 14 files changed, 288 insertions(+), 41 deletions(-) create mode 100644 drivers/usb/host/ehci-atmel.c Best regards Andreas Bießmann

2 4

Re: [U-Boot] i.MX35PDK: Starting U-Boot from serial NOR-Flash
by Hornung, Michael 05 Jul '12

05 Jul '12

Hi Fabio, thank you very much for your reply. > With these values you can create a correct imximage.cfg file for mx35pdk. Thank you, I'll try my best. >> $ ./tools/mkimage -n ./board/freescale/mx35pdk/imximage.cfg -T >> imximage -e 0xA0000000 -d u-boot.bin u-boot.imx Can you tell me which address I have to append to the -e switch of the mkimage program? I think that my choice (0xA0000000) is incorrect since it is /CS0 memory region of the WEIM. Is it 0x10000000 for internal RAM? And if so, do I have to change the following define within "include/configs/mx35pdk.h", too? /* Set TEXT at the beginning of the NOR flash */ #define CONFIG_SYS_TEXT_BASE 0xA0000000 > So my suggestion for you is to try to boot from internal boot mode first. Try booting from SD card first as this would be easier. Could you please give a short explanation, why it is easier to boot from SD than from serial NOR? > Regards, > Fabio Estevam Thank you very much! With best regards Michael Hornung

1 0

[U-Boot] [GIT PULL] Pull request: u-boot-imx
by Stefano Babic 05 Jul '12

05 Jul '12

Hi Albert, please pull from u-boot-imx. Thanks ! The following changes since commit 3e0cac6b5158b22248f57cdf7769bf8d610fec5e: EXYNOS: SMDK5250: Enable the pinmux setup (2012-06-25 22:51:36 +0200) are available in the git repository at: git://www.denx.de/git/u-boot-imx.git master for you to fetch changes up to c45272e25bdf241fbb27638465f16ce2342ed1b6: i.MX6 USDHC: Use the ESDHC clock (2012-07-02 19:53:20 +0200) ---------------------------------------------------------------- Fabio Estevam (21): mx53loco: Fix revision of Dialog boards mx53: Fix mask for SATA reference clock mx53loco: Remove unused SOBJS mx53evk: Remove unused SOBJS mx53ard: Remove unused SOBJS mx53smd: Remove unused SOBJS mx51evk: Remove unused SOBJS efikamx: Remove unused SOBJS vision2: Remove unused SOBJS ima3-mx53: Remove unused SOBJS mx6qarm2: Remove unused SOBJS mx6qsabrelite: Remove unused SOBJS mx53ard: Remove unused CONFIG_MII_GASKET imx31_phycore: Remove CONFIG_SYS_I2C_SLAVE definition mx35pdk: Remove CONFIG_SYS_I2C_SLAVE definition mx53ard: Remove CONFIG_SYS_I2C_SLAVE definition mx53evk: Remove CONFIG_SYS_I2C_SLAVE definition mx53loco: Remove CONFIG_SYS_I2C_SLAVE definition mx53smd: Remove CONFIG_SYS_I2C_SLAVE definition mx28evk: Fix PSWITCH key position mx28evk: Fix boot by adjusting HW_DRAM_CTL29 register Jason Liu (1): i.mx: i.mx6x: NO_MUX_I/NO_PAD_I not set correctly Marek Vasut (1): i.MX28: Add function to adjust memory parameters Michael Langer (1): i.MX6 USDHC: Use the ESDHC clock Otavio Salvador (6): MX28: Fix a typo in mx28_reg_8 macro m28evk: fix board config include guardian macro name mx28evk: ensure command definition is in alphabetic order mx28evk: fix board config include guardian macro name m28evk: drop duplicated definition of CONFIG_OF_LIBFDT m28evk: use same notation to alloc the 128kB stack Vikram Narayanan (1): mx6: Avoid writing to read-only bits in imximage.cfg arch/arm/cpu/arm926ejs/mx28/spl_mem_init.c | 8 ++++++++ arch/arm/cpu/armv7/imx-common/speed.c | 4 ++++ arch/arm/cpu/armv7/mx5/clock.c | 2 +- arch/arm/include/asm/arch-mx28/regs-common.h | 2 +- arch/arm/include/asm/arch-mx6/mx6x_pins.h | 4 ++-- board/efikamx/Makefile | 7 +++---- board/esg/ima3-mx53/Makefile | 2 +- board/freescale/mx28evk/iomux.c | 14 ++++++++++++++ board/freescale/mx51evk/Makefile | 7 +++---- board/freescale/mx53ard/Makefile | 7 +++---- board/freescale/mx53evk/Makefile | 7 +++---- board/freescale/mx53loco/Makefile | 7 +++---- board/freescale/mx53loco/mx53loco.c | 12 +++++++----- board/freescale/mx53smd/Makefile | 7 +++---- board/freescale/mx6qarm2/Makefile | 7 +++---- board/freescale/mx6qarm2/imximage.cfg | 2 +- board/freescale/mx6qsabrelite/Makefile | 7 +++---- board/freescale/mx6qsabrelite/imximage.cfg | 2 +- board/ttcontrol/vision2/Makefile | 5 ++--- doc/README.mx28evk | 2 +- include/configs/imx31_phycore.h | 1 - include/configs/m28evk.h | 10 ++++------ include/configs/mx28evk.h | 8 ++++---- include/configs/mx35pdk.h | 1 - include/configs/mx53ard.h | 2 -- include/configs/mx53evk.h | 1 - include/configs/mx53loco.h | 2 -- include/configs/mx53smd.h | 1 - 28 files changed, 75 insertions(+), 66 deletions(-) -- ===================================================================== DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic(a)denx.de =====================================================================

2 1

[U-Boot] [PATCH 0/3] Update Micrel KSZ8695 support to usable state
by Yann Vernier 05 Jul '12

05 Jul '12

The Micrel KSZ8695 is a SoC with an ARM922T processor, NOR or ROM booting, and SDRAM support. It has been used in a couple of Opengear products and some of that u-boot version has been contributed upstream, but apparently not been maintained since. The three patches submitted here are intended to remedy that. With all three combined, I have been able to get Micrel's KSZ8695X demo board to run U-Boot. As this is my first attempt at a contribution upstream to U-Boot, any comments are quite welcome. Yann Vernier (3): cm4008: set gd->ram_size in dram_init cm4008: Fix ROM relocation. cm4008: use common cfi_flash support arch/arm/cpu/arm920t/ks8695/lowlevel_init.S | 9 +++++++-- board/cm4008/Makefile | 2 +- board/cm4008/cm4008.c | 3 +-- board/cm4008/config.mk | 1 - include/configs/cm4008.h | 7 +++++++ 5 files changed, 16 insertions(+), 6 deletions(-) delete mode 100644 board/cm4008/config.mk -- 1.7.10

1 0

[U-Boot] [PATCH] arm: rmobile: kzm9g: Modify sdram area
by Tetsuyuki Kobayashi 05 Jul '12

05 Jul '12

This patch depends on Nobuhiro Iwamatsu's arm: rmobile: Add supoprt for KMC KZM-A9-GT board Reserve first 16MB for RT-CPU (as same as kernel config). Without this patch, kernel can't get ATAGS info from u-boot properly. Signed-off-by: Tetsuyuki Kobayashi <koba(a)kmckk.co.jp> --- include/configs/kzm_a9_gt.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/include/configs/kzm_a9_gt.h b/include/configs/kzm_a9_gt.h index 48b7afa..4749ca7 100644 --- a/include/configs/kzm_a9_gt.h +++ b/include/configs/kzm_a9_gt.h @@ -93,8 +93,9 @@ #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_INIT_RAM_ADDR + \ CONFIG_SYS_INIT_RAM_SIZE - \ GENERATED_GBL_DATA_SIZE) -#define CONFIG_SYS_SDRAM_BASE KZM_SDRAM_BASE -#define CONFIG_SYS_SDRAM_SIZE PHYS_SDRAM_SIZE +#define CONFIG_SDRAM_OFFSET_FOR_RT (1 * 16 * 1024 * 1024) +#define CONFIG_SYS_SDRAM_BASE (KZM_SDRAM_BASE + CONFIG_SDRAM_OFFSET_FOR_RT) +#define CONFIG_SYS_SDRAM_SIZE (PHYS_SDRAM_SIZE - CONFIG_SDRAM_OFFSET_FOR_RT) #define CONFIG_SYS_LOAD_ADDR (CONFIG_SYS_SDRAM_BASE + 32 * 1024 * 1024) #define CONFIG_SYS_MONITOR_BASE (KZM_FLASH_BASE) -- 1.7.9.5

2 1

[U-Boot] [PATCH v3] powerpc/p1022ds: Add sdcard and spi boot support to P1022DS
by Dirk Eibach 05 Jul '12

05 Jul '12

Signed-off-by: Dirk Eibach <eibach(a)gdsys.de> Cc: Timur Tabi <timur(a)freescale.com> --- Changes in v2: - add Cc - split up original patch series Changes in v3: - use clrsetbits() instead of clrbits()/setbits() - remove dead code - remove unnecessary #undef board/freescale/p1022ds/p1022ds.c | 3 ++ board/freescale/p1022ds/tlb.c | 10 ++++++ boards.cfg | 4 ++ include/configs/P1022DS.h | 56 +++++++++++++++++++++++++++++++++--- 4 files changed, 68 insertions(+), 5 deletions(-) diff --git a/board/freescale/p1022ds/p1022ds.c b/board/freescale/p1022ds/p1022ds.c index 456d9b0..fd4193d 100644 --- a/board/freescale/p1022ds/p1022ds.c +++ b/board/freescale/p1022ds/p1022ds.c @@ -37,6 +37,9 @@ int board_early_init_f(void) { ccsr_gur_t *gur = (void *)CONFIG_SYS_MPC85xx_GUTS_ADDR; + /* Reset eLBC_DIU and SPI_eLBC in case we are booting from SD */ + clrsetbits_be32(&gur->pmuxcr, 0x00600000, 0x80000000); + /* Set pmuxcr to allow both i2c1 and i2c2 */ setbits_be32(&gur->pmuxcr, 0x1000); diff --git a/board/freescale/p1022ds/tlb.c b/board/freescale/p1022ds/tlb.c index e620112..1e9969f 100644 --- a/board/freescale/p1022ds/tlb.c +++ b/board/freescale/p1022ds/tlb.c @@ -71,6 +71,16 @@ struct fsl_e_tlb_entry tlb_table[] = { SET_TLB_ENTRY(1, PIXIS_BASE, PIXIS_BASE_PHYS, MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G, 0, 7, BOOKE_PAGESZ_4K, 1), + +#if defined(CONFIG_SYS_RAMBOOT) + SET_TLB_ENTRY(1, CONFIG_SYS_DDR_SDRAM_BASE, CONFIG_SYS_DDR_SDRAM_BASE, + MAS3_SX|MAS3_SW|MAS3_SR, 0, + 0, 8, BOOKE_PAGESZ_1G, 1), + SET_TLB_ENTRY(1, CONFIG_SYS_DDR_SDRAM_BASE + 0x40000000, + CONFIG_SYS_DDR_SDRAM_BASE + 0x40000000, + MAS3_SX|MAS3_SW|MAS3_SR, 0, + 0, 9, BOOKE_PAGESZ_1G, 1) +#endif }; int num_tlb_entries = ARRAY_SIZE(tlb_table); diff --git a/boards.cfg b/boards.cfg index 24c5879..8de4235 100644 --- a/boards.cfg +++ b/boards.cfg @@ -700,6 +700,10 @@ P1021RDB-PC_SDCARD powerpc mpc85xx p1_p2_rdb_pc freesca P1021RDB-PC_SPIFLASH powerpc mpc85xx p1_p2_rdb_pc freescale - p1_p2_rdb_pc:P1021RDB,SPIFLASH P1022DS powerpc mpc85xx p1022ds freescale P1022DS_36BIT powerpc mpc85xx p1022ds freescale - P1022DS:36BIT +P1022DS_36BIT_SDCARD powerpc mpc85xx p1022ds freescale - P1022DS:36BIT,SDCARD +P1022DS_36BIT_SPIFLASH powerpc mpc85xx p1022ds freescale - P1022DS:36BIT,SPIFLASH +P1022DS_SDCARD powerpc mpc85xx p1022ds freescale - P1022DS:SDCARD +P1022DS_SPIFLASH powerpc mpc85xx p1022ds freescale - P1022DS:SPIFLASH P1023RDS powerpc mpc85xx p1023rds freescale - P1023RDS P1023RDS_NAND powerpc mpc85xx p1023rds freescale - P1023RDS:NAND P1024RDB powerpc mpc85xx p1_p2_rdb_pc freescale - p1_p2_rdb_pc:P1024RDB diff --git a/include/configs/P1022DS.h b/include/configs/P1022DS.h index 70d751d..213c5e3 100644 --- a/include/configs/P1022DS.h +++ b/include/configs/P1022DS.h @@ -26,6 +26,18 @@ #define CONFIG_P1022DS #define CONFIG_MP /* support multiple processors */ +#ifdef CONFIG_SDCARD +#define CONFIG_RAMBOOT_SDCARD 1 +#define CONFIG_SYS_TEXT_BASE 0x11000000 +#define CONFIG_RESET_VECTOR_ADDRESS 0x1107fffc +#endif + +#ifdef CONFIG_SPIFLASH +#define CONFIG_RAMBOOT_SPIFLASH 1 +#define CONFIG_SYS_TEXT_BASE 0x11000000 +#define CONFIG_RESET_VECTOR_ADDRESS 0x1107fffc +#endif + #ifndef CONFIG_SYS_TEXT_BASE #define CONFIG_SYS_TEXT_BASE 0xeff80000 #endif @@ -54,6 +66,7 @@ #define CONFIG_SYS_CLK_FREQ get_board_sys_clk() #define CONFIG_DDR_CLK_FREQ get_board_ddr_clk() + #define CONFIG_ICS307_REFCLK_HZ 33333000 /* ICS307 clock chip ref freq */ /* @@ -138,6 +151,12 @@ #define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE /* start of monitor */ +#if defined(CONFIG_RAMBOOT_NAND) || defined(CONFIG_RAMBOOT_SDCARD) || \ + defined(CONFIG_RAMBOOT_SPIFLASH) +#define CONFIG_SYS_RAMBOOT +#define CONFIG_SYS_EXTRA_ENV_RELOC +#endif + #define CONFIG_FLASH_CFI_DRIVER #define CONFIG_SYS_FLASH_CFI #define CONFIG_SYS_FLASH_EMPTY_INFO @@ -403,11 +422,38 @@ /* * Environment */ -#define CONFIG_ENV_IS_IN_FLASH -#define CONFIG_ENV_OVERWRITE -#define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - CONFIG_ENV_SECT_SIZE) -#define CONFIG_ENV_SIZE 0x2000 -#define CONFIG_ENV_SECT_SIZE 0x20000 +#if defined(CONFIG_SYS_RAMBOOT) +#if defined(CONFIG_RAMBOOT_NAND) +#define CONFIG_ENV_IS_IN_NAND 1 +#define CONFIG_ENV_SIZE CONFIG_SYS_NAND_BLOCK_SIZE +#define CONFIG_ENV_OFFSET ((512 * 1024) + CONFIG_SYS_NAND_BLOCK_SIZE) +#define CONFIG_ENV_RANGE (3 * CONFIG_ENV_SIZE) +#elif defined(CONFIG_RAMBOOT_SPIFLASH) +#define CONFIG_ENV_IS_IN_SPI_FLASH +#define CONFIG_ENV_SPI_BUS 0 +#define CONFIG_ENV_SPI_CS 0 +#define CONFIG_ENV_SPI_MAX_HZ 10000000 +#define CONFIG_ENV_SPI_MODE 0 +#define CONFIG_ENV_SIZE 0x2000 /* 8KB */ +#define CONFIG_ENV_OFFSET 0x100000 +#define CONFIG_ENV_SECT_SIZE 0x10000 +#elif defined(CONFIG_RAMBOOT_SDCARD) +#define CONFIG_ENV_IS_IN_MMC +#define CONFIG_FSL_FIXED_MMC_LOCATION +#define CONFIG_ENV_SIZE 0x2000 +#define CONFIG_SYS_MMC_ENV_DEV 0 +#else + #define CONFIG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */ + #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - 0x1000) + #define CONFIG_ENV_SIZE 0x2000 +#endif +#else + #define CONFIG_ENV_IS_IN_FLASH + #define CONFIG_ENV_OVERWRITE + #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - CONFIG_ENV_SECT_SIZE) + #define CONFIG_ENV_SIZE 0x2000 + #define CONFIG_ENV_SECT_SIZE 0x20000 +#endif #define CONFIG_LOADS_ECHO #define CONFIG_SYS_LOADS_BAUD_CHANGE -- 1.7.2.5

3 3