Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit b79a11cc2bda7a4d5e00444427a0d06b4e86a990

Authored by wdenk
1 parent 518e2e1ae3
Exists in master and in 54 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, imx_v2015.04_4.1.15_1.0.0_ga, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-emmc-imx_v2014.04_3.10.53_1.1.0_ga, smarc-emmc-imx_v2014.04_3.14.28_1.0.0_ga, smarc-imx-l5.0.0_1.0.0-ga, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2017.03_4.9.11_1.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2014.04_3.14.28_1.0.0_ga, smarc-imx_v2015.04_4.1.15_1.0.0_ga, smarc-imx_v2017.03_4.9.11_1.0.0_ga, smarc-imx_v2017.03_4.9.88_2.0.0_ga, smarc-imx_v2017.03_o8.1.0_1.3.0_8m, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_2.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0, smarc_8mq_lf_v2020.04, ti-u-boot-2015.07, u-boot-2013.01.y, v2013.10, v2013.10-smarct33, v2013.10-smartmen, v2014.01, v2014.04, v2014.04-smarct33, v2014.04-smarct33-emmc, v2014.04-smartmen, v2014.07, v2014.07-smarct33, v2014.07-smartmen, v2015.07-smarct33, v2015.07-smarct33-emmc, v2015.07-smarct4x, v2016.05-dlt, v2016.05-smarct3x, v2016.05-smarct3x-emmc, v2016.05-smarct4x, v2017.01-smarct3x, v2017.01-smarct3x-emmc, v2017.01-smarct4x

Code cleanup

Showing 21 changed files with 69 additions and 74 deletions Side-by-side Diff

... ... @@ -100,7 +100,7 @@
100 100 LIBS += cpu/$(CPU)/lib$(CPU).a
101 101 LIBS += lib_$(ARCH)/lib$(ARCH).a
102 102 LIBS += fs/cramfs/libcramfs.a fs/fat/libfat.a fs/fdos/libfdos.a fs/jffs2/libjffs2.a \
103   - fs/reiserfs/libreiserfs.a
  103 + fs/reiserfs/libreiserfs.a
104 104 LIBS += net/libnet.a
105 105 LIBS += disk/libdisk.a
106 106 LIBS += rtc/librtc.a
107 107  
... ... @@ -976,10 +976,10 @@
976 976 omap1610h2_cs3boot_config : unconfig
977 977 @if [ "$(findstring _cs0boot_, $@)" ] ; then \
978 978 echo "#define CONFIG_CS0_BOOT" >> ./include/config.h ; \
979   - echo "Configured for CS0 boot"; \
  979 + echo "... configured for CS0 boot"; \
980 980 else \
981 981 echo "#define CONFIG_CS3_BOOT" >> ./include/config.h ; \
982   - echo "Configured for CS3 boot"; \
  982 + echo "... configured for CS3 boot"; \
983 983 fi;
984 984 @./mkconfig -a $(call xtract_omap1610xxx,$@) arm arm926ejs omap1610inn
985 985  
... ... @@ -778,13 +778,13 @@
778 778 Enable Chips & Technologies 69000 Video chip
779 779  
780 780 CONFIG_VIDEO_SMI_LYNXEM
781   - Enable Silicon Motion SMI 712/710/810 Video chip. The
  781 + Enable Silicon Motion SMI 712/710/810 Video chip. The
782 782 video output is selected via environment 'videoout'
783 783 (1 = LCD and 2 = CRT). If videoout is undefined, CRT is
784 784 assumed.
785 785  
786   - For the CT69000 and SMI_LYNXEM drivers, videomode is
787   - selected via environment 'videomode'. Two diferent ways
  786 + For the CT69000 and SMI_LYNXEM drivers, videomode is
  787 + selected via environment 'videomode'. Two diferent ways
788 788 are possible:
789 789 - "videomode=num" 'num' is a standard LiLo mode numbers.
790 790 Following standard modes are supported (* is default):
... ... @@ -798,7 +798,7 @@
798 798 -------------+---------------------------------------------
799 799 (i.e. setenv videomode 317; saveenv; reset;)
800 800  
801   - - "videomode=bootargs" all the video parameters are parsed
  801 + - "videomode=bootargs" all the video parameters are parsed
