projects
/
oweals
/
u-boot.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
518e2e1
)
Code cleanup
LABEL_2004_03_25_1630
author
wdenk
<wdenk>
Thu, 25 Mar 2004 15:14:43 +0000
(15:14 +0000)
committer
wdenk
<wdenk>
Thu, 25 Mar 2004 15:14:43 +0000
(15:14 +0000)
24 files changed:
Makefile
patch
|
blob
|
history
README
patch
|
blob
|
history
board/eXalion/Makefile
patch
|
blob
|
history
common/cmd_bdinfo.c
patch
|
blob
|
history
drivers/smc91111.c
patch
|
blob
|
history
drivers/smiLynxEM.c
patch
|
blob
|
history
drivers/videomodes.c
patch
|
blob
|
history
drivers/videomodes.h
patch
|
blob
|
history
fs/reiserfs/dev.c
patch
|
blob
|
history
fs/reiserfs/mode_string.c
patch
|
blob
|
history
fs/reiserfs/reiserfs_private.h
patch
|
blob
|
history
include/configs/LANTEC.h
patch
|
blob
|
history
include/configs/MPC8260ADS.h
patch
|
blob
|
history
include/configs/MPC8266ADS.h
patch
|
blob
|
history
include/configs/PPChameleonEVB.h
patch
|
blob
|
history
include/configs/RBC823.h
patch
|
blob
|
history
include/configs/TOP5200.h
patch
|
blob
|
history
include/configs/ZPC1900.h
patch
|
blob
|
history
include/configs/ep8260.h
patch
|
blob
|
history
include/configs/hymod.h
patch
|
blob
|
history
include/configs/ppmc8260.h
patch
|
blob
|
history
include/configs/sacsng.h
patch
|
blob
|
history
include/configs/sbc8260.h
patch
|
blob
|
history
include/reiserfs.h
patch
|
blob
|
history
diff --git
a/Makefile
b/Makefile
index 44c25df71c735ecfb171fdbc5a9f64b1ee7b52df..a7e09dd7aab640175195836326c57e9d7e812b0e 100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-100,7
+100,7
@@
LIBS += board/$(BOARDDIR)/lib$(BOARD).a
LIBS += cpu/$(CPU)/lib$(CPU).a
LIBS += lib_$(ARCH)/lib$(ARCH).a
LIBS += fs/cramfs/libcramfs.a fs/fat/libfat.a fs/fdos/libfdos.a fs/jffs2/libjffs2.a \
LIBS += cpu/$(CPU)/lib$(CPU).a
LIBS += lib_$(ARCH)/lib$(ARCH).a
LIBS += fs/cramfs/libcramfs.a fs/fat/libfat.a fs/fdos/libfdos.a fs/jffs2/libjffs2.a \
-
fs/reiserfs/libreiserfs.a
+ fs/reiserfs/libreiserfs.a
LIBS += net/libnet.a
LIBS += disk/libdisk.a
LIBS += rtc/librtc.a
LIBS += net/libnet.a
LIBS += disk/libdisk.a
LIBS += rtc/librtc.a
@@
-976,10
+976,10
@@
omap1610h2_cs0boot_config \
omap1610h2_cs3boot_config : unconfig
@if [ "$(findstring _cs0boot_, $@)" ] ; then \
echo "#define CONFIG_CS0_BOOT" >> ./include/config.h ; \
omap1610h2_cs3boot_config : unconfig
@if [ "$(findstring _cs0boot_, $@)" ] ; then \
echo "#define CONFIG_CS0_BOOT" >> ./include/config.h ; \
- echo "
C
onfigured for CS0 boot"; \
+ echo "
... c
onfigured for CS0 boot"; \
else \
echo "#define CONFIG_CS3_BOOT" >> ./include/config.h ; \
else \
echo "#define CONFIG_CS3_BOOT" >> ./include/config.h ; \
- echo "
C
onfigured for CS3 boot"; \
+ echo "
... c
onfigured for CS3 boot"; \
fi;
@./mkconfig -a $(call xtract_omap1610xxx,$@) arm arm926ejs omap1610inn
fi;
@./mkconfig -a $(call xtract_omap1610xxx,$@) arm arm926ejs omap1610inn
diff --git
a/README
b/README
index 316f44d308a492063c917c888cb55085a5ff5b1c..071ee2fd73b8d52a12c055beccfb0a58fee51d1a 100644
(file)
--- a/
README
+++ b/
README
@@
-778,13
+778,13
@@
The following options need to be configured:
Enable Chips & Technologies 69000 Video chip
CONFIG_VIDEO_SMI_LYNXEM
Enable Chips & Technologies 69000 Video chip
CONFIG_VIDEO_SMI_LYNXEM
- Enable Silicon Motion SMI 712/710/810 Video chip. The
+ Enable Silicon Motion SMI 712/710/810 Video chip. The
video output is selected via environment 'videoout'
(1 = LCD and 2 = CRT). If videoout is undefined, CRT is
assumed.
video output is selected via environment 'videoout'
(1 = LCD and 2 = CRT). If videoout is undefined, CRT is
assumed.
- For the CT69000 and SMI_LYNXEM drivers, videomode is
- selected via environment 'videomode'. Two diferent ways
+ For the CT69000 and SMI_LYNXEM drivers, videomode is
+ selected via environment 'videomode'. Two diferent ways
are possible:
- "videomode=num" 'num' is a standard LiLo mode numbers.
Following standard modes are supported (* is default):
are possible:
- "videomode=num" 'num' is a standard LiLo mode numbers.
Following standard modes are supported (* is default):
@@
-798,7
+798,7
@@
The following options need to be configured:
-------------+---------------------------------------------
(i.e. setenv videomode 317; saveenv; reset;)
-------------+---------------------------------------------
(i.e. setenv videomode 317; saveenv; reset;)
- - "videomode=bootargs" all the video parameters are parsed
+ - "videomode=bootargs" all the video parameters are parsed
from the bootargs. (See drivers/videomodes.c)
from the bootargs. (See drivers/videomodes.c)
diff --git
a/board/eXalion/Makefile
b/board/eXalion/Makefile
index 110d09db7d688b8a4a3a798b37627eee3a1b93a7..cfbf465bbe6a4564344ca65634fc5b5e8626c207 100644
(file)
--- a/
board/eXalion/Makefile
+++ b/
board/eXalion/Makefile
@@
-29,7
+29,7
@@
OBJS = $(BOARD).o
SOBJS =
$(LIB): .depend $(OBJS) $(SOBJS)
SOBJS =
$(LIB): .depend $(OBJS) $(SOBJS)
- $(AR) crv $@ $
^
+ $(AR) crv $@ $
(OBJS) $(SOBJS)
#########################################################################
#########################################################################
diff --git
a/common/cmd_bdinfo.c
b/common/cmd_bdinfo.c
index 2a653d80dff00bff4ac1791959e6613c8c27a301..28be4b65c8e51aefc4065c273c7b36decc2ae82a 100644
(file)
--- a/
common/cmd_bdinfo.c
+++ b/
common/cmd_bdinfo.c
@@
-183,7
+183,7
@@
int do_bdinfo ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
puts ( "\n"
"ip_addr = ");
print_IPaddr (bd->bi_ip_addr);
puts ( "\n"
"ip_addr = ");
print_IPaddr (bd->bi_ip_addr);
- p
uts (
"\n"
+ p
rintf (
"\n"
"baudrate = %d bps\n", bd->bi_baudrate);
return 0;
"baudrate = %d bps\n", bd->bi_baudrate);
return 0;
diff --git
a/drivers/smc91111.c
b/drivers/smc91111.c
index 4e180ec2b171a2ceb9dc7514c642bf476994dfe5..9f9f364f1fe4fc18abf661355986faacea66b811 100644
(file)
--- a/
drivers/smc91111.c
+++ b/
drivers/smc91111.c
@@
-485,7
+485,7
@@
static int smc_send_packet (volatile void *packet, int packet_length)
word saved_ptr;
/* save PTR and PNR registers before manipulation */
word saved_ptr;
/* save PTR and PNR registers before manipulation */
- SMC_SELECT_BANK (2);
+ SMC_SELECT_BANK (2);
saved_pnr = SMC_inb( PN_REG );
saved_ptr = SMC_inw( PTR_REG );
saved_pnr = SMC_inb( PN_REG );
saved_ptr = SMC_inw( PTR_REG );
@@
-565,8
+565,8
@@
again:
/* we have a packet address, so tell the card to use it */
SMC_outb (packet_no, PN_REG);
/* we have a packet address, so tell the card to use it */
SMC_outb (packet_no, PN_REG);
- /* do not write new ptr value if Write data fifo not empty */
- while ( saved_ptr & PTR_NOTEMPTY )
+ /* do not write new ptr value if Write data fifo not empty */
+ while ( saved_ptr & PTR_NOTEMPTY )
printf ("Write data fifo not empty!\n");
/* point to the beginning of the packet */
printf ("Write data fifo not empty!\n");
/* point to the beginning of the packet */
diff --git
a/drivers/smiLynxEM.c
b/drivers/smiLynxEM.c
index 08754c519b9bd13b4b216dedb64de6995ec36f2d..26469e2a38aa5c3b0281aa435e41de54ee37ef7a 100644
(file)
--- a/
drivers/smiLynxEM.c
+++ b/
drivers/smiLynxEM.c
@@
-148,7
+148,7
@@
static char SMI_PCR [] = {
0x20, 0x04, 0x21, 0x30, 0x22, 0x00, 0x23, 0x00, 0x24, 0x00
};
static char SMI_MCR[] = {
0x20, 0x04, 0x21, 0x30, 0x22, 0x00, 0x23, 0x00, 0x24, 0x00
};
static char SMI_MCR[] = {
- 0x60, 0x01, 0x61, 0x00,
+ 0x60, 0x01, 0x61, 0x00,
};
static char SMI_HCR[] = {
};
static char SMI_HCR[] = {
@@
-400,7
+400,7
@@
static void smiLoadCrt (struct ctfb_res_modes *var, int bits_per_pixel)
he = (var->xres + var->right_margin + var->hsync_len) / 8; /* HsEnd */
ht = (var->left_margin + var->xres + var->right_margin + var->hsync_len) / 8; /* HTotal */
/* Blank */
he = (var->xres + var->right_margin + var->hsync_len) / 8; /* HsEnd */
ht = (var->left_margin + var->xres + var->right_margin + var->hsync_len) / 8; /* HTotal */
/* Blank */
- hbs = hd;
+ hbs = hd;
hbe = 0; /* Blank end at 0 */
/* Vertical */
hbe = 0; /* Blank end at 0 */
/* Vertical */
@@
-410,7
+410,7
@@
static void smiLoadCrt (struct ctfb_res_modes *var, int bits_per_pixel)
vt = var->upper_margin + var->yres + var->lower_margin + var->vsync_len; /* VTotal */
vbs = vd;
vbe = 0;
vt = var->upper_margin + var->yres + var->lower_margin + var->vsync_len; /* VTotal */
vbs = vd;
vbe = 0;
-
+
bpp = bits_per_pixel;
dblscan = (var->vmode & FB_VMODE_DOUBLE) ? 1 : 0;
interlaced = var->vmode & FB_VMODE_INTERLACED;
bpp = bits_per_pixel;
dblscan = (var->vmode & FB_VMODE_DOUBLE) ? 1 : 0;
interlaced = var->vmode & FB_VMODE_INTERLACED;
@@
-433,7
+433,7
@@
static void smiLoadCrt (struct ctfb_res_modes *var, int bits_per_pixel)
cr[0x03] = (hbe & 0x1F);
cr[0x04] = hs;
cr[0x05] = ((hbe & 0x20) << 2) | (he & 0x1f);
cr[0x03] = (hbe & 0x1F);
cr[0x04] = hs;
cr[0x05] = ((hbe & 0x20) << 2) | (he & 0x1f);
-
+
cr[0x06] = (vt - 2) & 0xFF;
cr[0x07] = (((vt - 2) & 0x100) >> 8)
| (((vd - 1) & 0x100) >> 7)
cr[0x06] = (vt - 2) & 0xFF;
cr[0x07] = (((vt - 2) & 0x100) >> 8)
| (((vd - 1) & 0x100) >> 7)
@@
-449,7
+449,7
@@
static void smiLoadCrt (struct ctfb_res_modes *var, int bits_per_pixel)
| (((vbs - 1) & 0x400) >> 9)
| ((vs & 0x400) >> 10)
| (interlaced) ? 0x80 : 0;
| (((vbs - 1) & 0x400) >> 9)
| ((vs & 0x400) >> 10)
| (interlaced) ? 0x80 : 0;
-
+
cr[0x08] = 0x00;
cr[0x09] = (dblscan << 7)
cr[0x08] = 0x00;
cr[0x09] = (dblscan << 7)
@@
-458,7
+458,7
@@
static void smiLoadCrt (struct ctfb_res_modes *var, int bits_per_pixel)
| (TextScanLines - 1);
cr[0x10] = vs & 0xff; /* VSyncPulseStart */
| (TextScanLines - 1);
cr[0x10] = vs & 0xff; /* VSyncPulseStart */
- cr[0x11] = (ve & 0x0f);
+ cr[0x11] = (ve & 0x0f);
cr[0x12] = (vd - 1) & 0xff; /* LineCount */
cr[0x13] = wd & 0xff;
cr[0x14] = 0x40;
cr[0x12] = (vd - 1) & 0xff; /* LineCount */
cr[0x13] = wd & 0xff;
cr[0x14] = 0x40;
@@
-494,7
+494,7
@@
static unsigned int FindPQ (unsigned int freq, unsigned int *pp, unsigned int *p
for (n = QMIN; n <= QMAX; n++) {
m = PMIN; /* p/q ~ freq/ref -> p*ref-freq*q ~ 0 */
for (n = QMIN; n <= QMAX; n++) {
m = PMIN; /* p/q ~ freq/ref -> p*ref-freq*q ~ 0 */
- L = P * n - m * Q;
+ L = P * n - m * Q;
while (L > 0 && m < PMAX) {
L -= REF_FREQ; /* difference is greater as 0 subtract fref */
m++; /* and increment m */
while (L > 0 && m < PMAX) {
L -= REF_FREQ; /* difference is greater as 0 subtract fref */
m++; /* and increment m */
@@
-548,12
+548,12
@@
static void smiLoadCcr (struct ctfb_res_modes *var, unsigned short device_id)
break;
}
smiWrite (SMI_INDX_C4, 0x6b, 0x15);
break;
}
smiWrite (SMI_INDX_C4, 0x6b, 0x15);
-
+
/* VCLK */
freq = 1000000000000L / var -> pixclock;
/* VCLK */
freq = 1000000000000L / var -> pixclock;
-
+
FindPQ ((unsigned int)freq, &p, &q);
FindPQ ((unsigned int)freq, &p, &q);
-
+
smiWrite (SMI_INDX_C4, 0x6c, p);
smiWrite (SMI_INDX_C4, 0x6d, q);
smiWrite (SMI_INDX_C4, 0x6c, p);
smiWrite (SMI_INDX_C4, 0x6d, q);
@@
-576,7
+576,7
@@
void *video_hw_init (void)
struct ctfb_res_modes *res_mode;
struct ctfb_res_modes var_mode;
unsigned char videoout;
struct ctfb_res_modes *res_mode;
struct ctfb_res_modes var_mode;
unsigned char videoout;
-
+
/* Search for video chip */
printf("Video: ");
/* Search for video chip */
printf("Video: ");
@@
-593,7
+593,7
@@
void *video_hw_init (void)
pci_mem_base = pci_mem_to_phys (devbusfn, pci_mem_base);
tmp = 0;
pci_mem_base = pci_mem_to_phys (devbusfn, pci_mem_base);
tmp = 0;
-
+
videomode = CFG_DEFAULT_VIDEO_MODE;
/* get video mode via environment */
if ((penv = getenv ("videomode")) != NULL) {
videomode = CFG_DEFAULT_VIDEO_MODE;
/* get video mode via environment */
if ((penv = getenv ("videomode")) != NULL) {
@@
-621,7
+621,7
@@
void *video_hw_init (void)
resindex];
bits_per_pixel = vesa_modes[i].bits_per_pixel;
} else {
resindex];
bits_per_pixel = vesa_modes[i].bits_per_pixel;
} else {
-
+
res_mode = (struct ctfb_res_modes *) &var_mode;
bits_per_pixel = video_get_params (res_mode, penv);
}
res_mode = (struct ctfb_res_modes *) &var_mode;
bits_per_pixel = video_get_params (res_mode, penv);
}
@@
-638,7
+638,7
@@
void *video_hw_init (void)
res_mode->lower_margin + res_mode->vsync_len);
t1 /= 1000;
vsynch = 1000000000L / t1;
res_mode->lower_margin + res_mode->vsync_len);
t1 /= 1000;
vsynch = 1000000000L / t1;
-
+
/* fill in Graphic device struct */
sprintf (pGD->modeIdent, "%dx%dx%d %ldkHz %ldHz", res_mode->xres,
res_mode->yres, bits_per_pixel, (hsynch / 1000),
/* fill in Graphic device struct */
sprintf (pGD->modeIdent, "%dx%dx%d %ldkHz %ldHz", res_mode->xres,
res_mode->yres, bits_per_pixel, (hsynch / 1000),
@@
-696,7
+696,7
@@
void *video_hw_init (void)
/* Attributes controller registers */
smiLoadRegs (SMI_INDX_ATTR, SMI_INDX_ATTR, SMI_ATTR, sizeof(SMI_ATTR));
/* Attributes controller registers */
smiLoadRegs (SMI_INDX_ATTR, SMI_INDX_ATTR, SMI_ATTR, sizeof(SMI_ATTR));
-
+
/* Graphics Controller Register */
smiLoadRegs (SMI_INDX_CE, SMI_DATA_CF, SMI_GCR, sizeof(SMI_GCR));
/* Graphics Controller Register */
smiLoadRegs (SMI_INDX_CE, SMI_DATA_CF, SMI_GCR, sizeof(SMI_GCR));
@@
-713,10
+713,10
@@
void *video_hw_init (void)
/* Set misc output register */
smiLoadMsr (res_mode);
/* Set misc output register */
smiLoadMsr (res_mode);
-
+
/* Set CRT and Clock control registers */
smiLoadCrt (res_mode, bits_per_pixel);
/* Set CRT and Clock control registers */
smiLoadCrt (res_mode, bits_per_pixel);
-
+
smiLoadCcr (res_mode, device_id);
/* Hardware Cusor Register */
smiLoadCcr (res_mode, device_id);
/* Hardware Cusor Register */
diff --git
a/drivers/videomodes.c
b/drivers/videomodes.c
index 418f74c572fcd62712386db3e5e3ac0cb1adfbfe..c81e5bc1416a55dbacb6f4f9b5b6d5a3c07182de 100644
(file)
--- a/
drivers/videomodes.c
+++ b/
drivers/videomodes.c
@@
-206,5
+206,3
@@
int video_get_params (struct ctfb_res_modes *pPar, char *penv)
}
return bpp;
}
}
return bpp;
}
-
-
diff --git
a/drivers/videomodes.h
b/drivers/videomodes.h
index b8f5a39de0dfd0f2ede1434610156a19b56052c0..e2dffe7fed51342b5422b79ec1c7a8ac46fe7c90 100644
(file)
--- a/
drivers/videomodes.h
+++ b/
drivers/videomodes.h
@@
-86,4
+86,3
@@
extern const struct ctfb_vesa_modes vesa_modes[];
extern const struct ctfb_res_modes res_mode_init[];
int video_get_params (struct ctfb_res_modes *pPar, char *penv);
extern const struct ctfb_res_modes res_mode_init[];
int video_get_params (struct ctfb_res_modes *pPar, char *penv);
-
diff --git
a/fs/reiserfs/dev.c
b/fs/reiserfs/dev.c
index 72d62a659b02770a0286ae47a8a324ca9ef47d38..6f6056f337741e94dee95f10dc2afc67ae49be4f 100644
(file)
--- a/
fs/reiserfs/dev.c
+++ b/
fs/reiserfs/dev.c
@@
-62,7
+62,7
@@
int reiserfs_devread (int sector, int byte_offset, int byte_len, char *buf)
if (sector < 0
|| ((sector + ((byte_offset + byte_len - 1) >> SECTOR_BITS))
>= part_info.size)) {
if (sector < 0
|| ((sector + ((byte_offset + byte_len - 1) >> SECTOR_BITS))
>= part_info.size)) {
-/
/ errnum = ERR_OUTSIDE_PART;
+/
* errnum = ERR_OUTSIDE_PART; */
printf (" ** reiserfs_devread() read outside partition\n");
return 0;
}
printf (" ** reiserfs_devread() read outside partition\n");
return 0;
}
diff --git
a/fs/reiserfs/mode_string.c
b/fs/reiserfs/mode_string.c
index b3f538906d69048c02be055a07cb86dd9c1da7c6..bc565fbddd2bdfea718100915a18d8abde273b5c 100644
(file)
--- a/
fs/reiserfs/mode_string.c
+++ b/
fs/reiserfs/mode_string.c
@@
-99,7
+99,6
@@
const char *bb_mode_string(int mode)
/* The previous version used "0pcCd?bB-?l?s???". However, the '0', 'C',
* and 'B' types don't appear to be available on linux. So I removed them. */
/* The previous version used "0pcCd?bB-?l?s???". However, the '0', 'C',
* and 'B' types don't appear to be available on linux. So I removed them. */
-//static const char type_chars[16] = "?pc?d?b?-?l?s???";
static const char type_chars[16] = "?pc?d?b?-?l?s???";
/* 0123456789abcdef */
static const char mode_chars[7] = "rwxSTst";
static const char type_chars[16] = "?pc?d?b?-?l?s???";
/* 0123456789abcdef */
static const char mode_chars[7] = "rwxSTst";
diff --git
a/fs/reiserfs/reiserfs_private.h
b/fs/reiserfs/reiserfs_private.h
index 295ce3b902fdaff34b85417d1043270433635823..2bdb5e7e3f32878dc831d77cb6a35bfc455d0ef9 100644
(file)
--- a/
fs/reiserfs/reiserfs_private.h
+++ b/
fs/reiserfs/reiserfs_private.h
@@
-285,10
+285,10
@@
struct disk_child {
#define dc_block_number(dc_p) (__le32_to_cpu((dc_p)->dc_block_number))
#define dc_block_number(dc_p) (__le32_to_cpu((dc_p)->dc_block_number))
-/
/
-
//
old stat data is 32 bytes long. We are going to distinguish new one by
-
//
different size
-
/
/
+/
*
+
*
old stat data is 32 bytes long. We are going to distinguish new one by
+
*
different size
+
*
/
struct stat_data_v1
{
__u16 sd_mode; /* file type, permissions */
struct stat_data_v1
{
__u16 sd_mode; /* file type, permissions */
@@
-315,7
+315,6
@@
struct stat_data_v1
} __attribute__ ((__packed__));
#define stat_data_v1(ih) (ih_version(ih) == ITEM_VERSION_1)
} __attribute__ ((__packed__));
#define stat_data_v1(ih) (ih_version(ih) == ITEM_VERSION_1)
-//#define sd_v1_mode(sdp) (__le16_to_cpu((sdp)->sd_mode))
#define sd_v1_mode(sdp) ((sdp)->sd_mode)
#define sd_v1_nlink(sdp) (__le16_to_cpu((sdp)->sd_nlink))
#define sd_v1_uid(sdp) (__le16_to_cpu((sdp)->sd_uid))
#define sd_v1_mode(sdp) ((sdp)->sd_mode)
#define sd_v1_nlink(sdp) (__le16_to_cpu((sdp)->sd_nlink))
#define sd_v1_uid(sdp) (__le16_to_cpu((sdp)->sd_uid))
@@
-339,7
+338,7
@@
struct stat_data {
union {
__u32 sd_rdev;
__u32 sd_generation;
union {
__u32 sd_rdev;
__u32 sd_generation;
- /
/__u32 sd_first_direct_byte;
+ /
*__u32 sd_first_direct_byte; */
/* first byte of file which is stored in a
direct item: except that if it equals 1
it is a symlink and if it equals
/* first byte of file which is stored in a
direct item: except that if it equals 1
it is a symlink and if it equals
diff --git
a/include/configs/LANTEC.h
b/include/configs/LANTEC.h
index 4c01cda064c2e1c960dfe9714bb25b3e6752e80b..49ffb931e4f444aeb0e129cb29fe569ab0aac0fa 100644
(file)
--- a/
include/configs/LANTEC.h
+++ b/
include/configs/LANTEC.h
@@
-81,7
+81,7
@@
CFG_CMD_MEMORY | \
CFG_CMD_LOADS | \
CFG_CMD_LOADB)
CFG_CMD_MEMORY | \
CFG_CMD_LOADS | \
CFG_CMD_LOADB)
-#define CONFIG_CMD_NORMAL (CONFIG_CMD_DFL & ~CFG_CMD_BOOTD)
+#define CONFIG_CMD_NORMAL (CONFIG_CMD_DFL & ~CFG_CMD_BOOTD
& ~CFG_CMD_REISER
)
#define CONFIG_CMD_GDB (CONFIG_CMD_NORMAL | CFG_CMD_KGDB)
#define CONFIG_CMD_FULL (CFG_CMD_ALL & ~CFG_CMD_BEDBUG \
& ~CFG_CMD_BMP \
#define CONFIG_CMD_GDB (CONFIG_CMD_NORMAL | CFG_CMD_KGDB)
#define CONFIG_CMD_FULL (CFG_CMD_ALL & ~CFG_CMD_BEDBUG \
& ~CFG_CMD_BMP \
@@
-103,6
+103,7
@@
& ~CFG_CMD_NAND \
& ~CFG_CMD_PCI \
& ~CFG_CMD_PCMCIA \
& ~CFG_CMD_NAND \
& ~CFG_CMD_PCI \
& ~CFG_CMD_PCMCIA \
+ & ~CFG_CMD_REISER \
& ~CFG_CMD_SCSI \
& ~CFG_CMD_SPI \
& ~CFG_CMD_USB \
& ~CFG_CMD_SCSI \
& ~CFG_CMD_SPI \
& ~CFG_CMD_USB \
diff --git
a/include/configs/MPC8260ADS.h
b/include/configs/MPC8260ADS.h
index f4ccdafba5324031a90e1206df7cf0795e0ad58d..efc7a613fccc41f0e9a97f79f0cf5e5388a06d40 100644
(file)
--- a/
include/configs/MPC8260ADS.h
+++ b/
include/configs/MPC8260ADS.h
@@
-170,6
+170,7
@@
CFG_CMD_NAND | \
CFG_CMD_PCI | \
CFG_CMD_PCMCIA | \
CFG_CMD_NAND | \
CFG_CMD_PCI | \
CFG_CMD_PCMCIA | \
+ CFG_CMD_REISER | \
CFG_CMD_SCSI | \
CFG_CMD_SPI | \
CFG_CMD_USB | \
CFG_CMD_SCSI | \
CFG_CMD_SPI | \
CFG_CMD_USB | \
diff --git
a/include/configs/MPC8266ADS.h
b/include/configs/MPC8266ADS.h
index 5b2a8a33e2dec77231c66fcd0a2d7fda7bcf4da2..86a5986cf8b5b38b7af47759f8b74bc6129b34e7 100644
(file)
--- a/
include/configs/MPC8266ADS.h
+++ b/
include/configs/MPC8266ADS.h
@@
-164,6
+164,7
@@
CFG_CMD_MMC | \
CFG_CMD_NAND | \
CFG_CMD_PCMCIA | \
CFG_CMD_MMC | \
CFG_CMD_NAND | \
CFG_CMD_PCMCIA | \
+ CFG_CMD_REISER | \
CFG_CMD_SCSI | \
CFG_CMD_SPI | \
CFG_CMD_VFD | \
CFG_CMD_SCSI | \
CFG_CMD_SPI | \
CFG_CMD_VFD | \
@@
-172,8
+173,8
@@
/* Define a command string that is automatically executed when no character
* is read on the console interface withing "Boot Delay" after reset.
*/
/* Define a command string that is automatically executed when no character
* is read on the console interface withing "Boot Delay" after reset.
*/
-#
define CONFIG_BOOT_ROOT_INITRD 0
/* Use ram disk for the root file system */
-#define
CONFIG_BOOT_ROOT_NFS 1
/* Use a NFS mounted root file system */
+#
undef CONFIG_BOOT_ROOT_INITRD
/* Use ram disk for the root file system */
+#define
CONFIG_BOOT_ROOT_NFS
/* Use a NFS mounted root file system */
#ifdef CONFIG_BOOT_ROOT_INITRD
#define CONFIG_BOOTCOMMAND \
#ifdef CONFIG_BOOT_ROOT_INITRD
#define CONFIG_BOOTCOMMAND \
diff --git
a/include/configs/PPChameleonEVB.h
b/include/configs/PPChameleonEVB.h
index cb76e3cf3b166d35c6755a04d9edf3fb858c6e6c..c2c372a4497f2e38b81d592ca2513957d6f2724b 100644
(file)
--- a/
include/configs/PPChameleonEVB.h
+++ b/
include/configs/PPChameleonEVB.h
@@
-694,6
+694,4
@@
#endif /* CONFIG_NO_SERIAL_EEPROM */
#endif /* CONFIG_NO_SERIAL_EEPROM */
-#define CFG_OPB_FREQ 50000000
-
#endif /* __CONFIG_H */
#endif /* __CONFIG_H */
diff --git
a/include/configs/RBC823.h
b/include/configs/RBC823.h
index af6e98b1f0fdc65c12c8c7debbe49bb59c10f7bd..1666d646c0af98676a2ab5cb16bd84ec3f96b5d3 100644
(file)
--- a/
include/configs/RBC823.h
+++ b/
include/configs/RBC823.h
@@
-89,35
+89,32
@@
#define CONFIG_HARD_I2C
#define CFG_I2C_SPEED 40000
#define CFG_I2C_SLAVE 0xfe
#define CONFIG_HARD_I2C
#define CFG_I2C_SPEED 40000
#define CFG_I2C_SLAVE 0xfe
-#define CFG_I2C_EEPROM_ADDR 0x50
-#define CFG_I2C_EEPROM_ADDR_LEN 1
-#define CFG_EEPROM_WRITE_BITS 4
-#define CFG_EEPROM_WRITE_DELAY_MS 10
+#define CFG_I2C_EEPROM_ADDR
0x50
+#define CFG_I2C_EEPROM_ADDR_LEN
1
+#define CFG_EEPROM_WRITE_BITS
4
+#define CFG_EEPROM_WRITE_DELAY_MS
10
#define CONFIG_COMMANDS ( CFG_CMD_ALL & \
#define CONFIG_COMMANDS ( CFG_CMD_ALL & \
- ~CFG_CMD_
PCMCIA
& \
- ~CFG_CMD_
IDE
& \
- ~CFG_CMD_
PCI
& \
+ ~CFG_CMD_
BSP
& \
+ ~CFG_CMD_
DATE
& \
+ ~CFG_CMD_
DTT
& \
~CFG_CMD_FDC & \
~CFG_CMD_FDC & \
- ~CFG_CMD_HWFLOW & \
~CFG_CMD_FDOS & \
~CFG_CMD_FDOS & \
- ~CFG_CMD_SCSI & \
- ~CFG_CMD_SETGETDCR & \
- ~CFG_CMD_BSP & \
- ~CFG_CMD_USB & \
- ~CFG_CMD_VFD & \
- ~CFG_CMD_SPI & \
- /* ~CFG_CMD_I2C & */ \
+ ~CFG_CMD_HWFLOW & \
+ ~CFG_CMD_IDE & \
~CFG_CMD_IRQ & \
~CFG_CMD_IRQ & \
- ~CFG_CMD_NAND & \
~CFG_CMD_JFFS2 & \
~CFG_CMD_JFFS2 & \
- ~CFG_CMD_DTT & \
~CFG_CMD_MII & \
~CFG_CMD_MMC & \
~CFG_CMD_MII & \
~CFG_CMD_MMC & \
- /*~CFG_CMD_NET &*/ \
- /*~CFG_CMD_ELF &*/ \
- /* ~CFG_CMD_EEPROM & */ \
- ~CFG_CMD_DATE )
+ ~CFG_CMD_NAND & \
+ ~CFG_CMD_PCI & \
+ ~CFG_CMD_PCMCIA & \
+ ~CFG_CMD_REISER & \
+ ~CFG_CMD_SCSI & \
+ ~CFG_CMD_SETGETDCR & \
+ ~CFG_CMD_SPI & \
+ ~CFG_CMD_USB & \
+ ~CFG_CMD_VFD )
/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
#include <cmd_confdefs.h>
/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
#include <cmd_confdefs.h>
diff --git
a/include/configs/TOP5200.h
b/include/configs/TOP5200.h
index 930ed2722d5fc896ab0c0537342956e841bda0be..aa6dcf81d467581f209872d860d9b6f78dc56cc4 100644
(file)
--- a/
include/configs/TOP5200.h
+++ b/
include/configs/TOP5200.h
@@
-123,7
+123,7
@@
#define CONFIG_COMMANDS ( CONFIG_CMD_DFL | \
ADD_PCI_CMD | \
ADD_USB_CMD | \
#define CONFIG_COMMANDS ( CONFIG_CMD_DFL | \
ADD_PCI_CMD | \
ADD_USB_CMD | \
- ADD_IDE_CMD | \
+ ADD_IDE_CMD
| \
CFG_CMD_ASKENV | \
CFG_CMD_DATE | \
CFG_CMD_DHCP | \
CFG_CMD_ASKENV | \
CFG_CMD_DATE | \
CFG_CMD_DHCP | \
diff --git
a/include/configs/ZPC1900.h
b/include/configs/ZPC1900.h
index 673d9e5b5a6402546ca9b18ef1be6197e5b99977..03331d6c03ff85e1c9a793c21f369cd3e208d6ef 100644
(file)
--- a/
include/configs/ZPC1900.h
+++ b/
include/configs/ZPC1900.h
@@
-130,6
+130,7
@@
CFG_CMD_NAND | \
CFG_CMD_PCI | \
CFG_CMD_PCMCIA | \
CFG_CMD_NAND | \
CFG_CMD_PCI | \
CFG_CMD_PCMCIA | \
+ CFG_CMD_REISER | \
CFG_CMD_SCSI | \
CFG_CMD_SPI | \
CFG_CMD_USB | \
CFG_CMD_SCSI | \
CFG_CMD_SPI | \
CFG_CMD_USB | \
diff --git
a/include/configs/ep8260.h
b/include/configs/ep8260.h
index 8af139b88724cc32247dd8446a5464f4198614eb..274bd7d17d7823d0947c41b88821ea8158580971 100644
(file)
--- a/
include/configs/ep8260.h
+++ b/
include/configs/ep8260.h
@@
-288,6
+288,7
@@
~CFG_CMD_PCI & \
~CFG_CMD_PCMCIA & \
~CFG_CMD_SCSI & \
~CFG_CMD_PCI & \
~CFG_CMD_PCMCIA & \
~CFG_CMD_SCSI & \
+ ~CFG_CMD_REISER & \
~CFG_CMD_SPI & \
~CFG_CMD_USB & \
~CFG_CMD_VFD & \
~CFG_CMD_SPI & \
~CFG_CMD_USB & \
~CFG_CMD_VFD & \
diff --git
a/include/configs/hymod.h
b/include/configs/hymod.h
index e5680a5d8759da7625910e1f250336671b6322e1..75f52b5a52e70d773dab844c64d44c71a898376d 100644
(file)
--- a/
include/configs/hymod.h
+++ b/
include/configs/hymod.h
@@
-188,6
+188,7
@@
CFG_CMD_PCMCIA | \
CFG_CMD_PCI | \
CFG_CMD_USB | \
CFG_CMD_PCMCIA | \
CFG_CMD_PCI | \
CFG_CMD_USB | \
+ CFG_CMD_REISER | \
CFG_CMD_SCSI | \
CFG_CMD_SPI | \
CFG_CMD_VFD ) )
CFG_CMD_SCSI | \
CFG_CMD_SPI | \
CFG_CMD_VFD ) )
diff --git
a/include/configs/ppmc8260.h
b/include/configs/ppmc8260.h
index 38aaf19d75db77bb4e63f5b4c7936154957266df..2ad2867351411ea2feb4ad88a6cbfc7fce5b671a 100644
(file)
--- a/
include/configs/ppmc8260.h
+++ b/
include/configs/ppmc8260.h
@@
-238,8
+238,8
@@
/* Define a command string that is automatically executed when no character
* is read on the console interface withing "Boot Delay" after reset.
*/
/* Define a command string that is automatically executed when no character
* is read on the console interface withing "Boot Delay" after reset.
*/
-#
define CONFIG_BOOT_ROOT_INITRD 0
/* Use ram disk for the root file system */
-#define
CONFIG_BOOT_ROOT_NFS 1
/* Use a NFS mounted root file system */
+#
undef CONFIG_BOOT_ROOT_INITRD
/* Use ram disk for the root file system */
+#define
CONFIG_BOOT_ROOT_NFS
/* Use a NFS mounted root file system */
#ifdef CONFIG_BOOT_ROOT_INITRD
#define CONFIG_BOOTCOMMAND \
#ifdef CONFIG_BOOT_ROOT_INITRD
#define CONFIG_BOOTCOMMAND \
diff --git
a/include/configs/sacsng.h
b/include/configs/sacsng.h
index 0e6be34fe51ad226eee7c9d3543d383eb1dc5c86..cc9774c6a472c41a268a847e17e4f6b1392d3e31 100644
(file)
--- a/
include/configs/sacsng.h
+++ b/
include/configs/sacsng.h
@@
-443,8
+443,8
@@
/* Define a command string that is automatically executed when no character
* is read on the console interface withing "Boot Delay" after reset.
*/
/* Define a command string that is automatically executed when no character
* is read on the console interface withing "Boot Delay" after reset.
*/
-#
define CONFIG_BOOT_ROOT_INITRD 0
/* Use ram disk for the root file system */
-#define
CONFIG_BOOT_ROOT_NFS 1
/* Use a NFS mounted root file system */
+#
undef CONFIG_BOOT_ROOT_INITRD
/* Use ram disk for the root file system */
+#define
CONFIG_BOOT_ROOT_NFS
/* Use a NFS mounted root file system */
#ifdef CONFIG_BOOT_ROOT_INITRD
#define CONFIG_BOOTCOMMAND \
#ifdef CONFIG_BOOT_ROOT_INITRD
#define CONFIG_BOOTCOMMAND \
diff --git
a/include/configs/sbc8260.h
b/include/configs/sbc8260.h
index 2414093dd7d7119be2649a79eb2c333cc98e7fe3..251d62a70b359cfaa89963db575becb5bd7b0d67 100644
(file)
--- a/
include/configs/sbc8260.h
+++ b/
include/configs/sbc8260.h
@@
-389,8
+389,8
@@
/* Define a command string that is automatically executed when no character
* is read on the console interface withing "Boot Delay" after reset.
*/
/* Define a command string that is automatically executed when no character
* is read on the console interface withing "Boot Delay" after reset.
*/
-#
define CONFIG_BOOT_ROOT_INITRD 0
/* Use ram disk for the root file system */
-#define
CONFIG_BOOT_ROOT_NFS 1
/* Use a NFS mounted root file system */
+#
undef CONFIG_BOOT_ROOT_INITRD
/* Use ram disk for the root file system */
+#define
CONFIG_BOOT_ROOT_NFS
/* Use a NFS mounted root file system */
#ifdef CONFIG_BOOT_ROOT_INITRD
#define CONFIG_BOOTCOMMAND \
#ifdef CONFIG_BOOT_ROOT_INITRD
#define CONFIG_BOOTCOMMAND \
diff --git
a/include/reiserfs.h
b/include/reiserfs.h
index 7124f77610faf2225460f1f54f1fbc9874200fca..c465b3cdaf8f7c1b208d4198788727a21406370c 100644
(file)
--- a/
include/reiserfs.h
+++ b/
include/reiserfs.h
@@
-80,4
+80,3
@@
extern int reiserfs_ls (char *dirname);
extern int reiserfs_open (char *filename);
extern int reiserfs_read (char *buf, unsigned len);
extern int reiserfs_mount (unsigned part_length);
extern int reiserfs_open (char *filename);
extern int reiserfs_read (char *buf, unsigned len);
extern int reiserfs_mount (unsigned part_length);
-