From 35ccfb9a3d204021346184ffdbed101fe2c3fe76 Mon Sep 17 00:00:00 2001 From: Asen Chavdarov Dimov Date: Mon, 27 Feb 2012 16:57:27 +0200 Subject: [PATCH 01/21] Typo fix in pm9261 init file Fixing this typo lets the barebox for pm9261 to be build. Signed-off-by: Asen Chavdarov Dimov Signed-off-by: Sascha Hauer --- arch/arm/boards/pm9261/init.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/boards/pm9261/init.c b/arch/arm/boards/pm9261/init.c index 23ed44ec6..f7f2928c4 100644 --- a/arch/arm/boards/pm9261/init.c +++ b/arch/arm/boards/pm9261/init.c @@ -123,7 +123,7 @@ static void __init pm_add_device_dm9000(void) IORESOURCE_MEM_16BIT, &dm9000_data); } #else -static void __init ek_add_device_dm9000(void) {} +static void __init pm_add_device_dm9000(void) {} #endif /* CONFIG_DRIVER_NET_DM9K */ static int pm9261_mem_init(void) From 8bf69241883f46a2722a93d5198480d893a5c820 Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Tue, 6 Mar 2012 10:08:09 +0100 Subject: [PATCH 02/21] Release v2012.03.0 Signed-off-by: Sascha Hauer --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 4f4c0069e..3853a1433 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ VERSION = 2012 -PATCHLEVEL = 02 +PATCHLEVEL = 03 SUBLEVEL = 0 EXTRAVERSION = NAME = Amissive Actinocutious Kiwi From 069e1f45c86ebece019637409f32df35c5cf2ac4 Mon Sep 17 00:00:00 2001 From: Juergen Beisert Date: Mon, 12 Mar 2012 14:57:59 +0100 Subject: [PATCH 03/21] serial S3: fix local structure malloc Patch 2c5404651091e985c9009aa417d80fdaf50d7a68 introduces a private structure for the S3C based UARTs but still reserves the memory for the smaller structure which fails at runtime. Signed-off-by: Juergen Beisert Signed-off-by: Sascha Hauer --- drivers/serial/serial_s3c.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/serial/serial_s3c.c b/drivers/serial/serial_s3c.c index a5fd4eeb5..2bdc1df69 100644 --- a/drivers/serial/serial_s3c.c +++ b/drivers/serial/serial_s3c.c @@ -153,7 +153,7 @@ static int s3c_serial_probe(struct device_d *dev) struct s3c_uart *priv; struct console_device *cdev; - priv = xzalloc(sizeof(struct console_device)); + priv = xzalloc(sizeof(struct s3c_uart)); cdev = &priv->cdev; priv->regs = dev_request_mem_region(dev, 0); dev->priv = priv; From aaf02c6b414691c416617df6bb1ca4e085c889da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Teresa=20G=C3=A1mez?= Date: Thu, 15 Mar 2012 13:46:46 +0100 Subject: [PATCH 04/21] pcm038: increase size of barebox partition MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The image built with pcm038_defconfig is >256k so increase the size of the barebox partition. Signed-off-by: Teresa Gámez Signed-off-by: Sascha Hauer --- arch/arm/boards/pcm038/env/config | 5 +++-- arch/arm/boards/pcm038/pcm038.c | 12 ++++++++---- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/arch/arm/boards/pcm038/env/config b/arch/arm/boards/pcm038/env/config index eb0f9c1a7..b1a5f42ef 100644 --- a/arch/arm/boards/pcm038/env/config +++ b/arch/arm/boards/pcm038/env/config @@ -40,11 +40,12 @@ autoboot_timeout=3 bootargs="console=ttymxc0,115200" -nor_parts="256k(barebox)ro,128k(bareboxenv),2M(kernel),-(root)" +nor_parts="512k(barebox)ro,128k(bareboxenv),2M(kernel),-(root)" rootfs_mtdblock_nor=3 -nand_parts="256k(barebox)ro,128k(bareboxenv),2M(kernel),-(root)" +nand_parts="512k(barebox)ro,128k(bareboxenv),2M(kernel),-(root)" rootfs_mtdblock_nand=7 +nand_device="mxc_nand" # set a fancy prompt (if support is compiled in) PS1="\e[1;32mbarebox@\e[1;31m\h:\w\e[0m " diff --git a/arch/arm/boards/pcm038/pcm038.c b/arch/arm/boards/pcm038/pcm038.c index 8dd652138..58dacaeee 100644 --- a/arch/arm/boards/pcm038/pcm038.c +++ b/arch/arm/boards/pcm038/pcm038.c @@ -274,16 +274,20 @@ static int pcm038_devices_init(void) case GPCR_BOOT_16BIT_NAND_2k: case GPCR_BOOT_16BIT_NAND_512: case GPCR_BOOT_8BIT_NAND_512: - devfs_add_partition("nand0", 0x00000, 0x40000, PARTITION_FIXED, "self_raw"); + devfs_add_partition("nand0", 0x00000, 0x80000, + PARTITION_FIXED, "self_raw"); dev_add_bb_dev("self_raw", "self0"); - devfs_add_partition("nand0", 0x40000, 0x20000, PARTITION_FIXED, "env_raw"); + devfs_add_partition("nand0", 0x80000, 0x100000, + PARTITION_FIXED, "env_raw"); dev_add_bb_dev("env_raw", "env0"); envdev = "NAND"; break; default: - devfs_add_partition("nor0", 0x00000, 0x40000, PARTITION_FIXED, "self0"); - devfs_add_partition("nor0", 0x40000, 0x20000, PARTITION_FIXED, "env0"); + devfs_add_partition("nor0", 0x00000, 0x80000, + PARTITION_FIXED, "self0"); + devfs_add_partition("nor0", 0x80000, 0x100000, + PARTITION_FIXED, "env0"); protect_file("/dev/env0", 1); envdev = "NOR"; From 96a43caf5ac88cd567853c4b7799853522a6f28f Mon Sep 17 00:00:00 2001 From: Marek Belisko Date: Thu, 22 Mar 2012 22:05:18 +0100 Subject: [PATCH 05/21] pxa27x_udc: Fix compilation warning. Fix following: drivers/usb/gadget/pxa27x_udc.c:1482:1: warning: initialization from incompatible pointer type Signed-off-by: Marek Belisko Signed-off-by: Sascha Hauer --- drivers/usb/gadget/pxa27x_udc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/usb/gadget/pxa27x_udc.c b/drivers/usb/gadget/pxa27x_udc.c index 56525559f..26be29dec 100644 --- a/drivers/usb/gadget/pxa27x_udc.c +++ b/drivers/usb/gadget/pxa27x_udc.c @@ -1473,9 +1473,9 @@ static struct pxa_udc memory = { } }; -static int pxa27x_udc_poller(struct poller_struct *poller) +static void pxa27x_udc_poller(struct poller_struct *poller) { - return usb_gadget_poll(); + usb_gadget_poll(); } static struct poller_struct poller = { .func = pxa27x_udc_poller From d3cb611fc61c7c619ec7b89b920f66b84b8c8595 Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Thu, 5 Apr 2012 08:47:49 +0200 Subject: [PATCH 06/21] string: remove unused bcopy function Signed-off-by: Sascha Hauer --- lib/string.c | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/lib/string.c b/lib/string.c index 77435aad7..28650883c 100644 --- a/lib/string.c +++ b/lib/string.c @@ -420,30 +420,6 @@ void * memset(void * s,int c,size_t count) #endif EXPORT_SYMBOL(memset); -#ifndef __HAVE_ARCH_BCOPY -/** - * bcopy - Copy one area of memory to another - * @src: Where to copy from - * @dest: Where to copy to - * @count: The size of the area. - * - * Note that this is the same as memcpy(), with the arguments reversed. - * memcpy() is the standard, bcopy() is a legacy BSD function. - * - * You should not use this function to access IO space, use memcpy_toio() - * or memcpy_fromio() instead. - */ -char * bcopy(const char * src, char * dest, int count) -{ - char *tmp = dest; - - while (count--) - *tmp++ = *src++; - - return dest; -} -#endif - #ifndef __HAVE_ARCH_MEMCPY /** * memcpy - Copy one area of memory to another From 6838fedc7626d3c9cb68e26cce2395bfc224be41 Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Thu, 5 Apr 2012 08:48:11 +0200 Subject: [PATCH 07/21] mtd: fix compiler warning Fixes: drivers/mtd/core.c: In function 'mtd_ioctl': drivers/mtd/core.c:122:24: warning: unused variable 'ecc' [-Wunused-variable] Signed-off-by: Sascha Hauer --- drivers/mtd/core.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/mtd/core.c b/drivers/mtd/core.c index ccc5c262a..7bc0a0f04 100644 --- a/drivers/mtd/core.c +++ b/drivers/mtd/core.c @@ -119,7 +119,9 @@ int mtd_ioctl(struct cdev *cdev, int request, void *buf) int ret = 0; struct mtd_info *mtd = cdev->priv; struct mtd_info_user *user = buf; +#if (defined(CONFIG_NAND_ECC_HW) || defined(CONFIG_NAND_ECC_SOFT)) struct mtd_ecc_stats *ecc = buf; +#endif struct region_info_user *reg = buf; switch (request) { From 3ed06ffde941f570479c43a0095e02007039e34a Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Thu, 5 Apr 2012 08:48:54 +0200 Subject: [PATCH 08/21] USB gadget pxa: Fix compiler warning Fixes: drivers/usb/gadget/pxa27x_udc.c:1263:13: warning: 'pxa27x_change_interface' defined but not used [-Wunused-function] Signed-off-by: Sascha Hauer --- drivers/usb/gadget/pxa27x_udc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/usb/gadget/pxa27x_udc.c b/drivers/usb/gadget/pxa27x_udc.c index 26be29dec..87dcfac96 100644 --- a/drivers/usb/gadget/pxa27x_udc.c +++ b/drivers/usb/gadget/pxa27x_udc.c @@ -1260,7 +1260,7 @@ static void pxa27x_change_configuration(struct pxa_udc *udc, int config) udc->driver->setup(&udc->gadget, &req); } -static void pxa27x_change_interface(struct pxa_udc *udc, int iface, int alt) +static void __maybe_unused pxa27x_change_interface(struct pxa_udc *udc, int iface, int alt) { struct usb_ctrlrequest req; From 4d66ef54b6faf83b1c20fabbfae2d7619ee229c8 Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Thu, 5 Apr 2012 08:49:59 +0200 Subject: [PATCH 09/21] mips: Fix compiler warnings Fixes: arch/mips/lib/lshrdi3.c:6: warning: no previous prototype for '__lshrdi3' arch/mips/lib/ashrdi3.c:6: warning: no previous prototype for '__ashrdi3' arch/mips/lib/ashldi3.c:6: warning: no previous prototype for '__ashldi3' Signed-off-by: Sascha Hauer --- arch/mips/lib/libgcc.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/mips/lib/libgcc.h b/arch/mips/lib/libgcc.h index 05909d58e..593e59802 100644 --- a/arch/mips/lib/libgcc.h +++ b/arch/mips/lib/libgcc.h @@ -22,4 +22,8 @@ typedef union { long long ll; } DWunion; +long long __lshrdi3(long long u, word_type b); +long long __ashldi3(long long u, word_type b); +long long __ashrdi3(long long u, word_type b); + #endif /* __ASM_LIBGCC_H */ From bb548648c0e8796e94c28c1a851997b8af36c4ed Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Thu, 5 Apr 2012 08:50:54 +0200 Subject: [PATCH 10/21] x86 linker script: Add missing _text Signed-off-by: Sascha Hauer --- arch/x86/lib/barebox.lds.S | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/x86/lib/barebox.lds.S b/arch/x86/lib/barebox.lds.S index 9798ed5c6..3315be255 100644 --- a/arch/x86/lib/barebox.lds.S +++ b/arch/x86/lib/barebox.lds.S @@ -144,6 +144,7 @@ SECTIONS .text : AT ( LOADADDR(.bootstrapping) + SIZEOF(.bootstrapping) ) { /* do not align here! It may fails with the LOADADDR! */ _stext = .; + _text = .; *(.text_entry*) __bare_init_start = .; *(.text_bare_init*) From 14bc0e9f83839d63a1ccf96de9db6ccb2e6ea177 Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Thu, 5 Apr 2012 10:44:28 +0200 Subject: [PATCH 11/21] cfi flash: Fix loop count calculation 'reduce the number of loops by the width of the port' means a simple len / width. Do not try to be clever by shifting and doing it wrong. Signed-off-by: Sascha Hauer --- drivers/nor/cfi_flash_intel.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/nor/cfi_flash_intel.c b/drivers/nor/cfi_flash_intel.c index 6318cfec8..f0cbf72d8 100644 --- a/drivers/nor/cfi_flash_intel.c +++ b/drivers/nor/cfi_flash_intel.c @@ -68,7 +68,7 @@ static int intel_flash_write_cfibuffer (struct flash_info *info, ulong dest, con return retcode; /* reduce the number of loops by the width of the port */ - cnt = len >> (info->portwidth - 1); + cnt = len / width; flash_write_cmd(info, sector, 0, (u32)cnt - 1); while (cnt-- > 0) { From 7eebd3b4c6a0b22ee389752dcd5b4ef1fe6fac7b Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Thu, 5 Apr 2012 10:46:57 +0200 Subject: [PATCH 12/21] cfi flash: Fix alignment problem The intel cfi buffer write has a problem with writing when the alignment of the buffer in memory is smaller than the flash bus width. This patch fixes a alignment problem which may show during this scenario: - 32 or 64 attached NOR flash - flashing an image directly from network to the nor flash The involved network driver is "smc9111.c". The data that comes from the network stack and should be written into the flash isn't 32 bit aligned (at least with this network driver). This is probably due to the 48 bit wide ethernet addresses. However the "cfi_flash.c" driver doesn't handle this situation, and accesses the not-aligned address with a 32 bit pointer. This patch fixes the problem by reducing the access width if an aligment problem between source and destination is found. Signed-off-by: Sascha Hauer --- drivers/nor/cfi_flash_intel.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/drivers/nor/cfi_flash_intel.c b/drivers/nor/cfi_flash_intel.c index f0cbf72d8..32e581a39 100644 --- a/drivers/nor/cfi_flash_intel.c +++ b/drivers/nor/cfi_flash_intel.c @@ -57,6 +57,9 @@ static int intel_flash_write_cfibuffer (struct flash_info *info, ulong dest, con int retcode; void *src = (void*)cp; void *dst = (void *)dest; + /* reduce width due to possible alignment problems */ + const unsigned long ptr = (unsigned long)dest | (unsigned long)cp | info->portwidth; + const int width = ptr & -ptr; sector = find_sector (info, dest); flash_write_cmd (info, sector, 0, FLASH_CMD_CLEAR_STATUS); @@ -70,20 +73,25 @@ static int intel_flash_write_cfibuffer (struct flash_info *info, ulong dest, con /* reduce the number of loops by the width of the port */ cnt = len / width; - flash_write_cmd(info, sector, 0, (u32)cnt - 1); + flash_write_cmd(info, sector, 0, cnt - 1); while (cnt-- > 0) { - if (bankwidth_is_1(info)) { + switch (width) { + case 1: flash_write8(flash_read8(src), dst); src += 1, dst += 1; - } else if (bankwidth_is_2(info)) { + break; + case 2: flash_write16(flash_read16(src), dst); src += 2, dst += 2; - } else if (bankwidth_is_4(info)) { + break; + case 4: flash_write32(flash_read32(src), dst); src += 4, dst += 4; - } else if (bankwidth_is_8(info)) { + break; + case 8: flash_write64(flash_read64(src), dst); src += 8, dst += 8; + break; } } From 4eb3478212e49240a1d9e9d8a1e212049829ef68 Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Thu, 5 Apr 2012 11:03:03 +0200 Subject: [PATCH 13/21] Release v2012.04.0 Signed-off-by: Sascha Hauer --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 3853a1433..77395c0ba 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ VERSION = 2012 -PATCHLEVEL = 03 +PATCHLEVEL = 04 SUBLEVEL = 0 EXTRAVERSION = NAME = Amissive Actinocutious Kiwi From 167443183145eaebfe7e2e68b78e157cf527d3ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eric=20B=C3=A9nard?= Date: Thu, 5 Apr 2012 11:41:36 +0200 Subject: [PATCH 14/21] imx27-regs: fix .h usage in assembly file MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 7ab0a0a i.MX27: Added helper for setup chipselect control register added an helper which triggers the following error : arch/arm/mach-imx/include/mach/imx27-regs.h:243: Error: bad instruction `static inline void imx27_setup_weimcs(size_t cs,unsigned upper,unsigned lower,unsigned addional)' This patch fix this problem. Signed-off-by: Eric Bénard Signed-off-by: Sascha Hauer --- arch/arm/mach-imx/include/mach/imx27-regs.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm/mach-imx/include/mach/imx27-regs.h b/arch/arm/mach-imx/include/mach/imx27-regs.h index 25ea04a55..437cc7d30 100644 --- a/arch/arm/mach-imx/include/mach/imx27-regs.h +++ b/arch/arm/mach-imx/include/mach/imx27-regs.h @@ -240,11 +240,13 @@ #define IMX_CS4_BASE 0xD4000000 #define IMX_CS5_BASE 0xD6000000 +#ifndef __ASSEMBLY__ static inline void imx27_setup_weimcs(size_t cs, unsigned upper, unsigned lower, unsigned addional) { CSxU(cs) = upper; CSxL(cs) = lower; CSxA(cs) = addional; } +#endif /* __ASSEMBLY__ */ #endif /* _IMX27_REGS_H */ From c56bb68d95b962495629f08fe0890ecdeb790912 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eric=20B=C3=A9nard?= Date: Thu, 5 Apr 2012 12:01:10 +0200 Subject: [PATCH 15/21] fix mxs iomux error in mx23 case MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit e62edd3 mxs: Fix support for BITKEEPER() macro added this macro in iomux-imxc.c but the macro is not present in the i.MX23 case. Adding it in iomux-imx23.h fix both imx23evk_defconfig and chumbyone_defconfig Signed-off-by: Eric Bénard Signed-off-by: Sascha Hauer --- arch/arm/mach-mxs/include/mach/iomux-imx23.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/arm/mach-mxs/include/mach/iomux-imx23.h b/arch/arm/mach-mxs/include/mach/iomux-imx23.h index bebaf5657..7b2883c7b 100644 --- a/arch/arm/mach-mxs/include/mach/iomux-imx23.h +++ b/arch/arm/mach-mxs/include/mach/iomux-imx23.h @@ -63,9 +63,13 @@ /* control pad's pull up / bit keeper feature */ #define PE (1 << 10) +#define BK (1 << 11) /* FIXME useful to distinguish? */ #define PE_PRESENT(x) (!!((x) & PE)) +#define BK_PRESENT(x) (!!((x) & BK)) #define PULLUP(x) ((x) << 13) +#define BITKEEPER(x) ((x) << 14) #define GET_PULLUP(x) (!!((x) & (1 << 13))) +#define GET_BITKEEPER(x) (!!((x) & BITKEEPER(1))) /* control pad's voltage feature */ #define VE (1 << 14) From c22e213cbe4e27b30943d13a8b26d910f33e96b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eric=20B=C3=A9nard?= Date: Thu, 5 Apr 2012 12:01:11 +0200 Subject: [PATCH 16/21] at91sam9g45_devices: fix warning MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit this patch fix the following warnings : arch/arm/mach-at91/at91sam9g45_devices.c:305:3: warning: initialization discards 'const' qualifier from pointer target type [enabled by default] arch/arm/mach-at91/at91sam9g45_devices.c:309:3: warning: initialization discards 'const' qualifier from pointer target type [enabled by default] Signed-off-by: Eric Bénard Signed-off-by: Sascha Hauer --- arch/arm/mach-at91/at91sam9g45_devices.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-at91/at91sam9g45_devices.c b/arch/arm/mach-at91/at91sam9g45_devices.c index 05b197c2c..25a8d80c2 100644 --- a/arch/arm/mach-at91/at91sam9g45_devices.c +++ b/arch/arm/mach-at91/at91sam9g45_devices.c @@ -296,9 +296,9 @@ void at91_add_device_mci(short mmc_id, struct atmel_mci_platform_data *data) {} #if defined(CONFIG_DRIVER_SPI_ATMEL) /* SPI */ -static const unsigned spi0_standard_cs[4] = { AT91_PIN_PB3, AT91_PIN_PB18, AT91_PIN_PB19, AT91_PIN_PD27 }; +static unsigned spi0_standard_cs[4] = { AT91_PIN_PB3, AT91_PIN_PB18, AT91_PIN_PB19, AT91_PIN_PD27 }; -static const unsigned spi1_standard_cs[4] = { AT91_PIN_PB17, AT91_PIN_PD28, AT91_PIN_PD18, AT91_PIN_PD19 }; +static unsigned spi1_standard_cs[4] = { AT91_PIN_PB17, AT91_PIN_PD28, AT91_PIN_PD18, AT91_PIN_PD19 }; static struct at91_spi_platform_data spi_pdata[] = { [0] = { From 1700a9bfe9d11d39cb90d7e9841ca50be5945106 Mon Sep 17 00:00:00 2001 From: Alexander Shiyan Date: Sun, 8 Apr 2012 20:35:31 +0400 Subject: [PATCH 17/21] PCM-038: fix SRAM device name Signed-off-by: Alexander Shiyan Signed-off-by: Sascha Hauer --- arch/arm/boards/pcm038/pcm038.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/boards/pcm038/pcm038.c b/arch/arm/boards/pcm038/pcm038.c index 8535e41a5..01129bb29 100644 --- a/arch/arm/boards/pcm038/pcm038.c +++ b/arch/arm/boards/pcm038/pcm038.c @@ -135,7 +135,7 @@ static int pcm038_mem_init(void) { arm_add_mem_device("ram0", 0xa0000000, 128 * 1024 * 1024); - add_mem_device("ram0", 0xc8000000, 512 * 1024, /* Can be up to 2MiB */ + add_mem_device("ram1", 0xc8000000, 512 * 1024, /* Can be up to 2MiB */ IORESOURCE_MEM_WRITEABLE); return 0; } From e1ff3fc4daf17f7f82c55c9e9c106dc3416f93ef Mon Sep 17 00:00:00 2001 From: Uwe Hermann Date: Fri, 6 Apr 2012 20:09:50 +0200 Subject: [PATCH 18/21] Fixup DRIVER_VIDEO_S3C24XX usage. From c67445d601c9332fabb71df8e41367fc104e1ac1 Mon Sep 17 00:00:00 2001 From: Uwe Hermann Date: Fri, 6 Apr 2012 20:07:12 +0200 DRIVER_VIDEO_S3C was renamed to DRIVER_VIDEO_S3C24XX recently. Signed-off-by: Uwe Hermann Signed-off-by: Sascha Hauer Acked-by: Juergen Beisert --- arch/arm/boards/mini2440/Kconfig | 2 +- drivers/video/Kconfig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/boards/mini2440/Kconfig b/arch/arm/boards/mini2440/Kconfig index 929df6039..a8e79b3b0 100644 --- a/arch/arm/boards/mini2440/Kconfig +++ b/arch/arm/boards/mini2440/Kconfig @@ -4,7 +4,7 @@ if MACH_MINI2440 config MINI2440_VIDEO bool select VIDEO - select DRIVER_VIDEO_S3C + select DRIVER_VIDEO_S3C24XX config MINI2440_VIDEO_N35 bool "Support N35 display (240x320)" diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig index 509ba640e..519cdbf25 100644 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig @@ -37,7 +37,7 @@ config DRIVER_VIDEO_S3C24XX help Add support for the S3C244x LCD controller. -if DRIVER_VIDEO_S3C +if DRIVER_VIDEO_S3C24XX config DRIVER_VIDEO_S3C_VERBOSE bool "S3C244x verbose framebuffer info" From fe3de245d1b7421da49a0124dc254ea4194c44ee Mon Sep 17 00:00:00 2001 From: Jean-Christophe PLAGNIOL-VILLARD Date: Fri, 6 Apr 2012 16:36:38 +0200 Subject: [PATCH 19/21] at91rm9200ek: set maximum nor flash size it's 8MiB. Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD Signed-off-by: Sascha Hauer --- arch/arm/boards/at91rm9200ek/init.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/arm/boards/at91rm9200ek/init.c b/arch/arm/boards/at91rm9200ek/init.c index 6911447aa..3875f4ab4 100644 --- a/arch/arm/boards/at91rm9200ek/init.c +++ b/arch/arm/boards/at91rm9200ek/init.c @@ -28,6 +28,7 @@ #include #include #include +#include #include #include #include @@ -116,7 +117,7 @@ static int at91rm9200ek_devices_init(void) at91_add_device_eth(0, ðer_pdata); - add_cfi_flash_device(0, AT91_CHIPSELECT_0, 0, 0); + add_cfi_flash_device(0, AT91_CHIPSELECT_0, SZ_8M, 0); /* USB Host */ at91_add_device_usbh_ohci(&ek_usbh_data); ek_device_add_leds(); From f8856d422ecdfe1609a8c2c78153ca68b4dae7a1 Mon Sep 17 00:00:00 2001 From: Alexander Shiyan Date: Tue, 3 Apr 2012 13:27:00 +0400 Subject: [PATCH 20/21] Define barebox_loc magic variable only once Signed-off-by: Alexander Shiyan Signed-off-by: Sascha Hauer --- arch/arm/mach-imx/boot.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/arch/arm/mach-imx/boot.c b/arch/arm/mach-imx/boot.c index 9f2def6b2..b79ebc740 100644 --- a/arch/arm/mach-imx/boot.c +++ b/arch/arm/mach-imx/boot.c @@ -87,8 +87,6 @@ static int imx_25_35_boot_save_loc(void) return 0; } coredevice_initcall(imx_25_35_boot_save_loc); - -BAREBOX_MAGICVAR(barebox_loc, "The source barebox has been booted from"); #endif #if defined(CONFIG_ARCH_IMX27) @@ -114,6 +112,6 @@ static int imx_27_boot_save_loc(void) return 0; } coredevice_initcall(imx_27_boot_save_loc); +#endif BAREBOX_MAGICVAR(barebox_loc, "The source barebox has been booted from"); -#endif From 32e630d182a5479e5da60906523b74a19cf5caab Mon Sep 17 00:00:00 2001 From: Jean-Christophe PLAGNIOL-VILLARD Date: Tue, 10 Apr 2012 17:36:07 +0200 Subject: [PATCH 21/21] defaultenv/update: fix dhcp-barebox support call dhcp when ip mode is dhcp-barebox Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD Signed-off-by: Sascha Hauer --- defaultenv/bin/_update | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/defaultenv/bin/_update b/defaultenv/bin/_update index e7cf1496e..8e27ee10c 100644 --- a/defaultenv/bin/_update +++ b/defaultenv/bin/_update @@ -11,7 +11,7 @@ if [ ! -e "$part" ]; then fi if [ x$mode = xtftp -o x$mode = xnfs ]; then - if [ x$ip = xdhcp ]; then + if [ x$ip = xdhcp -o x$ip = "xdhcp-barebox" ]; then dhcp fi