802 802 from the bootargs. (See drivers/videomodes.c)
803 803  
804 804  
board/eXalion/Makefile
Diff comments   View file @ b79a11c
... ... @@ -29,7 +29,7 @@
29 29 SOBJS =
30 30  
31 31 $(LIB): .depend $(OBJS) $(SOBJS)
32   - $(AR) crv $@ $^
  32 + $(AR) crv $@ $(OBJS) $(SOBJS)
33 33  
34 34 #########################################################################
35 35  
... ... @@ -183,7 +183,7 @@
183 183 puts ( "\n"
184 184 "ip_addr = ");
185 185 print_IPaddr (bd->bi_ip_addr);
186   - puts ( "\n"
  186 + printf ("\n"
187 187 "baudrate = %d bps\n", bd->bi_baudrate);
188 188  
189 189 return 0;
... ... @@ -485,7 +485,7 @@
485 485 word saved_ptr;
486 486  
487 487 /* save PTR and PNR registers before manipulation */
488   - SMC_SELECT_BANK (2);
  488 + SMC_SELECT_BANK (2);
489 489 saved_pnr = SMC_inb( PN_REG );
490 490 saved_ptr = SMC_inw( PTR_REG );
491 491  
... ... @@ -565,8 +565,8 @@
565 565 /* we have a packet address, so tell the card to use it */
566 566 SMC_outb (packet_no, PN_REG);
567 567  
568   - /* do not write new ptr value if Write data fifo not empty */
569   - while ( saved_ptr & PTR_NOTEMPTY )
  568 + /* do not write new ptr value if Write data fifo not empty */
  569 + while ( saved_ptr & PTR_NOTEMPTY )
570 570 printf ("Write data fifo not empty!\n");
571 571  
572 572 /* point to the beginning of the packet */
... ... @@ -148,7 +148,7 @@
148 148 0x20, 0x04, 0x21, 0x30, 0x22, 0x00, 0x23, 0x00, 0x24, 0x00
149 149 };
150 150 static char SMI_MCR[] = {
151   - 0x60, 0x01, 0x61, 0x00,
  151 + 0x60, 0x01, 0x61, 0x00,
152 152 };
153 153  
154 154 static char SMI_HCR[] = {
... ... @@ -400,7 +400,7 @@
400 400 he = (var->xres + var->right_margin + var->hsync_len) / 8; /* HsEnd */
401 401 ht = (var->left_margin + var->xres + var->right_margin + var->hsync_len) / 8; /* HTotal */
402 402 /* Blank */
403   - hbs = hd;
  403 + hbs = hd;
404 404 hbe = 0; /* Blank end at 0 */
405 405  
406 406 /* Vertical */
... ... @@ -410,7 +410,7 @@
410 410 vt = var->upper_margin + var->yres + var->lower_margin + var->vsync_len; /* VTotal */
411 411 vbs = vd;
412 412 vbe = 0;
413   -
  413 +
414 414 bpp = bits_per_pixel;
415 415 dblscan = (var->vmode & FB_VMODE_DOUBLE) ? 1 : 0;
416 416 interlaced = var->vmode & FB_VMODE_INTERLACED;
... ... @@ -433,7 +433,7 @@
433 433 cr[0x03] = (hbe & 0x1F);
434 434 cr[0x04] = hs;
435 435 cr[0x05] = ((hbe & 0x20) << 2) | (he & 0x1f);
436   -
  436 +
437 437 cr[0x06] = (vt - 2) & 0xFF;
438 438 cr[0x07] = (((vt - 2) & 0x100) >> 8)
439 439 | (((vd - 1) & 0x100) >> 7)
440 440  
... ... @@ -449,8 +449,8 @@
449 449 | (((vbs - 1) & 0x400) >> 9)
450 450 | ((vs & 0x400) >> 10)
451 451 | (interlaced) ? 0x80 : 0;
452   -
453 452  
  453 +
454 454 cr[0x08] = 0x00;
455 455 cr[0x09] = (dblscan << 7)
456 456 | ((LineCompare & 0x200) >> 3)
... ... @@ -458,7 +458,7 @@
458 458 | (TextScanLines - 1);
459 459  
460 460 cr[0x10] = vs & 0xff; /* VSyncPulseStart */
461   - cr[0x11] = (ve & 0x0f);
  461 + cr[0x11] = (ve & 0x0f);
462 462 cr[0x12] = (vd - 1) & 0xff; /* LineCount */
463 463 cr[0x13] = wd & 0xff;
464 464 cr[0x14] = 0x40;
... ... @@ -494,7 +494,7 @@
494 494  
495 495 for (n = QMIN; n <= QMAX; n++) {
496 496 m = PMIN; /* p/q ~ freq/ref -> p*ref-freq*q ~ 0 */
497   - L = P * n - m * Q;
  497 + L = P * n - m * Q;
498 498 while (L > 0 && m < PMAX) {
499 499 L -= REF_FREQ; /* difference is greater as 0 subtract fref */
500 500 m++; /* and increment m */
501 501  
502 502  
... ... @@ -548,12 +548,12 @@
548 548 break;
549 549 }
550 550 smiWrite (SMI_INDX_C4, 0x6b, 0x15);
551   -
  551 +
552 552 /* VCLK */
553 553 freq = 1000000000000L / var -> pixclock;
554   -
  554 +
555 555 FindPQ ((unsigned int)freq, &p, &q);
556   -
  556 +
557 557 smiWrite (SMI_INDX_C4, 0x6c, p);
558 558 smiWrite (SMI_INDX_C4, 0x6d, q);
559 559  
... ... @@ -576,7 +576,7 @@
576 576 struct ctfb_res_modes *res_mode;
577 577 struct ctfb_res_modes var_mode;
578 578 unsigned char videoout;
579   -
  579 +
580 580 /* Search for video chip */
581 581 printf("Video: ");
582 582  
... ... @@ -593,7 +593,7 @@
593 593 pci_mem_base = pci_mem_to_phys (devbusfn, pci_mem_base);
594 594  
595 595 tmp = 0;
596   -
  596 +
597 597 videomode = CFG_DEFAULT_VIDEO_MODE;
598 598 /* get video mode via environment */
599 599 if ((penv = getenv ("videomode")) != NULL) {
... ... @@ -621,7 +621,7 @@
621 621 resindex];
622 622 bits_per_pixel = vesa_modes[i].bits_per_pixel;
623 623 } else {
624   -
  624 +
625 625 res_mode = (struct ctfb_res_modes *) &var_mode;
626 626 bits_per_pixel = video_get_params (res_mode, penv);
627 627 }
... ... @@ -638,7 +638,7 @@
638 638 res_mode->lower_margin + res_mode->vsync_len);
639 639 t1 /= 1000;
640 640 vsynch = 1000000000L / t1;
641   -
  641 +
