common: delete CONFIG_SYS_64BIT_VSPRINTF and CONFIG_SYS_64BIT_STRTOUL
There is more and more usage of printing 64bit values, so enable this feature generally, and delete the CONFIG_SYS_64BIT_VSPRINTF and CONFIG_SYS_64BIT_STRTOUL defines. Signed-off-by: Heiko Schocher <hs@denx.de>utp
parent
00b6d927ba
commit
4b142febff
9
README
9
README
|
@ -777,7 +777,7 @@ The following options need to be configured:
|
||||||
CONFIG_LBA48
|
CONFIG_LBA48
|
||||||
|
|
||||||
Set this to enable support for disks larger than 137GB
|
Set this to enable support for disks larger than 137GB
|
||||||
Also look at CONFIG_SYS_64BIT_LBA ,CONFIG_SYS_64BIT_VSPRINTF and CONFIG_SYS_64BIT_STRTOUL
|
Also look at CONFIG_SYS_64BIT_LBA.
|
||||||
Whithout these , LBA48 support uses 32bit variables and will 'only'
|
Whithout these , LBA48 support uses 32bit variables and will 'only'
|
||||||
support disks up to 2.1TB.
|
support disks up to 2.1TB.
|
||||||
|
|
||||||
|
@ -2524,13 +2524,6 @@ use the "saveenv" command to store a valid environment.
|
||||||
- CONFIG_SYS_FAULT_MII_ADDR:
|
- CONFIG_SYS_FAULT_MII_ADDR:
|
||||||
MII address of the PHY to check for the Ethernet link state.
|
MII address of the PHY to check for the Ethernet link state.
|
||||||
|
|
||||||
- CONFIG_SYS_64BIT_VSPRINTF:
|
|
||||||
Makes vsprintf (and all *printf functions) support printing
|
|
||||||
of 64bit values by using the L quantifier
|
|
||||||
|
|
||||||
- CONFIG_SYS_64BIT_STRTOUL:
|
|
||||||
Adds simple_strtoull that returns a 64bit value
|
|
||||||
|
|
||||||
- CONFIG_NS16550_MIN_FUNCTIONS:
|
- CONFIG_NS16550_MIN_FUNCTIONS:
|
||||||
Define this if you desire to only have use of the NS16550_init
|
Define this if you desire to only have use of the NS16550_init
|
||||||
and NS16550_putc functions for the serial driver located at
|
and NS16550_putc functions for the serial driver located at
|
||||||
|
|
|
@ -364,13 +364,8 @@ int do_fdt (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
|
||||||
} else if (strncmp(argv[1], "me", 2) == 0) {
|
} else if (strncmp(argv[1], "me", 2) == 0) {
|
||||||
uint64_t addr, size;
|
uint64_t addr, size;
|
||||||
int err;
|
int err;
|
||||||
#ifdef CONFIG_SYS_64BIT_STRTOUL
|
|
||||||
addr = simple_strtoull(argv[2], NULL, 16);
|
addr = simple_strtoull(argv[2], NULL, 16);
|
||||||
size = simple_strtoull(argv[3], NULL, 16);
|
size = simple_strtoull(argv[3], NULL, 16);
|
||||||
#else
|
|
||||||
addr = simple_strtoul(argv[2], NULL, 16);
|
|
||||||
size = simple_strtoul(argv[3], NULL, 16);
|
|
||||||
#endif
|
|
||||||
err = fdt_fixup_memory(working_fdt, addr, size);
|
err = fdt_fixup_memory(working_fdt, addr, size);
|
||||||
if (err < 0)
|
if (err < 0)
|
||||||
return err;
|
return err;
|
||||||
|
@ -402,13 +397,8 @@ int do_fdt (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
|
||||||
} else if (argv[2][0] == 'a') {
|
} else if (argv[2][0] == 'a') {
|
||||||
uint64_t addr, size;
|
uint64_t addr, size;
|
||||||
int err;
|
int err;
|
||||||
#ifdef CONFIG_SYS_64BIT_STRTOUL
|
|
||||||
addr = simple_strtoull(argv[3], NULL, 16);
|
addr = simple_strtoull(argv[3], NULL, 16);
|
||||||
size = simple_strtoull(argv[4], NULL, 16);
|
size = simple_strtoull(argv[4], NULL, 16);
|
||||||
#else
|
|
||||||
addr = simple_strtoul(argv[3], NULL, 16);
|
|
||||||
size = simple_strtoul(argv[4], NULL, 16);
|
|
||||||
#endif
|
|
||||||
err = fdt_add_mem_rsv(working_fdt, addr, size);
|
err = fdt_add_mem_rsv(working_fdt, addr, size);
|
||||||
|
|
||||||
if (err < 0) {
|
if (err < 0) {
|
||||||
|
|
|
@ -1354,7 +1354,7 @@ ulong ide_read (int device, lbaint_t blknr, ulong blkcnt, void *buffer)
|
||||||
}
|
}
|
||||||
|
|
||||||
if ((c&(ATA_STAT_DRQ|ATA_STAT_BUSY|ATA_STAT_ERR)) != ATA_STAT_DRQ) {
|
if ((c&(ATA_STAT_DRQ|ATA_STAT_BUSY|ATA_STAT_ERR)) != ATA_STAT_DRQ) {
|
||||||
#if defined(CONFIG_SYS_64BIT_LBA) && defined(CONFIG_SYS_64BIT_VSPRINTF)
|
#if defined(CONFIG_SYS_64BIT_LBA)
|
||||||
printf ("Error (no IRQ) dev %d blk %Ld: status 0x%02x\n",
|
printf ("Error (no IRQ) dev %d blk %Ld: status 0x%02x\n",
|
||||||
device, blknr, c);
|
device, blknr, c);
|
||||||
#else
|
#else
|
||||||
|
@ -1444,7 +1444,7 @@ ulong ide_write (int device, lbaint_t blknr, ulong blkcnt, void *buffer)
|
||||||
c = ide_wait (device, IDE_TIME_OUT); /* can't take over 500 ms */
|
c = ide_wait (device, IDE_TIME_OUT); /* can't take over 500 ms */
|
||||||
|
|
||||||
if ((c&(ATA_STAT_DRQ|ATA_STAT_BUSY|ATA_STAT_ERR)) != ATA_STAT_DRQ) {
|
if ((c&(ATA_STAT_DRQ|ATA_STAT_BUSY|ATA_STAT_ERR)) != ATA_STAT_DRQ) {
|
||||||
#if defined(CONFIG_SYS_64BIT_LBA) && defined(CONFIG_SYS_64BIT_VSPRINTF)
|
#if defined(CONFIG_SYS_64BIT_LBA)
|
||||||
printf ("Error (no IRQ) dev %d blk %Ld: status 0x%02x\n",
|
printf ("Error (no IRQ) dev %d blk %Ld: status 0x%02x\n",
|
||||||
device, blknr, c);
|
device, blknr, c);
|
||||||
#else
|
#else
|
||||||
|
|
|
@ -19,10 +19,6 @@
|
||||||
|
|
||||||
#include <asm/io.h>
|
#include <asm/io.h>
|
||||||
|
|
||||||
#if !defined(CONFIG_SYS_64BIT_VSPRINTF)
|
|
||||||
#warning Please define CONFIG_SYS_64BIT_VSPRINTF for correct output!
|
|
||||||
#endif
|
|
||||||
|
|
||||||
static struct mtd_info *mtd;
|
static struct mtd_info *mtd;
|
||||||
|
|
||||||
static loff_t next_ofs;
|
static loff_t next_ofs;
|
||||||
|
|
|
@ -436,11 +436,7 @@ phys_size_t getenv_bootm_size(void)
|
||||||
char *s = getenv ("bootm_size");
|
char *s = getenv ("bootm_size");
|
||||||
if (s) {
|
if (s) {
|
||||||
phys_size_t tmp;
|
phys_size_t tmp;
|
||||||
#ifdef CONFIG_SYS_64BIT_STRTOUL
|
|
||||||
tmp = (phys_size_t)simple_strtoull (s, NULL, 16);
|
tmp = (phys_size_t)simple_strtoull (s, NULL, 16);
|
||||||
#else
|
|
||||||
tmp = (phys_size_t)simple_strtoul (s, NULL, 16);
|
|
||||||
#endif
|
|
||||||
return tmp;
|
return tmp;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -90,11 +90,7 @@ int cpu_release(int nr, int argc, char *argv[])
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef CONFIG_SYS_64BIT_STRTOUL
|
|
||||||
boot_addr = simple_strtoull(argv[0], NULL, 16);
|
boot_addr = simple_strtoull(argv[0], NULL, 16);
|
||||||
#else
|
|
||||||
boot_addr = simple_strtoul(argv[0], NULL, 16);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* handle pir, r3, r6 */
|
/* handle pir, r3, r6 */
|
||||||
for (i = 1; i < 4; i++) {
|
for (i = 1; i < 4; i++) {
|
||||||
|
|
|
@ -196,7 +196,7 @@ void dev_print (block_dev_desc_t *dev_desc)
|
||||||
if (dev_desc->lba48)
|
if (dev_desc->lba48)
|
||||||
printf (" Supports 48-bit addressing\n");
|
printf (" Supports 48-bit addressing\n");
|
||||||
#endif
|
#endif
|
||||||
#if defined(CONFIG_SYS_64BIT_LBA) && defined(CONFIG_SYS_64BIT_VSPRINTF)
|
#if defined(CONFIG_SYS_64BIT_LBA)
|
||||||
printf (" Capacity: %ld.%ld MB = %ld.%ld GB (%Ld x %ld)\n",
|
printf (" Capacity: %ld.%ld MB = %ld.%ld GB (%Ld x %ld)\n",
|
||||||
mb_quot, mb_rem,
|
mb_quot, mb_rem,
|
||||||
gb_quot, gb_rem,
|
gb_quot, gb_rem,
|
||||||
|
|
|
@ -41,10 +41,6 @@
|
||||||
#include <nand.h>
|
#include <nand.h>
|
||||||
#include <jffs2/jffs2.h>
|
#include <jffs2/jffs2.h>
|
||||||
|
|
||||||
#if !defined(CONFIG_SYS_64BIT_VSPRINTF)
|
|
||||||
#warning Please define CONFIG_SYS_64BIT_VSPRINTF for correct output!
|
|
||||||
#endif
|
|
||||||
|
|
||||||
typedef struct erase_info erase_info_t;
|
typedef struct erase_info erase_info_t;
|
||||||
typedef struct mtd_info mtd_info_t;
|
typedef struct mtd_info mtd_info_t;
|
||||||
|
|
||||||
|
|
|
@ -26,10 +26,6 @@
|
||||||
#include "ubifs.h"
|
#include "ubifs.h"
|
||||||
#include <u-boot/zlib.h>
|
#include <u-boot/zlib.h>
|
||||||
|
|
||||||
#if !defined(CONFIG_SYS_64BIT_VSPRINTF)
|
|
||||||
#warning Please define CONFIG_SYS_64BIT_VSPRINTF for correct output!
|
|
||||||
#endif
|
|
||||||
|
|
||||||
DECLARE_GLOBAL_DATA_PTR;
|
DECLARE_GLOBAL_DATA_PTR;
|
||||||
|
|
||||||
/* compress.c */
|
/* compress.c */
|
||||||
|
|
|
@ -617,9 +617,7 @@ void udelay (unsigned long);
|
||||||
|
|
||||||
/* lib_generic/vsprintf.c */
|
/* lib_generic/vsprintf.c */
|
||||||
ulong simple_strtoul(const char *cp,char **endp,unsigned int base);
|
ulong simple_strtoul(const char *cp,char **endp,unsigned int base);
|
||||||
#ifdef CONFIG_SYS_64BIT_VSPRINTF
|
|
||||||
unsigned long long simple_strtoull(const char *cp,char **endp,unsigned int base);
|
unsigned long long simple_strtoull(const char *cp,char **endp,unsigned int base);
|
||||||
#endif
|
|
||||||
long simple_strtol(const char *cp,char **endp,unsigned int base);
|
long simple_strtol(const char *cp,char **endp,unsigned int base);
|
||||||
void panic(const char *fmt, ...)
|
void panic(const char *fmt, ...)
|
||||||
__attribute__ ((format (__printf__, 1, 2)));
|
__attribute__ ((format (__printf__, 1, 2)));
|
||||||
|
|
|
@ -160,8 +160,6 @@
|
||||||
#define CONFIG_SYS_NAND_SKIP_BAD_DOT_I 1 /* ".i" read skips bad blocks */
|
#define CONFIG_SYS_NAND_SKIP_BAD_DOT_I 1 /* ".i" read skips bad blocks */
|
||||||
#define CONFIG_SYS_NAND_QUIET 1
|
#define CONFIG_SYS_NAND_QUIET 1
|
||||||
|
|
||||||
#define CONFIG_SYS_64BIT_VSPRINTF /* needed for nand_util.c */
|
|
||||||
|
|
||||||
/*-----------------------------------------------------------------------
|
/*-----------------------------------------------------------------------
|
||||||
* PCI stuff
|
* PCI stuff
|
||||||
*-----------------------------------------------------------------------
|
*-----------------------------------------------------------------------
|
||||||
|
|
|
@ -165,8 +165,6 @@
|
||||||
#define CONFIG_SYS_NAND_SKIP_BAD_DOT_I 1 /* ".i" read skips bad blocks */
|
#define CONFIG_SYS_NAND_SKIP_BAD_DOT_I 1 /* ".i" read skips bad blocks */
|
||||||
#define CONFIG_SYS_NAND_QUIET 1
|
#define CONFIG_SYS_NAND_QUIET 1
|
||||||
|
|
||||||
#define CONFIG_SYS_64BIT_VSPRINTF /* needed for nand_util.c */
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* For booting Linux, the board info and command line data
|
* For booting Linux, the board info and command line data
|
||||||
* have to be in the first 8 MB of memory, since this is
|
* have to be in the first 8 MB of memory, since this is
|
||||||
|
|
|
@ -219,8 +219,6 @@
|
||||||
#define CONFIG_SYS_NAND_SKIP_BAD_DOT_I 1 /* ".i" read skips bad blocks */
|
#define CONFIG_SYS_NAND_SKIP_BAD_DOT_I 1 /* ".i" read skips bad blocks */
|
||||||
#define CONFIG_SYS_NAND_QUIET 1
|
#define CONFIG_SYS_NAND_QUIET 1
|
||||||
|
|
||||||
#define CONFIG_SYS_64BIT_VSPRINTF /* needed for nand_util.c */
|
|
||||||
|
|
||||||
/*-----------------------------------------------------------------------
|
/*-----------------------------------------------------------------------
|
||||||
* PCI stuff
|
* PCI stuff
|
||||||
*-----------------------------------------------------------------------
|
*-----------------------------------------------------------------------
|
||||||
|
|
|
@ -160,8 +160,6 @@
|
||||||
#define CONFIG_SYS_NAND_SKIP_BAD_DOT_I 1 /* ".i" read skips bad blocks */
|
#define CONFIG_SYS_NAND_SKIP_BAD_DOT_I 1 /* ".i" read skips bad blocks */
|
||||||
#define CONFIG_SYS_NAND_QUIET 1
|
#define CONFIG_SYS_NAND_QUIET 1
|
||||||
|
|
||||||
#define CONFIG_SYS_64BIT_VSPRINTF /* needed for nand_util.c */
|
|
||||||
|
|
||||||
/*-----------------------------------------------------------------------
|
/*-----------------------------------------------------------------------
|
||||||
* PCI stuff
|
* PCI stuff
|
||||||
*-----------------------------------------------------------------------
|
*-----------------------------------------------------------------------
|
||||||
|
|
|
@ -263,8 +263,6 @@
|
||||||
#define CONFIG_SYS_NAND0_BASE 0xE1000000
|
#define CONFIG_SYS_NAND0_BASE 0xE1000000
|
||||||
#define CONFIG_SYS_MAX_NAND_DEVICE 1 /* Max number of NAND devices */
|
#define CONFIG_SYS_MAX_NAND_DEVICE 1 /* Max number of NAND devices */
|
||||||
|
|
||||||
#define CONFIG_SYS_64BIT_VSPRINTF /* needed for nand_util.c */
|
|
||||||
|
|
||||||
#endif /* CONFIG_CMD_NAND */
|
#endif /* CONFIG_CMD_NAND */
|
||||||
|
|
||||||
/*-----------------------------------------------------------------------
|
/*-----------------------------------------------------------------------
|
||||||
|
|
|
@ -236,7 +236,6 @@
|
||||||
#define CONFIG_CMD_NAND 1
|
#define CONFIG_CMD_NAND 1
|
||||||
#define CONFIG_NAND_FSL_ELBC 1
|
#define CONFIG_NAND_FSL_ELBC 1
|
||||||
#define CONFIG_SYS_NAND_BLOCK_SIZE 16384
|
#define CONFIG_SYS_NAND_BLOCK_SIZE 16384
|
||||||
#define CONFIG_SYS_64BIT_VSPRINTF /* needed for nand_util.c */
|
|
||||||
|
|
||||||
#define CONFIG_SYS_NAND_U_BOOT_SIZE (512 << 10)
|
#define CONFIG_SYS_NAND_U_BOOT_SIZE (512 << 10)
|
||||||
#define CONFIG_SYS_NAND_U_BOOT_DST 0x00100000
|
#define CONFIG_SYS_NAND_U_BOOT_DST 0x00100000
|
||||||
|
|
|
@ -228,7 +228,6 @@
|
||||||
#define CONFIG_MTD_NAND_VERIFY_WRITE 1
|
#define CONFIG_MTD_NAND_VERIFY_WRITE 1
|
||||||
#define CONFIG_CMD_NAND 1
|
#define CONFIG_CMD_NAND 1
|
||||||
#define CONFIG_NAND_FSL_ELBC 1
|
#define CONFIG_NAND_FSL_ELBC 1
|
||||||
#define CONFIG_SYS_64BIT_VSPRINTF /* needed for nand_util.c */
|
|
||||||
|
|
||||||
#define CONFIG_SYS_BR1_PRELIM ( CONFIG_SYS_NAND_BASE \
|
#define CONFIG_SYS_BR1_PRELIM ( CONFIG_SYS_NAND_BASE \
|
||||||
| (2<<BR_DECC_SHIFT) /* Use HW ECC */ \
|
| (2<<BR_DECC_SHIFT) /* Use HW ECC */ \
|
||||||
|
|
|
@ -213,7 +213,6 @@
|
||||||
#define CONFIG_NAND_FSL_UPM 1
|
#define CONFIG_NAND_FSL_UPM 1
|
||||||
#define CONFIG_SYS_MAX_NAND_DEVICE 1
|
#define CONFIG_SYS_MAX_NAND_DEVICE 1
|
||||||
#define CONFIG_MTD_NAND_VERIFY_WRITE
|
#define CONFIG_MTD_NAND_VERIFY_WRITE
|
||||||
#define CONFIG_SYS_64BIT_VSPRINTF /* needed for nand_util.c */
|
|
||||||
|
|
||||||
#define CONFIG_SYS_LBLAWBAR1_PRELIM CONFIG_SYS_NAND_BASE
|
#define CONFIG_SYS_LBLAWBAR1_PRELIM CONFIG_SYS_NAND_BASE
|
||||||
#define CONFIG_SYS_LBLAWAR1_PRELIM 0x8000001b /* Access window size 4K */
|
#define CONFIG_SYS_LBLAWAR1_PRELIM 0x8000001b /* Access window size 4K */
|
||||||
|
|
|
@ -321,9 +321,6 @@
|
||||||
#define CONFIG_OF_BOARD_SETUP 1
|
#define CONFIG_OF_BOARD_SETUP 1
|
||||||
#define CONFIG_OF_STDOUT_VIA_ALIAS 1
|
#define CONFIG_OF_STDOUT_VIA_ALIAS 1
|
||||||
|
|
||||||
#define CONFIG_SYS_64BIT_STRTOUL 1
|
|
||||||
#define CONFIG_SYS_64BIT_VSPRINTF 1
|
|
||||||
|
|
||||||
/* I2C */
|
/* I2C */
|
||||||
#define CONFIG_HARD_I2C /* I2C with hardware support */
|
#define CONFIG_HARD_I2C /* I2C with hardware support */
|
||||||
#undef CONFIG_SOFT_I2C /* I2C bit-banged */
|
#undef CONFIG_SOFT_I2C /* I2C bit-banged */
|
||||||
|
|
|
@ -343,9 +343,6 @@
|
||||||
#define CONFIG_OF_BOARD_SETUP 1
|
#define CONFIG_OF_BOARD_SETUP 1
|
||||||
#define CONFIG_OF_STDOUT_VIA_ALIAS 1
|
#define CONFIG_OF_STDOUT_VIA_ALIAS 1
|
||||||
|
|
||||||
#define CONFIG_SYS_64BIT_STRTOUL 1
|
|
||||||
#define CONFIG_SYS_64BIT_VSPRINTF 1
|
|
||||||
|
|
||||||
/* I2C */
|
/* I2C */
|
||||||
#define CONFIG_HARD_I2C /* I2C with hardware support */
|
#define CONFIG_HARD_I2C /* I2C with hardware support */
|
||||||
#undef CONFIG_SOFT_I2C /* I2C bit-banged */
|
#undef CONFIG_SOFT_I2C /* I2C bit-banged */
|
||||||
|
|
|
@ -433,10 +433,6 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy);
|
||||||
#define CONFIG_OF_BOARD_SETUP 1
|
#define CONFIG_OF_BOARD_SETUP 1
|
||||||
#define CONFIG_OF_STDOUT_VIA_ALIAS 1
|
#define CONFIG_OF_STDOUT_VIA_ALIAS 1
|
||||||
|
|
||||||
#define CONFIG_SYS_64BIT_STRTOUL 1
|
|
||||||
#define CONFIG_SYS_64BIT_VSPRINTF 1
|
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* I2C
|
* I2C
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -260,9 +260,6 @@
|
||||||
#define CONFIG_OF_BOARD_SETUP 1
|
#define CONFIG_OF_BOARD_SETUP 1
|
||||||
#define CONFIG_OF_STDOUT_VIA_ALIAS 1
|
#define CONFIG_OF_STDOUT_VIA_ALIAS 1
|
||||||
|
|
||||||
#define CONFIG_SYS_64BIT_VSPRINTF 1
|
|
||||||
#define CONFIG_SYS_64BIT_STRTOUL 1
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* I2C
|
* I2C
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -286,9 +286,6 @@ extern unsigned long get_clock_freq(void);
|
||||||
#define CONFIG_OF_BOARD_SETUP 1
|
#define CONFIG_OF_BOARD_SETUP 1
|
||||||
#define CONFIG_OF_STDOUT_VIA_ALIAS 1
|
#define CONFIG_OF_STDOUT_VIA_ALIAS 1
|
||||||
|
|
||||||
#define CONFIG_SYS_64BIT_VSPRINTF 1
|
|
||||||
#define CONFIG_SYS_64BIT_STRTOUL 1
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* I2C
|
* I2C
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -242,9 +242,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
|
||||||
#define CONFIG_OF_BOARD_SETUP 1
|
#define CONFIG_OF_BOARD_SETUP 1
|
||||||
#define CONFIG_OF_STDOUT_VIA_ALIAS 1
|
#define CONFIG_OF_STDOUT_VIA_ALIAS 1
|
||||||
|
|
||||||
#define CONFIG_SYS_64BIT_STRTOUL 1
|
|
||||||
#define CONFIG_SYS_64BIT_VSPRINTF 1
|
|
||||||
|
|
||||||
/* I2C */
|
/* I2C */
|
||||||
#define CONFIG_FSL_I2C /* Use FSL common I2C driver */
|
#define CONFIG_FSL_I2C /* Use FSL common I2C driver */
|
||||||
#define CONFIG_HARD_I2C /* I2C with hardware support */
|
#define CONFIG_HARD_I2C /* I2C with hardware support */
|
||||||
|
|
|
@ -309,9 +309,6 @@ extern unsigned long get_clock_freq(void);
|
||||||
#define CONFIG_OF_BOARD_SETUP 1
|
#define CONFIG_OF_BOARD_SETUP 1
|
||||||
#define CONFIG_OF_STDOUT_VIA_ALIAS 1
|
#define CONFIG_OF_STDOUT_VIA_ALIAS 1
|
||||||
|
|
||||||
#define CONFIG_SYS_64BIT_VSPRINTF 1
|
|
||||||
#define CONFIG_SYS_64BIT_STRTOUL 1
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* I2C
|
* I2C
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -284,9 +284,6 @@ extern unsigned long get_clock_freq(void);
|
||||||
#define CONFIG_OF_BOARD_SETUP 1
|
#define CONFIG_OF_BOARD_SETUP 1
|
||||||
#define CONFIG_OF_STDOUT_VIA_ALIAS 1
|
#define CONFIG_OF_STDOUT_VIA_ALIAS 1
|
||||||
|
|
||||||
#define CONFIG_SYS_64BIT_VSPRINTF 1
|
|
||||||
#define CONFIG_SYS_64BIT_STRTOUL 1
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* I2C
|
* I2C
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -253,9 +253,6 @@
|
||||||
#define CONFIG_OF_BOARD_SETUP 1
|
#define CONFIG_OF_BOARD_SETUP 1
|
||||||
#define CONFIG_OF_STDOUT_VIA_ALIAS 1
|
#define CONFIG_OF_STDOUT_VIA_ALIAS 1
|
||||||
|
|
||||||
#define CONFIG_SYS_64BIT_VSPRINTF 1
|
|
||||||
#define CONFIG_SYS_64BIT_STRTOUL 1
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* I2C
|
* I2C
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -270,9 +270,6 @@ extern unsigned long get_clock_freq(void);
|
||||||
#define CONFIG_OF_BOARD_SETUP 1
|
#define CONFIG_OF_BOARD_SETUP 1
|
||||||
#define CONFIG_OF_STDOUT_VIA_ALIAS 1
|
#define CONFIG_OF_STDOUT_VIA_ALIAS 1
|
||||||
|
|
||||||
#define CONFIG_SYS_64BIT_VSPRINTF 1
|
|
||||||
#define CONFIG_SYS_64BIT_STRTOUL 1
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* I2C
|
* I2C
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -247,9 +247,6 @@ extern unsigned long get_clock_freq(void);
|
||||||
#define CONFIG_OF_BOARD_SETUP 1
|
#define CONFIG_OF_BOARD_SETUP 1
|
||||||
#define CONFIG_OF_STDOUT_VIA_ALIAS 1
|
#define CONFIG_OF_STDOUT_VIA_ALIAS 1
|
||||||
|
|
||||||
#define CONFIG_SYS_64BIT_VSPRINTF 1
|
|
||||||
#define CONFIG_SYS_64BIT_STRTOUL 1
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* I2C
|
* I2C
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -367,9 +367,6 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy);
|
||||||
#define CONFIG_OF_BOARD_SETUP 1
|
#define CONFIG_OF_BOARD_SETUP 1
|
||||||
#define CONFIG_OF_STDOUT_VIA_ALIAS 1
|
#define CONFIG_OF_STDOUT_VIA_ALIAS 1
|
||||||
|
|
||||||
#define CONFIG_SYS_64BIT_VSPRINTF 1
|
|
||||||
#define CONFIG_SYS_64BIT_STRTOUL 1
|
|
||||||
|
|
||||||
/* new uImage format support */
|
/* new uImage format support */
|
||||||
#define CONFIG_FIT 1
|
#define CONFIG_FIT 1
|
||||||
#define CONFIG_FIT_VERBOSE 1 /* enable fit_format_{error,warning}() */
|
#define CONFIG_FIT_VERBOSE 1 /* enable fit_format_{error,warning}() */
|
||||||
|
|
|
@ -251,9 +251,6 @@
|
||||||
/* maximum size of the flat tree (8K) */
|
/* maximum size of the flat tree (8K) */
|
||||||
#define OF_FLAT_TREE_MAX_SIZE 8192
|
#define OF_FLAT_TREE_MAX_SIZE 8192
|
||||||
|
|
||||||
#define CONFIG_SYS_64BIT_VSPRINTF 1
|
|
||||||
#define CONFIG_SYS_64BIT_STRTOUL 1
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* I2C
|
* I2C
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -301,10 +301,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
|
||||||
#define CONFIG_OF_BOARD_SETUP 1
|
#define CONFIG_OF_BOARD_SETUP 1
|
||||||
#define CONFIG_OF_STDOUT_VIA_ALIAS 1
|
#define CONFIG_OF_STDOUT_VIA_ALIAS 1
|
||||||
|
|
||||||
|
|
||||||
#define CONFIG_SYS_64BIT_VSPRINTF 1
|
|
||||||
#define CONFIG_SYS_64BIT_STRTOUL 1
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* I2C
|
* I2C
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -310,9 +310,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
|
||||||
#define CONFIG_OF_BOARD_SETUP 1
|
#define CONFIG_OF_BOARD_SETUP 1
|
||||||
#define CONFIG_OF_STDOUT_VIA_ALIAS 1
|
#define CONFIG_OF_STDOUT_VIA_ALIAS 1
|
||||||
|
|
||||||
#define CONFIG_SYS_64BIT_VSPRINTF 1
|
|
||||||
#define CONFIG_SYS_64BIT_STRTOUL 1
|
|
||||||
|
|
||||||
/* new uImage format support */
|
/* new uImage format support */
|
||||||
#define CONFIG_FIT 1
|
#define CONFIG_FIT 1
|
||||||
#define CONFIG_FIT_VERBOSE 1 /* enable fit_format_{error,warning}() */
|
#define CONFIG_FIT_VERBOSE 1 /* enable fit_format_{error,warning}() */
|
||||||
|
|
|
@ -401,9 +401,6 @@ extern unsigned long calculate_board_ddr_clk(unsigned long dummy);
|
||||||
#define CONFIG_OF_BOARD_SETUP 1
|
#define CONFIG_OF_BOARD_SETUP 1
|
||||||
#define CONFIG_OF_STDOUT_VIA_ALIAS 1
|
#define CONFIG_OF_STDOUT_VIA_ALIAS 1
|
||||||
|
|
||||||
#define CONFIG_SYS_64BIT_VSPRINTF 1
|
|
||||||
#define CONFIG_SYS_64BIT_STRTOUL 1
|
|
||||||
|
|
||||||
/* new uImage format support */
|
/* new uImage format support */
|
||||||
#define CONFIG_FIT 1
|
#define CONFIG_FIT 1
|
||||||
#define CONFIG_FIT_VERBOSE 1 /* enable fit_format_{error,warning}() */
|
#define CONFIG_FIT_VERBOSE 1 /* enable fit_format_{error,warning}() */
|
||||||
|
|
|
@ -181,8 +181,6 @@
|
||||||
#define CONFIG_SYS_NAND_SKIP_BAD_DOT_I 1 /* ".i" read skips bad blocks */
|
#define CONFIG_SYS_NAND_SKIP_BAD_DOT_I 1 /* ".i" read skips bad blocks */
|
||||||
#define CONFIG_SYS_NAND_QUIET 1
|
#define CONFIG_SYS_NAND_QUIET 1
|
||||||
|
|
||||||
#define CONFIG_SYS_64BIT_VSPRINTF /* needed for nand_util.c */
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* PCI stuff
|
* PCI stuff
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -211,8 +211,6 @@
|
||||||
*-----------------------------------------------------------------------
|
*-----------------------------------------------------------------------
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#define CONFIG_SYS_64BIT_VSPRINTF /* needed for nand_util.c */
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* nand device 1 on dave (PPChameleonEVB) needs more time,
|
* nand device 1 on dave (PPChameleonEVB) needs more time,
|
||||||
* so we just introduce additional wait in nand_wait(),
|
* so we just introduce additional wait in nand_wait(),
|
||||||
|
|
|
@ -132,7 +132,6 @@
|
||||||
#define CONFIG_MTD_NAND_VERIFY_WRITE
|
#define CONFIG_MTD_NAND_VERIFY_WRITE
|
||||||
#define CONFIG_CMD_NAND 1
|
#define CONFIG_CMD_NAND 1
|
||||||
#define CONFIG_NAND_FSL_ELBC 1
|
#define CONFIG_NAND_FSL_ELBC 1
|
||||||
#define CONFIG_SYS_64BIT_VSPRINTF /* needed for nand_util.c */
|
|
||||||
|
|
||||||
#define CONFIG_SYS_NAND_U_BOOT_SIZE (512 << 10)
|
#define CONFIG_SYS_NAND_U_BOOT_SIZE (512 << 10)
|
||||||
#define CONFIG_SYS_NAND_U_BOOT_DST 0x00100000
|
#define CONFIG_SYS_NAND_U_BOOT_DST 0x00100000
|
||||||
|
|
|
@ -442,8 +442,6 @@
|
||||||
WRITE_NAND(d, addr); \
|
WRITE_NAND(d, addr); \
|
||||||
} while(0)
|
} while(0)
|
||||||
|
|
||||||
#define CONFIG_SYS_64BIT_VSPRINTF /* needed for nand_util.c */
|
|
||||||
|
|
||||||
#endif /* CONFIG_CMD_NAND */
|
#endif /* CONFIG_CMD_NAND */
|
||||||
|
|
||||||
#define CONFIG_PCI
|
#define CONFIG_PCI
|
||||||
|
|
|
@ -372,8 +372,6 @@
|
||||||
|
|
||||||
#define NAND_BIG_DELAY_US 25 /* max tR for Samsung devices */
|
#define NAND_BIG_DELAY_US 25 /* max tR for Samsung devices */
|
||||||
|
|
||||||
#define CONFIG_SYS_64BIT_VSPRINTF /* needed for nand_util.c */
|
|
||||||
|
|
||||||
#endif /* CONFIG_NAND */
|
#endif /* CONFIG_NAND */
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
|
@ -169,8 +169,6 @@
|
||||||
#define CONFIG_SYS_NAND_SKIP_BAD_DOT_I 1 /* ".i" read skips bad blocks */
|
#define CONFIG_SYS_NAND_SKIP_BAD_DOT_I 1 /* ".i" read skips bad blocks */
|
||||||
#define CONFIG_SYS_NAND_QUIET 1
|
#define CONFIG_SYS_NAND_QUIET 1
|
||||||
|
|
||||||
#define CONFIG_SYS_64BIT_VSPRINTF /* needed for nand_util.c */
|
|
||||||
|
|
||||||
/*-----------------------------------------------------------------------
|
/*-----------------------------------------------------------------------
|
||||||
* PCI stuff
|
* PCI stuff
|
||||||
*-----------------------------------------------------------------------
|
*-----------------------------------------------------------------------
|
||||||
|
|
|
@ -157,8 +157,6 @@
|
||||||
|
|
||||||
#define CONFIG_SYS_NAND_SKIP_BAD_DOT_I 1 /* ".i" read skips bad blocks */
|
#define CONFIG_SYS_NAND_SKIP_BAD_DOT_I 1 /* ".i" read skips bad blocks */
|
||||||
|
|
||||||
#define CONFIG_SYS_64BIT_VSPRINTF /* needed for nand_util.c */
|
|
||||||
|
|
||||||
/*-----------------------------------------------------------------------
|
/*-----------------------------------------------------------------------
|
||||||
* PCI stuff
|
* PCI stuff
|
||||||
*-----------------------------------------------------------------------
|
*-----------------------------------------------------------------------
|
||||||
|
|
|
@ -239,9 +239,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
|
||||||
#define CONFIG_OF_BOARD_SETUP 1
|
#define CONFIG_OF_BOARD_SETUP 1
|
||||||
#define CONFIG_OF_STDOUT_VIA_ALIAS 1
|
#define CONFIG_OF_STDOUT_VIA_ALIAS 1
|
||||||
|
|
||||||
#define CONFIG_SYS_64BIT_VSPRINTF 1
|
|
||||||
#define CONFIG_SYS_64BIT_STRTOUL 1
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* I2C
|
* I2C
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -213,9 +213,6 @@
|
||||||
#define CONFIG_OF_BOARD_SETUP 1
|
#define CONFIG_OF_BOARD_SETUP 1
|
||||||
#define CONFIG_OF_STDOUT_VIA_ALIAS 1
|
#define CONFIG_OF_STDOUT_VIA_ALIAS 1
|
||||||
|
|
||||||
#define CONFIG_SYS_64BIT_VSPRINTF 1
|
|
||||||
#define CONFIG_SYS_64BIT_STRTOUL 1
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* I2C
|
* I2C
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -244,9 +244,6 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy);
|
||||||
#define CONFIG_OF_BOARD_SETUP 1
|
#define CONFIG_OF_BOARD_SETUP 1
|
||||||
#define CONFIG_OF_STDOUT_VIA_ALIAS 1
|
#define CONFIG_OF_STDOUT_VIA_ALIAS 1
|
||||||
|
|
||||||
#define CONFIG_SYS_64BIT_VSPRINTF 1
|
|
||||||
#define CONFIG_SYS_64BIT_STRTOUL 1
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* I2C
|
* I2C
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -266,8 +266,6 @@
|
||||||
#define CONFIG_SYS_NAND_BASE (CONFIG_SYS_NAND_ADDR + CONFIG_SYS_NAND_CS)
|
#define CONFIG_SYS_NAND_BASE (CONFIG_SYS_NAND_ADDR + CONFIG_SYS_NAND_CS)
|
||||||
#define CONFIG_SYS_NAND_SELECT_DEVICE 1 /* nand driver supports mutipl. chips */
|
#define CONFIG_SYS_NAND_SELECT_DEVICE 1 /* nand driver supports mutipl. chips */
|
||||||
|
|
||||||
#define CONFIG_SYS_64BIT_VSPRINTF /* needed for nand_util.c */
|
|
||||||
|
|
||||||
/*-----------------------------------------------------------------------
|
/*-----------------------------------------------------------------------
|
||||||
* External Bus Controller (EBC) Setup
|
* External Bus Controller (EBC) Setup
|
||||||
*----------------------------------------------------------------------*/
|
*----------------------------------------------------------------------*/
|
||||||
|
|
|
@ -107,7 +107,6 @@
|
||||||
#define CONFIG_SYS_NAND_ENABLE_PIN AT91_PIN_PC14
|
#define CONFIG_SYS_NAND_ENABLE_PIN AT91_PIN_PC14
|
||||||
#define CONFIG_SYS_NAND_READY_PIN AT91_PIN_PC13
|
#define CONFIG_SYS_NAND_READY_PIN AT91_PIN_PC13
|
||||||
|
|
||||||
#define CONFIG_SYS_64BIT_VSPRINTF /* needed for nand_util.c */
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* NOR flash - no real flash on this board */
|
/* NOR flash - no real flash on this board */
|
||||||
|
|
|
@ -258,8 +258,6 @@
|
||||||
#define CONFIG_ENV_ADDR 0x00020000
|
#define CONFIG_ENV_ADDR 0x00020000
|
||||||
#define CONFIG_ENV_ADDR_FLEX 0x00040000
|
#define CONFIG_ENV_ADDR_FLEX 0x00040000
|
||||||
|
|
||||||
#define CONFIG_SYS_64BIT_VSPRINTF /* needed for nand_util.c */
|
|
||||||
|
|
||||||
#ifdef CONFIG_SYS_USE_UBI
|
#ifdef CONFIG_SYS_USE_UBI
|
||||||
#define CONFIG_CMD_MTDPARTS
|
#define CONFIG_CMD_MTDPARTS
|
||||||
#define MTDIDS_DEFAULT "onenand0=onenand"
|
#define MTDIDS_DEFAULT "onenand0=onenand"
|
||||||
|
|
|
@ -251,8 +251,6 @@
|
||||||
#define CONFIG_SYS_MAX_NAND_DEVICE 1
|
#define CONFIG_SYS_MAX_NAND_DEVICE 1
|
||||||
#define NAND_MAX_CHIPS CONFIG_SYS_MAX_NAND_DEVICE
|
#define NAND_MAX_CHIPS CONFIG_SYS_MAX_NAND_DEVICE
|
||||||
|
|
||||||
#define CONFIG_SYS_64BIT_VSPRINTF /* needed for nand_util.c */
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Configuration parameters for MPC5121 NAND driver
|
* Configuration parameters for MPC5121 NAND driver
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -131,7 +131,6 @@
|
||||||
#define CONFIG_SYS_NAND_BASE 0x40000000
|
#define CONFIG_SYS_NAND_BASE 0x40000000
|
||||||
#define CONFIG_SYS_NAND_DBW_8 1
|
#define CONFIG_SYS_NAND_DBW_8 1
|
||||||
|
|
||||||
#define CONFIG_SYS_64BIT_VSPRINTF /* needed for nand_util.c */
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* Ethernet */
|
/* Ethernet */
|
||||||
|
|
|
@ -123,7 +123,6 @@
|
||||||
#define CONFIG_SYS_NAND_ENABLE_PIN AT91_PIN_PC14
|
#define CONFIG_SYS_NAND_ENABLE_PIN AT91_PIN_PC14
|
||||||
#define CONFIG_SYS_NAND_READY_PIN AT91_PIN_PC13
|
#define CONFIG_SYS_NAND_READY_PIN AT91_PIN_PC13
|
||||||
|
|
||||||
#define CONFIG_SYS_64BIT_VSPRINTF /* needed for nand_util.c */
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* NOR flash - no real flash on this board */
|
/* NOR flash - no real flash on this board */
|
||||||
|
|
|
@ -133,7 +133,6 @@
|
||||||
#define CONFIG_SYS_NAND_ENABLE_PIN AT91_PIN_PC14
|
#define CONFIG_SYS_NAND_ENABLE_PIN AT91_PIN_PC14
|
||||||
#define CONFIG_SYS_NAND_READY_PIN AT91_PIN_PC15
|
#define CONFIG_SYS_NAND_READY_PIN AT91_PIN_PC15
|
||||||
|
|
||||||
#define CONFIG_SYS_64BIT_VSPRINTF /* needed for nand_util.c */
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* NOR flash - no real flash on this board */
|
/* NOR flash - no real flash on this board */
|
||||||
|
|
|
@ -267,7 +267,6 @@
|
||||||
#define CONFIG_SYS_NAND_ENABLE_PIN AT91_PIN_PD15
|
#define CONFIG_SYS_NAND_ENABLE_PIN AT91_PIN_PD15
|
||||||
#define CONFIG_SYS_NAND_READY_PIN AT91_PIN_PA22
|
#define CONFIG_SYS_NAND_READY_PIN AT91_PIN_PA22
|
||||||
|
|
||||||
#define CONFIG_SYS_64BIT_VSPRINTF /* needed for nand_util.c */
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* Ethernet */
|
/* Ethernet */
|
||||||
|
|
|
@ -118,7 +118,6 @@
|
||||||
/* NOR flash, if populated */
|
/* NOR flash, if populated */
|
||||||
#ifndef CONFIG_CMD_NAND
|
#ifndef CONFIG_CMD_NAND
|
||||||
#define CONFIG_SYS_NO_FLASH 1
|
#define CONFIG_SYS_NO_FLASH 1
|
||||||
#define CONFIG_SYS_64BIT_VSPRINTF /* needed for nand_util.c */
|
|
||||||
#else
|
#else
|
||||||
#define CONFIG_SYS_FLASH_CFI 1
|
#define CONFIG_SYS_FLASH_CFI 1
|
||||||
#define CONFIG_FLASH_CFI_DRIVER 1
|
#define CONFIG_FLASH_CFI_DRIVER 1
|
||||||
|
@ -142,7 +141,6 @@
|
||||||
#define CONFIG_SYS_NAND_ENABLE_PIN AT91_PIN_PC14
|
#define CONFIG_SYS_NAND_ENABLE_PIN AT91_PIN_PC14
|
||||||
#define CONFIG_SYS_NAND_READY_PIN AT91_PIN_PC8
|
#define CONFIG_SYS_NAND_READY_PIN AT91_PIN_PC8
|
||||||
|
|
||||||
#define CONFIG_SYS_64BIT_VSPRINTF /* needed for nand_util.c */
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* Ethernet */
|
/* Ethernet */
|
||||||
|
|
|
@ -119,7 +119,6 @@
|
||||||
#define CONFIG_SYS_NAND_ENABLE_PIN AT91_PIN_PB6
|
#define CONFIG_SYS_NAND_ENABLE_PIN AT91_PIN_PB6
|
||||||
#define CONFIG_SYS_NAND_READY_PIN AT91_PIN_PD17
|
#define CONFIG_SYS_NAND_READY_PIN AT91_PIN_PD17
|
||||||
|
|
||||||
#define CONFIG_SYS_64BIT_VSPRINTF /* needed for nand_util.c */
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* Ethernet - not present */
|
/* Ethernet - not present */
|
||||||
|
|
|
@ -87,9 +87,6 @@
|
||||||
# define CONFIG_CMD_SPIBOOTLDR
|
# define CONFIG_CMD_SPIBOOTLDR
|
||||||
# endif
|
# endif
|
||||||
#endif
|
#endif
|
||||||
#ifdef CONFIG_CMD_NAND
|
|
||||||
# define CONFIG_SYS_64BIT_VSPRINTF
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Console Settings
|
* Console Settings
|
||||||
|
|
|
@ -295,7 +295,6 @@
|
||||||
#define CONFIG_SYS_NAND_ENABLE_PIN AT91_PIN_PC14
|
#define CONFIG_SYS_NAND_ENABLE_PIN AT91_PIN_PC14
|
||||||
#define CONFIG_SYS_NAND_MASK_ALE (1 << 21)
|
#define CONFIG_SYS_NAND_MASK_ALE (1 << 21)
|
||||||
#define CONFIG_SYS_NAND_MASK_CLE (1 << 22)
|
#define CONFIG_SYS_NAND_MASK_CLE (1 << 22)
|
||||||
#define CONFIG_SYS_64BIT_VSPRINTF /* needed for nand_util.c */
|
|
||||||
|
|
||||||
/* NOR flash */
|
/* NOR flash */
|
||||||
#define CONFIG_SYS_FLASH_CFI 1
|
#define CONFIG_SYS_FLASH_CFI 1
|
||||||
|
|
|
@ -69,7 +69,6 @@
|
||||||
#define CONFIG_SYS_NAND_USE_FLASH_BBT
|
#define CONFIG_SYS_NAND_USE_FLASH_BBT
|
||||||
#define CONFIG_SYS_NAND_4BIT_HW_ECC_OOBFIRST
|
#define CONFIG_SYS_NAND_4BIT_HW_ECC_OOBFIRST
|
||||||
#define CONFIG_SYS_NAND_PAGE_2K
|
#define CONFIG_SYS_NAND_PAGE_2K
|
||||||
#define CONFIG_SYS_64BIT_VSPRINTF /* needed for nand_util.c */
|
|
||||||
|
|
||||||
#define CONFIG_SYS_NAND_LARGEPAGE
|
#define CONFIG_SYS_NAND_LARGEPAGE
|
||||||
#define CONFIG_SYS_NAND_BASE_LIST { 0x02000000, }
|
#define CONFIG_SYS_NAND_BASE_LIST { 0x02000000, }
|
||||||
|
|
|
@ -114,7 +114,6 @@
|
||||||
#define CONFIG_ENV_SIZE (256 << 10) /* 256 KiB */
|
#define CONFIG_ENV_SIZE (256 << 10) /* 256 KiB */
|
||||||
#define CONFIG_ENV_IS_IN_NAND
|
#define CONFIG_ENV_IS_IN_NAND
|
||||||
#define CONFIG_ENV_OFFSET 0x3C0000
|
#define CONFIG_ENV_OFFSET 0x3C0000
|
||||||
#define CONFIG_SYS_64BIT_VSPRINTF /* needed for nand_util.c */
|
|
||||||
#undef CONFIG_ENV_IS_IN_FLASH
|
#undef CONFIG_ENV_IS_IN_FLASH
|
||||||
#define CONFIG_ENV_OVERWRITE
|
#define CONFIG_ENV_OVERWRITE
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -77,7 +77,6 @@
|
||||||
#define CONFIG_SYS_NAND_USE_FLASH_BBT
|
#define CONFIG_SYS_NAND_USE_FLASH_BBT
|
||||||
#define CONFIG_SYS_NAND_4BIT_HW_ECC_OOBFIRST
|
#define CONFIG_SYS_NAND_4BIT_HW_ECC_OOBFIRST
|
||||||
#define CONFIG_SYS_NAND_PAGE_2K
|
#define CONFIG_SYS_NAND_PAGE_2K
|
||||||
#define CONFIG_SYS_64BIT_VSPRINTF /* needed for nand_util.c */
|
|
||||||
|
|
||||||
#define CONFIG_SYS_NAND_LARGEPAGE
|
#define CONFIG_SYS_NAND_LARGEPAGE
|
||||||
#define CONFIG_SYS_NAND_BASE_LIST { 0x02000000, }
|
#define CONFIG_SYS_NAND_BASE_LIST { 0x02000000, }
|
||||||
|
|
|
@ -77,7 +77,6 @@
|
||||||
#define CONFIG_NAND_DAVINCI
|
#define CONFIG_NAND_DAVINCI
|
||||||
#undef CONFIG_ENV_IS_IN_FLASH
|
#undef CONFIG_ENV_IS_IN_FLASH
|
||||||
#define CONFIG_ENV_IS_IN_NAND
|
#define CONFIG_ENV_IS_IN_NAND
|
||||||
#define CONFIG_SYS_64BIT_VSPRINTF /* needed for nand_util.c */
|
|
||||||
#define CONFIG_ENV_SIZE (16 << 10) /* 16 KiB */
|
#define CONFIG_ENV_SIZE (16 << 10) /* 16 KiB */
|
||||||
#define CONFIG_SYS_NAND_BASE_LIST {0x42000000, }
|
#define CONFIG_SYS_NAND_BASE_LIST {0x42000000, }
|
||||||
#define CONFIG_SYS_NAND_HW_ECC
|
#define CONFIG_SYS_NAND_HW_ECC
|
||||||
|
|
|
@ -138,7 +138,6 @@
|
||||||
#define CONFIG_SYS_NAND_HW_ECC
|
#define CONFIG_SYS_NAND_HW_ECC
|
||||||
#define CONFIG_SYS_MAX_NAND_DEVICE 1 /* Max number of NAND devices */
|
#define CONFIG_SYS_MAX_NAND_DEVICE 1 /* Max number of NAND devices */
|
||||||
#define CONFIG_ENV_OFFSET 0x0 /* Block 0--not used by bootcode */
|
#define CONFIG_ENV_OFFSET 0x0 /* Block 0--not used by bootcode */
|
||||||
#define CONFIG_SYS_64BIT_VSPRINTF /* needed for nand_util.c */
|
|
||||||
#define DEF_BOOTM ""
|
#define DEF_BOOTM ""
|
||||||
#elif defined(CONFIG_SYS_USE_NOR)
|
#elif defined(CONFIG_SYS_USE_NOR)
|
||||||
#ifdef CONFIG_NOR_UART_BOOT
|
#ifdef CONFIG_NOR_UART_BOOT
|
||||||
|
|
|
@ -92,7 +92,6 @@
|
||||||
#define CONFIG_SYS_NAND_HW_ECC
|
#define CONFIG_SYS_NAND_HW_ECC
|
||||||
#define CONFIG_SYS_MAX_NAND_DEVICE 1 /* Max number of NAND devices */
|
#define CONFIG_SYS_MAX_NAND_DEVICE 1 /* Max number of NAND devices */
|
||||||
#define CONFIG_ENV_OFFSET 0x0 /* Block 0--not used by bootcode */
|
#define CONFIG_ENV_OFFSET 0x0 /* Block 0--not used by bootcode */
|
||||||
#define CONFIG_SYS_64BIT_VSPRINTF /* needed for nand_util.c */
|
|
||||||
/*=====================*/
|
/*=====================*/
|
||||||
/* Board related stuff */
|
/* Board related stuff */
|
||||||
/*=====================*/
|
/*=====================*/
|
||||||
|
|
|
@ -87,7 +87,6 @@
|
||||||
#define CONFIG_SYS_NAND_HW_ECC
|
#define CONFIG_SYS_NAND_HW_ECC
|
||||||
#define CONFIG_SYS_MAX_NAND_DEVICE 1 /* Max number of NAND devices */
|
#define CONFIG_SYS_MAX_NAND_DEVICE 1 /* Max number of NAND devices */
|
||||||
#define CONFIG_ENV_OFFSET 0x0 /* Block 0--not used by bootcode */
|
#define CONFIG_ENV_OFFSET 0x0 /* Block 0--not used by bootcode */
|
||||||
#define CONFIG_SYS_64BIT_VSPRINTF /* needed for nand_util.c */
|
|
||||||
/* I2C switch definitions for PCA9543 chip */
|
/* I2C switch definitions for PCA9543 chip */
|
||||||
#define CONFIG_SYS_I2C_PCA9543_ADDR 0x70
|
#define CONFIG_SYS_I2C_PCA9543_ADDR 0x70
|
||||||
#define CONFIG_SYS_I2C_PCA9543_ADDR_LEN 0 /* Single register. */
|
#define CONFIG_SYS_I2C_PCA9543_ADDR_LEN 0 /* Single register. */
|
||||||
|
|
|
@ -125,7 +125,6 @@
|
||||||
#define CONFIG_SYS_NAND_HW_ECC
|
#define CONFIG_SYS_NAND_HW_ECC
|
||||||
#define CONFIG_SYS_MAX_NAND_DEVICE 1 /* Max number of NAND devices */
|
#define CONFIG_SYS_MAX_NAND_DEVICE 1 /* Max number of NAND devices */
|
||||||
#define CONFIG_ENV_OFFSET 0x0 /* Block 0--not used by bootcode */
|
#define CONFIG_ENV_OFFSET 0x0 /* Block 0--not used by bootcode */
|
||||||
#define CONFIG_SYS_64BIT_VSPRINTF /* needed for nand_util.c */
|
|
||||||
#define DEF_BOOTM ""
|
#define DEF_BOOTM ""
|
||||||
#elif defined(CONFIG_SYS_USE_NOR)
|
#elif defined(CONFIG_SYS_USE_NOR)
|
||||||
#ifdef CONFIG_NOR_UART_BOOT
|
#ifdef CONFIG_NOR_UART_BOOT
|
||||||
|
|
|
@ -226,8 +226,6 @@
|
||||||
#define CONFIG_SYS_NAND_BASE_LIST { CONFIG_SYS_NAND0_BASE }
|
#define CONFIG_SYS_NAND_BASE_LIST { CONFIG_SYS_NAND0_BASE }
|
||||||
#define CONFIG_SYS_MAX_NAND_DEVICE 1 /* Max number of NAND devices */
|
#define CONFIG_SYS_MAX_NAND_DEVICE 1 /* Max number of NAND devices */
|
||||||
|
|
||||||
#define CONFIG_SYS_64BIT_VSPRINTF /* needed for nand_util.c */
|
|
||||||
|
|
||||||
/* nand timeout values */
|
/* nand timeout values */
|
||||||
#define CONFIG_SYS_NAND_PROG_ERASE_TO 3000
|
#define CONFIG_SYS_NAND_PROG_ERASE_TO 3000
|
||||||
#define CONFIG_SYS_NAND_OTHER_TO 100
|
#define CONFIG_SYS_NAND_OTHER_TO 100
|
||||||
|
|
|
@ -132,8 +132,6 @@
|
||||||
|
|
||||||
#define CONFIG_SYS_MAX_NAND_DEVICE 1 /* Max number of NAND */
|
#define CONFIG_SYS_MAX_NAND_DEVICE 1 /* Max number of NAND */
|
||||||
/* devices */
|
/* devices */
|
||||||
#define CONFIG_SYS_64BIT_VSPRINTF /* needed for nand_util.c */
|
|
||||||
|
|
||||||
#define CONFIG_JFFS2_NAND
|
#define CONFIG_JFFS2_NAND
|
||||||
/* nand device jffs2 lives on */
|
/* nand device jffs2 lives on */
|
||||||
#define CONFIG_JFFS2_DEV "nand0"
|
#define CONFIG_JFFS2_DEV "nand0"
|
||||||
|
|
|
@ -127,8 +127,6 @@
|
||||||
|
|
||||||
#define CONFIG_SYS_MALLOC_LEN (1024 * 1024) /* Reserved for malloc */
|
#define CONFIG_SYS_MALLOC_LEN (1024 * 1024) /* Reserved for malloc */
|
||||||
|
|
||||||
#define CONFIG_SYS_64BIT_VSPRINTF /* needed for UBI/UBIFS */
|
|
||||||
|
|
||||||
/* UBI Support for all Keymile boards */
|
/* UBI Support for all Keymile boards */
|
||||||
#define CONFIG_CMD_UBI
|
#define CONFIG_CMD_UBI
|
||||||
#define CONFIG_RBTREE
|
#define CONFIG_RBTREE
|
||||||
|
|
|
@ -217,8 +217,6 @@
|
||||||
#define CONFIG_SYS_NAND_BASE (CONFIG_SYS_NAND_ADDR + CONFIG_SYS_NAND_CS)
|
#define CONFIG_SYS_NAND_BASE (CONFIG_SYS_NAND_ADDR + CONFIG_SYS_NAND_CS)
|
||||||
#define CONFIG_SYS_NAND_SELECT_DEVICE 1 /* nand driver supports mutipl. chips */
|
#define CONFIG_SYS_NAND_SELECT_DEVICE 1 /* nand driver supports mutipl. chips */
|
||||||
|
|
||||||
#define CONFIG_SYS_64BIT_VSPRINTF /* needed for nand_util.c */
|
|
||||||
|
|
||||||
/*-----------------------------------------------------------------------
|
/*-----------------------------------------------------------------------
|
||||||
* DDR SDRAM
|
* DDR SDRAM
|
||||||
*----------------------------------------------------------------------*/
|
*----------------------------------------------------------------------*/
|
||||||
|
|
|
@ -177,8 +177,6 @@
|
||||||
#define CONFIG_SYS_MAX_NAND_DEVICE 1
|
#define CONFIG_SYS_MAX_NAND_DEVICE 1
|
||||||
#define NAND_MAX_CHIPS CONFIG_SYS_MAX_NAND_DEVICE
|
#define NAND_MAX_CHIPS CONFIG_SYS_MAX_NAND_DEVICE
|
||||||
|
|
||||||
#define CONFIG_SYS_64BIT_VSPRINTF /* needed for nand_util.c */
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Configuration parameters for MPC5121 NAND driver
|
* Configuration parameters for MPC5121 NAND driver
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -121,7 +121,6 @@
|
||||||
#define CONFIG_SYS_NAND_ENABLE_PIN AT91_PIN_PD15
|
#define CONFIG_SYS_NAND_ENABLE_PIN AT91_PIN_PD15
|
||||||
#define CONFIG_SYS_NAND_READY_PIN AT91_PIN_PA22
|
#define CONFIG_SYS_NAND_READY_PIN AT91_PIN_PA22
|
||||||
|
|
||||||
#define CONFIG_SYS_64BIT_VSPRINTF /* needed for nand_util.c */
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* Ethernet */
|
/* Ethernet */
|
||||||
|
|
|
@ -239,8 +239,6 @@
|
||||||
#define NAND_MAX_CHIPS CONFIG_SYS_MAX_NAND_DEVICE
|
#define NAND_MAX_CHIPS CONFIG_SYS_MAX_NAND_DEVICE
|
||||||
#define CONFIG_SYS_NAND_SELECT_DEVICE /* driver supports mutipl. chips */
|
#define CONFIG_SYS_NAND_SELECT_DEVICE /* driver supports mutipl. chips */
|
||||||
|
|
||||||
#define CONFIG_SYS_64BIT_VSPRINTF /* needed for nand_util.c */
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Configuration parameters for MPC5121 NAND driver
|
* Configuration parameters for MPC5121 NAND driver
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -111,8 +111,6 @@
|
||||||
#define CONFIG_SYS_NAND_BASE 0x04000000 + (2 << 23)
|
#define CONFIG_SYS_NAND_BASE 0x04000000 + (2 << 23)
|
||||||
#define NAND_ALLOW_ERASE_ALL 1
|
#define NAND_ALLOW_ERASE_ALL 1
|
||||||
|
|
||||||
#define CONFIG_SYS_64BIT_VSPRINTF /* needed for nand_util.c */
|
|
||||||
|
|
||||||
#define CONFIG_HARD_I2C
|
#define CONFIG_HARD_I2C
|
||||||
#define CONFIG_SYS_I2C_SPEED 100000
|
#define CONFIG_SYS_I2C_SPEED 100000
|
||||||
#define CONFIG_SYS_I2C_SLAVE 1
|
#define CONFIG_SYS_I2C_SLAVE 1
|
||||||
|
|
|
@ -91,7 +91,6 @@
|
||||||
#define CONFIG_SYS_MEMTEST_END 0x0FFFFFFF
|
#define CONFIG_SYS_MEMTEST_END 0x0FFFFFFF
|
||||||
#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 256 * 1024)
|
#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 256 * 1024)
|
||||||
#define CONFIG_SYS_GBL_DATA_SIZE 128 /* for initial data */
|
#define CONFIG_SYS_GBL_DATA_SIZE 128 /* for initial data */
|
||||||
#define CONFIG_SYS_64BIT_VSPRINTF /* mtd desires this */
|
|
||||||
|
|
||||||
#define BOARD_LATE_INIT /* call board_late_init during start up */
|
#define BOARD_LATE_INIT /* call board_late_init during start up */
|
||||||
|
|
||||||
|
|
|
@ -151,8 +151,6 @@
|
||||||
|
|
||||||
#define CONFIG_SYS_MAX_NAND_DEVICE 1 /* Max number of NAND */
|
#define CONFIG_SYS_MAX_NAND_DEVICE 1 /* Max number of NAND */
|
||||||
/* devices */
|
/* devices */
|
||||||
#define CONFIG_SYS_64BIT_VSPRINTF /* needed for nand_util.c */
|
|
||||||
|
|
||||||
#define CONFIG_JFFS2_NAND
|
#define CONFIG_JFFS2_NAND
|
||||||
/* nand device jffs2 lives on */
|
/* nand device jffs2 lives on */
|
||||||
#define CONFIG_JFFS2_DEV "nand0"
|
#define CONFIG_JFFS2_DEV "nand0"
|
||||||
|
|
|
@ -146,8 +146,6 @@
|
||||||
|
|
||||||
#define CONFIG_SYS_MAX_NAND_DEVICE 1 /* Max number of */
|
#define CONFIG_SYS_MAX_NAND_DEVICE 1 /* Max number of */
|
||||||
/* NAND devices */
|
/* NAND devices */
|
||||||
#define CONFIG_SYS_64BIT_VSPRINTF /* needed for nand_util.c */
|
|
||||||
|
|
||||||
#define CONFIG_JFFS2_NAND
|
#define CONFIG_JFFS2_NAND
|
||||||
/* nand device jffs2 lives on */
|
/* nand device jffs2 lives on */
|
||||||
#define CONFIG_JFFS2_DEV "nand0"
|
#define CONFIG_JFFS2_DEV "nand0"
|
||||||
|
|
|
@ -137,8 +137,6 @@
|
||||||
|
|
||||||
#define CONFIG_SYS_MAX_NAND_DEVICE 1 /* Max number of NAND */
|
#define CONFIG_SYS_MAX_NAND_DEVICE 1 /* Max number of NAND */
|
||||||
/* devices */
|
/* devices */
|
||||||
#define CONFIG_SYS_64BIT_VSPRINTF /* needed for nand_util.c */
|
|
||||||
|
|
||||||
#define CONFIG_JFFS2_NAND
|
#define CONFIG_JFFS2_NAND
|
||||||
/* nand device jffs2 lives on */
|
/* nand device jffs2 lives on */
|
||||||
#define CONFIG_JFFS2_DEV "nand0"
|
#define CONFIG_JFFS2_DEV "nand0"
|
||||||
|
|
|
@ -140,9 +140,6 @@
|
||||||
|
|
||||||
#define CONFIG_SYS_MAX_NAND_DEVICE 1 /* Max number of NAND */
|
#define CONFIG_SYS_MAX_NAND_DEVICE 1 /* Max number of NAND */
|
||||||
/* devices */
|
/* devices */
|
||||||
|
|
||||||
#define CONFIG_SYS_64BIT_VSPRINTF /* needed for nand_util.c */
|
|
||||||
|
|
||||||
#define CONFIG_JFFS2_NAND
|
#define CONFIG_JFFS2_NAND
|
||||||
/* nand device jffs2 lives on */
|
/* nand device jffs2 lives on */
|
||||||
#define CONFIG_JFFS2_DEV "nand0"
|
#define CONFIG_JFFS2_DEV "nand0"
|
||||||
|
|
|
@ -147,9 +147,6 @@
|
||||||
|
|
||||||
#define CONFIG_SYS_MAX_NAND_DEVICE 1 /* Max number of NAND */
|
#define CONFIG_SYS_MAX_NAND_DEVICE 1 /* Max number of NAND */
|
||||||
/* devices */
|
/* devices */
|
||||||
|
|
||||||
#define CONFIG_SYS_64BIT_VSPRINTF /* needed for nand_util.c */
|
|
||||||
|
|
||||||
#define CONFIG_JFFS2_NAND
|
#define CONFIG_JFFS2_NAND
|
||||||
/* nand device jffs2 lives on */
|
/* nand device jffs2 lives on */
|
||||||
#define CONFIG_JFFS2_DEV "nand0"
|
#define CONFIG_JFFS2_DEV "nand0"
|
||||||
|
|
|
@ -167,8 +167,6 @@
|
||||||
#define GPMC_NAND_ECC_LP_x16_LAYOUT 1
|
#define GPMC_NAND_ECC_LP_x16_LAYOUT 1
|
||||||
#define CONFIG_SYS_MAX_NAND_DEVICE 1
|
#define CONFIG_SYS_MAX_NAND_DEVICE 1
|
||||||
|
|
||||||
#define CONFIG_SYS_64BIT_VSPRINTF /* needed for nand_util.c */
|
|
||||||
|
|
||||||
/* Environment information */
|
/* Environment information */
|
||||||
#define CONFIG_BOOTDELAY 10
|
#define CONFIG_BOOTDELAY 10
|
||||||
|
|
||||||
|
|
|
@ -114,7 +114,6 @@
|
||||||
#define NAND_MAX_CHIPS 1
|
#define NAND_MAX_CHIPS 1
|
||||||
#define CONFIG_SYS_NAND_BASE 0xD8000000 /* KW_DEFADR_NANDF */
|
#define CONFIG_SYS_NAND_BASE 0xD8000000 /* KW_DEFADR_NANDF */
|
||||||
#define NAND_ALLOW_ERASE_ALL 1
|
#define NAND_ALLOW_ERASE_ALL 1
|
||||||
#define CONFIG_SYS_64BIT_VSPRINTF /* needed for nand_util.c */
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
|
@ -266,7 +266,6 @@
|
||||||
*/
|
*/
|
||||||
#define CONFIG_SYS_MAX_NAND_DEVICE 1
|
#define CONFIG_SYS_MAX_NAND_DEVICE 1
|
||||||
#define CONFIG_SYS_NAND_BASE 0x51000000 /* NAND FLASH Base Address */
|
#define CONFIG_SYS_NAND_BASE 0x51000000 /* NAND FLASH Base Address */
|
||||||
#define CONFIG_SYS_64BIT_VSPRINTF /* needed for nand_util.c */
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
|
@ -236,9 +236,6 @@
|
||||||
#define CONFIG_SYS_NAND_ENABLE_PIN AT91_PIN_PC14
|
#define CONFIG_SYS_NAND_ENABLE_PIN AT91_PIN_PC14
|
||||||
#define CONFIG_SYS_NAND_READY_PIN AT91_PIN_PA16
|
#define CONFIG_SYS_NAND_READY_PIN AT91_PIN_PA16
|
||||||
|
|
||||||
#define CONFIG_SYS_64BIT_VSPRINTF /* needed for nand_util.c */
|
|
||||||
|
|
||||||
|
|
||||||
/* NOR flash */
|
/* NOR flash */
|
||||||
#define CONFIG_SYS_FLASH_CFI 1
|
#define CONFIG_SYS_FLASH_CFI 1
|
||||||
#define CONFIG_FLASH_CFI_DRIVER 1
|
#define CONFIG_FLASH_CFI_DRIVER 1
|
||||||
|
|
|
@ -259,7 +259,6 @@
|
||||||
#define CONFIG_SYS_NAND_ENABLE_PIN AT91_PIN_PD15
|
#define CONFIG_SYS_NAND_ENABLE_PIN AT91_PIN_PD15
|
||||||
#define CONFIG_SYS_NAND_READY_PIN AT91_PIN_PB30
|
#define CONFIG_SYS_NAND_READY_PIN AT91_PIN_PB30
|
||||||
|
|
||||||
#define CONFIG_SYS_64BIT_VSPRINTF /* needed for nand_util.c */
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define CONFIG_CMD_JFFS2 1
|
#define CONFIG_CMD_JFFS2 1
|
||||||
|
|
|
@ -226,7 +226,6 @@
|
||||||
#define CONFIG_SYS_NAND_ALE 30 /* our ALE is GPIO30 */
|
#define CONFIG_SYS_NAND_ALE 30 /* our ALE is GPIO30 */
|
||||||
#define CONFIG_SYS_MAX_NAND_DEVICE 1
|
#define CONFIG_SYS_MAX_NAND_DEVICE 1
|
||||||
|
|
||||||
#define CONFIG_SYS_64BIT_VSPRINTF /* needed for nand_util.c */
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/*-----------------------------------------------------------------------
|
/*-----------------------------------------------------------------------
|
||||||
|
|
|
@ -107,7 +107,6 @@
|
||||||
#define NAND_MAX_CHIPS 1
|
#define NAND_MAX_CHIPS 1
|
||||||
#define CONFIG_SYS_NAND_BASE 0xD8000000 /* KW_DEFADR_NANDF */
|
#define CONFIG_SYS_NAND_BASE 0xD8000000 /* KW_DEFADR_NANDF */
|
||||||
#define NAND_ALLOW_ERASE_ALL 1
|
#define NAND_ALLOW_ERASE_ALL 1
|
||||||
#define CONFIG_SYS_64BIT_VSPRINTF /* needed for nand_util.c */
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
|
@ -161,7 +161,6 @@
|
||||||
#define CONFIG_ENV_OFFSET 0x60000
|
#define CONFIG_ENV_OFFSET 0x60000
|
||||||
#define CONFIG_ENV_OFFSET_REDUND 0x80000
|
#define CONFIG_ENV_OFFSET_REDUND 0x80000
|
||||||
#define CONFIG_ENV_SIZE 0x20000
|
#define CONFIG_ENV_SIZE 0x20000
|
||||||
#define CONFIG_SYS_64BIT_VSPRINTF /* needed for nand_util.c */
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define CONFIG_BOOTCOMMAND "nboot 0x21000000 0 400000"
|
#define CONFIG_BOOTCOMMAND "nboot 0x21000000 0 400000"
|
||||||
|
|
|
@ -285,9 +285,6 @@
|
||||||
#define CONFIG_OF_BOARD_SETUP 1
|
#define CONFIG_OF_BOARD_SETUP 1
|
||||||
#define CONFIG_OF_STDOUT_VIA_ALIAS 1
|
#define CONFIG_OF_STDOUT_VIA_ALIAS 1
|
||||||
|
|
||||||
#define CONFIG_SYS_64BIT_VSPRINTF 1
|
|
||||||
#define CONFIG_SYS_64BIT_STRTOUL 1
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* I2C
|
* I2C
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -422,8 +422,6 @@
|
||||||
#define CONFIG_SYS_MAX_NAND_DEVICE 1
|
#define CONFIG_SYS_MAX_NAND_DEVICE 1
|
||||||
#define CONFIG_SYS_NAND_BASE 0x77D00000
|
#define CONFIG_SYS_NAND_BASE 0x77D00000
|
||||||
|
|
||||||
#define CONFIG_SYS_64BIT_VSPRINTF /* needed for nand_util.c */
|
|
||||||
|
|
||||||
#define CONFIG_JFFS2_NAND 1 /* jffs2 on nand support */
|
#define CONFIG_JFFS2_NAND 1 /* jffs2 on nand support */
|
||||||
|
|
||||||
/* No command line, one static partition */
|
/* No command line, one static partition */
|
||||||
|
|
|
@ -107,7 +107,6 @@
|
||||||
#define NAND_MAX_CHIPS 1
|
#define NAND_MAX_CHIPS 1
|
||||||
#define CONFIG_SYS_NAND_BASE 0xD8000000 /* KW_DEFADR_NANDF */
|
#define CONFIG_SYS_NAND_BASE 0xD8000000 /* KW_DEFADR_NANDF */
|
||||||
#define NAND_ALLOW_ERASE_ALL 1
|
#define NAND_ALLOW_ERASE_ALL 1
|
||||||
#define CONFIG_SYS_64BIT_VSPRINTF /* needed for nand_util.c */
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
|
@ -268,8 +268,6 @@
|
||||||
48, 49, 50, 51, 52, 53, 54, 55, \
|
48, 49, 50, 51, 52, 53, 54, 55, \
|
||||||
56, 57, 58, 59, 60, 61, 62, 63}
|
56, 57, 58, 59, 60, 61, 62, 63}
|
||||||
|
|
||||||
#define CONFIG_SYS_64BIT_VSPRINTF /* needed for nand_util.c */
|
|
||||||
|
|
||||||
/* Boot configuration (define only one of next 3) */
|
/* Boot configuration (define only one of next 3) */
|
||||||
#define CONFIG_BOOT_NAND
|
#define CONFIG_BOOT_NAND
|
||||||
/* None of these are currently implemented. Left from the original Samsung
|
/* None of these are currently implemented. Left from the original Samsung
|
||||||
|
|
|
@ -213,8 +213,6 @@
|
||||||
#define CONFIG_SYS_MONITOR_LEN (256 << 10) /* 256 KiB */
|
#define CONFIG_SYS_MONITOR_LEN (256 << 10) /* 256 KiB */
|
||||||
#define CONFIG_IDENT_STRING " for SMDKC100"
|
#define CONFIG_IDENT_STRING " for SMDKC100"
|
||||||
|
|
||||||
#define CONFIG_SYS_64BIT_VSPRINTF
|
|
||||||
|
|
||||||
#if !defined(CONFIG_NAND_SPL) && (TEXT_BASE >= 0xc0000000)
|
#if !defined(CONFIG_NAND_SPL) && (TEXT_BASE >= 0xc0000000)
|
||||||
#define CONFIG_ENABLE_MMU
|
#define CONFIG_ENABLE_MMU
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -188,8 +188,6 @@
|
||||||
#define CONFIG_SYS_MAX_NAND_DEVICE 1
|
#define CONFIG_SYS_MAX_NAND_DEVICE 1
|
||||||
#define CONFIG_CMD_NAND
|
#define CONFIG_CMD_NAND
|
||||||
|
|
||||||
#define CONFIG_SYS_64BIT_VSPRINTF /* needed for nand_util.c */
|
|
||||||
|
|
||||||
/* LIME GDC */
|
/* LIME GDC */
|
||||||
#define CONFIG_SYS_LIME_BASE 0xc8000000
|
#define CONFIG_SYS_LIME_BASE 0xc8000000
|
||||||
#define CONFIG_SYS_LIME_SIZE 0x04000000 /* 64 MB */
|
#define CONFIG_SYS_LIME_SIZE 0x04000000 /* 64 MB */
|
||||||
|
|
|
@ -138,7 +138,6 @@
|
||||||
#define CONFIG_ENV_OFFSET 0x60000
|
#define CONFIG_ENV_OFFSET 0x60000
|
||||||
#define CONFIG_ENV_OFFSET_REDUND 0x80000
|
#define CONFIG_ENV_OFFSET_REDUND 0x80000
|
||||||
#define CONFIG_ENV_SIZE 0x20000
|
#define CONFIG_ENV_SIZE 0x20000
|
||||||
#define CONFIG_SYS_64BIT_VSPRINTF /* needed for nand_util.c */
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define CONFIG_BOOTCOMMAND "nboot 0x21000000 0 400000"
|
#define CONFIG_BOOTCOMMAND "nboot 0x21000000 0 400000"
|
||||||
|
|
|
@ -283,12 +283,6 @@ int vct_gpio_get(int pin);
|
||||||
#define CONFIG_BOOTCOMMAND "run test3"
|
#define CONFIG_BOOTCOMMAND "run test3"
|
||||||
#define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */
|
#define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */
|
||||||
|
|
||||||
/*
|
|
||||||
* Needed for 64bit printf format
|
|
||||||
*/
|
|
||||||
#define CONFIG_SYS_64BIT_VSPRINTF 1
|
|
||||||
#define CONFIG_SYS_64BIT_STRTOUL 1
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* UBI configuration
|
* UBI configuration
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -205,8 +205,6 @@
|
||||||
#define CONFIG_SYS_NAND_SENDCMD_RETRY 3
|
#define CONFIG_SYS_NAND_SENDCMD_RETRY 3
|
||||||
#undef NAND_ALLOW_ERASE_ALL /* Allow erasing bad blocks - don't use */
|
#undef NAND_ALLOW_ERASE_ALL /* Allow erasing bad blocks - don't use */
|
||||||
|
|
||||||
#define CONFIG_SYS_64BIT_VSPRINTF /* needed for nand_util.c */
|
|
||||||
|
|
||||||
/* NAND Timing Parameters (in ns) */
|
/* NAND Timing Parameters (in ns) */
|
||||||
#define NAND_TIMING_tCH 10
|
#define NAND_TIMING_tCH 10
|
||||||
#define NAND_TIMING_tCS 0
|
#define NAND_TIMING_tCS 0
|
||||||
|
|
|
@ -100,12 +100,6 @@
|
||||||
#endif /* 440EP/EPX 440GR/GRX 440SP/SPE 460EX/GT/SX 405EX*/
|
#endif /* 440EP/EPX 440GR/GRX 440SP/SPE 460EX/GT/SX 405EX*/
|
||||||
|
|
||||||
#if defined(CONFIG_440)
|
#if defined(CONFIG_440)
|
||||||
/*
|
|
||||||
* Enable long long (%ll ...) printf format on 440 PPC's since most of
|
|
||||||
* them support 36bit physical addressing
|
|
||||||
*/
|
|
||||||
#define CONFIG_SYS_64BIT_VSPRINTF
|
|
||||||
#define CONFIG_SYS_64BIT_STRTOUL
|
|
||||||
#include <ppc440.h>
|
#include <ppc440.h>
|
||||||
#else
|
#else
|
||||||
#include <ppc405.h>
|
#include <ppc405.h>
|
||||||
|
|
|
@ -21,21 +21,10 @@
|
||||||
extern int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]);
|
extern int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef CONFIG_SYS_64BIT_VSPRINTF
|
|
||||||
#include <div64.h>
|
#include <div64.h>
|
||||||
# define NUM_TYPE long long
|
# define NUM_TYPE long long
|
||||||
#else
|
|
||||||
# define NUM_TYPE long
|
|
||||||
#define do_div(n, base) ({ \
|
|
||||||
unsigned int __res; \
|
|
||||||
__res = ((unsigned NUM_TYPE) n) % base; \
|
|
||||||
n = ((unsigned NUM_TYPE) n) / base; \
|
|
||||||
__res; \
|
|
||||||
})
|
|
||||||
#endif
|
|
||||||
#define noinline __attribute__((noinline))
|
#define noinline __attribute__((noinline))
|
||||||
|
|
||||||
|
|
||||||
const char hex_asc[] = "0123456789abcdef";
|
const char hex_asc[] = "0123456789abcdef";
|
||||||
#define hex_asc_lo(x) hex_asc[((x) & 0x0f)]
|
#define hex_asc_lo(x) hex_asc[((x) & 0x0f)]
|
||||||
#define hex_asc_hi(x) hex_asc[((x) & 0xf0) >> 4]
|
#define hex_asc_hi(x) hex_asc[((x) & 0xf0) >> 4]
|
||||||
|
@ -104,7 +93,6 @@ int ustrtoul(const char *cp, char **endp, unsigned int base)
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef CONFIG_SYS_64BIT_STRTOUL
|
|
||||||
unsigned long long simple_strtoull (const char *cp, char **endp, unsigned int base)
|
unsigned long long simple_strtoull (const char *cp, char **endp, unsigned int base)
|
||||||
{
|
{
|
||||||
unsigned long long result = 0, value;
|
unsigned long long result = 0, value;
|
||||||
|
@ -132,7 +120,6 @@ unsigned long long simple_strtoull (const char *cp, char **endp, unsigned int ba
|
||||||
*endp = (char *) cp;
|
*endp = (char *) cp;
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
#endif /* CONFIG_SYS_64BIT_STRTOUL */
|
|
||||||
|
|
||||||
/* we use this so that we can do without the ctype library */
|
/* we use this so that we can do without the ctype library */
|
||||||
#define is_digit(c) ((c) >= '0' && (c) <= '9')
|
#define is_digit(c) ((c) >= '0' && (c) <= '9')
|
||||||
|
@ -631,12 +618,9 @@ int vsprintf(char *buf, const char *fmt, va_list args)
|
||||||
--fmt;
|
--fmt;
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
#ifdef CONFIG_SYS_64BIT_VSPRINTF
|
|
||||||
if (qualifier == 'L') /* "quad" for 64 bit variables */
|
if (qualifier == 'L') /* "quad" for 64 bit variables */
|
||||||
num = va_arg(args, unsigned long long);
|
num = va_arg(args, unsigned long long);
|
||||||
else
|
else if (qualifier == 'l') {
|
||||||
#endif
|
|
||||||
if (qualifier == 'l') {
|
|
||||||
num = va_arg(args, unsigned long);
|
num = va_arg(args, unsigned long);
|
||||||
if (flags & SIGN)
|
if (flags & SIGN)
|
||||||
num = (signed long) num;
|
num = (signed long) num;
|
||||||
|
|
Loading…
Reference in New Issue