diff options
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | arch/arm/cpu/cpu.c | 2 | ||||
| -rw-r--r-- | arch/arm/cpu/start.c | 3 | ||||
| -rw-r--r-- | arch/arm/include/asm/barebox-arm.h | 1 | ||||
| -rw-r--r-- | arch/arm/mach-omap/omap3_core.S | 2 | ||||
| -rw-r--r-- | board/eukrea_cpuimx25/eukrea_cpuimx25.c | 2 | ||||
| -rw-r--r-- | drivers/i2c/i2c.c | 2 | ||||
| -rw-r--r-- | drivers/nor/cfi_flash_amd.c | 3 | ||||
| -rw-r--r-- | include/linux/byteorder/generic.h | 6 |
9 files changed, 15 insertions, 8 deletions
@@ -1,5 +1,5 @@ VERSION = 2010 -PATCHLEVEL = 06 +PATCHLEVEL = 07 SUBLEVEL = 0 EXTRAVERSION = NAME = Amissive Actinocutious Kiwi diff --git a/arch/arm/cpu/cpu.c b/arch/arm/cpu/cpu.c index 2b36a793dc..133d144e8c 100644 --- a/arch/arm/cpu/cpu.c +++ b/arch/arm/cpu/cpu.c @@ -72,8 +72,6 @@ int icache_status(void) */ void arch_shutdown(void) { - int i; - #ifdef CONFIG_MMU /* nearly the same as below, but this could also disable * second level cache. diff --git a/arch/arm/cpu/start.c b/arch/arm/cpu/start.c index eea7dcfa3c..53d7ac199f 100644 --- a/arch/arm/cpu/start.c +++ b/arch/arm/cpu/start.c @@ -56,6 +56,9 @@ void __naked __bare_init reset(void) r |= 0xd3; __asm__ __volatile__("msr cpsr, %0" : : "r"(r)); +#ifdef CONFIG_ARCH_HAS_LOWLEVEL_INIT + arch_init_lowlevel(); +#endif __asm__ __volatile__ ( "bl __mmu_cache_flush;" : diff --git a/arch/arm/include/asm/barebox-arm.h b/arch/arm/include/asm/barebox-arm.h index 54561c3cd6..5f0bb73413 100644 --- a/arch/arm/include/asm/barebox-arm.h +++ b/arch/arm/include/asm/barebox-arm.h @@ -38,5 +38,6 @@ int dram_init (void); void board_init_lowlevel(void); void board_init_lowlevel_return(void); +void arch_init_lowlevel(void); #endif /* _BAREBOX_ARM_H_ */ diff --git a/arch/arm/mach-omap/omap3_core.S b/arch/arm/mach-omap/omap3_core.S index 7337d4c545..d904231171 100644 --- a/arch/arm/mach-omap/omap3_core.S +++ b/arch/arm/mach-omap/omap3_core.S @@ -92,7 +92,7 @@ next: arch_start: .word arch_init_lowlevel barebox_start: - .word _start + .word exception_vectors SRAM_INTVECT: .word OMAP_SRAM_INTVECT diff --git a/board/eukrea_cpuimx25/eukrea_cpuimx25.c b/board/eukrea_cpuimx25/eukrea_cpuimx25.c index b19efcc9d3..caeb46e872 100644 --- a/board/eukrea_cpuimx25/eukrea_cpuimx25.c +++ b/board/eukrea_cpuimx25/eukrea_cpuimx25.c @@ -221,7 +221,7 @@ static int eukrea_cpuimx25_devices_init(void) PARTITION_FIXED, "self_raw"); dev_add_bb_dev("self_raw", "self0"); - devfs_add_partition("nand0", 0x40000, 0x40000, + devfs_add_partition("nand0", 0x40000, 0x20000, PARTITION_FIXED, "env_raw"); dev_add_bb_dev("env_raw", "env0"); diff --git a/drivers/i2c/i2c.c b/drivers/i2c/i2c.c index 1fa114a31c..87360f3fd6 100644 --- a/drivers/i2c/i2c.c +++ b/drivers/i2c/i2c.c @@ -365,7 +365,7 @@ int i2c_add_numbered_adapter(struct i2c_adapter *adapter) if (i2c_get_adapter(adapter->nr)) return -EBUSY; - list_add_tail(&adapter_list, &adapter->list); + list_add_tail(&adapter->list, &adapter_list); /* populate children from any i2c device tables */ scan_boardinfo(adapter); diff --git a/drivers/nor/cfi_flash_amd.c b/drivers/nor/cfi_flash_amd.c index 411d8e6526..ea4c2c99eb 100644 --- a/drivers/nor/cfi_flash_amd.c +++ b/drivers/nor/cfi_flash_amd.c @@ -74,8 +74,7 @@ static int amd_flash_is_busy (flash_info_t * info, flash_sect_t sect) static int amd_flash_erase_one (flash_info_t * info, long sect) { flash_unlock_seq(info); - flash_write_cmd (info, sect, AMD_ADDR_ERASE_START, - AMD_CMD_ERASE_START); + flash_write_cmd (info, 0, AMD_ADDR_ERASE_START, AMD_CMD_ERASE_START); flash_unlock_seq(info); flash_write_cmd (info, sect, 0, AMD_CMD_ERASE_SECTOR); diff --git a/include/linux/byteorder/generic.h b/include/linux/byteorder/generic.h index cff850f850..aab8f4b6bf 100644 --- a/include/linux/byteorder/generic.h +++ b/include/linux/byteorder/generic.h @@ -78,6 +78,12 @@ * */ +#ifndef __LITTLE_ENDIAN +#define __LITTLE_ENDIAN 1234 +#endif +#ifndef __BIG_ENDIAN +#define __BIG_ENDIAN 4321 +#endif #if defined(__KERNEL__) /* |