642 642 /* fill in Graphic device struct */
643 643 sprintf (pGD->modeIdent, "%dx%dx%d %ldkHz %ldHz", res_mode->xres,
644 644 res_mode->yres, bits_per_pixel, (hsynch / 1000),
... ... @@ -696,7 +696,7 @@
696 696  
697 697 /* Attributes controller registers */
698 698 smiLoadRegs (SMI_INDX_ATTR, SMI_INDX_ATTR, SMI_ATTR, sizeof(SMI_ATTR));
699   -
  699 +
700 700 /* Graphics Controller Register */
701 701 smiLoadRegs (SMI_INDX_CE, SMI_DATA_CF, SMI_GCR, sizeof(SMI_GCR));
702 702  
703 703  
... ... @@ -713,10 +713,10 @@
713 713  
714 714 /* Set misc output register */
715 715 smiLoadMsr (res_mode);
716   -
  716 +
717 717 /* Set CRT and Clock control registers */
718 718 smiLoadCrt (res_mode, bits_per_pixel);
719   -
  719 +
720 720 smiLoadCcr (res_mode, device_id);
721 721  
722 722 /* Hardware Cusor Register */
... ... @@ -62,7 +62,7 @@
62 62 if (sector < 0
63 63 || ((sector + ((byte_offset + byte_len - 1) >> SECTOR_BITS))
64 64 >= part_info.size)) {
65   -// errnum = ERR_OUTSIDE_PART;
  65 +/* errnum = ERR_OUTSIDE_PART; */
66 66 printf (" ** reiserfs_devread() read outside partition\n");
67 67 return 0;
68 68 }
fs/reiserfs/mode_string.c
Diff comments   View file @ b79a11c
... ... @@ -99,7 +99,6 @@
99 99  
100 100 /* The previous version used "0pcCd?bB-?l?s???". However, the '0', 'C',
101 101 * and 'B' types don't appear to be available on linux. So I removed them. */
102   -//static const char type_chars[16] = "?pc?d?b?-?l?s???";
103 102 static const char type_chars[16] = "?pc?d?b?-?l?s???";
104 103 /* 0123456789abcdef */
105 104 static const char mode_chars[7] = "rwxSTst";
fs/reiserfs/reiserfs_private.h
Diff comments   View file @ b79a11c
... ... @@ -285,10 +285,10 @@
285 285 #define dc_block_number(dc_p) (__le32_to_cpu((dc_p)->dc_block_number))
286 286  
287 287  
288   -//
289   -// old stat data is 32 bytes long. We are going to distinguish new one by
290   -// different size
291   -//
  288 +/*
  289 + * old stat data is 32 bytes long. We are going to distinguish new one by
  290 + * different size
  291 + */
292 292 struct stat_data_v1
293 293 {
294 294 __u16 sd_mode; /* file type, permissions */
... ... @@ -315,7 +315,6 @@
315 315 } __attribute__ ((__packed__));
316 316  
317 317 #define stat_data_v1(ih) (ih_version(ih) == ITEM_VERSION_1)
318   -//#define sd_v1_mode(sdp) (__le16_to_cpu((sdp)->sd_mode))
319 318 #define sd_v1_mode(sdp) ((sdp)->sd_mode)
320 319 #define sd_v1_nlink(sdp) (__le16_to_cpu((sdp)->sd_nlink))
321 320 #define sd_v1_uid(sdp) (__le16_to_cpu((sdp)->sd_uid))
... ... @@ -339,7 +338,7 @@
339 338 union {
340 339 __u32 sd_rdev;
341 340 __u32 sd_generation;
342   - //__u32 sd_first_direct_byte;
  341 + /*__u32 sd_first_direct_byte; */
343 342 /* first byte of file which is stored in a
344 343 direct item: except that if it equals 1
345 344 it is a symlink and if it equals
include/configs/LANTEC.h
Diff comments   View file @ b79a11c
... ... @@ -81,7 +81,7 @@
81 81 CFG_CMD_MEMORY | \
82 82 CFG_CMD_LOADS | \
83 83 CFG_CMD_LOADB)
84   -#define CONFIG_CMD_NORMAL (CONFIG_CMD_DFL & ~CFG_CMD_BOOTD)
  84 +#define CONFIG_CMD_NORMAL (CONFIG_CMD_DFL & ~CFG_CMD_BOOTD & ~CFG_CMD_REISER)
85 85 #define CONFIG_CMD_GDB (CONFIG_CMD_NORMAL | CFG_CMD_KGDB)
86 86 #define CONFIG_CMD_FULL (CFG_CMD_ALL & ~CFG_CMD_BEDBUG \
87 87 & ~CFG_CMD_BMP \
... ... @@ -103,6 +103,7 @@
103 103 & ~CFG_CMD_NAND \
104 104 & ~CFG_CMD_PCI \
105 105 & ~CFG_CMD_PCMCIA \
  106 + & ~CFG_CMD_REISER \
106 107 & ~CFG_CMD_SCSI \
107 108 & ~CFG_CMD_SPI \
108 109 & ~CFG_CMD_USB \
include/configs/MPC8260ADS.h
Diff comments   View file @ b79a11c
... ... @@ -170,6 +170,7 @@
170 170 CFG_CMD_NAND | \
171 171 CFG_CMD_PCI | \
172 172 CFG_CMD_PCMCIA | \
  173 + CFG_CMD_REISER | \
173 174 CFG_CMD_SCSI | \
174 175 CFG_CMD_SPI | \
175 176 CFG_CMD_USB | \
include/configs/MPC8266ADS.h
Diff comments   View file @ b79a11c
... ... @@ -164,6 +164,7 @@
164 164 CFG_CMD_MMC | \
165 165 CFG_CMD_NAND | \
166 166 CFG_CMD_PCMCIA | \
  167 + CFG_CMD_REISER | \
167 168 CFG_CMD_SCSI | \
168 169 CFG_CMD_SPI | \
169 170 CFG_CMD_VFD | \
... ... @@ -172,8 +173,8 @@
172 173 /* Define a command string that is automatically executed when no character
173 174 * is read on the console interface withing "Boot Delay" after reset.
174 175 */
175   -#define CONFIG_BOOT_ROOT_INITRD 0 /* Use ram disk for the root file system */
176   -#define CONFIG_BOOT_ROOT_NFS 1 /* Use a NFS mounted root file system */
  176 +#undef CONFIG_BOOT_ROOT_INITRD /* Use ram disk for the root file system */
  177 +#define CONFIG_BOOT_ROOT_NFS /* Use a NFS mounted root file system */
177 178  
178 179 #ifdef CONFIG_BOOT_ROOT_INITRD
179 180 #define CONFIG_BOOTCOMMAND \
include/configs/PPChameleonEVB.h
Diff comments   View file @ b79a11c
... ... @@ -694,7 +694,5 @@
694 694  
695 695 #endif /* CONFIG_NO_SERIAL_EEPROM */
696 696  
697   -#define CFG_OPB_FREQ 50000000
698   -
699 697 #endif /* __CONFIG_H */
include/configs/RBC823.h
Diff comments   View file @ b79a11c
... ... @@ -89,35 +89,32 @@
89 89 #define CONFIG_HARD_I2C
90 90 #define CFG_I2C_SPEED 40000
91 91 #define CFG_I2C_SLAVE 0xfe
92   -#define CFG_I2C_EEPROM_ADDR 0x50
93   -#define CFG_I2C_EEPROM_ADDR_LEN 1
94   -#define CFG_EEPROM_WRITE_BITS 4
95   -#define CFG_EEPROM_WRITE_DELAY_MS 10
  92 +#define CFG_I2C_EEPROM_ADDR 0x50
  93 +#define CFG_I2C_EEPROM_ADDR_LEN 1
  94 +#define CFG_EEPROM_WRITE_BITS 4
  95 +#define CFG_EEPROM_WRITE_DELAY_MS 10
96 96  
97 97 #define CONFIG_COMMANDS ( CFG_CMD_ALL & \
98   - ~CFG_CMD_PCMCIA & \
99   - ~CFG_CMD_IDE & \
100   - ~CFG_CMD_PCI & \
  98 + ~CFG_CMD_BSP & \
  99 + ~CFG_CMD_DATE & \
  100 + ~CFG_CMD_DTT & \
101 101 ~CFG_CMD_FDC & \
102   - ~CFG_CMD_HWFLOW & \
103 102 ~CFG_CMD_FDOS & \
104   - ~CFG_CMD_SCSI & \
105   - ~CFG_CMD_SETGETDCR & \
106   - ~CFG_CMD_BSP & \
107   - ~CFG_CMD_USB & \
108   - ~CFG_CMD_VFD & \
109   - ~CFG_CMD_SPI & \
110   - /* ~CFG_CMD_I2C & */ \
  103 + ~CFG_CMD_HWFLOW & \
  104 + ~CFG_CMD_IDE & \
111 105 ~CFG_CMD_IRQ & \
112   - ~CFG_CMD_NAND & \
113 106 ~CFG_CMD_JFFS2 & \
114   - ~CFG_CMD_DTT & \
115 107 ~CFG_CMD_MII & \
116 108 ~CFG_CMD_MMC & \
117   - /*~CFG_CMD_NET &*/ \
118   - /*~CFG_CMD_ELF &*/ \
119   - /* ~CFG_CMD_EEPROM & */ \
120   - ~CFG_CMD_DATE )
  109 + ~CFG_CMD_NAND & \
  110 + ~CFG_CMD_PCI & \
  111 + ~CFG_CMD_PCMCIA & \
  112 + ~CFG_CMD_REISER & \
  113 + ~CFG_CMD_SCSI & \
  114 + ~CFG_CMD_SETGETDCR & \
  115 + ~CFG_CMD_SPI & \
  116 + ~CFG_CMD_USB & \
  117 + ~CFG_CMD_VFD )
