Commit 881cf02f47390c7515f4e11727a473ab042d6d76

Authored by Ben Warren

Merge git://www.denx.de/git/u-boot

Showing 24 changed files Side-by-side Diff

  1 +commit e881cb563e32f45832b7b6db77bdcd017adcbb41
  2 +Author: Bruce Adler <bruce.adler@ccpu.com>
  3 +Date: Fri Nov 2 13:15:42 2007 -0700
  4 +
  5 + fix wording in README
  6 +
  7 + Changed the wording to properly describe the shadowing
  8 + of the environment from ROM to RAM
  9 +
  10 + Signed-off-by: Bruce Adler <bruce.adler@acm.org>
  11 +
  12 +commit ad845beef06245426c57b53dcdc01b7dc70e0d45
  13 +Author: Shinya Kuribayashi <skuribay@ruby.dti.ne.jp>
  14 +Date: Wed Oct 31 02:18:15 2007 +0900
  15 +
  16 + blackfin: Move `-D__BLACKFIN__' to $(ARCH)_config.mk
  17 +
  18 + Signed-off-by: Shinya Kuribayashi <skuribay@ruby.dti.ne.jp>
  19 +
  20 +commit ec22755799466c8a103664bb3a5e647bf9c238f4
  21 +Author: Vlad Lungu <vlad@comsys.ro>
  22 +Date: Thu Oct 25 16:08:14 2007 +0300
  23 +
  24 + Trimmed some variables in ne2000.c
  25 +
  26 + Signed-off-by: Vlad Lungu <vlad@comsys.ro>
  27 +
  28 +commit eb6f214d3644b2a77968c176ed36dcf858cfe7e0
  29 +Author: Zhang Wei <wei.zhang@freescale.com>
  30 +Date: Thu Oct 25 17:51:27 2007 +0800
  31 +
  32 + Fix the issue of usb_kbd driver missing the scan code of key 'z'.
  33 +
  34 + The scan code of the key 'z' is 0x1d, which should be handled.
  35 +
  36 + The change has be tested on NOVATEK USB keyboard and ULI PCI OHCI
  37 + controller.
  38 +
  39 + Signed-off-by: Zhang Wei <wei.zhang@freescale.com>
  40 +
  41 +commit bbf4796f6498fbade56d56eff3a0a49b299d93e5
  42 +Author: Zhang Wei <wei.zhang@freescale.com>
  43 +Date: Thu Oct 25 17:30:04 2007 +0800
  44 +
  45 + Fix USB support issue for MPC8641HPCN board.
  46 +
  47 + The configuration file has already enabled USB, but it
  48 + missed definition of CFG_OHCI_SWAP_REG_ACCESS, the USB
  49 + on MPC8641HPCN can not work because of the wrong USB
  50 + register endian.
  51 +
  52 + And add the USB command to U-Boot commands list.
  53 +
  54 + Signed-off-by: Zhang Wei <wei.zhang@freescale.com>
  55 +
  56 +commit 4e62041023dc3de9d98d977bb080235bc6d035e0
  57 +Author: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
  58 +Date: Wed Oct 24 18:16:01 2007 +0200
  59 +
  60 + Use config_cmd_default.h instead of config_cmd_all.h
  61 +
  62 + Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
  63 +
  64 +commit 56622f87857439b1c221e9deef11a9d5bb5d4308
  65 +Author: Marian Balakowicz <m8@semihalf.com>
  66 +Date: Wed Oct 24 01:37:36 2007 +0200
  67 +
  68 + TQM5200: Call usb_cpu_init() during board init
  69 +
  70 + usb_cpu_init() configures GPS USB pins, clocks, etc. and
  71 + is required for proper operation of kernel USB subsystem.
  72 + This setup was previously done in the kernel by the fixup
  73 + code which is being removed, thus low level init must be
  74 + done by U-boot now.
  75 +
  76 + Signed-off-by: Marian Balakowicz <m8@semihalf.com>
  77 +
  78 +commit 29c29c0267fe857e72014ce90c5d35b2ef6302bd
  79 +Author: Guennadi Liakhovetski <lg@denx.de>
  80 +Date: Tue Oct 23 16:25:50 2007 +0200
  81 +
  82 + Fix typo in nfs.c
  83 +
  84 + An obvious typo. Originally fixed in linkstation u-boot port.
  85 +
  86 + Signed-off-by: Guennadi Liakhovetski <lg@denx.de>
  87 +
  88 +commit 59543fe00a4ce720ef9f5aa7fb387c6daf1c7d78
  89 +Author: Guennadi Liakhovetski <lg@denx.de>
  90 +Date: Tue Oct 23 14:35:05 2007 +0200
  91 +
  92 + Fix a typo in cpu/mpc824x/interrupts.c
  93 +
  94 + Since December 2003 the timer_interrupt_cpu() function in
  95 + cpu/mpc824x/interrupts.c contains what seems to be a superfluous
  96 + parameter. Remove it.
  97 +
  98 + Signed-off-by: Guennadi Liakhovetski <lg@denx.de>
  99 +
  100 +commit c9e7b9b9a1700fe009678d1f9b41e6364ac5df2d
  101 +Author: Sergej Stepanov <Sergej.Stepanov@ids.de>
  102 +Date: Wed Oct 17 11:13:51 2007 +0200
  103 +
  104 + add ft_cpu_setup(..) on mpc8260
  105 +
  106 + Add ft_cpu_setup(..)-function to adapt it for use with libfdt
  107 + based on code from mpc5xxx
  108 +
  109 + Sigend-off-by: Sergej Stepanov <Sergej.Stepanov@ids.de>
  110 + --
  111 +
  112 +commit 6abd82e19ae93c0b4d104e50165e235915ec0875
  113 +Author: Sergej Stepanov <Sergej.Stepanov@ids.de>
  114 +Date: Wed Oct 17 11:18:42 2007 +0200
  115 +
  116 + changes for IDS8247 board support
  117 +
  118 + To get the IDS8247 board working following are done:
  119 + - FCC2 is deactivated
  120 + - FCC1 is activated
  121 + - I2C is activated
  122 + - CFI driver is activated
  123 + - Adapted for use with LIBFDT
  124 +
  125 + Signed-off-by: Sergej Stepanov <Sergej.Stepanov@ids.de>
  126 + --
  127 +
  128 +commit 8b6684a698500be9c142ec2c9f46cfc348e17f0c
  129 +Author: Haavard Skinnemoen <hskinnemoen@atmel.com>
  130 +Date: Wed Oct 24 15:48:37 2007 +0200
  131 +
  132 + ATSTK1002: Remove default ethernet addresses
  133 +
  134 + Wolfgang is right: It's not a good idea to set up default initial
  135 + ethernet addresses for a board, even though they belong to the local
  136 + range.
  137 +
  138 + This will change the failure mode from "IT manager screams at you for
  139 + using duplicate ethernet addresses" to a nice error message explaining
  140 + that the ethernet address hasn't been set properly.
  141 +
  142 + Signed-off-by: Haavard Skinnemoen <hskinnemoen@atmel.com>
  143 +
  144 +commit e5c794e491a57d829b6d8733e2ed8368a2269abf
  145 +Author: Justin Flammia <jflammia@savantav.com>
  146 +Date: Mon Oct 29 17:40:35 2007 -0400
  147 +
  148 + DHCP Client Fix
  149 +
  150 + This is a multi-part message in MIME format.
  151 +
  152 + commit e6e505eae94ed721e123e177489291fc4544b7b8
  153 + Author: Justin Flammia <jflammia@savantav.com>
  154 + Date: Mon Oct 29 17:19:03 2007 -0400
  155 +
  156 + Found a bug in the way the DHCP Request packet is built, where the IP address
  157 + that is offered by the server is bound to prematurely. This patch is a fix of
  158 + that bug where the IP address offered by the DHCP server is not used until
  159 + after the DHCP ACK from the server is received.
  160 +
  161 + Signed-off-by: Justin Flammia <jflammia@savantav.com>
  162 + Signed-off-by: Ben Warren <bwarren@qstreams.com>
  163 +
  164 +commit e8ee8f3ade2a06c1893dd5e68f223070d650c7ed
  165 +Author: TsiChungLiew <Tsi-Chung.Liew@freescale.com>
  166 +Date: Thu Oct 25 17:16:22 2007 -0500
  167 +
  168 + ColdFire 54455: Fix correct boot location for atmel and intel
  169 +
  170 + Signed-off-by: TsiChungLiew <Tsi-Chung.Liew@freescale.com>
  171 +
  172 +commit 688e8eb414ac111cca7ce60bdf30e805ab9a7bcb
  173 +Author: TsiChungLiew <Tsi-Chung.Liew@freescale.com>
  174 +Date: Thu Oct 25 17:14:00 2007 -0500
  175 +
  176 + ColdFire: Fix build error when CONFIG_WATCHDOG is defined
  177 +
  178 + Signed-off-by: TsiChungLiew <Tsi-Chung.Liew@freescale.com>
  179 +
  180 +commit c67e12e705b204cfe914e3e3e693d69a445dcabf
  181 +Author: TsiChungLiew <Tsi-Chung.Liew@freescale.com>
  182 +Date: Thu Oct 25 17:12:36 2007 -0500
  183 +
  184 + ColdFire 5329: Assign correct SDRAM size and fix cache
  185 +
  186 + Signed-off-by: TsiChungLiew <Tsi-Chung.Liew@freescale.com>
  187 +
  188 +commit 95e9f2c212a65610b2e59a5c00d0113383a4da0b
  189 +Author: TsiChungLiew <Tsi-Chung.Liew@freescale.com>
  190 +Date: Thu Oct 25 17:10:23 2007 -0500
  191 +
  192 + ColdFire 5253: Assign correct SDRAM size
  193 +
  194 + Signed-off-by: TsiChungLiew <Tsi-Chung.Liew@freescale.com>
  195 +
  196 +commit 2acefa72ee0026f862ab65597ca687428f63a973
  197 +Author: TsiChungLiew <Tsi-Chung.Liew@freescale.com>
  198 +Date: Thu Oct 25 17:09:17 2007 -0500
  199 +
  200 + ColdFire 5282: Fix external flash boot and return dramsize
  201 +
  202 + Signed-off-by: TsiChungLiew <Tsi-Chung.Liew@freescale.com>
  203 +
  204 +commit d78791ae914d4e7c5edca1cdad73b3dc81a4eb82
  205 +Author: Bartlomiej Sieka <tur@semihalf.com>
  206 +Date: Thu Oct 25 17:20:01 2007 +0200
  207 +
  208 + TQM5200: increase kernel_addr_r and fdt_addr_r (hinted by Wolfgang Denk).
  209 +
  210 + Signed-off-by: Bartlomiej Sieka <tur@semihalf.com>
  211 +
  212 +commit 1a0ce20aa4cb4e3068da04e7290ee9986fd0b834
  213 +Author: Martin Krause <martin.krause@tqs.de>
  214 +Date: Wed Oct 24 08:42:25 2007 +0200
  215 +
  216 + TQM5200: fix spurious characters on second serial interface
  217 +
  218 + With this patch PSC3 is configured as UART. This is done, because if
  219 + the pins of PSC3 are not configured at all (-> all pins are GPI),
  220 + due to crosstalk, spurious characters may be send over the RX232_2_TXD
  221 + signal line.
  222 +
  223 + Signed-off-by: Martin Krause <martin.krause@tqs.de>
  224 + Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
  225 +
  226 +commit be4a87f11e297a5cededbf7dd71c0248f3874acd
  227 +Author: Martin Krause <martin.krause@tqs.de>
  228 +Date: Wed Oct 24 08:41:27 2007 +0200
  229 +
  230 + TQM5200S: fix commands for STK52xx base board because of missing SM501 grafic controller
  231 +
  232 + Some commands for the STK52xx base board try to access the SM501 grafic
  233 + controller. But the TQM5200S has no grafic controller (only the TQM5200
  234 + and the TQM5200B have). This patch deactivates the commands accessing
  235 + the SM501 for the TQM5200S.
  236 +
  237 + Signed-off-by: Martin Krause <martin.krause@tqs.de>
  238 + Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
  239 +
  240 +commit b31f64343ead9482cd439b1adbe4c34026a641b1
  241 +Author: Martin Krause <martin.krause@tqs.de>
  242 +Date: Mon Oct 22 16:45:53 2007 +0200
  243 +
  244 + TQM5200: fix spurious characters on second serial interface
  245 +
  246 + With this patch PSC3 is configured as UART. This is done, because if
  247 + the pins of PSC3 are not configured at all (-> all pins are GPI),
  248 + due to crosstalk, spurious characters may be send over the RX232_2_TXD
  249 + signal line.
  250 +
  251 + Signed-off-by: Martin Krause <martin.krause@tqs.de>
  252 +
  253 +commit 0fc0f91b20ffa802f5a66534ca5c2844910583f6
  254 +Author: Martin Krause <martin.krause@tqs.de>
  255 +Date: Mon Oct 22 16:40:06 2007 +0200
  256 +
  257 + TQM5200S: fix commands for STK52xx base board because of missing SM501 grafic controller
  258 +
  259 + Some commands for the STK52xx base board try to access the SM501 grafic
  260 + controller. But the TQM5200S has no grafic controller (only the TQM5200
  261 + and the TQM5200B have). This patch deactivates the commands accessing
  262 + the SM501 for the TQM5200S.
  263 +
  264 + Signed-off-by: Martin Krause <martin.krause@tqs.de>
  265 +
  266 +commit 7b0a42219f30277f71f4405cbaf8a269f6d2d227
  267 +Author: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
  268 +Date: Sun Oct 21 09:14:28 2007 +0200
  269 +
  270 + Mips: Fix string functions differ prototype declaration
  271 +
  272 + Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
  273 +
  274 +commit cb8250fe4b3c4ed549b270e8a20bc22060e7e1d2
  275 +Author: Ed Swarthout <Ed.Swarthout@freescale.com>
  276 +Date: Fri Oct 19 17:51:40 2007 -0500
  277 +
  278 + fsl_pci_init enable COMMAND_MEMORY if inbound window
  279 +
  280 + Patch 16e23c3f removed PCSRBAR allocation. But passing zero windows
  281 + to pciauto_setup_device has the side effect of not getting
  282 + COMMAND_MEMORY set.
  283 +
  284 + Signed-off-by: Ed Swarthout <Ed.Swarthout@freescale.com>
  285 +
  286 +commit e9d0d527992566ebef9826962ff1745b2f082b92
  287 +Author: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
  288 +Date: Fri Oct 19 10:55:24 2007 +0200
  289 +
  290 + delta: Fix OHCI_REGS_BASE undeclared and wait_ms implicit declaration
  291 +
  292 + Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
  293 +
  294 +commit 9c4884f54da982ce990c7d1760ac81b0704d3c64
  295 +Author: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
  296 +Date: Fri Oct 19 08:10:15 2007 +0200
  297 +
  298 + fix warning: no return statement in function returning non-void
  299 +
  300 + Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
  301 +
  302 +commit e78220f6e514206757acfe247297fc9a328a881f
  303 +Author: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
  304 +Date: Fri Oct 19 06:33:45 2007 +0200
  305 +
  306 + xsengine: Fix no partition type specified, use DOS as default
  307 +
  308 + Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
  309 +
  310 +commit 10cdb8dbd67a818823ab9ec88b68fc348903db59
  311 +Author: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
  312 +Date: Fri Oct 19 00:24:59 2007 +0200
  313 +
  314 + lubbock: Fix no partition type specified, use DOS as default
  315 +
  316 + Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
  317 +
  318 +commit 41b4d282d38fa7231c315c5f6cfff5bdd24e0191
  319 +Author: Wolfgang Denk <wd@denx.de>
  320 +Date: Tue Oct 23 16:50:03 2007 +0200
  321 +
  322 + Coding style: keep lists sorted; update CHANGELOG
  323 +
  324 + Signed-off-by: Wolfgang Denk <wd@denx.de>
  325 +
1 326 commit 58b74b05c621e2835ecf4e2d3243042cf4186777
2 327 Author: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
3 328 Date: Fri Oct 19 00:09:05 2007 +0200
... ... @@ -51,6 +376,112 @@
51 376 are added to u-boot.
52 377 Signed-off-by Rune Torgersen <runet@innovsys.com>
53 378  
  379 +commit d3afa1ee19345a31fd1eaad3e98b97d13ca47315
  380 +Author: Bartlomiej Sieka <tur@semihalf.com>
  381 +Date: Tue Oct 23 13:14:10 2007 +0200
  382 +
  383 + Motion-PRO: Update configuration to accomodate next generation board.
  384 +
  385 + New board has faster oscillator and a different Flash chip. This affects:
  386 + - CFG_MPC5XXX_CLKIN
  387 + - SDRAM timings
  388 + - Flash CS configuration (timings)
  389 + - Flash sector size, and thus MTD partition layout
  390 + - malloc() arena size (due to bigger Flash sectors)
  391 + - smaller memory test range (due to bigger malloc() arena)
  392 +
  393 + This patch also enables more extensive memory testing via "mtest".
  394 +
  395 + Signed-off-by: Bartlomiej Sieka <tur@semihalf.com>
  396 +
  397 +commit eff501904df2bf1724a750062628ba2c51dbb1f8
  398 +Author: Bartlomiej Sieka <tur@semihalf.com>
  399 +Date: Tue Oct 23 11:36:07 2007 +0200
  400 +
  401 + Motion-PRO: Add setting of SDelay reg. to SDRAM controller configuration.
  402 +
  403 + Per AN3221 (MPC5200B SDRAM Initialization and Configuration), the SDelay
  404 + register must be written a value of 0x00000004 as the first step of the
  405 + SDRAM contorller configuration.
  406 +
  407 + Signed-off-by: Bartlomiej Sieka <tur@semihalf.com>
  408 +
  409 +commit 7a9348728ebda63cdbaacffd83099aa71d9d4c54
  410 +Author: Peter Pearse <peter.pearse@arm.com>
  411 +Date: Tue Oct 23 10:22:16 2007 +0100
  412 +
  413 + Move PL01* serial drivers to drivers/serial and adjust Makefiles.
  414 +
  415 +commit de9a738faa7c2f47286119c3bfebc3dfbfe7d86d
  416 +Author: Vlad Lungu <vlad@comsys.ro>
  417 +Date: Sun Oct 21 22:10:10 2007 +0900
  418 +
  419 + [MIPS] Fix UNCACHED_SDRAM
  420 +
  421 + PHYSADDR is for physical address, KSEG1ADDR is for uncached.
  422 +
  423 + Signed-off-by: Vlad Lungu <vlad@comsys.ro>
  424 + Signed-off-by: Shinya Kuribayashi <shinya.kuribayashi@necel.com>
  425 +
  426 +commit 00101dd7a32d12f698150123e47e4b3420279f86
  427 +Author: Shinya Kuribayashi <shinya.kuribayashi@necel.com>
  428 +Date: Sun Oct 21 21:30:42 2007 +0900
  429 +
  430 + [MIPS] Add PIC-related switches to PLATFORM_{CPP,LD}FLAGS and cleanup
  431 +
  432 + Signed-off-by: Shinya Kuribayashi <shinya.kuribayashi@necel.com>
  433 +
  434 +commit eb700636db017d310edaeb559b13d82588560674
  435 +Author: Shinya Kuribayashi <shinya.kuribayashi@necel.com>
  436 +Date: Sun Oct 21 10:55:37 2007 +0900
  437 +
  438 + [MIPS] u-boot.lds: Define _gp in a standard manner
  439 +
  440 + Signed-off-by: Shinya Kuribayashi <shinya.kuribayashi@necel.com>
  441 +
  442 +commit 22069215eb7adf5a3888bf7c7784ea9d70a72cd0
  443 +Author: Shinya Kuribayashi <shinya.kuribayashi@necel.com>
  444 +Date: Sun Oct 21 10:55:36 2007 +0900
  445 +
  446 + [MIPS] Fix $gp usage
  447 +
  448 + Now we load $gp with _GLOBAL_OFFSET_TABLE_, but this is incorrect use.
  449 + As a general principle, we should use _gp for $gp.
  450 +
  451 + Thanks to linker script's help we fortunately have _gp which equals to
  452 + _GLOBAL_OFFSET_TABLE_. But once _gp gets out of alignment, we will not
  453 + be able to access to GOT entires, global variables and procedure entry
  454 + points. The right thing to do is to use _gp.
  455 +
  456 + This patch also introduce a new symbol `.gpword _GLOBAL_OFFSET_TABLE_'
  457 + which holds the offset from _gp. When updating GOT entries, we use this
  458 + offset and _gp to calculate the final _GLOBAL_OFFSET_TABLE_.
  459 +
  460 + This patch is originally submitted by Vlad Lungu <vlad@comsys.ro>, then
  461 + I made some change to leave over num_got_entries.
  462 +
  463 + Signed-off-by: Shinya Kuribayashi <shinya.kuribayashi@necel.com>
  464 + Cc: Vlad Lungu <vlad@comsys.ro>
  465 +
  466 +commit cbf2323b5b8285ea01acba7bbb905a3162d9b021
  467 +Author: Shinya Kuribayashi <shinya.kuribayashi@necel.com>
  468 +Date: Sun Oct 21 10:55:36 2007 +0900
  469 +
  470 + [MIPS] u-boot.lds: Fix __got_start and __got_end
  471 +
  472 + Ensure that __got_start points to top of the `.got', and __got_end points
  473 + to bottom as well, so that we never fail to count num_got_entries.
  474 +
  475 + Signed-off-by: Shinya Kuribayashi <shinya.kuribayashi@necel.com>
  476 +
  477 +commit e5f325fec5b48ae705c89522923ba5a2e37cd5c7
  478 +Author: Shinya Kuribayashi <shinya.kuribayashi@necel.com>
  479 +Date: Sun Oct 21 10:55:36 2007 +0900
  480 +
  481 + [MIPS] u-boot.lds: Remove duplicated .sdata section
  482 +
  483 + Signed-off-by: Shinya Kuribayashi <shinya.kuribayashi@necel.com>
  484 +
54 485 commit 05bf4919c1ce49cdedadacd564d0786a8ed796a1
55 486 Author: Wolfgang Denk <wd@denx.de>
56 487 Date: Sun Oct 21 01:01:17 2007 +0200
... ... @@ -73,6 +504,84 @@
73 504  
74 505 Signed-off-by: Vlad Lungu <vlad@comsys.ro>
75 506  
  507 +commit df90968b48fb34fa9072fab150db2ac89678f537
  508 +Author: urwithsughosh@gmail.com <urwithsughosh@gmail.com>
  509 +Date: Mon Sep 24 13:32:13 2007 -0400
  510 +
  511 + Setting MSR[DE] in do_reset
  512 +
  513 + Hello,
  514 + This patch ensures the soft reset of the board for the 85xx boards
  515 + by setting the MSR[DE] in the do_reset function.
  516 +
  517 + Signed-off-by: Sughosh Ganu <urwithsughosh@gmail.com>
  518 +
  519 +commit 1e701e701304b3c3a3768ca83dd2ab7b9e88c77d
  520 +Author: urwithsughosh@gmail.com <urwithsughosh@gmail.com>
  521 +Date: Mon Sep 24 13:36:01 2007 -0400
  522 +
  523 + MSR overwrite fix
  524 +
  525 + Hello,
  526 + This patch fixes the MSR overwrite in the start.S when moving out of
  527 + the last 4K page.
  528 +
  529 + Signed-off-by: Sughosh Ganu <urwithsughosh@gmail.com>
  530 +
  531 +commit 5c7ea64bb74a850a2b2303f853a8270695ad8602
  532 +Author: Dan Wilson <dwilson@fulcrummicro.com>
  533 +Date: Fri Oct 19 11:33:48 2007 -0500
  534 +
  535 + tsec driver should clear RHALT on startup
  536 +
  537 + This was causing problems for some people.
  538 +
  539 + Signed-off-by: Alain Gravel <agravel@fulcrummicro.com>
  540 + Signed-off-by: Dan Wilson <dwilson@fulcrummicro.com>
  541 + Signed-off-by: Andy Fleming <afleming@freescale.com>
  542 +
  543 +commit 7600d47b8f6a10019e537dc9a62aa1498df58d25
  544 +Author: Kumar Gala <galak@kernel.crashing.org>
  545 +Date: Thu Oct 11 00:29:18 2007 -0500
  546 +
  547 + Improve handling of PCI interrupt device tree fixup on MPC85xx CDS
  548 +
  549 + On the MPC85xx CDS we have two issues:
  550 +
  551 + 1. The device tree fixup code did not check to see if the property we are
  552 + trying to update is actually found. Its possible that it would update
  553 + random memory starting at 0.
  554 +
  555 + 2. Newer Linux kernel's have moved the location of the PCI nodes to be
  556 + sibilings of the soc node and not children. The explicit PATH to the PCI
  557 + node would not be found for these device trees. Add the ability to handle
  558 + both paths. In the future we shouldn't handle such fixups by explicit path.
  559 +
  560 + Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
  561 +
  562 +commit a3063eec775719b7e91023bbec3f64b3118791df
  563 +Author: Kumar Gala <galak@kernel.crashing.org>
  564 +Date: Thu Oct 11 00:18:48 2007 -0500
  565 +
  566 + Set OF_STDOUT_PATH to match the default console on MPC8568 MDS
  567 +
  568 + On the MPC8568 MDS we use ttyS0, UART0, etc. as the standard configured
  569 + console. Make it so we match that config what we tell Linux as the early
  570 + STDOUT console.
  571 +
  572 + Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
  573 +
  574 +commit e1ce3cb617bb06f91f82f98915391175addf3e82
  575 +Author: Kumar Gala <galak@kernel.crashing.org>
  576 +Date: Tue Oct 2 11:12:27 2007 -0500
  577 +
  578 + Remove magic numbers from cache related operations for mpc85xx
  579 +
  580 + The mpc85xx start code uses some magic numbers that we actually
  581 + have #defines for in <config.h> so use those instead.
  582 +
  583 + Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
  584 +
76 585 commit 5441f61a3d8b7034f19fc1361183e936198e6dbb
77 586 Author: Detlev Zundel <dzu@denx.de>
78 587 Date: Fri Oct 19 16:47:26 2007 +0200
... ... @@ -408,6 +917,16 @@
408 917 ppc4xx: lwmon5: Change GPIO 58 to default to low (watchdog test)
409 918  
410 919 Signed-off-by: Stefan Roese <sr@denx.de>
  920 +
  921 +commit 1487adbdcf9594bb2eb686325a6f9540dad1b70a
  922 +Author: Ed Swarthout <Ed.Swarthout@freescale.com>
  923 +Date: Wed Sep 26 16:35:54 2007 -0500
  924 +
  925 + 85xx io out functions need sync after write.
  926 +
  927 + This fixes the mc146818 rtc_read/write functions for 85xx.
  928 +
  929 + Signed-off-by: Ed Swarthout <Ed.Swarthout@freescale.com>
411 930  
412 931 commit 0d38effc6e359e6b1b0c78d66e8bc1a4dc15a2ae
413 932 Author: Grant Likely <grant.likely@secretlab.ca>
... ... @@ -2123,7 +2123,7 @@
2123 2123 to be a good choice since it makes it far enough from the
2124 2124 start of the data area as well as from the stack pointer.
2125 2125  
2126   -Please note that the environment is read-only as long as the monitor
  2126 +Please note that the environment is read-only until the monitor
2127 2127 has been relocated to RAM and a RAM copy of the environment has been
2128 2128 created; also, when using EEPROM you will have to use getenv_r()
2129 2129 until then to read environment variables.
... ... @@ -21,5 +21,5 @@
21 21 # MA 02111-1307 USA
22 22 #
23 23  
24   -PLATFORM_CPPFLAGS += -DCONFIG_BLACKFIN
  24 +PLATFORM_CPPFLAGS += -DCONFIG_BLACKFIN -D__BLACKFIN__
board/ids8247/ids8247.c
... ... @@ -25,6 +25,12 @@
25 25 #include <ioports.h>
26 26 #include <mpc8260.h>
27 27  
  28 +#if defined(CONFIG_OF_LIBFDT)
  29 +#include <libfdt.h>
  30 +#include <libfdt_env.h>
  31 +#include <fdt_support.h>
  32 +#endif
  33 +
28 34 DECLARE_GLOBAL_DATA_PTR;
29 35  
30 36 /*
... ... @@ -38,12 +44,12 @@
38 44  
39 45 /* Port A configuration */
40 46 { /* conf ppar psor pdir podr pdat */
41   - /* PA31 */ { 0, 1, 1, 0, 0, 0 }, /* FCC1 COL */
42   - /* PA30 */ { 0, 1, 1, 0, 0, 0 }, /* FCC1 CRS */
43   - /* PA29 */ { 0, 1, 1, 1, 0, 0 }, /* FCC1 TXER */
44   - /* PA28 */ { 0, 1, 1, 1, 0, 0 }, /* FCC1 TXEN */
45   - /* PA27 */ { 0, 1, 1, 0, 0, 0 }, /* FCC1 RXDV */
46   - /* PA26 */ { 0, 1, 1, 0, 0, 0 }, /* FCC1 RXER */
  47 + /* PA31 */ { 1, 1, 1, 0, 0, 0 }, /* FCC1 COL */
  48 + /* PA30 */ { 1, 1, 1, 0, 0, 0 }, /* FCC1 CRS */
  49 + /* PA29 */ { 1, 1, 1, 1, 0, 0 }, /* FCC1 TXER */
  50 + /* PA28 */ { 1, 1, 1, 1, 0, 0 }, /* FCC1 TXEN */
  51 + /* PA27 */ { 1, 1, 1, 0, 0, 0 }, /* FCC1 RXDV */
  52 + /* PA26 */ { 1, 1, 1, 0, 0, 0 }, /* FCC1 RXER */
47 53 /* PA25 */ { 0, 0, 0, 0, 1, 0 }, /* 8247_P0 */
48 54 #if defined(CONFIG_SOFT_I2C)
49 55 /* PA24 */ { 1, 0, 0, 0, 1, 1 }, /* I2C_SDA2 */
... ... @@ -53,14 +59,14 @@
53 59 /* PA23 */ { 0, 0, 0, 1, 0, 0 }, /* PA23 */
54 60 #endif
55 61 /* PA22 */ { 0, 0, 0, 0, 1, 0 }, /* SMC2_DCD */
56   - /* PA21 */ { 0, 1, 0, 1, 0, 0 }, /* FCC1 TXD3 */
57   - /* PA20 */ { 0, 1, 0, 1, 0, 0 }, /* FCC1 TXD2 */
58   - /* PA19 */ { 0, 1, 0, 1, 0, 0 }, /* FCC1 TXD1 */
59   - /* PA18 */ { 0, 1, 0, 1, 0, 0 }, /* FCC1 TXD0 */
60   - /* PA17 */ { 0, 1, 0, 0, 0, 0 }, /* FCC1 RXD0 */
61   - /* PA16 */ { 0, 1, 0, 0, 0, 0 }, /* FCC1 RXD1 */
62   - /* PA15 */ { 0, 1, 0, 0, 0, 0 }, /* FCC1 RXD2 */
63   - /* PA14 */ { 0, 1, 0, 0, 0, 0 }, /* FCC1 RXD3 */
  62 + /* PA21 */ { 1, 1, 0, 1, 0, 0 }, /* FCC1 TXD3 */
  63 + /* PA20 */ { 1, 1, 0, 1, 0, 0 }, /* FCC1 TXD2 */
  64 + /* PA19 */ { 1, 1, 0, 1, 0, 0 }, /* FCC1 TXD1 */
  65 + /* PA18 */ { 1, 1, 0, 1, 0, 0 }, /* FCC1 TXD0 */
  66 + /* PA17 */ { 1, 1, 0, 0, 0, 0 }, /* FCC1 RXD0 */
  67 + /* PA16 */ { 1, 1, 0, 0, 0, 0 }, /* FCC1 RXD1 */
  68 + /* PA15 */ { 1, 1, 0, 0, 0, 0 }, /* FCC1 RXD2 */
  69 + /* PA14 */ { 1, 1, 0, 0, 0, 0 }, /* FCC1 RXD3 */
64 70 /* PA13 */ { 0, 0, 0, 1, 1, 0 }, /* SMC2_RTS */
65 71 /* PA12 */ { 0, 0, 0, 0, 1, 0 }, /* SMC2_CTS */
66 72 /* PA11 */ { 0, 0, 0, 1, 1, 0 }, /* SMC2_DTR */
... ... @@ -79,20 +85,20 @@
79 85  
80 86 /* Port B configuration */
81 87 { /* conf ppar psor pdir podr pdat */
82   - /* PB31 */ { 1, 1, 0, 1, 0, 0 }, /* FCC2 MII TX_ER */
83   - /* PB30 */ { 1, 1, 0, 0, 0, 0 }, /* FCC2 MII RX_DV */
84   - /* PB29 */ { 1, 1, 1, 1, 0, 0 }, /* FCC2 MII TX_EN */
85   - /* PB28 */ { 1, 1, 0, 0, 0, 0 }, /* FCC2 MII RX_ER */
86   - /* PB27 */ { 1, 1, 0, 0, 0, 0 }, /* FCC2 MII COL */
87   - /* PB26 */ { 1, 1, 0, 0, 0, 0 }, /* FCC2 MII CRS */
88   - /* PB25 */ { 1, 1, 0, 1, 0, 0 }, /* FCC2 MII TxD[3] */
89   - /* PB24 */ { 1, 1, 0, 1, 0, 0 }, /* FCC2 MII TxD[2] */
90   - /* PB23 */ { 1, 1, 0, 1, 0, 0 }, /* FCC2 MII TxD[1] */
91   - /* PB22 */ { 1, 1, 0, 1, 0, 0 }, /* FCC2 MII TxD[0] */
92   - /* PB21 */ { 1, 1, 0, 0, 0, 0 }, /* FCC2 MII RxD[0] */
93   - /* PB20 */ { 1, 1, 0, 0, 0, 0 }, /* FCC2 MII RxD[1] */
94   - /* PB19 */ { 1, 1, 0, 0, 0, 0 }, /* FCC2 MII RxD[2] */
95   - /* PB18 */ { 1, 1, 0, 0, 0, 0 }, /* FCC2 MII RxD[3] */
  88 + /* PB31 */ { 0, 1, 0, 1, 0, 0 }, /* FCC2 MII TX_ER */
  89 + /* PB30 */ { 0, 1, 0, 0, 0, 0 }, /* FCC2 MII RX_DV */
  90 + /* PB29 */ { 0, 1, 1, 1, 0, 0 }, /* FCC2 MII TX_EN */
  91 + /* PB28 */ { 0, 1, 0, 0, 0, 0 }, /* FCC2 MII RX_ER */
  92 + /* PB27 */ { 0, 1, 0, 0, 0, 0 }, /* FCC2 MII COL */
  93 + /* PB26 */ { 0, 1, 0, 0, 0, 0 }, /* FCC2 MII CRS */
  94 + /* PB25 */ { 0, 1, 0, 1, 0, 0 }, /* FCC2 MII TxD[3] */
  95 + /* PB24 */ { 0, 1, 0, 1, 0, 0 }, /* FCC2 MII TxD[2] */
  96 + /* PB23 */ { 0, 1, 0, 1, 0, 0 }, /* FCC2 MII TxD[1] */
  97 + /* PB22 */ { 0, 1, 0, 1, 0, 0 }, /* FCC2 MII TxD[0] */
  98 + /* PB21 */ { 0, 1, 0, 0, 0, 0 }, /* FCC2 MII RxD[0] */
  99 + /* PB20 */ { 0, 1, 0, 0, 0, 0 }, /* FCC2 MII RxD[1] */
  100 + /* PB19 */ { 0, 1, 0, 0, 0, 0 }, /* FCC2 MII RxD[2] */
  101 + /* PB18 */ { 0, 1, 0, 0, 0, 0 }, /* FCC2 MII RxD[3] */
96 102 /* PB17 */ { 0, 0, 0, 0, 0, 0 }, /* PB17 */
97 103 /* PB16 */ { 0, 0, 0, 0, 0, 0 }, /* PB16 */
98 104 /* PB15 */ { 0, 0, 0, 0, 0, 0 }, /* PB15 */
... ... @@ -123,8 +129,8 @@
123 129 /* PC26 */ { 0, 0, 0, 1, 0, 0 }, /* PC26 */
124 130 /* PC25 */ { 0, 1, 1, 0, 0, 0 }, /* SYNC_IN */
125 131 /* PC24 */ { 0, 0, 0, 1, 0, 0 }, /* PC24 */
126   - /* PC23 */ { 0, 1, 0, 1, 0, 0 }, /* ATMTFCLK */
127   - /* PC22 */ { 0, 1, 0, 0, 0, 0 }, /* ATMRFCLK */
  132 + /* PC23 */ { 1, 1, 0, 0, 0, 0 }, /* FCC1 MII TX_CLK */
  133 + /* PC22 */ { 1, 1, 0, 0, 0, 0 }, /* FCC1 MII RX_CLK */
128 134 /* PC21 */ { 0, 1, 0, 0, 0, 0 }, /* SCC1 EN RXCLK */
129 135 /* PC20 */ { 0, 1, 0, 0, 0, 0 }, /* SCC1 EN TXCLK */
130 136 /* PC19 */ { 1, 1, 0, 0, 0, 0 }, /* FCC2 MII RX_CLK */
... ... @@ -180,7 +186,7 @@
180 186 /* PD10 */ { 0, 0, 0, 0, 0, 0 }, /* PD10 */
181 187 /* PD9 */ { 0, 0, 0, 0, 0, 0 }, /* PD9 */
182 188 /* PD8 */ { 0, 0, 0, 0, 0, 0 }, /* PD8 */
183   - /* PD7 */ { 0, 0, 0, 1, 0, 1 }, /* MII_MDIO */
  189 + /* PD7 */ { 1, 0, 0, 1, 0, 1 }, /* MII_MDIO */
184 190 /* PD6 */ { 0, 0, 0, 1, 0, 1 }, /* PD6 */
185 191 /* PD5 */ { 0, 0, 0, 1, 0, 1 }, /* PD5 */
186 192 /* PD4 */ { 0, 0, 0, 1, 0, 1 }, /* PD4 */
... ... @@ -224,7 +230,7 @@
224 230 * mapped by the controller. That means, that the initial mapping has
225 231 * to be (at least) twice as large as the maximum expected size.
226 232 */
227   - maxsize = (1 + (~orx | 0x7fff)) / 2;
  233 + maxsize = (1 + (~orx | 0x7fff))/* / 2*/;
228 234  
229 235 sdmr_ptr = &memctl->memc_psdmr;
230 236 orx_ptr = &memctl->memc_or2;
... ... @@ -315,5 +321,39 @@
315 321 printf ("%4lu MB\n", totlen >>20);
316 322 }
317 323  
318   -#endif
  324 +#endif /* CFG_CMD_NAND */
  325 +
  326 +#if defined(CONFIG_OF_BOARD_SETUP) && defined(CONFIG_OF_LIBFDT)
  327 +/*
  328 + * update "memory" property in the blob
  329 + */
  330 +void ft_blob_update(void *blob, bd_t *bd)
  331 +{
  332 + int ret, nodeoffset = 0;
  333 + ulong memory_data[2] = {0};
  334 +
  335 + memory_data[0] = cpu_to_be32(bd->bi_memstart);
  336 + memory_data[1] = cpu_to_be32(bd->bi_memsize);
  337 +
  338 + nodeoffset = fdt_find_node_by_path (blob, "/memory");
  339 + if (nodeoffset >= 0) {
  340 + ret = fdt_setprop(blob, nodeoffset, "reg", memory_data,
  341 + sizeof(memory_data));
  342 + if (ret < 0)
  343 + printf("ft_blob_update): cannot set /memory/reg "
  344 + "property err:%s\n", fdt_strerror(ret));
  345 + }
  346 + else {
  347 + /* memory node is required in dts */
  348 + printf("ft_blob_update(): cannot find /memory node "
  349 + "err:%s\n", fdt_strerror(nodeoffset));
  350 + }
  351 +}
  352 +
  353 +void ft_board_setup(void *blob, bd_t *bd)
  354 +{
  355 + ft_cpu_setup( blob, bd);
  356 + ft_blob_update(blob, bd);
  357 +}
  358 +#endif /* defined(CONFIG_OF_BOARD_SETUP) && defined(CONFIG_OF_LIBFDT) */
board/tqm5200/tqm5200.c
... ... @@ -441,15 +441,21 @@
441 441 }
442 442 #endif /* CONFIG_POST || CONFIG_LOGBUFFER*/
443 443  
444   -#ifdef CONFIG_PS2MULT
445 444 #ifdef CONFIG_BOARD_EARLY_INIT_R
446 445 int board_early_init_r (void)
447 446 {
  447 +#ifdef CONFIG_PS2MULT
448 448 ps2mult_early_init();
  449 +#endif /* CONFIG_PS2MULT */
  450 +
  451 +#if defined(CONFIG_USB_OHCI_NEW) && defined(CFG_USB_OHCI_CPU_INIT)
  452 + /* Low level USB init, required for proper kernel operation */
  453 + usb_cpu_init();
  454 +#endif
  455 +
449 456 return (0);
450 457 }
451 458 #endif
452   -#endif /* CONFIG_PS2MULT */
453 459  
454 460 #ifdef CONFIG_FO300
455 461 int silent_boot (void)
... ... @@ -257,7 +257,7 @@
257 257 repeat_delay=REPEAT_DELAY;
258 258 }
259 259 keycode=0;
260   - if((scancode>3) && (scancode<0x1d)) { /* alpha numeric values */
  260 + if((scancode>3) && (scancode<=0x1d)) { /* alpha numeric values */
261 261 keycode=scancode-4 + 0x61;
262 262 if(caps_lock)
263 263 keycode&=~CAPITAL_MASK; /* switch to capital Letters */
... ... @@ -69,10 +69,6 @@
69 69 endif
70 70 endif
71 71  
72   -ifeq ($(ARCH),blackfin)
73   -PLATFORM_CPPFLAGS+= -D__BLACKFIN__
74   -endif
75   -
76 72 ifdef ARCH
77 73 sinclude $(TOPDIR)/$(ARCH)_config.mk # include architecture dependend rules
78 74 endif
cpu/mpc824x/interrupts.c
... ... @@ -86,7 +86,7 @@
86 86 vga?
87 87 */
88 88  
89   -void timer_interrupt_cpu (struct pt_regs *regs, ulong timestamp)
  89 +void timer_interrupt_cpu (struct pt_regs *regs)
90 90 {
91 91 /* nothing to do here */
92 92 return;
... ... @@ -47,6 +47,11 @@
47 47 #include <asm/processor.h>
48 48 #include <asm/cpm_8260.h>
49 49  
  50 +#if defined(CONFIG_OF_LIBFDT)
  51 +#include <libfdt.h>
  52 +#include <libfdt_env.h>
  53 +#endif
  54 +
50 55 DECLARE_GLOBAL_DATA_PTR;
51 56  
52 57 #if defined(CONFIG_GET_CPU_STR_F)
... ... @@ -294,4 +299,37 @@
294 299 #endif /* CONFIG_WATCHDOG */
295 300  
296 301 /* ------------------------------------------------------------------------- */
  302 +#if defined(CONFIG_OF_LIBFDT)
  303 +static void do_fixup(void *fdt, const char *node, const char *prop,
  304 + const void *val, int len, int create)
  305 +{
  306 +#if defined(DEBUG)
  307 + int i;
  308 + debug("Updating property '%s/%s' = ", node, prop);
  309 + for (i = 0; i < len; i++)
  310 + debug(" %.2x", *(u8*)(val+i));
  311 + debug("\n");
  312 +#endif
  313 + int rc = fdt_find_and_setprop(fdt, node, prop, val, len, create);
  314 + if (rc)
  315 + printf("Unable to update property %s:%s, err=%s\n",
  316 + node, prop, fdt_strerror(rc));
  317 +}
  318 +
  319 +static void do_fixup_u32(void *fdt, const char *node, const char *prop,
  320 + u32 val, int create)
  321 +{
  322 + val = cpu_to_fdt32(val);
  323 + do_fixup(fdt, node, prop, &val, sizeof(val), create);
  324 +}
  325 +
  326 +void ft_cpu_setup (void *blob, bd_t *bd)
  327 +{
  328 + char * cpu_path = "/cpus/" OF_CPU;
  329 +
  330 + do_fixup_u32(blob, cpu_path, "bus-frequency", bd->bi_busfreq, 1);
  331 + do_fixup_u32(blob, cpu_path, "timebase-frequency", OF_TBCLK, 1);
  332 + do_fixup_u32(blob, cpu_path, "clock-frequency", bd->bi_intfreq, 1);
  333 +}
  334 +#endif /* CONFIG_OF_LIBFDT */
... ... @@ -268,7 +268,7 @@
268 268 */
269 269 lis r3,CFG_INIT_RAM_ADDR@h
270 270 ori r3,r3,CFG_INIT_RAM_ADDR@l
271   - li r2,(CFG_DCACHE_SIZE / (2 * CFG_CACHELINE_SIZE))
  271 + li r2,(CFG_DCACHE_SIZE / (2 * CFG_CACHELINE_SIZE))
272 272 mtctr r2
273 273 li r0,0
274 274 1:
... ... @@ -1061,7 +1061,7 @@
1061 1061 /* invalidate the INIT_RAM section */
1062 1062 lis r3,(CFG_INIT_RAM_ADDR & ~31)@h
1063 1063 ori r3,r3,(CFG_INIT_RAM_ADDR & ~31)@l
1064   - li r4,(CFG_DCACHE_SIZE / (2 * CFG_CACHELINE_SIZE))
  1064 + li r4,(CFG_DCACHE_SIZE / (2 * CFG_CACHELINE_SIZE))
1065 1065 mtctr r4
1066 1066 1: icbi r0,r3
1067 1067 dcbi r0,r3
... ... @@ -723,7 +723,8 @@
723 723 { /* SuperSocket RE450T */ 0x0110, 0x00, 0xe0, 0x98, 0 },
724 724 { /* Volktek NPL-402CT */ 0x0060, 0x00, 0x40, 0x05, 0 },
725 725 { /* NEC PC-9801N-J12 */ 0x0ff0, 0x00, 0x00, 0x4c, 0 },
726   - { /* PCMCIA Technology OEM */ 0x01c8, 0x00, 0xa0, 0x0c, 0 }
  726 + { /* PCMCIA Technology OEM */ 0x01c8, 0x00, 0xa0, 0x0c, 0 },
  727 + { /* Qemu */ 0x0, 0x52, 0x54, 0x00, 0 }
727 728 };
728 729  
729 730 #define NR_INFO (sizeof(hw_info)/sizeof(hw_info_t))
730 731  
731 732  
732 733  
733 734  
... ... @@ -824,30 +825,22 @@
824 825  
825 826 /* U-boot specific routines */
826 827  
827   -#define NB 5
828 828  
829 829 static unsigned char *pbuf = NULL;
830   -static int plen[NB];
831   -static int nrx = 0;
832 830  
833 831 static int pkey = -1;
834 832 static int initialized=0;
835 833  
836 834 void uboot_push_packet_len(int len) {
837   - PRINTK("pushed len = %d, nrx = %d\n", len, nrx);
  835 + PRINTK("pushed len = %d\n", len);
838 836 if (len>=2000) {
839 837 printf("NE2000: packet too big\n");
840 838 return;
841 839 }
842   - if (nrx >= NB) {
843   - printf("losing packets in rx\n");
844   - return;
845   - }
846   - plen[nrx] = len;
847   - dp83902a_recv(&pbuf[nrx*2000], len);
  840 + dp83902a_recv(&pbuf[0], len);
848 841  
849 842 /*Just pass it to the upper layer*/
850   - NetReceive(&pbuf[nrx*2000], plen[nrx]);
  843 + NetReceive(&pbuf[0], len);
851 844 }
852 845  
853 846 void uboot_push_tx_done(int key, int val) {
854 847  
... ... @@ -862,9 +855,9 @@
862 855 PRINTK("### eth_init\n");
863 856  
864 857 if (!pbuf) {
865   - pbuf = malloc(NB*2000);
  858 + pbuf = malloc(2000);
866 859 if (!pbuf) {
867   - printf("Cannot allocate rx buffers\n");
  860 + printf("Cannot allocate rx buffer\n");
868 861 return -1;
869 862 }
870 863 }
include/configs/ADNPESC1.h
... ... @@ -574,38 +574,30 @@
574 574 /*
575 575 * Command line configuration.
576 576 */
577   -#include <config_cmd_all.h>
  577 +#include <config_cmd_default.h>
578 578  
579   -#undef CONFIG_CMD_ASKENV
580   -#undef CONFIG_CMD_BEDBUG
581   -#undef CONFIG_CMD_BMP
582   -#undef CONFIG_CMD_CACHE
583   -#undef CONFIG_CMD_DOC
584   -#undef CONFIG_CMD_DTT
585   -#undef CONFIG_CMD_EEPROM
586   -#undef CONFIG_CMD_ELF
587   -#undef CONFIG_CMD_FAT
588   -#undef CONFIG_CMD_FDC
589   -#undef CONFIG_CMD_FDOS
590   -#undef CONFIG_CMD_HWFLOW
591   -#undef CONFIG_CMD_IDE
592   -#undef CONFIG_CMD_I2C
593   -#undef CONFIG_CMD_JFFS2
594   -#undef CONFIG_CMD_KGDB
595   -#undef CONFIG_CMD_NAND
  579 +#define CONFIG_CMD_BSP
  580 +#define CONFIG_CMD_CDP
  581 +#define CONFIG_CMD_DHCP
  582 +#define CONFIG_CMD_DIAG
  583 +#define CONFIG_CMD_DISPLAY
  584 +#define CONFIG_CMD_EXT2
  585 +#define CONFIG_CMD_IMMAP
  586 +#define CONFIG_CMD_IRQ
  587 +#define CONFIG_CMD_PING
  588 +#define CONFIG_CMD_PORTIO
  589 +#define CONFIG_CMD_REGINFO
  590 +#define CONFIG_CMD_REISER
  591 +#define CONFIG_CMD_SAVES
  592 +#define CONFIG_CMD_SDRAM
  593 +#define CONFIG_CMD_SNTP
  594 +
596 595 #undef CONFIG_CMD_NFS
597   -#undef CONFIG_CMD_MMC
598   -#undef CONFIG_CMD_MII
599   -#undef CONFIG_CMD_PCI
600   -#undef CONFIG_CMD_PCMCIA
601   -#undef CONFIG_CMD_SCSI
602   -#undef CONFIG_CMD_VFD
603   -#undef CONFIG_CMD_USB
604 596 #undef CONFIG_CMD_XIMG
605 597  
606   -#if (CFG_NIOS_CPU_SPI_NUMS != 1)
607   -#undef CONFIG_CMD_SPI
608   -#undef CONFIG_CMD_DATE
  598 +#if (CFG_NIOS_CPU_SPI_NUMS == 1)
  599 +#define CONFIG_CMD_DATE
  600 +#define CONFIG_CMD_SPI
609 601 #endif
610 602  
611 603 /*------------------------------------------------------------------------
include/configs/DK1C20.h
... ... @@ -459,37 +459,26 @@
459 459 /*
460 460 * Command line configuration.
461 461 */
462   -#include <config_cmd_all.h>
  462 +#include <config_cmd_default.h>
463 463  
464   -#undef CONFIG_CMD_ASKENV
465   -#undef CONFIG_CMD_BEDBUG
466   -#undef CONFIG_CMD_BMP
467   -#undef CONFIG_CMD_BSP
468   -#undef CONFIG_CMD_CACHE
469   -#undef CONFIG_CMD_DATE
470   -#undef CONFIG_CMD_DOC
471   -#undef CONFIG_CMD_DTT
472   -#undef CONFIG_CMD_EEPROM
473   -#undef CONFIG_CMD_ELF
474   -#undef CONFIG_CMD_FDC
475   -#undef CONFIG_CMD_FDOS
476   -#undef CONFIG_CMD_HWFLOW
477   -#undef CONFIG_CMD_I2C
478   -#undef CONFIG_CMD_JFFS2
479   -#undef CONFIG_CMD_KGDB
480   -#undef CONFIG_CMD_NAND
  464 +#define CONFIG_CMD_CDP
  465 +#define CONFIG_CMD_DHCP
  466 +#define CONFIG_CMD_DIAG
  467 +#define CONFIG_CMD_DISPLAY
  468 +#define CONFIG_CMD_EXT2
  469 +#define CONFIG_CMD_FAT
  470 +#define CONFIG_CMD_IDE
  471 +#define CONFIG_CMD_IMMAP
  472 +#define CONFIG_CMD_IRQ
  473 +#define CONFIG_CMD_PING
  474 +#define CONFIG_CMD_PORTIO
  475 +#define CONFIG_CMD_REGINFO
  476 +#define CONFIG_CMD_SAVES
  477 +#define CONFIG_CMD_SDRAM
  478 +#define CONFIG_CMD_SNTP
  479 +
481 480 #undef CONFIG_CMD_NFS
482   -#undef CONFIG_CMD_MMC
483   -#undef CONFIG_CMD_MII
484   -#undef CONFIG_CMD_PCI
485   -#undef CONFIG_CMD_PCMCIA
486   -#undef CONFIG_CMD_REISER
487   -#undef CONFIG_CMD_SCSI
488   -#undef CONFIG_CMD_SPI
489   -#undef CONFIG_CMD_VFD
490   -#undef CONFIG_CMD_USB
491 481 #undef CONFIG_CMD_XIMG
492   -
493 482  
494 483 /*------------------------------------------------------------------------
495 484 * COMPACT FLASH
include/configs/DK1S10.h
... ... @@ -466,38 +466,25 @@
466 466 /*
467 467 * Command line configuration.
468 468 */
469   -#include <config_cmd_all.h>
  469 +#include <config_cmd_default.h>
470 470  
471   -#undef CONFIG_CMD_ASKENV
472   -#undef COND_CMD_BEDBUG
473   -#undef COND_CMD_BMP
474   -#undef COND_CMD_BSP
475   -#undef COND_CMD_CACHE
476   -#undef COND_CMD_DATE
477   -#undef COND_CMD_DOC
478   -#undef COND_CMD_DTT
479   -#undef COND_CMD_EEPROM
480   -#undef COND_CMD_ELF
481   -#undef COND_CMD_FAT
482   -#undef COND_CMD_FDC
483   -#undef COND_CMD_FDOS
484   -#undef COND_CMD_HWFLOW
485   -#undef COND_CMD_IDE
486   -#undef COND_CMD_I2C
487   -#undef COND_CMD_JFFS2
488   -#undef COND_CMD_KGDB
489   -#undef COND_CMD_NAND
490   -#undef COND_CMD_NFS
491   -#undef COND_CMD_MMC
492   -#undef COND_CMD_MII
493   -#undef COND_CMD_PCI
494   -#undef COND_CMD_PCMCIA
495   -#undef COND_CMD_SCSI
496   -#undef COND_CMD_SPI
497   -#undef COND_CMD_VFD
498   -#undef COND_CMD_USB
499   -#undef COND_CMD_XIMG
  471 +#define CONFIG_CMD_CDP
  472 +#define CONFIG_CMD_DHCP
  473 +#define CONFIG_CMD_DIAG
  474 +#define CONFIG_CMD_DISPLAY
  475 +#define CONFIG_CMD_EXT2
  476 +#define CONFIG_CMD_IMMAP
  477 +#define CONFIG_CMD_IRQ
  478 +#define CONFIG_CMD_PING
  479 +#define CONFIG_CMD_PORTIO
  480 +#define CONFIG_CMD_REGINFO
  481 +#define CONFIG_CMD_REISER
  482 +#define CONFIG_CMD_SAVES
  483 +#define CONFIG_CMD_SDRAM
  484 +#define CONFIG_CMD_SNTP
500 485  
  486 +#undef CONFIG_CMD_NFS
  487 +#undef CONFIG_CMD_XIMG
501 488  
502 489 /*------------------------------------------------------------------------
503 490 * KGDB
include/configs/IDS8247.h
... ... @@ -120,6 +120,17 @@
120 120  
121 121 #define CFG_NS16550_COM1 (CFG_UART_BASE + 0x8000)
122 122  
  123 +
  124 +/* pass open firmware flat tree */
  125 +#define CONFIG_OF_LIBFDT 1
  126 +#define CONFIG_OF_BOARD_SETUP 1
  127 +
  128 +#define OF_CPU "PowerPC,8247@0"
  129 +#define OF_SOC "soc@f0000000"
  130 +#define OF_TBCLK (bd->bi_busfreq / 4)
  131 +#define OF_STDOUT_PATH "/soc@f0000000/serial8250@e0008000"
  132 +
  133 +
123 134 /*
124 135 * select ethernet configuration
125 136 *
126 137  
127 138  
... ... @@ -133,16 +144,18 @@
133 144 #undef CONFIG_ETHER_ON_SCC /* define if ether on SCC */
134 145 #define CONFIG_ETHER_ON_FCC /* define if ether on FCC */
135 146 #undef CONFIG_ETHER_NONE /* define if ether on something else */
136   -#define CONFIG_ETHER_INDEX 2 /* which SCC/FCC channel for ethernet */
  147 +#define CONFIG_ETHER_INDEX 1 /* which SCC/FCC channel for ethernet */
  148 +#define CONFIG_ETHER_ON_FCC1
  149 +#define FCC_ENET
137 150  
138 151 /*
139   - * - Rx-CLK is CLK13
140   - * - Tx-CLK is CLK14
  152 + * - Rx-CLK is CLK10
  153 + * - Tx-CLK is CLK9
141 154 * - RAM for BD/Buffers is on the 60x Bus (see 28-13)
142 155 * - Enable Full Duplex in FSMR
143 156 */
144   -# define CFG_CMXFCR_MASK (CMXFCR_FC2|CMXFCR_RF2CS_MSK|CMXFCR_TF2CS_MSK)
145   -# define CFG_CMXFCR_VALUE (CMXFCR_RF2CS_CLK13|CMXFCR_TF2CS_CLK14)
  157 +# define CFG_CMXFCR_MASK (CMXFCR_FC1|CMXFCR_RF1CS_MSK|CMXFCR_TF1CS_MSK)
  158 +# define CFG_CMXFCR_VALUE (CMXFCR_RF1CS_CLK10|CMXFCR_TF1CS_CLK9)
146 159 # define CFG_CPMFCR_RAMTYPE 0
147 160 # define CFG_FCC_PSMR (FCC_PSMR_FDE|FCC_PSMR_LPB)
148 161  
... ... @@ -166,6 +179,8 @@
166 179 #define CONFIG_BOOTP_BOOTPATH
167 180 #define CONFIG_BOOTP_BOOTFILESIZE
168 181  
  182 +#define CONFIG_RTC_PCF8563
  183 +#define CFG_I2C_RTC_ADDR 0x51
169 184  
170 185 /*
171 186 * Command line configuration.
... ... @@ -211,7 +226,10 @@
211 226 */
212 227 #define CFG_BOOTMAPSZ (8 << 20) /* Initial Memory map for Linux */
213 228  
214   -
  229 +#define CFG_FLASH_CFI /* The flash is CFI compatible */
  230 +#define CFG_FLASH_CFI_DRIVER /* Use common CFI driver */
  231 +#define CFG_FLASH_BANKS_LIST { 0xFF800000 }
  232 +#define CFG_MAX_FLASH_BANKS_DETECT 1
215 233 /* What should the base address of the main FLASH be and how big is
216 234 * it (in MBytes)? This must contain TEXT_BASE from board/ids8247/config.mk
217 235 * The main FLASH is whichever is connected to *CS0.
... ... @@ -227,7 +245,7 @@
227 245 * FLASH organization
228 246 */
229 247 #define CFG_MAX_FLASH_BANKS 1 /* max num of memory banks */
230   -#define CFG_MAX_FLASH_SECT 64 /* max num of sects on one chip */
  248 +#define CFG_MAX_FLASH_SECT 128 /* max num of sects on one chip */
231 249  
232 250 #define CFG_FLASH_ERASE_TOUT 240000 /* Flash Erase Timeout (in ms) */
233 251 #define CFG_FLASH_WRITE_TOUT 500 /* Flash Write Timeout (in ms) */
234 252  
235 253  
... ... @@ -511,12 +529,12 @@
511 529 */
512 530 #define CFG_OR2 ((~(CFG_GLOBAL_SDRAM_LIMIT-1) & ORxS_SDAM_MSK) |\
513 531 ORxS_BPD_4 |\
514   - ORxS_ROWST_PBI0_A10 |\
  532 + ORxS_ROWST_PBI0_A9 |\
515 533 ORxS_NUMR_12)
516 534  
517   -#define CFG_PSDMR (PSDMR_SDAM_A13_IS_A5 |\
  535 +#define CFG_PSDMR (PSDMR_SDAM_A14_IS_A5 |\
518 536 PSDMR_BSMA_A15_A17 |\
519   - PSDMR_SDA10_PBI0_A11 |\
  537 + PSDMR_SDA10_PBI0_A10 |\
520 538 PSDMR_RFRC_5_CLK |\
521 539 PSDMR_PRETOACT_2W |\
522 540 PSDMR_ACTTORW_2W |\
include/configs/LANTEC.h
... ... @@ -87,37 +87,23 @@
87 87 /*
88 88 * Command line configuration.
89 89 */
90   -#include <config_cmd_all.h>
  90 +#include <config_cmd_default.h>
91 91  
92   -#undef CONFIG_CMD_BEDBUG
93   -#undef CONFIG_CMD_BMP
94   -#undef CONFIG_CMD_BSP
95   -#undef CONFIG_CMD_DISPLAY
96   -#undef CONFIG_CMD_DOC
97   -#undef CONFIG_CMD_DTT
98   -#undef CONFIG_CMD_EEPROM
99   -#undef CONFIG_CMD_ELF
100   -#undef CONFIG_CMD_EXT2
101   -#undef CONFIG_CMD_FDC
102   -#undef CONFIG_CMD_FDOS
103   -#undef CONFIG_CMD_HWFLOW
104   -#undef CONFIG_CMD_I2C
105   -#undef CONFIG_CMD_IDE
106   -#undef CONFIG_CMD_IRQ
107   -#undef CONFIG_CMD_JFFS2
108   -#undef CONFIG_CMD_KGDB
109   -#undef CONFIG_CMD_MFSL
110   -#undef CONFIG_CMD_MII
111   -#undef CONFIG_CMD_MMC
112   -#undef CONFIG_CMD_NAND
113   -#undef CONFIG_CMD_PCI
114   -#undef CONFIG_CMD_PCMCIA
115   -#undef CONFIG_CMD_REISER
116   -#undef CONFIG_CMD_SCSI
117   -#undef CONFIG_CMD_SPI
118   -#undef CONFIG_CMD_UNIVERSE
119   -#undef CONFIG_CMD_USB
120   -#undef CONFIG_CMD_VFD
  92 +#define CONFIG_CMD_ASKENV
  93 +#define CONFIG_CMD_CACHE
  94 +#define CONFIG_CMD_CDP
  95 +#define CONFIG_CMD_DATE
  96 +#define CONFIG_CMD_DHCP
  97 +#define CONFIG_CMD_DIAG
  98 +#define CONFIG_CMD_FAT
  99 +#define CONFIG_CMD_IMMAP
  100 +#define CONFIG_CMD_PING
  101 +#define CONFIG_CMD_PORTIO
  102 +#define CONFIG_CMD_REGINFO
  103 +#define CONFIG_CMD_SAVES
  104 +#define CONFIG_CMD_SDRAM
  105 +#define CONFIG_CMD_SNTP
  106 +
121 107 #undef CONFIG_CMD_XIMG
122 108  
123 109 #if !(CONFIG_LANTEC >= 2)
include/configs/M54455EVB.h
... ... @@ -278,7 +278,7 @@
278 278 * FLASH organization
279 279 */
280 280 #ifdef CFG_ATMEL_BOOT
281   -# define CFG_FLASH_BASE CFG_CS0_BASE
  281 +# define CFG_FLASH_BASE CFG_CS0_BASE
282 282 # define CFG_FLASH0_BASE CFG_CS0_BASE
283 283 # define CFG_FLASH1_BASE CFG_CS1_BASE
284 284 # define CFG_ENV_ADDR (CFG_FLASH_BASE + 0x4000)
include/configs/MPC8260ADS.h
... ... @@ -209,35 +209,25 @@
209 209 /*
210 210 * Command line configuration.
211 211 */
212   -#include <config_cmd_all.h>
  212 +#include <config_cmd_default.h>
213 213  
214   -#undef CONFIG_CMD_BEDBUG
215   -#undef CONFIG_CMD_BMP
216   -#undef CONFIG_CMD_BSP
217   -#undef CONFIG_CMD_DATE
218   -#undef CONFIG_CMD_DISPLAY
219   -#undef CONFIG_CMD_DOC
220   -#undef CONFIG_CMD_DTT
221   -#undef CONFIG_CMD_EEPROM
222   -#undef CONFIG_CMD_ELF
223   -#undef CONFIG_CMD_EXT2
224   -#undef CONFIG_CMD_FAT
225   -#undef CONFIG_CMD_FDC
226   -#undef CONFIG_CMD_FDOS
227   -#undef CONFIG_CMD_HWFLOW
228   -#undef CONFIG_CMD_IDE
229   -#undef CONFIG_CMD_KGDB
230   -#undef CONFIG_CMD_MFSL
231   -#undef CONFIG_CMD_MMC
232   -#undef CONFIG_CMD_NAND
233   -#undef CONFIG_CMD_PCMCIA
234   -#undef CONFIG_CMD_REISER
235   -#undef CONFIG_CMD_SCSI
236   -#undef CONFIG_CMD_SPI
237   -#undef CONFIG_CMD_SNTP
238   -#undef CONFIG_CMD_UNIVERSE
239   -#undef CONFIG_CMD_USB
240   -#undef CONFIG_CMD_VFD
  214 +#define CONFIG_CMD_ASKENV
  215 +#define CONFIG_CMD_CACHE
  216 +#define CONFIG_CMD_CDP
  217 +#define CONFIG_CMD_DHCP
  218 +#define CONFIG_CMD_DIAG
  219 +#define CONFIG_CMD_I2C
  220 +#define CONFIG_CMD_IMMAP
  221 +#define CONFIG_CMD_IRQ
  222 +#define CONFIG_CMD_JFFS2
  223 +#define CONFIG_CMD_MII
  224 +#define CONFIG_CMD_PCI
  225 +#define CONFIG_CMD_PING
  226 +#define CONFIG_CMD_PORTIO
  227 +#define CONFIG_CMD_REGINFO
  228 +#define CONFIG_CMD_SAVES
  229 +#define CONFIG_CMD_SDRAM
  230 +
241 231 #undef CONFIG_CMD_XIMG
242 232  
243 233 #if CONFIG_ADSTYPE == CFG_8272ADS
include/configs/MPC8641HPCN.h
... ... @@ -346,6 +346,7 @@
346 346 #define CFG_USB_EVENT_POLL 1
347 347 #define CFG_USB_OHCI_SLOT_NAME "ohci_pci"
348 348 #define CFG_USB_OHCI_MAX_ROOT_PORTS 15
  349 +#define CFG_OHCI_SWAP_REG_ACCESS 1
349 350  
350 351 #if !defined(CONFIG_PCI_PNP)
351 352 #define PCI_ENET0_IOADDR 0xe0000000
... ... @@ -544,6 +545,7 @@
544 545 #define CONFIG_CMD_PCI
545 546 #define CONFIG_CMD_SCSI
546 547 #define CONFIG_CMD_EXT2
  548 + #define CONFIG_CMD_USB
547 549 #endif
548 550  
549 551  
include/configs/RBC823.h
... ... @@ -105,35 +105,30 @@
105 105 /*
106 106 * Command line configuration.
107 107 */
108   -#include <config_cmd_all.h>
  108 +#include <config_cmd_default.h>
109 109  
110   -#undef CONFIG_CMD_BSP
111   -#undef CONFIG_CMD_DATE
112   -#undef CONFIG_CMD_DISPLAY
113   -#undef CONFIG_CMD_DTT
114   -#undef CONFIG_CMD_EXT2
115   -#undef CONFIG_CMD_FDC
116   -#undef CONFIG_CMD_FDOS
117   -#undef CONFIG_CMD_HWFLOW
118   -#undef CONFIG_CMD_IDE
119   -#undef CONFIG_CMD_IRQ
120   -#undef CONFIG_CMD_JFFS2
121   -#undef CONFIG_CMD_MII
122   -#undef CONFIG_CMD_MFSL
123   -#undef CONFIG_CMD_MMC
124   -#undef CONFIG_CMD_NAND
125   -#undef CONFIG_CMD_PCI
126   -#undef CONFIG_CMD_PCMCIA
127   -#undef CONFIG_CMD_REISER
128   -#undef CONFIG_CMD_SCSI
  110 +#define CONFIG_CMD_ASKENV
  111 +#define CONFIG_CMD_BEDBUG
  112 +#define CONFIG_CMD_BMP
  113 +#define CONFIG_CMD_CACHE
  114 +#define CONFIG_CMD_CDP
  115 +#define CONFIG_CMD_DHCP
  116 +#define CONFIG_CMD_DIAG
  117 +#define CONFIG_CMD_DOC
  118 +#define CONFIG_CMD_EEPROM
  119 +#define CONFIG_CMD_ELF
  120 +#define CONFIG_CMD_FAT
  121 +#define CONFIG_CMD_I2C
  122 +#define CONFIG_CMD_IMMAP
  123 +#define CONFIG_CMD_KGDB
  124 +#define CONFIG_CMD_PING
  125 +#define CONFIG_CMD_PORTIO
  126 +#define CONFIG_CMD_REGINFO
  127 +#define CONFIG_CMD_SAVES
  128 +#define CONFIG_CMD_SDRAM
  129 +
129 130 #undef CONFIG_CMD_SETGETDCR
130   -#undef CONFIG_CMD_SNTP
131   -#undef CONFIG_CMD_SPI
132   -#undef CONFIG_CMD_UNIVERSE
133   -#undef CONFIG_CMD_USB
134   -#undef CONFIG_CMD_VFD
135 131 #undef CONFIG_CMD_XIMG
136   -
137 132  
138 133 /*
139 134 * Miscellaneous configurable options
include/configs/ep8260.h
... ... @@ -303,37 +303,28 @@
303 303 /*
304 304 * Command line configuration.
305 305 */
306   -#include <config_cmd_all.h>
  306 +#include <config_cmd_default.h>
307 307  
308   -#undef CONFIG_CMD_BMP
309   -#undef CONFIG_CMD_BSP
  308 +#define CONFIG_CMD_ASKENV
  309 +#define CONFIG_CMD_BEDBUG
  310 +#define CONFIG_CMD_CACHE
  311 +#define CONFIG_CMD_CDP
  312 +#define CONFIG_CMD_DATE
  313 +#define CONFIG_CMD_DIAG
  314 +#define CONFIG_CMD_ELF
  315 +#define CONFIG_CMD_FAT
  316 +#define CONFIG_CMD_I2C
  317 +#define CONFIG_CMD_IMMAP
  318 +#define CONFIG_CMD_IRQ
  319 +#define CONFIG_CMD_PING
  320 +#define CONFIG_CMD_PORTIO
  321 +#define CONFIG_CMD_REGINFO
  322 +#define CONFIG_CMD_SAVES
  323 +#define CONFIG_CMD_SDRAM
  324 +#define CONFIG_CMD_SNTP
  325 +
310 326 #undef CONFIG_CMD_DCR
311   -#undef CONFIG_CMD_DHCP
312   -#undef CONFIG_CMD_DISPLAY
313   -#undef CONFIG_CMD_DOC
314   -#undef CONFIG_CMD_DTT
315   -#undef CONFIG_CMD_EEPROM
316   -#undef CONFIG_CMD_EXT2
317   -#undef CONFIG_CMD_FDC
318   -#undef CONFIG_CMD_FDOS
319   -#undef CONFIG_CMD_HWFLOW
320   -#undef CONFIG_CMD_IDE
321   -#undef CONFIG_CMD_JFFS2
322   -#undef CONFIG_CMD_KGDB
323   -#undef CONFIG_CMD_MII
324   -#undef CONFIG_CMD_MFSL
325   -#undef CONFIG_CMD_MMC
326   -#undef CONFIG_CMD_NAND
327   -#undef CONFIG_CMD_PCI
328   -#undef CONFIG_CMD_PCMCIA
329   -#undef CONFIG_CMD_REISER
330   -#undef CONFIG_CMD_SCSI
331   -#undef CONFIG_CMD_SPI
332   -#undef CONFIG_CMD_UNIVERSE
333   -#undef CONFIG_CMD_USB
334   -#undef CONFIG_CMD_VFD
335 327 #undef CONFIG_CMD_XIMG
336   -
337 328  
338 329 /* Where do the internal registers live? */
339 330 #define CFG_IMMR 0xF0000000
include/configs/hymod.h
... ... @@ -185,32 +185,33 @@
185 185 /*
186 186 * Command line configuration.
187 187 */
188   -#include <config_cmd_all.h>
  188 +#include <config_cmd_default.h>
189 189  
190   -#undef CONFIG_CMD_BEDBUG
191   -#undef CONFIG_CMD_BMP
192   -#undef CONFIG_CMD_DISPLAY
193   -#undef CONFIG_CMD_DOC
194   -#undef CONFIG_CMD_EXT2
195   -#undef CONFIG_CMD_FDC
196   -#undef CONFIG_CMD_FDOS
  190 +#define CONFIG_CMD_ASKENV
  191 +#define CONFIG_CMD_BSP
  192 +#define CONFIG_CMD_CACHE
  193 +#define CONFIG_CMD_CDP
  194 +#define CONFIG_CMD_DATE
  195 +#define CONFIG_CMD_DHCP
  196 +#define CONFIG_CMD_DIAG
  197 +#define CONFIG_CMD_DTT
  198 +#define CONFIG_CMD_EEPROM
  199 +#define CONFIG_CMD_ELF
  200 +#define CONFIG_CMD_FAT
  201 +#define CONFIG_CMD_I2C
  202 +#define CONFIG_CMD_IMMAP
  203 +#define CONFIG_CMD_IRQ
  204 +#define CONFIG_CMD_KGDB
  205 +#define CONFIG_CMD_MII
  206 +#define CONFIG_CMD_PING
  207 +#define CONFIG_CMD_PORTIO
  208 +#define CONFIG_CMD_REGINFO
  209 +#define CONFIG_CMD_SAVES
  210 +#define CONFIG_CMD_SDRAM
  211 +#define CONFIG_CMD_SNTP
  212 +
197 213 #undef CONFIG_CMD_FPGA
198   -#undef CONFIG_CMD_HWFLOW
199   -#undef CONFIG_CMD_IDE
200   -#undef CONFIG_CMD_JFFS2
201   -#undef CONFIG_CMD_NAND
202   -#undef CONFIG_CMD_MFSL
203   -#undef CONFIG_CMD_MMC
204   -#undef CONFIG_CMD_PCMCIA
205   -#undef CONFIG_CMD_PCI
206   -#undef CONFIG_CMD_USB
207   -#undef CONFIG_CMD_REISER
208   -#undef CONFIG_CMD_SCSI
209   -#undef CONFIG_CMD_SPI
210   -#undef CONFIG_CMD_UNIVERSE
211   -#undef CONFIG_CMD_VFD
212 214 #undef CONFIG_CMD_XIMG
213   -
214 215  
215 216 #ifdef DEBUG
216 217 #define CONFIG_BOOTDELAY -1 /* autoboot disabled */
... ... @@ -979,7 +979,7 @@
979 979 {
980 980 BootpRequest();
981 981 }
982   -#endif
  982 +#endif /* CONFIG_CMD_DHCP */
983 983  
984   -#endif
  984 +#endif /* CONFIG_CMD_NET */
... ... @@ -405,7 +405,6 @@
405 405  
406 406 if (rpc_pkt.u.reply.rstatus ||
407 407 rpc_pkt.u.reply.verifier ||
408   - rpc_pkt.u.reply.astatus ||
409 408 rpc_pkt.u.reply.astatus) {
410 409 return -1;
411 410 }