parent
84bc72d90c
commit
455ae7e87f
|
@ -34,4 +34,3 @@ dataflash_protect_t area_list[NB_DATAFLASH_AREA] = {
|
||||||
{0x00004200, 0x000083FF, FLAG_PROTECT_CLEAR, 0, "Environment"},
|
{0x00004200, 0x000083FF, FLAG_PROTECT_CLEAR, 0, "Environment"},
|
||||||
{0x00008400, 0x00041FFF, FLAG_PROTECT_CLEAR, 0, "U-Boot"},
|
{0x00008400, 0x00041FFF, FLAG_PROTECT_CLEAR, 0, "U-Boot"},
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -601,7 +601,7 @@ static int do_ubi(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
|
||||||
|
|
||||||
U_BOOT_CMD(ubi, 6, 1, do_ubi,
|
U_BOOT_CMD(ubi, 6, 1, do_ubi,
|
||||||
"ubi - ubi commands\n",
|
"ubi - ubi commands\n",
|
||||||
"part [nand|nor|onenand] [part]"
|
"part [nand|nor|onenand] [part]"
|
||||||
" - Show or set current partition\n"
|
" - Show or set current partition\n"
|
||||||
"ubi info [l[ayout]]"
|
"ubi info [l[ayout]]"
|
||||||
" - Display volume and ubi layout information\n"
|
" - Display volume and ubi layout information\n"
|
||||||
|
|
|
@ -131,7 +131,7 @@ void cpu_init_f(void)
|
||||||
mbar2_writeByte(MCFSIM_INTBASE, 0x40); /* Base interrupts at 64 */
|
mbar2_writeByte(MCFSIM_INTBASE, 0x40); /* Base interrupts at 64 */
|
||||||
mbar2_writeByte(MCFSIM_SPURVEC, 0x00);
|
mbar2_writeByte(MCFSIM_SPURVEC, 0x00);
|
||||||
|
|
||||||
/*mbar2_writeLong(MCFSIM_IDECONFIG1, 0x00000020); *//* Enable a 1 cycle pre-drive cycle on CS1 */
|
/*mbar2_writeLong(MCFSIM_IDECONFIG1, 0x00000020); */ /* Enable a 1 cycle pre-drive cycle on CS1 */
|
||||||
|
|
||||||
/* FlexBus Chipselect */
|
/* FlexBus Chipselect */
|
||||||
init_fbcs();
|
init_fbcs();
|
||||||
|
|
|
@ -982,5 +982,3 @@ unlock_ram_in_cache:
|
||||||
blr
|
blr
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -706,4 +706,3 @@ int cpu_eth_init(bd_t *bis)
|
||||||
#endif
|
#endif
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -727,7 +727,7 @@ _start:
|
||||||
ori r2,r2,0xffff
|
ori r2,r2,0xffff
|
||||||
mfdcr r1,ISRAM1_DPC
|
mfdcr r1,ISRAM1_DPC
|
||||||
and r1,r1,r2 /* Disable parity check */
|
and r1,r1,r2 /* Disable parity check */
|
||||||
mtdcr ISRAM1_DPC,r1
|
mtdcr ISRAM1_DPC,r1
|
||||||
mfdcr r1,ISRAM1_PMEG
|
mfdcr r1,ISRAM1_PMEG
|
||||||
and r1,r1,r2 /* Disable pwr mgmt */
|
and r1,r1,r2 /* Disable pwr mgmt */
|
||||||
mtdcr ISRAM1_PMEG,r1
|
mtdcr ISRAM1_PMEG,r1
|
||||||
|
|
|
@ -434,4 +434,3 @@ int i2c_write(uchar chip, uint addr, int alen, uchar *buffer, int len)
|
||||||
send_stop();
|
send_stop();
|
||||||
return(failures);
|
return(failures);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -97,7 +97,7 @@ u32 crc32_le(u32 crc, unsigned char const *p, size_t len)
|
||||||
# else
|
# else
|
||||||
# define DO_CRC(x) crc = tab[ ((crc >> 24) ^ (x)) & 255] ^ (crc<<8)
|
# define DO_CRC(x) crc = tab[ ((crc >> 24) ^ (x)) & 255] ^ (crc<<8)
|
||||||
# endif
|
# endif
|
||||||
//printf("Crc32_le crc=%x\n",crc);
|
/* printf("Crc32_le crc=%x\n",crc); */
|
||||||
crc = __cpu_to_le32(crc);
|
crc = __cpu_to_le32(crc);
|
||||||
/* Align it */
|
/* Align it */
|
||||||
if((((long)b)&3 && len)){
|
if((((long)b)&3 && len)){
|
||||||
|
|
|
@ -186,7 +186,7 @@ retry:
|
||||||
if (read != len && err == -EBADMSG) {
|
if (read != len && err == -EBADMSG) {
|
||||||
ubi_assert(0);
|
ubi_assert(0);
|
||||||
printk("%s[%d] not here\n", __func__, __LINE__);
|
printk("%s[%d] not here\n", __func__, __LINE__);
|
||||||
// err = -EIO;
|
/* err = -EIO; */
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
ubi_assert(len == read);
|
ubi_assert(len == read);
|
||||||
|
|
|
@ -260,7 +260,7 @@ int ubi_create_volume(struct ubi_device *ubi, struct ubi_mkvol_req *req)
|
||||||
goto out_unlock;
|
goto out_unlock;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Calculate how many eraseblocks are requested */
|
/* Calculate how many eraseblocks are requested */
|
||||||
vol->usable_leb_size = ubi->leb_size - ubi->leb_size % req->alignment;
|
vol->usable_leb_size = ubi->leb_size - ubi->leb_size % req->alignment;
|
||||||
bytes = req->bytes;
|
bytes = req->bytes;
|
||||||
if (do_div(bytes, vol->usable_leb_size))
|
if (do_div(bytes, vol->usable_leb_size))
|
||||||
|
|
|
@ -490,7 +490,7 @@
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* Memory Bank 1 (RESET) initialization */
|
/* Memory Bank 1 (RESET) initialization */
|
||||||
#define CONFIG_SYS_EBC_PB1AP 0x7f817200 //0x03017200
|
#define CONFIG_SYS_EBC_PB1AP 0x7f817200 /* 0x03017200 */
|
||||||
#define CONFIG_SYS_EBC_PB1CR (CONFIG_SYS_RESET_BASE | 0x1c000)
|
#define CONFIG_SYS_EBC_PB1CR (CONFIG_SYS_RESET_BASE | 0x1c000)
|
||||||
|
|
||||||
/* Memory Bank 4 (FPGA / 32Bit) initialization */
|
/* Memory Bank 4 (FPGA / 32Bit) initialization */
|
||||||
|
|
|
@ -167,4 +167,3 @@
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -6,10 +6,10 @@
|
||||||
#define _LINUX_CRC32_H
|
#define _LINUX_CRC32_H
|
||||||
|
|
||||||
#include <linux/types.h>
|
#include <linux/types.h>
|
||||||
//#include <linux/bitrev.h>
|
/* #include <linux/bitrev.h> */
|
||||||
|
|
||||||
extern u32 crc32_le(u32 crc, unsigned char const *p, size_t len);
|
extern u32 crc32_le(u32 crc, unsigned char const *p, size_t len);
|
||||||
//extern u32 crc32_be(u32 crc, unsigned char const *p, size_t len);
|
/* extern u32 crc32_be(u32 crc, unsigned char const *p, size_t len); */
|
||||||
|
|
||||||
#define crc32(seed, data, length) crc32_le(seed, (unsigned char const *)data, length)
|
#define crc32(seed, data, length) crc32_le(seed, (unsigned char const *)data, length)
|
||||||
|
|
||||||
|
@ -21,7 +21,7 @@ extern u32 crc32_le(u32 crc, unsigned char const *p, size_t len);
|
||||||
* is in bit nr 0], thus it must be reversed before use. Except for
|
* is in bit nr 0], thus it must be reversed before use. Except for
|
||||||
* nics that bit swap the result internally...
|
* nics that bit swap the result internally...
|
||||||
*/
|
*/
|
||||||
//#define ether_crc(length, data) bitrev32(crc32_le(~0, data, length))
|
/* #define ether_crc(length, data) bitrev32(crc32_le(~0, data, length)) */
|
||||||
//#define ether_crc_le(length, data) crc32_le(~0, data, length)
|
/* #define ether_crc_le(length, data) crc32_le(~0, data, length) */
|
||||||
|
|
||||||
#endif /* _LINUX_CRC32_H */
|
#endif /* _LINUX_CRC32_H */
|
||||||
|
|
|
@ -76,9 +76,9 @@ struct device;
|
||||||
struct device_node;
|
struct device_node;
|
||||||
|
|
||||||
int __devinit of_mtd_parse_partitions(struct device *dev,
|
int __devinit of_mtd_parse_partitions(struct device *dev,
|
||||||
struct mtd_info *mtd,
|
struct mtd_info *mtd,
|
||||||
struct device_node *node,
|
struct device_node *node,
|
||||||
struct mtd_partition **pparts);
|
struct mtd_partition **pparts);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -21,7 +21,7 @@
|
||||||
#ifndef __LINUX_UBI_H__
|
#ifndef __LINUX_UBI_H__
|
||||||
#define __LINUX_UBI_H__
|
#define __LINUX_UBI_H__
|
||||||
|
|
||||||
//#include <asm/ioctl.h>
|
/* #include <asm/ioctl.h> */
|
||||||
#include <linux/types.h>
|
#include <linux/types.h>
|
||||||
#include <mtd/ubi-user.h>
|
#include <mtd/ubi-user.h>
|
||||||
|
|
||||||
|
|
|
@ -56,7 +56,7 @@ do { \
|
||||||
#define ubi_sysfs_close(...) do { } while (0)
|
#define ubi_sysfs_close(...) do { } while (0)
|
||||||
static inline int is_power_of_2(unsigned long n)
|
static inline int is_power_of_2(unsigned long n)
|
||||||
{
|
{
|
||||||
return (n != 0 && ((n & (n - 1)) == 0));
|
return (n != 0 && ((n & (n - 1)) == 0));
|
||||||
}
|
}
|
||||||
|
|
||||||
/* FIXME */
|
/* FIXME */
|
||||||
|
|
Loading…
Reference in New Issue