121 118  
122 119 /* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
123 120 #include <cmd_confdefs.h>
include/configs/TOP5200.h
Diff comments   View file @ b79a11c
... ... @@ -123,7 +123,7 @@
123 123 #define CONFIG_COMMANDS ( CONFIG_CMD_DFL | \
124 124 ADD_PCI_CMD | \
125 125 ADD_USB_CMD | \
126   - ADD_IDE_CMD | \
  126 + ADD_IDE_CMD | \
127 127 CFG_CMD_ASKENV | \
128 128 CFG_CMD_DATE | \
129 129 CFG_CMD_DHCP | \
include/configs/ZPC1900.h
Diff comments   View file @ b79a11c
... ... @@ -130,6 +130,7 @@
130 130 CFG_CMD_NAND | \
131 131 CFG_CMD_PCI | \
132 132 CFG_CMD_PCMCIA | \
  133 + CFG_CMD_REISER | \
133 134 CFG_CMD_SCSI | \
134 135 CFG_CMD_SPI | \
135 136 CFG_CMD_USB | \
include/configs/ep8260.h
Diff comments   View file @ b79a11c
... ... @@ -288,6 +288,7 @@
288 288 ~CFG_CMD_PCI & \
289 289 ~CFG_CMD_PCMCIA & \
290 290 ~CFG_CMD_SCSI & \
  291 + ~CFG_CMD_REISER & \
291 292 ~CFG_CMD_SPI & \
292 293 ~CFG_CMD_USB & \
293 294 ~CFG_CMD_VFD & \
include/configs/hymod.h
Diff comments   View file @ b79a11c
... ... @@ -188,6 +188,7 @@
188 188 CFG_CMD_PCMCIA | \
189 189 CFG_CMD_PCI | \
190 190 CFG_CMD_USB | \
  191 + CFG_CMD_REISER | \
191 192 CFG_CMD_SCSI | \
192 193 CFG_CMD_SPI | \
193 194 CFG_CMD_VFD ) )
include/configs/ppmc8260.h
Diff comments   View file @ b79a11c
... ... @@ -238,8 +238,8 @@
238 238 /* Define a command string that is automatically executed when no character
239 239 * is read on the console interface withing "Boot Delay" after reset.
240 240 */
241   -#define CONFIG_BOOT_ROOT_INITRD 0 /* Use ram disk for the root file system */
242   -#define CONFIG_BOOT_ROOT_NFS 1 /* Use a NFS mounted root file system */
  241 +#undef CONFIG_BOOT_ROOT_INITRD /* Use ram disk for the root file system */
  242 +#define CONFIG_BOOT_ROOT_NFS /* Use a NFS mounted root file system */
