diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-04-05 11:09:58 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-04-05 11:09:58 +0200 |
| commit | 2a6460cbb6f5e4ca02f988c7dac243882d7e080a (patch) | |
| tree | 7131c44c619fe70f0c178064b56bd4d80d64ca6f /arch/arm/boards/pcm038 | |
| parent | 4eb3478212e49240a1d9e9d8a1e212049829ef68 (diff) | |
| parent | ac29648413d1a33126ad1f98714717cbee452e55 (diff) | |
| download | barebox-2a6460cbb6f5e4ca02f988c7dac243882d7e080a.tar.gz barebox-2a6460cbb6f5e4ca02f988c7dac243882d7e080a.tar.xz | |
Merge branch 'next'
Diffstat (limited to 'arch/arm/boards/pcm038')
| -rw-r--r-- | arch/arm/boards/pcm038/lowlevel.c | 3 | ||||
| -rw-r--r-- | arch/arm/boards/pcm038/pcm038.c | 16 |
2 files changed, 7 insertions, 12 deletions
diff --git a/arch/arm/boards/pcm038/lowlevel.c b/arch/arm/boards/pcm038/lowlevel.c index 32392636e7..2bc89a0c13 100644 --- a/arch/arm/boards/pcm038/lowlevel.c +++ b/arch/arm/boards/pcm038/lowlevel.c @@ -30,6 +30,7 @@ #include <asm/barebox-arm.h> #include <asm/system.h> #include <asm-generic/memory_layout.h> +#include <asm-generic/sections.h> #include "pll.h" @@ -44,7 +45,7 @@ static void __bare_init __naked insdram(void) r = STACK_BASE + STACK_SIZE - 12; __asm__ __volatile__("mov sp, %0" : : "r"(r)); - imx_nand_load_image((void *)TEXT_BASE, 256 * 1024); + imx_nand_load_image((void *)TEXT_BASE, barebox_image_size); board_init_lowlevel_return(); } diff --git a/arch/arm/boards/pcm038/pcm038.c b/arch/arm/boards/pcm038/pcm038.c index 58dacaeee4..8535e41a5c 100644 --- a/arch/arm/boards/pcm038/pcm038.c +++ b/arch/arm/boards/pcm038/pcm038.c @@ -41,7 +41,7 @@ #include <mach/imxfb.h> #include <asm/mmu.h> #include <i2c/i2c.h> -#include <usb/isp1504.h> +#include <usb/ulpi.h> #include <mach/spi.h> #include <mach/iomux-mx27.h> #include <mach/devices-imx27.h> @@ -127,7 +127,7 @@ static void pcm038_usbh_init(void) mdelay(10); - isp1504_set_vbus_power((void *)(IMX_OTG_BASE + 0x570), 1); + ulpi_setup((void *)(IMX_OTG_BASE + 0x570), 1); } #endif @@ -224,19 +224,13 @@ static int pcm038_devices_init(void) }; /* configure 16 bit nor flash on cs0 */ - CS0U = 0x22C2CF00; - CS0L = 0x75000D01; - CS0A = 0x00000900; + imx27_setup_weimcs(0, 0x22C2CF00, 0x75000D01, 0x00000900); /* configure SRAM on cs1 */ - CS1U = 0x0000d843; - CS1L = 0x22252521; - CS1A = 0x22220a00; + imx27_setup_weimcs(1, 0x0000d843, 0x22252521, 0x22220a00); /* configure SJA1000 on cs4 */ - CS4U = 0x0000DCF6; - CS4L = 0x444A0301; - CS4A = 0x44443302; + imx27_setup_weimcs(4, 0x0000DCF6, 0x444A0301, 0x44443302); /* initizalize gpios */ for (i = 0; i < ARRAY_SIZE(mode); i++) |