243 243  
244 244 #ifdef CONFIG_BOOT_ROOT_INITRD
245 245 #define CONFIG_BOOTCOMMAND \
include/configs/sacsng.h
Diff comments   View file @ b79a11c
... ... @@ -443,8 +443,8 @@
443 443 /* Define a command string that is automatically executed when no character
444 444 * is read on the console interface withing "Boot Delay" after reset.
445 445 */
446   -#define CONFIG_BOOT_ROOT_INITRD 0 /* Use ram disk for the root file system */
447   -#define CONFIG_BOOT_ROOT_NFS 1 /* Use a NFS mounted root file system */
  446 +#undef CONFIG_BOOT_ROOT_INITRD /* Use ram disk for the root file system */
  447 +#define CONFIG_BOOT_ROOT_NFS /* Use a NFS mounted root file system */
448 448  
449 449 #ifdef CONFIG_BOOT_ROOT_INITRD
450 450 #define CONFIG_BOOTCOMMAND \
include/configs/sbc8260.h
Diff comments   View file @ b79a11c
... ... @@ -389,8 +389,8 @@
389 389 /* Define a command string that is automatically executed when no character
390 390 * is read on the console interface withing "Boot Delay" after reset.
391 391 */
392   -#define CONFIG_BOOT_ROOT_INITRD 0 /* Use ram disk for the root file system */
393   -#define CONFIG_BOOT_ROOT_NFS 1 /* Use a NFS mounted root file system */
  392 +#undef CONFIG_BOOT_ROOT_INITRD /* Use ram disk for the root file system */
  393 +#define CONFIG_BOOT_ROOT_NFS /* Use a NFS mounted root file system */
394 394  
395 395 #ifdef CONFIG_BOOT_ROOT_INITRD
396 396 #define CONFIG_BOOTCOMMAND \